Date: 27 Feb 1999 19:29:17 -0000 From: Tom Hukins <tom@eborcom.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10305: Update port: Maildrop Message-ID: <19990227192917.16960.qmail@eborcom.com>
next in thread | raw e-mail | index | archive | help
>Number: 10305
>Category: ports
>Synopsis: Update Maildrop port from 0.60 to 0.62
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 28 09:10:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Tom Hukins
>Release: FreeBSD 2.2.8-STABLE i386
>Organization:
eBORcOM
>Environment:
>Description:
The patch below upgrades the Maildrop port (mail/maildrop) from 0.60
to 0.62. A build dependency on databases/gdbm now exists.
The following files have been added to the port:
pkg/PLIST.docs
pkg/PLIST.gdbm
The following files have been removed from the port:
patches (directory)
patches/patch-aa
patches/patch-ab
patches/patch-ac
pkg/PLIST.nodocs
>How-To-Repeat:
>Fix:
diff -ruN maildrop.old/Makefile maildrop/Makefile
--- maildrop.old/Makefile Thu Dec 24 07:27:15 1998
+++ maildrop/Makefile Sat Feb 27 19:10:41 1999
@@ -1,18 +1,25 @@
# New ports collection makefile for: maildrop
-# Version required: 0.60
+# Version required: 0.62
# Date created: 16 November 1998
# Whom: Tom Hukins <tom@eborcom.com>
#
# $Id: Makefile,v 1.1.1.1 1998/12/24 07:27:15 steve Exp $
#
-DISTNAME= maildrop-0.60
+DISTNAME= maildrop-0.62
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/mail/mailhandlers
MAINTAINER= tom@eborcom.com
+# Maildrop is usually installed with gdbm extensions. If you do not
+# want these extensions installed, NO_GDBM must be defined.
+#
+.if !defined(NO_GDBM)
+BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+.endif
+
ALL_TARGET= autoconf.h config.h all
# Maildrop will be installed with suid permissions for MAILDROP_SUID,
@@ -20,33 +27,40 @@
# default to "root" and "mail" respectively, which should be suitable
# for most systems.
#
-.if !defined(MAILDROP_SUID)
-MAILDROP_SUID= root
-.endif
-.if !defined(MAILDROP_SGID)
-MAILDROP_SGID= mail
-.endif
+MAILDROP_SUID?= root
+MAILDROP_SGIG?= mail
CONFIGURE_ARGS= --enable-syslog=1 \
+ --with-docdir="${PREFIX}/share/doc/maildrop" \
+ --with-etcdir="${PREFIX}/etc" \
--enable-maildrop-uid="${MAILDROP_SUID}" \
--enable-maildrop-gid="${MAILDROP_SGID}"
-CONFIGURE_ENV+= CXX="${CXX}" \
- CXXFLAGS="${CXXFLAGS}"
+CONFIGURE_ENV= CXX="${CXX}" \
+ CXXFLAGS="${CXXFLAGS} -I${PREFIX}/include" \
+ LDFLAGS="${LDFLAGS} -L${PREFIX}/lib"
GNU_CONFIGURE= yes
.if defined(NOPORTDOCS)
-PLIST= ${PKGDIR}/PLIST.nodocs
INSTALL_TARGET= install-exec all
.else
-MAN1= dotlock.1 maildrop.1 reformail.1
-MAN5= maildropex.5 maildropfilter.5
+MAN1= dotlock.1 maildrop.1 maildrop.makegdbm.1 reformail.1 reformime.1
+MAN5= maildropex.5 maildropfilter.5 maildropgdbm.5
MANCOMPRESSED= yes
.endif
+.if defined(NO_GDBM)
+CONFIGURE_ARGS+= --without-gdbm
+.endif
+
+PLIST= ${WRKDIR}/PLIST
+
post-patch:
-.for file in README.html maildrop.1 maildrop.html maildropfilter.5 maildropfilter.html main.C recipenode.C
- @${MV} ${WRKSRC}/${file} ${WRKSRC}/${file}.bak
- @${SED} < ${WRKSRC}/${file}.bak > ${WRKSRC}/${file} s+!!PREFIX!!+${PREFIX}+g
-.endfor
+ @${CP} ${PKGDIR}/PLIST ${WRKDIR}
+.if !defined(NO_GDBM)
+ @${CAT} ${PKGDIR}/PLIST.gdbm >> ${WRKDIR}/PLIST
+.endif
+.if !defined(NOPORTDOCS)
+ @${CAT} ${PKGDIR}/PLIST.docs >> ${WRKDIR}/PLIST
+.endif
.include <bsd.port.mk>
diff -ruN maildrop.old/files/md5 maildrop/files/md5
--- maildrop.old/files/md5 Thu Dec 24 07:27:15 1998
+++ maildrop/files/md5 Fri Feb 26 16:58:07 1999
@@ -1 +1 @@
-MD5 (maildrop-0.60.tar.gz) = 6751c4978733f4cffbd5336d74a51a70
+MD5 (maildrop-0.62.tar.gz) = caf2b16975257e5c38050c9e2c4ed7dc
diff -ruN maildrop.old/patches/patch-aa maildrop/patches/patch-aa
--- maildrop.old/patches/patch-aa Thu Dec 24 07:27:15 1998
+++ maildrop/patches/patch-aa Thu Jan 1 01:00:00 1970
@@ -1,214 +0,0 @@
---- README.html.orig Fri Oct 30 05:15:08 1998
-+++ README.html Fri Nov 13 13:46:45 1998
-@@ -93,7 +93,7 @@
- of procmail. Here is the suggested entry for sendmail.cf, courtesy of Eric
- J. Schwertfeger <ejs<TT>@</TT>bfd.com>:
- <PRE>
--Mlocal, P=/usr/local/bin/maildrop, F=lsAw5:/|@SPfhn, S=10/30, R=20/40,
-+Mlocal, P=!!PREFIX!!/bin/maildrop, F=lsAw5:/|@SPfhn, S=10/30, R=20/40,
- T=DNS/RFC822/X-Unix,
- A=maildrop -d $u</PRE>
- You may also consider including the D, F, and M flags as well.
-@@ -132,7 +132,7 @@
- <BR>
- <LI>
- V0.55 - added <TT>HOSTNAME</TT> and <TT>FROM</TT> environment variables.
--Added -f option. Added support for <TT>/etc/maildroprcs</TT> - see <TT>maildrop(1)</TT>.
-+Added -f option. Added support for <TT>!!PREFIX!!/etc/maildroprcs</TT> - see <TT>maildrop(1)</TT>.
- Fixed obscure bug that can trash a file descriptor.</LI>
-
- <BR>
---- maildrop.1.orig Tue Nov 17 02:49:53 1998
-+++ maildrop.1 Mon Nov 30 16:10:57 1998
-@@ -253,12 +253,12 @@
- If $HOME/.mailfilter does not exist, \fImaildrop\fP will simply
- deliver the message to the user's mailbox.
- .PP
--If the file /etc/maildroprc exists, \fImaildrop\fP will read filtering
-+If the file !!PREFIX!!/etc/maildroprc exists, \fImaildrop\fP will read filtering
- instructions from this file first, before reading $HOME/.mailfilter.
- This allows the system administrator to provide global filtering instructions
- for all users.
- .PP
--NOTE - /etc/maildroprc is read only in delivery mode.
-+NOTE - !!PREFIX!!/etc/maildroprc is read only in delivery mode.
- .PP
- .br
- .br
-@@ -296,23 +296,23 @@
- EXITCODE environment variable.
- .br
- .br
--.SH "/ETC/MAILDROPRCS IN EMBEDDED MODE
-+.SH "MAILDROPRCS IN EMBEDDED MODE
- This is a new feature to version 0.55. If \fImaildrop\fP encounters an include
--statement where the filename starts with /etc/maildroprcs/, the
-+statement where the filename starts with !!PREFIX!!/etc/maildroprcs/, the
- normal restrictions for the embedded mode are suspended while executing
--the filter file in the /etc/maildroprcs directory. The restrictions
-+the filter file in the !!PREFIX!!/etc/maildroprcs directory. The restrictions
- are also suspended for any additional filter files that are included from
--/etc/maildroprcs. The restrictions resume once \fImaildrop\fP finishes
--executing the file from /etc/maildroprcs.
-+!!PREFIX!!/etc/maildroprcs. The restrictions resume once \fImaildrop\fP finishes
-+executing the file from !!PREFIX!!/etc/maildroprcs.
- .PP
- This allows the system administrator to have a controlled environment
- for running external commands (via the backticks, or the xfilter
- command).
- .PP
- The name of the file may not contain any periods (so that a creative
--individual can't write include "/etc/maildroprcs/../../home/user/recipe").
-+individual can't write include "!!PREFIX!!/etc/maildroprcs/../../home/user/recipe").
- .PP
--Before executing the commands in the /etc/maildroprcs file,
-+Before executing the commands in the !!PREFIX!!/etc/maildroprcs file,
- \fImaildrop\fP automatically resets the following variables to their initial
- values: DEFAULT, HOME, LOCKEXT,
- LOCKSLEEP,
-@@ -322,7 +322,7 @@
- SENDMAIL,
- and SHELL. Please note that the previous values of these variables
- (if they were changed) will NOT be restored once \fImaildrop\fP finishes executing
--the commands from /etc/maildroprcs.
-+the commands from !!PREFIX!!/etc/maildroprcs.
- .br
- .br
- .SH "WATCHDOG TIMER
-@@ -338,14 +338,14 @@
- to set user's home directory, and related variables.
- If NIS/YP is install, that will be used as well.
- .TP 14
--.B "/etc/maildroprc
-+.B "!!PREFIX!!/etc/maildroprc
- global filtering instructions for delivery mode.
- .TP 14
- .B "/var/spool/mail
- system mailbox (actual directory defined by
- the system administrator).
- .TP 14
--.B "/usr/lib/sendmail
-+.B "/usr/sbin/sendmail
- program to forward mail (exact program defined
- by the system administrator).
- .TP 14
---- maildrop.html.orig Mon Nov 30 16:02:00 1998
-+++ maildrop.html Mon Nov 30 16:11:24 1998
-@@ -238,11 +238,11 @@
- or global permissions (<I>maildrop</I> terminates if it does).
- <P>If <TT>$HOME/.mailfilter</TT> does not exist, <I>maildrop</I> will simply
- deliver the message to the user's mailbox.
--<P>If the file <TT>/etc/maildroprc</TT> exists, <I>maildrop</I> will read filtering
-+<P>If the file <TT>!!PREFIX!!/etc/maildroprc</TT> exists, <I>maildrop</I> will read filtering
- instructions from this file first, before reading <TT>$HOME/.mailfilter</TT>.
- This allows the system administrator to provide global filtering instructions
- for all users.
--<P>NOTE - <TT>/etc/maildroprc</TT> is read only in delivery mode.
-+<P>NOTE - <TT>!!PREFIX!!/etc/maildroprc</TT> is read only in delivery mode.
- <P><A NAME="embedded"></A>
- <BR><BR>
- <H2>
-@@ -287,20 +287,20 @@
- <TT>EXITCODE</TT> environment variable.
- <BR><BR>
- <H2>
--<TT>/ETC/MAILDROPRCS</TT> IN EMBEDDED MODE</H2>
-+<TT>MAILDROPRCS</TT> IN EMBEDDED MODE</H2>
- This is a new feature to version 0.55. If <I>maildrop</I> encounters an <A HREF="maildropfilter.html#include">include</A>
--statement where the filename starts with <TT>/etc/maildroprcs/</TT>, the
-+statement where the filename starts with <TT>!!PREFIX!!/etc/maildroprcs/</TT>, the
- normal restrictions for the embedded mode are suspended while executing
--the filter file in the <TT>/etc/maildroprcs</TT> directory. The restrictions
-+the filter file in the <TT>!!PREFIX!!/etc/maildroprcs</TT> directory. The restrictions
- are also suspended for any additional filter files that are included from
--<TT>/etc/maildroprcs</TT>. The restrictions resume once <I>maildrop</I> finishes
--executing the file from <TT>/etc/maildroprcs</TT>.
-+<TT>!!PREFIX!!/etc/maildroprcs</TT>. The restrictions resume once <I>maildrop</I> finishes
-+executing the file from <TT>!!PREFIX!!/etc/maildroprcs</TT>.
- <P>This allows the system administrator to have a controlled environment
- for running external commands (via the backticks, or the <A HREF="maildropfilter.html#xfilter">xfilter</A>
- command).
- <P>The name of the file may not contain any periods (so that a creative
--individual can't write <TT>include "/etc/maildroprcs/../../home/user/recipe"</TT>).
--<P>Before executing the commands in the <TT>/etc/maildroprcs</TT> file,
-+individual can't write <TT>include "!!PREFIX!!/etc/maildroprcs/../../home/user/recipe"</TT>).
-+<P>Before executing the commands in the <TT>!!PREFIX!!/etc/maildroprcs</TT> file,
- <I>maildrop</I> automatically resets the following variables to their initial
- values: <TT>DEFAULT</TT>, <TT>HOME</TT>, <TT>LOCKEXT</TT>,
- <TT>LOCKSLEEP</TT>,
-@@ -310,7 +310,7 @@
- <TT>SENDMAIL</TT>,
- and <TT>SHELL</TT>. Please note that the previous values of these variables
- (if they were changed) will NOT be restored once <I>maildrop</I> finishes executing
--the commands from <TT>/etc/maildroprcs</TT>.
-+the commands from <TT>!!PREFIX!!/etc/maildroprcs</TT>.
- <BR><BR>
- <H2>
- WATCHDOG TIMER</H2>
-@@ -335,7 +335,7 @@
- the system administrator).</LI>
-
- <LI>
--<TT>/usr/lib/sendmail</TT> - program to forward mail (exact program defined
-+<TT>/usr/sbin/sendmail</TT> - program to forward mail (exact program defined
- by the system administrator).</LI>
-
- <LI>
---- maildropfilter.5.orig Fri Oct 30 05:15:08 1998
-+++ maildropfilter.5 Fri Nov 13 13:32:08 1998
-@@ -14,7 +14,7 @@
- .br
- .br
- .SH "SYNOPSIS
--/etc/maildroprc, $HOME/.mailfilter, $HOME/.mailfilters/*, and friends...
-+!!PREFIX!!/etc/maildroprc, $HOME/.mailfilter, $HOME/.mailfilters/*, and friends...
- .br
- .br
- .SH "DESCRIPTION
---- maildropfilter.html.orig Fri Oct 30 05:15:08 1998
-+++ maildropfilter.html Fri Nov 13 13:39:31 1998
-@@ -24,7 +24,7 @@
- <BR><BR>
- <H2>
- SYNOPSIS</H2>
--<TT>/etc/maildroprc, $HOME/.mailfilter, $HOME/.mailfilters/*, and friends...</TT>
-+<TT>!!PREFIX!!/etc/maildroprc, $HOME/.mailfilter, $HOME/.mailfilters/*, and friends...</TT>
- <BR><BR>
- <H2>
- DESCRIPTION</H2>
---- main.C.orig Fri Oct 30 05:15:05 1998
-+++ main.C Fri Nov 13 13:40:54 1998
-@@ -404,11 +404,11 @@
- Recipe r;
- Lexer in;
-
-- fd=in.Open("/etc/maildroprc");
-+ fd=in.Open("!!PREFIX!!/etc/maildroprc");
- if (fd < 0)
- {
- if (errno != ENOENT)
-- throw "Error opening /etc/maildroprc.";
-+ throw "Error opening !!PREFIX!!/etc/maildroprc.";
- }
- else
- {
---- recipenode.C.orig Fri Oct 30 05:15:06 1998
-+++ recipenode.C Fri Nov 13 13:41:48 1998
-@@ -38,7 +38,7 @@
- // Utility class to save and restore the status of the embedded_mode flag.
- //
- // Embedded mode can be temporarily disabled by including something from
--// /etc/maildroprcs.
-+// !!PREFIX!!/etc/maildroprcs.
- //
-
- class MaildropSaveEM {
-@@ -783,7 +783,7 @@
- Recipe r;
- Lexer in;
- MaildropSaveEM save_embedded_mode;
-- static const char embedded_mode_directory[]="/etc/maildroprcs/";
-+ static const char embedded_mode_directory[]="!!PREFIX!!/etc/maildroprcs/";
-
- if (strncmp( (const char *)b, embedded_mode_directory,
- sizeof(embedded_mode_directory)-1) == 0 &&
diff -ruN maildrop.old/patches/patch-ab maildrop/patches/patch-ab
--- maildrop.old/patches/patch-ab Thu Dec 24 07:27:15 1998
+++ maildrop/patches/patch-ab Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig Mon Nov 16 20:49:55 1998
-+++ Makefile.in Wed Dec 23 23:25:27 1998
-@@ -120,7 +120,7 @@
-
- man_MANS = dotlock.1 maildrop.1 maildropex.5 maildropfilter.5 reformail.1
-
--htmldir = $(prefix)/doc/$(distdir)
-+htmldir = $(prefix)/share/doc/maildrop
- html_DATA = README.html dotlock.html maildrop.html maildropex.html \
- maildropfilter.html reformail.html
-
diff -ruN maildrop.old/patches/patch-ac maildrop/patches/patch-ac
--- maildrop.old/patches/patch-ac Thu Dec 24 07:27:15 1998
+++ maildrop/patches/patch-ac Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.am.orig Wed Dec 23 23:22:02 1998
-+++ Makefile.am Wed Dec 23 23:23:05 1998
-@@ -35,7 +35,7 @@
-
- man_MANS = dotlock.1 maildrop.1 maildropex.5 maildropfilter.5 reformail.1
-
--htmldir = $(prefix)/doc/$(distdir)
-+htmldir = $(prefix)/share/doc/maildrop
- html_DATA = README.html dotlock.html maildrop.html maildropex.html \
- maildropfilter.html reformail.html
-
diff -ruN maildrop.old/pkg/DESCR maildrop/pkg/DESCR
--- maildrop.old/pkg/DESCR Thu Dec 24 07:27:15 1998
+++ maildrop/pkg/DESCR Fri Feb 26 17:07:29 1999
@@ -21,4 +21,4 @@
maildrop can be used with sendmail, Qmail, and other MTAs.
-http://www.geocities.com/SiliconValley/Peaks/5799/maildrop.README.html
+http://www.flounder.net/~mrsam/maildrop/
diff -ruN maildrop.old/pkg/PLIST maildrop/pkg/PLIST
--- maildrop.old/pkg/PLIST Thu Dec 24 07:27:15 1998
+++ maildrop/pkg/PLIST Sat Feb 27 18:45:09 1999
@@ -3,10 +3,4 @@
bin/maildrop
bin/maildrop.maildirmake
bin/reformail
-share/doc/maildrop/README.html
-share/doc/maildrop/dotlock.html
-share/doc/maildrop/maildrop.html
-share/doc/maildrop/maildropex.html
-share/doc/maildrop/maildropfilter.html
-share/doc/maildrop/reformail.html
-@dirrm share/doc/maildrop
+bin/reformime
diff -ruN maildrop.old/pkg/PLIST.docs maildrop/pkg/PLIST.docs
--- maildrop.old/pkg/PLIST.docs Thu Jan 1 01:00:00 1970
+++ maildrop/pkg/PLIST.docs Sat Feb 27 18:45:56 1999
@@ -0,0 +1,12 @@
+share/doc/maildrop/INSTALL.html
+share/doc/maildrop/README.html
+share/doc/maildrop/dotlock.html
+share/doc/maildrop/maildrop.html
+share/doc/maildrop/maildrop.makegdbm.html
+share/doc/maildrop/maildropex.html
+share/doc/maildrop/maildropfilter.html
+share/doc/maildrop/maildropgdbm.html
+share/doc/maildrop/maildroptips.html
+share/doc/maildrop/reformail.html
+share/doc/maildrop/reformime.html
+@dirrm share/doc/maildrop
diff -ruN maildrop.old/pkg/PLIST.gdbm maildrop/pkg/PLIST.gdbm
--- maildrop.old/pkg/PLIST.gdbm Thu Jan 1 01:00:00 1970
+++ maildrop/pkg/PLIST.gdbm Sat Feb 27 15:14:26 1999
@@ -0,0 +1,2 @@
+bin/maildrop.makegdbm
+bin/makegdbm
diff -ruN maildrop.old/pkg/PLIST.nodocs maildrop/pkg/PLIST.nodocs
--- maildrop.old/pkg/PLIST.nodocs Thu Dec 24 07:27:15 1998
+++ maildrop/pkg/PLIST.nodocs Thu Jan 1 01:00:00 1970
@@ -1,5 +0,0 @@
-bin/dotlock
-bin/maildrop
-bin/maildirmake
-bin/maildrop.maildirmake
-bin/reformail
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990227192917.16960.qmail>