Date: 13 Mar 2003 00:17:54 -0000 From: Sergei Kolobov <sergei@kolobov.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: petef@FreeBSD.org Subject: ports/49974: [PATCH] Update mail/maildrop to 1.5.2 Message-ID: <20030313001754.56866.qmail@outpost.globcon.net>
next in thread | raw e-mail | index | archive | help
>Number: 49974
>Category: ports
>Synopsis: [PATCH] Update mail/maildrop to 1.5.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 12 16:20:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Sergei Kolobov
>Release: FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Mon Oct 14 02:23:23 MSD 2002 sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST i386
>Description:
- Update to 1.5.2
- Document existing compile-time knobs
- Add a new knob (WITH_MAILDIRQUOTA) as suggested by Rui Lopes in ports/48920.
In addition to changes from that PR, add PLIST_SUB for proper handling
of pkg-plist in both cases.
- Install additional documentation
- Re-group some Makefile statements for better readability
Removed patches:
files/patch-ad
files/patch-ae
(Both do not seem to be required anymore).
Port maintainer - petef@FreeBSD.org - has been copied.
>How-To-Repeat:
>Fix:
--- maildrop-1.5.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/maildrop/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 2003/03/07 06:05:53 1.24
+++ Makefile 2003/03/13 00:12:40
@@ -5,8 +5,20 @@
# $FreeBSD: ports/mail/maildrop/Makefile,v 1.24 2003/03/07 06:05:53 ade Exp $
#
+# The following compile-time options are available:
+# WITHOUT_GDBM=yes Disable building maildrop gdbm extensions.
+# (default: enabled)
+# WITH_MAILDIRQUOTA=yes Enable optional support for maildir quotas
+# (default: disabled)
+# MAILDROP_SUID=<uid>,
+# MAILDROP_SGID=<gid> Maildrop will be installed with suid permissions for
+# MAILDROP_SUID, and sgid permissions for MAILDROP_SGID.
+# If undefined, these values default to "root" and "mail"
+# respectively, which should be suitable for most
+# systems.
+
PORTNAME= maildrop
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.2
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= courier
@@ -14,51 +26,55 @@
MAINTAINER= petef@FreeBSD.org
COMMENT= Replacement local mail delivery agent, similar to procmail
-# Maildrop is usually installed with gdbm extensions. If you do not
-# want these extensions installed, define WITHOUT_GDBM.
-#
.if !defined(WITHOUT_GDBM)
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
+.else
+CONFIGURE_ARGS+= --without-db
.endif
-
-INSTALL_TARGET= install-strip
-# Maildrop will be installed with suid permissions for MAILDROP_SUID,
-# and sgid permissions for MAILDROP_SGID. If undefined, these values
-# default to "root" and "mail" respectively, which should be suitable
-# for most systems.
-#
-MAILDROP_SUID?= root
-MAILDROP_SGID?= mail
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_PERL5_BUILD=yes
+USE_PERL5_RUN= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
+ LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS+= --enable-syslog=1 \
--enable-use-flock \
--with-etcdir="${PREFIX}/etc" \
--enable-maildrop-uid="${MAILDROP_SUID}" \
--enable-maildrop-gid="${MAILDROP_SGID}"
-.if defined(MAILDROPDEFAULT)
-CONFIGURE_ARGS+= --with-default-maildrop=${MAILDROPDEFAULT}
+
+.if defined(WITH_MAILDIRQUOTA)
+CONFIGURE_ARGS+= --enable-maildirquota
+PLIST_SUB+= MAILDIRQUOTA=""
+.else
+PLIST_SUB+= MAILDIRQUOTA="@comment "
.endif
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS}" \
- LIBS="-L${LOCALBASE}/lib"
-GNU_CONFIGURE= yes
-USE_BZIP2= yes
-USE_PERL5_BUILD=yes
-USE_PERL5_RUN= yes
-.if defined(NOPORTDOCS)
+MAILDROP_SUID?= root
+MAILDROP_SGID?= mail
+
+.if !defined(NOPORTDOCS)
+INSTALL_TARGET= install-strip
+.else
# Just install the binary and man pages, no extra documentation
INSTALL_TARGET= install-maildrop install-man
.endif
MAN1= lockmail.1 mailbot.1 maildirmake.1 maildrop.1 makemime.1 \
reformail.1 reformime.1
-MAN5= maildropex.5 maildropfilter.5 maildropgdbm.5
+MAN5= maildir.5 maildropex.5 maildropfilter.5 maildropgdbm.5
MAN7= maildirquota.7
MAN8= deliverquota.8
-
-.if defined(WITHOUT_GDBM)
-CONFIGURE_ARGS+= --without-db
+INSTALL_DOCS= INSTALL INSTALL.html README README.html README.postfix \
+ UPGRADE UPGRADE.html maildroptips.txt \
+ maildir/README.*.html maildir/README.*.txt
+
+.if !defined(NOPORTDOCS)
+post-install:
+ cd ${WRKSRC} && ${INSTALL_DATA} ${INSTALL_DOCS} ${DOCSDIR}
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/maildrop/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo 2002/11/13 19:47:02 1.12
+++ distinfo 2003/03/13 00:12:40
@@ -1 +1 @@
-MD5 (maildrop-1.5.0.tar.bz2) = 2362ece1de4f14a77ae3014fef319f7f
+MD5 (maildrop-1.5.2.tar.bz2) = 45ce438482780861ec43ce3af55b99cd
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/maildrop/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist 2002/11/13 19:47:02 1.5
+++ pkg-plist 2003/03/13 00:12:40
@@ -1,3 +1,4 @@
+%%MAILDIRQUOTA%%bin/deliverquota
bin/lockmail
bin/mailbot
bin/maildirmake
@@ -5,14 +6,31 @@
bin/makemime
bin/reformail
bin/reformime
+%%PORTDOCS%%share/doc/maildrop/INSTALL
+%%PORTDOCS%%share/doc/maildrop/INSTALL.html
+%%PORTDOCS%%share/doc/maildrop/README
+%%PORTDOCS%%share/doc/maildrop/README.html
+%%PORTDOCS%%share/doc/maildrop/README.maildirfilter.html
+%%PORTDOCS%%share/doc/maildrop/README.maildirquota.html
+%%PORTDOCS%%share/doc/maildrop/README.maildirquota.txt
+%%PORTDOCS%%share/doc/maildrop/README.postfix
+%%PORTDOCS%%share/doc/maildrop/README.sharedfolders.html
+%%PORTDOCS%%share/doc/maildrop/README.sharedfolders.txt
+%%PORTDOCS%%share/doc/maildrop/UPGRADE
+%%PORTDOCS%%share/doc/maildrop/UPGRADE.html
+%%MAILDIRQUOTA%%%%PORTDOCS%%share/doc/maildrop/deliverquota.html
%%PORTDOCS%%share/doc/maildrop/lockmail.html
%%PORTDOCS%%share/doc/maildrop/mailbot.html
+%%PORTDOCS%%share/doc/maildrop/maildir.html
%%PORTDOCS%%share/doc/maildrop/maildirmake.html
+%%MAILDIRQUOTA%%%%PORTDOCS%%share/doc/maildrop/maildirquota.html
%%PORTDOCS%%share/doc/maildrop/maildrop.html
%%PORTDOCS%%share/doc/maildrop/maildropex.html
%%PORTDOCS%%share/doc/maildrop/maildropfilter.html
%%PORTDOCS%%share/doc/maildrop/maildropgdbm.html
+%%PORTDOCS%%share/doc/maildrop/maildroptips.txt
%%PORTDOCS%%share/doc/maildrop/makemime.html
+%%PORTDOCS%%share/doc/maildrop/manpage.css
%%PORTDOCS%%share/doc/maildrop/reformail.html
%%PORTDOCS%%share/doc/maildrop/reformime.html
%%PORTDOCS%%share/doc/maildrop/rfc2045.html
--- maildrop-1.5.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030313001754.56866.qmail>