Index: head/mail/sylpheed/Makefile =================================================================== --- head/mail/sylpheed/Makefile (revision 379100) +++ head/mail/sylpheed/Makefile (revision 379101) @@ -1,135 +1,115 @@ # Created by: shigeri # $FreeBSD$ 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 MAINTAINER= ehaupt@FreeBSD.org COMMENT= Lightweight, featureful, and fast GTK+ based e-mail client LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support USES= gettext iconv gmake pkgconfig tar:bzip2 desktop-file-utils \ libtool USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-ipv6 \ --prefix=${PREFIX} \ --with-libintl-prefix=${LOCALBASE} \ --program-transform-name='' 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 +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 + 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 libsylph/Makefile.in \ src/icons/Makefile.in post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \ s|-lresolv||g; s|-lpisock\"|${ICONV_LIB} &|g;' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \ ${WRKSRC}/libsylph/procmime.c # to prevent breaking cc of ldif.c because of a base64.h in PREFIX/include @${REINPLACE_CMD} -e 's|^\(DEFS.*\.\.\)$$|\1 -I../libsylph|' \ ${WRKSRC}/src/Makefile.in .if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e 's|^SUBDIRS = ac libsylph src plugin po manual faq nsis$$|SUBDIRS = ac libsylph src plugin po nsis|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: @${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 Index: head/mail/sylpheed/files/extra-patch-libsylph_ssl.c =================================================================== --- head/mail/sylpheed/files/extra-patch-libsylph_ssl.c (nonexistent) +++ head/mail/sylpheed/files/extra-patch-libsylph_ssl.c (revision 379101) @@ -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 Property changes on: head/mail/sylpheed/files/extra-patch-libsylph_ssl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property