svn commit: r384809 - in head: . mail/opensmtpd mail/opensmtpd/files

[Ashish SHUKLA]

Author: ashish
Date: Mon Apr 27 02:42:22 2015
New Revision: 384809
URL: https://svnweb.freebsd.org/changeset/ports/384809

Log:
  - Update to 5.4.5p1
  - Remove OPTIONS for the features unsupported upstream: SQLITE, MYSQL,
    LDAP, PGSQL, and REDIS
  - Add workaround to prevent unnecessary dependency on autotools, due
    to problem with tarball
  - Add note to UPDATING about the removal of OPTIONS

Modified:
  head/UPDATING
  head/mail/opensmtpd/Makefile
  head/mail/opensmtpd/distinfo
  head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Apr 27 02:26:18 2015	(r384808)
+++ head/UPDATING	Mon Apr 27 02:42:22 2015	(r384809)
@@ -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 at 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 at FreeBSD.org

Modified: head/mail/opensmtpd/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile	Mon Apr 27 02:26:18 2015	(r384808)
+++ head/mail/opensmtpd/Makefile	Mon Apr 27 02:42:22 2015	(r384809)
@@ -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:${POR
 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>

Modified: head/mail/opensmtpd/distinfo
==============================================================================
--- head/mail/opensmtpd/distinfo	Mon Apr 27 02:26:18 2015	(r384808)
+++ head/mail/opensmtpd/distinfo	Mon Apr 27 02:42:22 2015	(r384809)
@@ -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

Modified: head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
==============================================================================
--- head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in	Mon Apr 27 02:26:18 2015	(r384808)
+++ head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in	Mon Apr 27 02:42:22 2015	(r384809)
@@ -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