svn commit: r367193 - in head/mail/maildrop: . files

Guido Falsi madpilot at FreeBSD.org
Wed Sep 3 13:21:59 UTC 2014 

Author: madpilot
Date: Wed Sep  3 13:21:58 2014
New Revision: 367193
URL: http://svnweb.freebsd.org/changeset/ports/367193
QAT: https://qat.redports.org/buildarchive/r367193/

Log:
  - Update to 2.7.2
  - Allow packaging as a user adn don't use @exec directives in plist

Deleted:
  head/mail/maildrop/files/patch-libs_unicode_configure
Modified:
  head/mail/maildrop/Makefile
  head/mail/maildrop/distinfo
  head/mail/maildrop/files/patch-Makefile.in
  head/mail/maildrop/pkg-plist

Modified: head/mail/maildrop/Makefile
==============================================================================
--- head/mail/maildrop/Makefile	Wed Sep  3 13:19:50 2014	(r367192)
+++ head/mail/maildrop/Makefile	Wed Sep  3 13:21:58 2014	(r367193)
@@ -10,8 +10,7 @@
 # MAILDROP_LOG_COLUMNS	lenght of 'File:' line in log - 8; default: 72
 
 PORTNAME=	maildrop
-PORTVERSION=	2.7.1
-PORTREVISION=	2
+PORTVERSION=	2.7.2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -20,7 +19,7 @@ COMMENT=	Mail delivery agent (MDA) with 
 
 LICENSE=	GPLv3
 
-USES=		iconv shebangfix perl5 tar:bzip2
+USES=		iconv perl5 tar:bzip2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog=1 \
@@ -31,11 +30,10 @@ INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-SHEBANG_FILES=	libs/unicode/*.pl
+CONFLICTS=	courier-0.65* libunicode-[0-9]*
 
-CONFLICTS=	courier-0.65*
-
-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libunicode.so:${PORTSDIR}/devel/courier-unicode
 
 MAILDROP_LOG_COLUMNS?=	72	# lenght of 'File:' line in log
 
@@ -75,18 +73,17 @@ MAILWRAPPER_CONFIGURE_OFF=	--enable-send
 
 .include <bsd.port.options.mk>
 
-.if defined(MAILDROP_SUID)
+.if defined(MAILDROP_SUID) && defined(MAILDROP_SGID)
+CONFIGURE_ARGS+=	--enable-maildrop-uid="${MAILDROP_SUID}" --enable-maildrop-gid="${MAILDROP_SGID}"
+PLIST_SUB+=		MMODE='6755' MUID='${MAILDROP_SUID}' MGID='${MAILDROP_SGID}'
+.elif defined(MAILDROP_SUID)
 CONFIGURE_ARGS+=	--enable-maildrop-uid="${MAILDROP_SUID}"
-PLIST_SUB+=		MSUID='' MUID='${MAILDROP_SUID}'
-.else
-PLIST_SUB+=		MSUID='@comment ' MUID='root'
-.endif
-
-.if defined(MAILDROP_SGID)
+PLIST_SUB+=		MMODE='4755' MUID='${MAILDROP_SUID}'
+.elif defined(MAILDROP_SGID)
 CONFIGURE_ARGS+=	--enable-maildrop-gid="${MAILDROP_SGID}"
-PLIST_SUB+=		MSGID='' MGID='${MAILDROP_SGID}'
+PLIST_SUB+=		MMODE='2755' MGID='${MAILDROP_SGID}'
 .else
-PLIST_SUB+=		MSGID='@comment ' MGID='mail'
+PLIST_SUB+=		MMODE='' MUID='root' MGID='mail'
 .endif
 
 .if ${PORT_OPTIONS:MFAM}
@@ -133,11 +130,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/libs/maildir/quotawarnmsg \
 		${STAGEDIR}${PREFIX}/etc/quotawarnmsg.sample
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS:S/maildir\//libs\/&/} ${STAGEDIR}${DOCSDIR}
-.if defined(MAILDROP_SUID)
-	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/lockmail ${STAGEDIR}${PREFIX}/bin/maildrop
-.endif
-.if defined(MAILDROP_SGID)
-	${CHMOD} g+s ${STAGEDIR}${PREFIX}/bin/lockmail ${STAGEDIR}${PREFIX}/bin/maildrop
-.endif
 
 .include <bsd.port.mk>

Modified: head/mail/maildrop/distinfo
==============================================================================
--- head/mail/maildrop/distinfo	Wed Sep  3 13:19:50 2014	(r367192)
+++ head/mail/maildrop/distinfo	Wed Sep  3 13:21:58 2014	(r367193)
@@ -1,4 +1,4 @@
-SHA256 (maildrop-2.7.1.tar.bz2) = fe1c3528c527e3a5bfe44b2e7437912bf55a5829fae442255347acb4a1caeb1b
-SIZE (maildrop-2.7.1.tar.bz2) = 2211838
+SHA256 (maildrop-2.7.2.tar.bz2) = d978cba4a6f1f139216f22cf03ee3c878fe2b287c9409024a2d41ef54931a4a6
+SIZE (maildrop-2.7.2.tar.bz2) = 1968673
 SHA256 (maildrop-2.7.0-dovecotauth.patch.txt) = 2987e56071d78dc55ac2ce523fe041dbf6565a90e98410f9fa2219d7434b945b
 SIZE (maildrop-2.7.0-dovecotauth.patch.txt) = 22063

Modified: head/mail/maildrop/files/patch-Makefile.in
==============================================================================
--- head/mail/maildrop/files/patch-Makefile.in	Wed Sep  3 13:19:50 2014	(r367192)
+++ head/mail/maildrop/files/patch-Makefile.in	Wed Sep  3 13:21:58 2014	(r367193)
@@ -1,16 +1,16 @@
---- Makefile.in.orig	2013-09-28 19:28:36.000000000 +0200
-+++ Makefile.in	2013-10-01 17:24:51.798480620 +0200
-@@ -372,7 +372,7 @@
+--- Makefile.in.orig	2014-09-01 14:50:09.000000000 +0200
++++ Makefile.in	2014-09-02 00:46:38.638094906 +0200
+@@ -376,7 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
--htmldir = $(pkgdatadir)/html
+-htmldir = $(docdir)/html
 +htmldir = $(datadir)/doc/@PACKAGE@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
-@@ -406,16 +406,16 @@
- 	maildroptips.txt COPYING.GPL manpage.css pgpkeys.txt
+@@ -411,15 +411,15 @@
+ 	maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW)
  
  scriptdir = $(pkgdatadir)/scripts
 -DELIVERQUOTAHTMLSOURCE = maildirquota.html deliverquota.html
@@ -19,18 +19,17 @@
 -DELIVERQUOTAMAN = maildirquota.7 deliverquota.8
 +DELIVERQUOTAMAN = maildirquota.7 maildrop-deliverquota.8
  MAILDROPHTML = lockmail.html maildiracl.html maildirkw.html \
--	maildirmake.html maildropex.html \
+-	maildirmake.html maildropex.html maildir.html \
 +	maildrop-maildirmake.html maildropex.html \
- 	maildir.html \
- 	maildropfilter.html maildropgdbm.html maildrop.html mailbot.html \
- 	makemime.html reformail.html reformime.html
- 
--MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
-+MAILDROPMAN = lockmail.1 maildrop-maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
- 	maildir.5 \
- 	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
- 
-@@ -1255,21 +1255,21 @@
+ 	maildropfilter.html maildropgdbm.html maildrop.html \
+ 	mailbot.html makemime.html reformail.html reformime.html \
+ 	$(am__append_1)
+-MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 \
++MAILDROPMAN = lockmail.1 maildrop-maildirmake.1 maildrop.1 mailbot.1 \
+ 	maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \
+ 	makemime.1 reformail.1 reformime.1 $(am__append_2)
+ EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
+@@ -1257,21 +1257,21 @@
  
  install-deliverquota:
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -58,7 +57,7 @@
  
  #  In maildrop 0.74, maildirmake was installed as bindir/maildrop.maildirmake
  #  and a soft link was created from maildirmake to maildrop.maildirmake
-@@ -1287,7 +1287,7 @@
+@@ -1289,7 +1289,7 @@
  		$(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	$(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
@@ -67,16 +66,16 @@
  	$(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
  	$(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
  	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-@@ -1298,7 +1298,7 @@
+@@ -1300,7 +1300,7 @@
  	. libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
  
  uninstall-maildrop:
 -	for f in maildrop mailbot maildirmake reformail lockmail makemime reformime; do \
-+	for f in maildrop mailbot maildrop-maildirmake reformail lockmail makemime reformime; do \
++	for f in maildrop mailbot maildir-maildirmake reformail lockmail makemime reformime; do \
  		rm -f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-@@ -1352,11 +1352,11 @@
+@@ -1354,11 +1354,11 @@
  maildirkw.html: libs/maildir/maildirkw.html
  	cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html
  

Modified: head/mail/maildrop/pkg-plist
==============================================================================
--- head/mail/maildrop/pkg-plist	Wed Sep  3 13:19:50 2014	(r367192)
+++ head/mail/maildrop/pkg-plist	Wed Sep  3 13:21:58 2014	(r367193)
@@ -1,8 +1,14 @@
-bin/maildrop-deliverquota
+ at owner %%MUID%%
+ at group %%MGID%%
+ at mode %%MMODE%%
 bin/lockmail
+bin/maildrop
+ at owner
+ at group
+ at mode
+bin/maildrop-deliverquota
 bin/mailbot
 bin/maildrop-maildirmake
-bin/maildrop
 bin/makedat
 bin/makedatprog
 bin/makemime
@@ -13,6 +19,7 @@ man/man1/lockmail.1.gz
 man/man1/mailbot.1.gz
 man/man1/maildrop-maildirmake.1.gz
 man/man1/maildrop.1.gz
+man/man1/makedat.1.gz
 man/man1/makemime.1.gz
 man/man1/reformail.1.gz
 man/man1/reformime.1.gz
@@ -40,7 +47,6 @@ man/man8/maildrop-deliverquota.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/maildrop-deliverquota.html
 %%PORTDOCS%%%%DOCSDIR%%/lockmail.html
 %%PORTDOCS%%%%DOCSDIR%%/mailbot.html
-%%PORTDOCS%%%%DOCSDIR%%/maildir.html
 %%PORTDOCS%%%%DOCSDIR%%/maildiracl.html
 %%PORTDOCS%%%%DOCSDIR%%/maildirkw.html
 %%PORTDOCS%%%%DOCSDIR%%/maildrop-maildirmake.html
@@ -58,7 +64,3 @@ man/man8/maildrop-deliverquota.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/rfc2045.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc822.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at exec chown %%MUID%% %D/bin/lockmail %D/bin/maildrop
-%%MSUID%%@exec chmod u+s %D/bin/lockmail %D/bin/maildrop
- at exec chgrp %%MGID%% %D/bin/lockmail %D/bin/maildrop
-%%MSGID%%@exec chmod g+s %D/bin/lockmail %D/bin/maildrop

More information about the svn-ports-head mailing list