svn commit: r335834 - in head: . mail/opensmtpd mail/opensmtpd/files
Ashish SHUKLA
ashish at FreeBSD.org
Sat Dec 7 17:14:14 UTC 2013
Author: ashish
Date: Sat Dec 7 17:14:12 2013
New Revision: 335834
URL: http://svnweb.freebsd.org/changeset/ports/335834
Log:
- Update to 5.4.1p1
- Update LICENSE information
- Add OPTIONS for SQLITE, MYSQL, PGSQL, and LDAP
- Add STAGE support
- Add a note to UPDATING about change in configuration
Changes: http://article.gmane.org/gmane.mail.opensmtpd.general/1146
Added:
head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in (contents, props changed)
Deleted:
head/mail/opensmtpd/files/patch-bootstrap
head/mail/opensmtpd/files/patch-smtpd_Makefile.am
Modified:
head/UPDATING
head/mail/opensmtpd/Makefile
head/mail/opensmtpd/distinfo
head/mail/opensmtpd/pkg-descr
head/mail/opensmtpd/pkg-plist
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Sat Dec 7 16:21:06 2013 (r335833)
+++ head/UPDATING Sat Dec 7 17:14:12 2013 (r335834)
@@ -5,6 +5,13 @@ 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.
+20131207:
+ AFFECTS: users of mail/opensmtpd
+ AUTHOR: ashish at FreeBSD.org
+
+ There has been changes to the OpenSMTPD configuration. Please refer to
+ smtpd.conf(5), and use "smtpd -nf smtpd.conf" to validate.
+
20131203:
AFFECTS: users of graphics/opencv, graphics/opencv-core
AUTHOR: jhale at FreeBSD.org
Modified: head/mail/opensmtpd/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile Sat Dec 7 16:21:06 2013 (r335833)
+++ head/mail/opensmtpd/Makefile Sat Dec 7 17:14:12 2013 (r335834)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= opensmtpd
-PORTVERSION= 5.3.3
+PORTVERSION= 5.4.1
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.opensmtpd.org/archives/ \
@@ -13,34 +13,65 @@ MAINTAINER= ashish at FreeBSD.org
COMMENT= OpenSMTPD is a free MTA
LICENSE= ISCL
-LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent
-OPTIONS_DEFINE= PAM
+OPTIONS_DEFINE= PAM SQLITE MYSQL PGSQL LDAP
OPTIONS_DEFAULT= PAM
USE_AUTOTOOLS= autoconf:env automake:env libtool:env
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/
+CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \
+ --with-mailwrapper
USE_RC_SUBR= smtpd
SUB_FILES= pkg-install pkg-deinstall pkg-message
CONFLICTS_INSTALL= postfix-[0-9]* sendmail-[0-9]* opensmtpd-devel-[0-9]*
-MAN8= makemap.8 newaliases.8 smtpctl.8 smtpd.8
-MAN5= smtpd.conf.5 aliases.5 forward.5
-
USERS= _smtpd _smtpq _smtpf
GROUPS= _smtpd
-NO_STAGE= yes
.include <bsd.port.options.mk>
USE_OPENSSL= yes
+.if ${PORT_OPTIONS:MMYSQL}
+USE_MYSQL= yes
+CFLAGS+= -I${LOCALBASE}/include/mysql
+LDFLAGS+= -L${LOCALBASE}/lib/mysql
+CONFIGURE_ARGS+= --with-experimental-mysql
+PLIST_SUB+= MYSQL=""
+.else
+PLIST_SUB+= MYSQL="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
+USE_SQLITE= 3
+CONFIGURE_ARGS+= --with-experimental-sqlite
+PLIST_SUB+= SQLITE=""
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+.else
+PLIST_SUB+= SQLITE="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL= yes
+CONFIGURE_ARGS+= --with-experimental-postgres
+PLIST_SUB+= PGSQL=""
+.else
+PLIST_SUB+= PGSQL="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
+CONFIGURE_ARGS+= --with-experimental-ldap
+PLIST_SUB+= LDAP=""
+.else
+PLIST_SUB+= LDAP="@comment "
+.endif
+
.if ${PORT_OPTIONS:MPAM}
CONFIGURE_ARGS+= --with-pam
.endif
@@ -50,13 +81,6 @@ CONFIGURE_ARGS+= --with-pam
WITH_OPENSSL_PORT= yes
.endif
-pre-configure:
- @cd ${WRKSRC} && ./bootstrap
-
-post-install:
- @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${CAT} ${PKGMESSAGE}
-
post-deinstall:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-DEINSTALL
Modified: head/mail/opensmtpd/distinfo
==============================================================================
--- head/mail/opensmtpd/distinfo Sat Dec 7 16:21:06 2013 (r335833)
+++ head/mail/opensmtpd/distinfo Sat Dec 7 17:14:12 2013 (r335834)
@@ -1,2 +1,2 @@
-SHA256 (opensmtpd-5.3.3p1.tar.gz) = 34f0e208e6fdde5c5c25bb11f468436c4d6148a8b640c32117869cad140b823c
-SIZE (opensmtpd-5.3.3p1.tar.gz) = 343733
+SHA256 (opensmtpd-5.4.1p1.tar.gz) = 7debbf7e55ff3687617ae2c3b38e1cf30574b96f56b869e597c0e98478e5b5d9
+SIZE (opensmtpd-5.4.1p1.tar.gz) = 871745
Added: head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/opensmtpd/files/patch-mk_smtpd_Makefile.in Sat Dec 7 17:14:12 2013 (r335834)
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- mk/smtpd/Makefile.in.orig
++++ mk/smtpd/Makefile.in
+@@ -1906,11 +1906,7 @@
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+
+- @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \
+- $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
+- else \
+- echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
+- fi
++ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf.sample
+
+ $(INSTALL) -m 644 aliases.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5
+ $(INSTALL) -m 644 forward.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/forward.5
Modified: head/mail/opensmtpd/pkg-descr
==============================================================================
--- head/mail/opensmtpd/pkg-descr Sat Dec 7 16:21:06 2013 (r335833)
+++ head/mail/opensmtpd/pkg-descr Sat Dec 7 17:14:12 2013 (r335834)
@@ -3,4 +3,4 @@ defined by RFC 5321, with some additiona
allows ordinary machines to exchange e-mails with other systems
speaking the SMTP protocol.
-WWW: http://www.OpenSMTPD.org/
+WWW: http://www.OpenSMTPD.org/
Modified: head/mail/opensmtpd/pkg-plist
==============================================================================
--- head/mail/opensmtpd/pkg-plist Sat Dec 7 16:21:06 2013 (r335833)
+++ head/mail/opensmtpd/pkg-plist Sat Dec 7 17:14:12 2013 (r335834)
@@ -1,10 +1,26 @@
-bin/mailq
-bin/newaliases
-bin/smtpscript
etc/mail/smtpd.conf.sample
-libexec/mail.local
+libexec/opensmtpd/mail.local
libexec/opensmtpd/makemap
-sbin/makemap
+libexec/opensmtpd/queue-null
+libexec/opensmtpd/queue-ram
+libexec/opensmtpd/queue-stub
+libexec/opensmtpd/table-stub
+libexec/opensmtpd/table-passwd
+%%MYSQL%%libexec/opensmtpd/table-mysql
+%%SQLITE%%libexec/opensmtpd/table-sqlite
+%%LDAP%%libexec/opensmtpd/table-ldap
+%%PGSQL%%libexec/opensmtpd/table-postgres
+libexec/opensmtpd/scheduler-ram
+libexec/opensmtpd/scheduler-stub
+man/man8/makemap.8.gz
+man/man8/newaliases.8.gz
+man/man8/sendmail.8.gz
+man/man8/smtpctl.8.gz
+man/man8/smtpd.8.gz
+man/man5/forward.5.gz
+man/man5/aliases.5.gz
+man/man5/table.5.gz
+man/man5/smtpd.conf.5.gz
sbin/smtpctl
sbin/smtpd
@dirrm libexec/opensmtpd
More information about the svn-ports-head
mailing list