6 files changed, 49 insertions, 27 deletions
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 5a58f5b4eaee..b960b06e9efe 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -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$
+# $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 @@ ALL_TARGET=	autoconf.h config.h all
 # 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 --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 2ad8835b509f..6fe603804f21 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1 +1 @@
-MD5 (maildrop-0.60.tar.gz) = 6751c4978733f4cffbd5336d74a51a70
+MD5 (maildrop-0.62.tar.gz) = caf2b16975257e5c38050c9e2c4ed7dc
diff --git a/mail/maildrop/pkg-descr b/mail/maildrop/pkg-descr
index 052fc9ef202c..6be0c44926c2 100644
--- a/mail/maildrop/pkg-descr
+++ b/mail/maildrop/pkg-descr
@@ -21,4 +21,4 @@ be necessary.
 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 --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist
index e5115e4407c5..acb3cc8d3ec9 100644
--- a/mail/maildrop/pkg-plist
+++ b/mail/maildrop/pkg-plist
@@ -3,10 +3,4 @@ bin/maildirmake
 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 --git a/mail/maildrop/pkg-plist.docs b/mail/maildrop/pkg-plist.docs
new file mode 100644
index 000000000000..c9264a36d81b
--- /dev/null
+++ b/mail/maildrop/pkg-plist.docs
@@ -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 --git a/mail/maildrop/pkg-plist.gdbm b/mail/maildrop/pkg-plist.gdbm
new file mode 100644
index 000000000000..24dfb53f12f8
--- /dev/null
+++ b/mail/maildrop/pkg-plist.gdbm
@@ -0,0 +1,2 @@
+bin/maildrop.makegdbm
+bin/makegdbm