aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING15
-rw-r--r--mail/opensmtpd/Makefile27
-rw-r--r--mail/opensmtpd/distinfo4
-rw-r--r--mail/opensmtpd/files/patch-mk_smtpd_Makefile.in2
4 files changed, 24 insertions, 24 deletions
diff --git a/UPDATING b/UPDATING
index f12d99e2d04d..1f0e6fa90c1f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20150427:
+ AFFECTS: users of mail/opensmtpd
+ AUTHOR: ashish@FreeBSD.org
+
+ Following OPTIONS are being removed in 5.4.5p1:
+
+ - LDAP
+ - SQLITE
+ - MYSQL
+ - PGSQL
+ - REDIS
+
+ They are disabled/removed in upstream since 5.4.4p1, but did not get removed
+ from port.
+
20150420:
AFFECTS: users of devel/icu
AUTHOR: bapt@FreeBSD.org
diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
index 8c3641697f4a..421b54c50027 100644
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= opensmtpd
-PORTVERSION= 5.4.4
-PORTREVISION= 1
+PORTVERSION= 5.4.5
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.opensmtpd.org/archives/ \
@@ -18,8 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2
-OPTIONS_DEFINE= CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS LIBASRDEVEL \
- MAILERCONF
+OPTIONS_DEFINE= CA_BUNDLE PAM LIBASRDEVEL MAILERCONF
OPTIONS_DEFAULT= CA_BUNDLE PAM
@@ -52,24 +50,11 @@ LIBASRDEVEL_LIB_DEPENDS= libasr.so:${PORTSDIR}/dns/libasr-devel
CA_BUNDLE_CONFIGURE_ON= --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-MYSQL_USE= MYSQL=yes
-MYSQL_CFLAGS= -I${LOCALBASE}/include/mysql
-MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
-MYSQL_CONFIGURE_ON= --with-experimental-mysql
-
-SQLITE_USE= SQLITE=3
-SQLITE_CFLAGS= -I${LOCALBASE}/include
-SQLITE_LDFLAGS= -L${LOCALBASE}/lib
-SQLITE_CONFIGURE_ON= --with-experimental-sqlite
-
-PGSQL_USES= pgsql
-PGSQL_CONFIGURE_ON= --with-experimental-postgres
-
-LDAP_CONFIGURE_ON= --with-experimental-ldap
-
PAM_CONFIGURE_ON= --with-pam --with-pam-service=smtpd
-REDIS_LIB_DEPENDS= libhiredis.so:${PORTSDIR}/databases/hiredis
-REDIS_CONFIGURE_ON= --with-experimental-redis
+post-patch:
+ @${FIND} ${WRKSRC} -type f -name 'Makefile.in' |${XARGS} ${TOUCH}
+ @${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in
+ @${TOUCH} ${WRKSRC}/config.h.in ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/mail/opensmtpd/distinfo b/mail/opensmtpd/distinfo
index f4491fa843c5..c7cc9715be3a 100644
--- a/mail/opensmtpd/distinfo
+++ b/mail/opensmtpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-5.4.4p1.tar.gz) = 1118330aa54e9a8a30914a1f2e129a83f2954a5956300eade522a1396f6d8ebd
-SIZE (opensmtpd-5.4.4p1.tar.gz) = 798968
+SHA256 (opensmtpd-5.4.5p1.tar.gz) = 7a926cee9b237c443fa83b372ddd92ecaafc56bd7c4ed65e14e73d8d6f665197
+SIZE (opensmtpd-5.4.5p1.tar.gz) = 797097
diff --git a/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in b/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
index 2a4ff86867ec..b45e8dbd6574 100644
--- a/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
+++ b/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
@@ -3,7 +3,7 @@ $FreeBSD$
--- mk/smtpd/Makefile.in.orig
+++ mk/smtpd/Makefile.in
-@@ -1782,11 +1782,7 @@
+@@ -1793,11 +1793,7 @@
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8