Date: Wed, 2 Jan 2013 13:25:06 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309815 - in head: . mail/opensmtpd mail/opensmtpd/files Message-ID: <201301021325.r02DP6w0094136@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Wed Jan 2 13:25:05 2013 New Revision: 309815 URL: http://svnweb.freebsd.org/changeset/ports/309815 Log: - Update to latest snapshot 201212222206 - Add dependency on databases/sqlite3 - Remove ABI version from LIB_DEPENDS - Document the configuration change in UPDATING Added: head/mail/opensmtpd/files/patch-smtpd_Makefile.am (contents, props changed) Deleted: head/mail/opensmtpd/files/patch-src_Makefile.am Modified: head/UPDATING head/mail/opensmtpd/Makefile head/mail/opensmtpd/distinfo head/mail/opensmtpd/files/pkg-deinstall.in head/mail/opensmtpd/files/pkg-install.in head/mail/opensmtpd/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jan 2 13:12:48 2013 (r309814) +++ head/UPDATING Wed Jan 2 13:25:05 2013 (r309815) @@ -5,6 +5,14 @@ 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. +20130102: + AFFECTS: users of mail/opensmtpd + AUTHOR: ashish@FreeBSD.org + + OpenSMTPD port has been updated to the latest portable snapshot. There + has been several changes to the configuration between the last version + and this version, which requires configuration file need to be reviewed. + 20121229: AFFECTS: users of devel/libical AUTHOR: gnome@FreeBSD.org Modified: head/mail/opensmtpd/Makefile ============================================================================== --- head/mail/opensmtpd/Makefile Wed Jan 2 13:12:48 2013 (r309814) +++ head/mail/opensmtpd/Makefile Wed Jan 2 13:25:05 2013 (r309815) @@ -6,19 +6,21 @@ # PORTNAME= opensmtpd -PORTVERSION= 201210090136 +PORTVERSION= 201212222206 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ http://distfiles.pirateparty.in/ashish/ +DISTNAME= ${PORTNAME}-${PORTVERSION}p1 MAINTAINER= ashish@FreeBSD.org COMMENT= OpenSMTPD is a free MTA -LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent +LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent \ + sqlite3:${PORTSDIR}/databases/sqlite3 LICENSE_NAME= ISCL -WRKSRC= ${WRKDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME}-5.2.xp1 USE_AUTOTOOLS= autoconf:env automake:env libtool:env GNU_CONFIGURE= yes @@ -30,7 +32,7 @@ SUB_FILES= pkg-install pkg-deinstall CONFLICTS= postfix-[0-9]* sendmail-[0-9]* MAN8= makemap.8 newaliases.8 smtpctl.8 smtpd.8 -MAN5= smtpd.conf.5 +MAN5= smtpd.conf.5 aliases.5 forward.5 USERS= _smtpd GROUPS= _smtpd Modified: head/mail/opensmtpd/distinfo ============================================================================== --- head/mail/opensmtpd/distinfo Wed Jan 2 13:12:48 2013 (r309814) +++ head/mail/opensmtpd/distinfo Wed Jan 2 13:25:05 2013 (r309815) @@ -1,2 +1,2 @@ -SHA256 (opensmtpd-201210090136.tar.gz) = de3eecd447e5554ada9129632f1184d33930eb2c5721d535ddfe90696912cdd2 -SIZE (opensmtpd-201210090136.tar.gz) = 253466 +SHA256 (opensmtpd-201212222206p1.tar.gz) = 49da146abfbe37a4364e006d1ceb801526cda34cc1831e5996e6f3ec18dc102e +SIZE (opensmtpd-201212222206p1.tar.gz) = 416789 Added: head/mail/opensmtpd/files/patch-smtpd_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/opensmtpd/files/patch-smtpd_Makefile.am Wed Jan 2 13:25:05 2013 (r309815) @@ -0,0 +1,42 @@ + +$FreeBSD$ + +--- smtpd/Makefile.am.orig ++++ smtpd/Makefile.am +@@ -97,7 +97,7 @@ + CFLAGS+= -D_GNU_SOURCE + CPPFLAGS= -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ + +-PATHS= -DSMTPD_CONFDIR=\"$(sysconfdir)\" \ ++PATHS= -DSMTPD_CONFDIR=\"$(sysconfdir)/mail\" \ + -DPATH_SMTPCTL=\"$(sbindir)/smtpctl\" \ + -DPATH_MAILLOCAL=\"$(libexecdir)/mail.local\" + +@@ -116,7 +116,7 @@ + ../contrib/lib/libc/asr/asr_private.h \ + $(CONFIGFILES_IN) $(MANPAGES_IN) + +-PATHSUBS= -e 's|/etc/mail/|$(sysconfdir)/|g' \ ++PATHSUBS= -e 's|/etc/mail/|$(sysconfdir)/mail/|g' \ + -e 's|/usr/libexec|$(libexecdir)|g' \ + -e 's|/var/run/smtpd.sock|$(sockdir)/smtpd.sock|g' + +@@ -142,16 +142,12 @@ + # smtpd.conf + # newaliases makemap + install-exec-hook: $(CONFIGFILES) $(MANPAGES) +- $(MKDIR_P) $(DESTDIR)$(sysconfdir) ++ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/mail + $(MKDIR_P) $(DESTDIR)$(bindir) + $(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)/mail/smtpd.conf.sample + + ln -f $(DESTDIR)$(sbindir)/smtpctl$(EXEEXT) \ + $(DESTDIR)$(bindir)/mailq$(EXEEXT); Modified: head/mail/opensmtpd/files/pkg-deinstall.in ============================================================================== --- head/mail/opensmtpd/files/pkg-deinstall.in Wed Jan 2 13:12:48 2013 (r309814) +++ head/mail/opensmtpd/files/pkg-deinstall.in Wed Jan 2 13:25:05 2013 (r309815) @@ -7,7 +7,7 @@ PREFIX=$(echo %%PREFIX%% |sed -e 's,/,\\ if [ "$TARGET" = POST-DEINSTALL ]; then sed -e '/[[:space:]]'$PREFIX'\/sbin\/smtpctl/d' \ - -e '/[[:space:]]'$PREFIX'\/libexec\/opensmtpd-portable\/makemap/d' \ + -e '/[[:space:]]'$PREFIX'\/libexec\/opensmtpd\/makemap/d' \ -e 's/^### smtpd: //g' -i '' /etc/mail/mailer.conf fi Modified: head/mail/opensmtpd/files/pkg-install.in ============================================================================== --- head/mail/opensmtpd/files/pkg-install.in Wed Jan 2 13:12:48 2013 (r309814) +++ head/mail/opensmtpd/files/pkg-install.in Wed Jan 2 13:25:05 2013 (r309815) @@ -9,8 +9,8 @@ if [ "$TARGET" = POST-INSTALL ]; then sendmail %%PREFIX%%/sbin/smtpctl send-mail %%PREFIX%%/sbin/smtpctl mailq %%PREFIX%%/sbin/smtpctl -makemap %%PREFIX%%/libexec/opensmtpd-portable/makemap -newaliases %%PREFIX%%/libexec/opensmtpd-portable/makemap +makemap %%PREFIX%%/libexec/opensmtpd/makemap +newaliases %%PREFIX%%/libexec/opensmtpd/makemap EOF fi Modified: head/mail/opensmtpd/pkg-plist ============================================================================== --- head/mail/opensmtpd/pkg-plist Wed Jan 2 13:12:48 2013 (r309814) +++ head/mail/opensmtpd/pkg-plist Wed Jan 2 13:25:05 2013 (r309815) @@ -1,10 +1,11 @@ bin/mailq bin/newaliases +bin/smtpscript etc/mail/smtpd.conf.sample libexec/mail.local -libexec/opensmtpd-portable/makemap +libexec/opensmtpd/makemap sbin/makemap sbin/smtpctl sbin/smtpd -@dirrm libexec/opensmtpd-portable +@dirrm libexec/opensmtpd @dirrmtry etc/mail
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301021325.r02DP6w0094136>