svn commit: r379101 - in head/mail/sylpheed: . files

Emanuel Haupt ehaupt at FreeBSD.org
Mon Feb 16 18:25:18 UTC 2015 

Author: ehaupt
Date: Mon Feb 16 18:25:16 2015
New Revision: 379101
URL: https://svnweb.freebsd.org/changeset/ports/379101
QAT: https://qat.redports.org/buildarchive/r379101/

Log:
  - Use new options helpers
  - Provide an option to include CA bundle for certificate verification
  - Provide an option to depend on curl. Curl is required to check for remote
    updates. Enable this by default because the user expects this menu point to
    work but give users an option to explicitly disable.
  - Don't quiesce INSTALL_* commands

Added:
  head/mail/sylpheed/files/extra-patch-libsylph_ssl.c   (contents, props changed)
Modified:
  head/mail/sylpheed/Makefile

Modified: head/mail/sylpheed/Makefile
==============================================================================
--- head/mail/sylpheed/Makefile	Mon Feb 16 17:27:58 2015	(r379100)
+++ head/mail/sylpheed/Makefile	Mon Feb 16 18:25:16 2015	(r379101)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	3.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/  \
 		LOCAL/ehaupt
@@ -32,68 +32,48 @@ CONFIGURE_ARGS=	--enable-ipv6 \
 
 CONFLICTS=	sylpheed-1.[0-8]* sylpheed-2.[0-9]* sylpheed-gtk2-[0-9]*
 
-OPTIONS_DEFINE=	GPGME COMPFACE JPILOT LDAP SSL GTKSPELL ONIGURUMA DOCS
+OPTIONS_DEFINE=	CA_BUNDLE COMPFACE CURL DOCS GPGME GTKSPELL JPILOT LDAP \
+		ONIGURUMA SSL
 
-GPGME_DESC=	GnuPG support using GPGME
+CA_BUNDLE_DESC=	Include CA bundle for certificate verification
 COMPFACE_DESC=	X-Face support
-JPILOT_DESC=	JPilot support
+CURL_DESC=	libcurl dependency (remote update check)
+GPGME_DESC=	GnuPG support using GPGME
 GTKSPELL_DESC=	Spell checking support
+JPILOT_DESC=	JPilot support
 ONIGURUMA_DESC=	Oniguruma support
 
-OPTIONS_DEFAULT=SSL GTKSPELL
+OPTIONS_DEFAULT=CA_BUNDLE CURL GTKSPELL SSL
 
-.include <bsd.port.options.mk>
+CA_BUNDLE_RUN_DEPENDS=		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+CA_BUNDLE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-libsylph_ssl.c
 
-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--enable-ssl
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
+COMPFACE_LIB_DEPENDS=		libcompface.so:${PORTSDIR}/mail/faces
+COMPFACE_CONFIGURE_ENABLE=	compface
 
-.if ${PORT_OPTIONS:MGPGME}
-LIB_DEPENDS+=	libgpgme.so:${PORTSDIR}/security/gpgme
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=--enable-gpgme
-.else
-CONFIGURE_ARGS+=--disable-gpgme
-.endif
+CURL_RUN_DEPENDS=		curl:${PORTSDIR}/ftp/curl
 
-.if ${PORT_OPTIONS:MCOMPFACE}
-LIB_DEPENDS+=	libcompface.so:${PORTSDIR}/mail/faces
-CONFIGURE_ARGS+=--enable-compface
-.else
-CONFIGURE_ARGS+=--disable-compface
-.endif
+GPGME_LIB_DEPENDS=		libgpgme.so:${PORTSDIR}/security/gpgme
+GPGME_RUN_DEPENDS=		gpg:${PORTSDIR}/security/gnupg
+GPGME_CONFIGURE_ENABLE=		gpgme
 
-.if ${PORT_OPTIONS:MJPILOT}
-LIB_DEPENDS+=	libpisock.so:${PORTSDIR}/palm/pilot-link
-RUN_DEPENDS+=	jpilot:${PORTSDIR}/palm/jpilot
-CONFIGURE_ARGS+=--enable-jpilot
-.else
-CONFIGURE_ARGS+=--disable-jpilot
-.endif
+GTKSPELL_LIB_DEPENDS=		libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+GTKSPELL_CONFIGURE_ENABLE=	gtkspell
 
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--enable-ldap
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
+JPILOT_LIB_DEPENDS=		libpisock.so:${PORTSDIR}/palm/pilot-link
+JPILOT_RUN_DEPENDS=		jpilot:${PORTSDIR}/palm/jpilot
+JPILOT_CONFIGURE_ENABLE=	jpilot
 
-.if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
-CONFIGURE_ARGS+=--enable-gtkspell
-.else
-CONFIGURE_ARGS+=--disable-gtkspell
-.endif
+LDAP_CONFIGURE_ENABLE=		ldap
+LDAP_USE=			openldap=yes
 
-.if ${PORT_OPTIONS:MONIGURUMA}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libonig.a:${PORTSDIR}/devel/oniguruma5
-CONFIGURE_ARGS+=--enable-oniguruma
-.else
-CONFIGURE_ARGS+=--disable-oniguruma
-.endif
+ONIGURUMA_BUILD_DEPENDS=	${LOCALBASE}/lib/libonig.a:${PORTSDIR}/devel/oniguruma5
+ONIGURUMA_CONFIGURE_ENABLE=	oniguruma
+
+SSL_CONFIGURE_ENABLE=		ssl
+SSL_USE=			openssl=yes
+
+.include <bsd.port.options.mk>
 
 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 \
@@ -126,10 +106,10 @@ post-patch:
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ChangeLog INSTALL README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${i}.ja ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i}.ja ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${STAGEDIR}${PREFIX}/share/pixmaps/
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${STAGEDIR}${PREFIX}/share/applications/
 
 .include <bsd.port.mk>

Added: head/mail/sylpheed/files/extra-patch-libsylph_ssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/sylpheed/files/extra-patch-libsylph_ssl.c	Mon Feb 16 18:25:16 2015	(r379101)
@@ -0,0 +1,19 @@
+--- libsylph/ssl.c.orig	2014-06-10 06:06:36.000000000 +0200
++++ libsylph/ssl.c	2015-02-16 16:38:30.082429979 +0100
+@@ -59,6 +59,7 @@
+ 		LOOK_FOR("ca-bundle.crt");
+ 		LOOK_FOR("ca-root.crt");
+ 		LOOK_FOR("certs.crt");
++		LOOK_FOR("cert.pem");
+ 	}
+ 
+ #undef LOOK_FOR
+@@ -117,7 +118,7 @@
+ 			certs_dir = NULL;
+ 		}
+ #else
+-		certs_file = find_certs_file("/etc/ssl");
++		certs_file = find_certs_file("/usr/local/etc/ssl");
+ 		if (!certs_file)
+ 			certs_file = find_certs_file("/etc");
+ #endif

More information about the svn-ports-all mailing list