Update to 0.9.12.20040622

PR:		ports/68620
Submitted by:	maintainer

5 files changed, 28 insertions, 61 deletions

diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 91068ef..ee30a3a 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		sylpheed-gtk2
-PORTVERSION=		0.9.11.20040613
-PORTREVISION=		1
+PORTVERSION=		0.9.12.20040622
 CATEGORIES=		mail ipv6
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,15 +20,14 @@ USE_GMAKE=		yes
 USE_ICONV=		yes
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk20
-USE_OPENSSL=		yes
 USE_LIBTOOL_VER=	15
 USE_REINPLACE=		yes
 
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=		--enable-ssl
 
-OPTIONS=		GPGME "GnuPG support (using GPGME)" off \
+OPTIONS=		SSL "SSL support" off \
+			GPGME "GnuPG support (using GPGME)" off \
 			COMPFACE "X-Face support (using compface)" off \
 			JPILOT "JPilot support" off \
 			LDAP "LDAP support" off
@@ -38,6 +36,12 @@ CONFLICTS=		sylpheed-0.*
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_SSL)
+# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+CONFIGURE_ARGS+=	--enable-ssl
+.endif
+
 .if defined(WITH_GPGME)
 LIB_DEPENDS+=		gpgme.9:${PORTSDIR}/security/gpgme
 RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
@@ -61,41 +65,16 @@ USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--enable-ldap
 .endif
 
-MAKEFILES=		Makefile.in		\
-			ac/Makefile.in		\
-			faq/Makefile.in		\
-			faq/de/Makefile.in 	\
-			faq/en/Makefile.in	\
-			faq/es/Makefile.in	\
-			faq/fr/Makefile.in	\
-			faq/it/Makefile.in	\
-			manual/Makefile.in	\
-			manual/en/Makefile.in	\
-			manual/ja/Makefile.in	\
-			src/Makefile.in
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
-		s|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
-
+	@${REINPLACE_CMD} -e \
+		's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \
+		 s|-lresolv||g; s|-lpisock\"|-liconv &|g; \
+		 s|^manualdir=.*|manualdir="${DOCSDIR}/manual"|g; \
+		 s|^faqdir=.*|faqdir="${DOCSDIR}/faq"|g' \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po src manual faq$$|SUBDIRS = ac po src|g' \
 		${WRKSRC}/Makefile.in
-.else
-.for i in ${MAKEFILES}
-	@${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \
-		s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \
-		${WRKSRC}/${i}
-.endfor
-.endif
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ChangeLog INSTALL README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${i}.jp ${DOCSDIR}
-.endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/sylpheed-gtk2/distinfo b/mail/sylpheed-gtk2/distinfo
index 1e8d0d7..9b56c18 100644
--- a/mail/sylpheed-gtk2/distinfo
+++ b/mail/sylpheed-gtk2/distinfo
@@ -1,2 +1,2 @@
-MD5 (sylpheed-0.9.11-gtk2-20040613.tar.gz) = f652436eed105967c5faa6583695c89d
-SIZE (sylpheed-0.9.11-gtk2-20040613.tar.gz) = 3378496
+MD5 (sylpheed-0.9.12-gtk2-20040622.tar.gz) = 9f1a4a642aac8645bf940dba07d19835
+SIZE (sylpheed-0.9.12-gtk2-20040622.tar.gz) = 3375655
diff --git a/mail/sylpheed-gtk2/files/patch-src::defs.h b/mail/sylpheed-gtk2/files/patch-src::defs.h
index 16f79ae..95df340 100644
--- a/mail/sylpheed-gtk2/files/patch-src::defs.h
+++ b/mail/sylpheed-gtk2/files/patch-src::defs.h
@@ -1,11 +1,6 @@
---- src/defs.h.orig	Sun Jun 13 23:42:41 2004
-+++ src/defs.h	Wed Jun 16 02:57:31 2004
-@@ -60,11 +60,11 @@
- #define CACHE_FILE		".sylpheed_cache"
- #define MARK_FILE		".sylpheed_mark"
- /*#warning FIXME_GTK2 */
--#define CACHE_VERSION		2018
-+#define CACHE_VERSION		2019
+--- src/defs.h.orig	Sat Jul  3 01:49:41 2004
++++ src/defs.h	Sat Jul  3 01:50:15 2004
+@@ -64,7 +64,7 @@
  #define MARK_VERSION		2
  
  #define DEFAULT_SIGNATURE	".signature"
diff --git a/mail/sylpheed-gtk2/files/patch-src::main.c b/mail/sylpheed-gtk2/files/patch-src::main.c
index 77ad5c7..9e5ca81 100644
--- a/mail/sylpheed-gtk2/files/patch-src::main.c
+++ b/mail/sylpheed-gtk2/files/patch-src::main.c
@@ -1,23 +1,24 @@
---- src/main.c.orig	Sun Apr 18 17:22:45 2004
-+++ src/main.c	Sun Apr 18 17:23:11 2004
-@@ -194,21 +194,6 @@
+--- src/main.c.orig	Sat Jul  3 01:52:00 2004
++++ src/main.c	Sat Jul  3 01:52:35 2004
+@@ -194,22 +194,6 @@
  
  	srandom((gint)time(NULL));
  
 -	/* parse gtkrc files */
--	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc",
+-	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc-2.0",
 -			     NULL);
 -	gtk_rc_parse(userrc);
 -	g_free(userrc);
 -	userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk",
--			     G_DIR_SEPARATOR_S, "gtkrc", NULL);
+-			     G_DIR_SEPARATOR_S, "gtkrc-2.0", NULL);
 -	gtk_rc_parse(userrc);
 -	g_free(userrc);
--	userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc", NULL);
+-	userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc-2.0",
+-			     NULL);
 -	gtk_rc_parse(userrc);
 -	g_free(userrc);
 -
--	gtk_rc_parse("./gtkrc");
+-	gtk_rc_parse("./gtkrc-2.0");
 -
  	userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
  	gtk_accel_map_load (userrc);
diff --git a/mail/sylpheed-gtk2/pkg-plist b/mail/sylpheed-gtk2/pkg-plist
index f1a15e1..6a457ee 100644
--- a/mail/sylpheed-gtk2/pkg-plist
+++ b/mail/sylpheed-gtk2/pkg-plist
@@ -1,12 +1,4 @@
 bin/sylpheed
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.jp
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.jp
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.jp
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/TODO.jp
 share/locale/bg/LC_MESSAGES/sylpheed.mo
 share/locale/cs/LC_MESSAGES/sylpheed.mo
 share/locale/da/LC_MESSAGES/sylpheed.mo