From a794556dae7c3e38aeafbfd3a104109c118ad61e Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Tue, 24 Sep 2013 16:34:28 +0200 Subject: [PATCH] mail/claws-mail: Make libetpan dependency optional --- mail/claws-mail/Makefile | 9 ++++++--- mail/claws-mail/Makefile.claws | 1 + mail/claws-mail/pkg-plist | 12 ++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 615c7f3..d09c968 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -8,7 +8,6 @@ CATEGORIES= mail news ipv6 COMMENT= Lightweight and featureful GTK+ based e-mail and news client LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ - libetpan.so:${PORTSDIR}/mail/libetpan \ libgnutls.so:${PORTSDIR}/security/gnutls \ libgcrypt.so:${PORTSDIR}/security/libgcrypt RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support @@ -18,17 +17,18 @@ USES= desktop-file-utils pathfix INSTALLS_ICONS= yes OPTIONS_DEFINE= COMPFACE DEBUG DOCS ENCHANT IPV6 JPILOT LDAP \ - MANUAL NLS STARTUP THEMES + LIBETPAN MANUAL NLS STARTUP THEMES OPTIONS_SUB= yes COMPFACE_DESC= X-Face support ENCHANT_DESC= Spell checking support JPILOT_DESC= JPilot support +LIBETPAN_DESC= IMAP and NNTP support MANUAL_DESC= User manual STARTUP_DESC= Startup notification support THEMES_DESC= Additional themes -OPTIONS_DEFAULT= COMPFACE ENCHANT MANUAL STARTUP THEMES +OPTIONS_DEFAULT= COMPFACE ENCHANT LIBETPAN MANUAL STARTUP THEMES COMPFACE_CONFIGURE_ENABLE= compface COMPFACE_LIB_DEPENDS= libcompface.so:${PORTSDIR}/mail/faces @@ -47,6 +47,9 @@ JPILOT_RUN_DEPENDS= jpilot:${PORTSDIR}/palm/jpilot LDAP_CONFIGURE_ENABLE= ldap LDAP_USE= openldap=yes +LIBETPAN_CONFIGURE_ENABLE= libetpan +LIBETPAN_LIB_DEPENDS= libetpan.so:${PORTSDIR}/mail/libetpan + MANUAL_CONFIGURE_ON= --enable-manual --with-manualdir=${DOCSDIR}/manual MANUAL_CONFIGURE_OFF= --disable-manual MANUAL_BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2html:${PORTSDIR}/textproc/docbook-utils diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws index afc07c7..8dc47f3 100644 --- a/mail/claws-mail/Makefile.claws +++ b/mail/claws-mail/Makefile.claws @@ -74,4 +74,5 @@ do-install: cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD} install DESTDIR="${STAGEDIR}" . endfor +CONFIGURE_ARGS+= --disable-libetpan .endif diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist index a8e2024..17c3fe8 100644 --- a/mail/claws-mail/pkg-plist +++ b/mail/claws-mail/pkg-plist @@ -69,12 +69,12 @@ include/claws-mail/editldap_basedn.h include/claws-mail/edittags.h include/claws-mail/editvcard.h include/claws-mail/enriched.h -include/claws-mail/etpan/etpan-errors.h -include/claws-mail/etpan/etpan-ssl.h -include/claws-mail/etpan/etpan-thread-manager-types.h -include/claws-mail/etpan/etpan-thread-manager.h -include/claws-mail/etpan/imap-thread.h -include/claws-mail/etpan/nntp-thread.h +%%LIBETPAN%%include/claws-mail/etpan/etpan-errors.h +%%LIBETPAN%%include/claws-mail/etpan/etpan-ssl.h +%%LIBETPAN%%include/claws-mail/etpan/etpan-thread-manager-types.h +%%LIBETPAN%%include/claws-mail/etpan/etpan-thread-manager.h +%%LIBETPAN%%include/claws-mail/etpan/imap-thread.h +%%LIBETPAN%%include/claws-mail/etpan/nntp-thread.h include/claws-mail/exphtmldlg.h include/claws-mail/expldifdlg.h include/claws-mail/export.h -- 2.1.2