aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authordanilo <danilo@FreeBSD.org>2014-01-24 06:52:32 +0800
committerdanilo <danilo@FreeBSD.org>2014-01-24 06:52:32 +0800
commit9dfd42ea5342e4c10153cbe9e07b2f221b49d805 (patch)
tree37e50aea7bcf945031b559f055b82191c92d7c49 /mail
parent72d80f986181c270b400bde38021fc73c9248580 (diff)
downloadfreebsd-ports-gnome-9dfd42ea5342e4c10153cbe9e07b2f221b49d805.tar.gz
freebsd-ports-gnome-9dfd42ea5342e4c10153cbe9e07b2f221b49d805.tar.zst
freebsd-ports-gnome-9dfd42ea5342e4c10153cbe9e07b2f221b49d805.zip
- Update from 3.1.9 to 3.1.10
while here - Convert all "if's" in options helpers PR: ports/186047 Submitted by: Alan Hicks <ahicks@p-o.co.uk> (maintainer)
Diffstat (limited to 'mail')
-rw-r--r--mail/dbmail/Makefile38
-rw-r--r--mail/dbmail/distinfo4
2 files changed, 14 insertions, 28 deletions
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 2c168596ef12..ba93137138fe 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dbmail
-PORTVERSION= 3.1.9
+PORTVERSION= 3.1.10
CATEGORIES= mail
MASTER_SITES= http://www.dbmail.org/download/3.1/ \
http://git.dbmail.eu/paul/dbmail/snapshot/
@@ -17,7 +17,7 @@ LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
libmhash.so:${PORTSDIR}/security/mhash \
libevent-2.0.so:${PORTSDIR}/devel/libevent2
-BUILD_DEPENDS+= asciidoc:${PORTSDIR}/textproc/asciidoc \
+BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \
xmlto:${PORTSDIR}/textproc/xmlto \
${LOCALBASE}/share/sgml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-450
@@ -27,6 +27,8 @@ OPTIONS_DEFINE= DOCS LDAP SIEVE THREADS
OPTIONS_DEFAULT= THREADS
SIEVE_DESC= Build with support for Sieve mail sorting language
+OPTIONS_SUB= yes
+
USE_AUTOTOOLS= libtool autoheader autoconf
USE_LDCONFIG= ${PREFIX}/lib/dbmail
USE_RC_SUBR= dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
@@ -43,7 +45,13 @@ MAKE_ARGS+= mandir=${MANPREFIX}/man
DOCS= AUTHORS BUGS INSTALL THANKS UPGRADING
-.include <bsd.port.options.mk>
+SIEVE_CONFIGURE_WITH= sieve
+SIEVE_LIB_DEPENDS= libsieve.so:${PORTSDIR}/mail/libsieve
+
+LDAP_CONFIGURE_WITH= ldap
+LDAP_USE= OPENLDAP=yes
+
+THREADS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-acinclude.m4
DBMAIL_USER?= mailnull
DBMAIL_GROUP?= mail
@@ -53,28 +61,6 @@ PLIST_SUB+= DBMAIL_USER="${DBMAIL_USER}" \
DBMAIL_GROUP="${DBMAIL_GROUP}" \
PIDDIR="${PIDDIR}"
-.if ${PORT_OPTIONS:MSIEVE}
-CONFIGURE_ARGS+=--with-sieve=${LOCALBASE}
-LIB_DEPENDS+= libsieve.so:${PORTSDIR}/mail/libsieve
-PLIST_SUB+= SIEVE=""
-.else
-CONFIGURE_ARGS+=--without-sieve
-PLIST_SUB+= SIEVE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-USE_OPENLDAP= yes
-PLIST_SUB+= LDAP=""
-.else
-CONFIGURE_ARGS+=--without-ldap
-PLIST_SUB+= LDAP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTHREADS}
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-acinclude.m4
-.endif
-
post-install:
${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${STAGEDIR}${PREFIX}/etc/dbmail.conf-dist
@${MKDIR} ${STAGEDIR}${DATADIR}
@@ -86,6 +72,6 @@ post-install:
@${MKDIR} ${STAGEDIR}${PIDDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
- @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+ (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
.include <bsd.port.mk>
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 7c5107eb5aeb..75018568a7fd 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dbmail-3.1.9.tar.gz) = 665f42700654aae767d24647dde284a4df7aec1702a00d1122d55b3f9f4318dd
-SIZE (dbmail-3.1.9.tar.gz) = 2397293
+SHA256 (dbmail-3.1.10.tar.gz) = 7a5b82eb8feb45faf215bebee7fb648092e5eaa71b2d5acd5826ca36d8e63f4f
+SIZE (dbmail-3.1.10.tar.gz) = 2397512