6 files changed, 92 insertions, 32 deletions

diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index c28afa0700e1..e51b0f8ff3d5 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	perdition
-PORTVERSION=	1.11
-PORTREVISION=	2
+PORTVERSION=	1.12
 CATEGORIES=	mail net security
 MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
 
@@ -22,29 +21,31 @@ LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
 
 MAN5=		perditiondb.5
 MAN8=		perdition.8
-MLINK=		perdition.8  - perdition.pop3s.8 \
-		-  perdition.imap4.8 -  perdition.imap4s.8 \
-		- perdition.imaps.8  - perdition.pop3.8
 
 MANCOMPRESSED=	no
 
 USE_LIBTOOL=	YES
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	DOCSDIR=${DOCSDIR}
+CONFIGURE_ARGS+=	--disable-daemon-map
 
 INSTALLS_SHLIB=	yes
 
-# Available knobs:
-# WITHOUT_SSL: Disable OpenSSL support
-# WITHOUT_POSIX_REGEX: Disable native regex support
-# WITH_BDB: Enable Berkerley database backend
-# WITH_NIS: Enable NIS database backend
-# WITH_GDBM: Enable gdbm database backend
-# WITH_MYSQL: Enable MySQL database backend
-# WITH_PGSQL: Enable PostgreSQL database backend
-# WITH_OPENLDAP: Enable OpenLDAP database backend
-# WITH_ODBC: Enable ODBC database backend
+##
+## Available knobs:
+##   WITH_BDB: Enable Berkerley database backend
+##   WITH_DAEMON_MAP: Enable Daemon Map support
+##   WITH_GDBM: Enable gdbm database backend
+##   WITH_MYSQL: Enable MySQL database backend
+##   WITH_NIS: Enable NIS database backend
+##   WITH_PGSQL: Enable PostgreSQL database backend
+##   WITH_ODBC: Enable ODBC database backend
+##   WITH_OPENLDAP: Enable OpenLDAP database backend
+##
+##   WITHOUT_SSL: Disable OpenSSL support
+##   WITHOUT_POSIX_REGEX: Disable native regex support
+##
 
 .if !defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--enable-ssl
@@ -55,10 +56,19 @@ CONFIGURE_ARGS+=	--disable-ssl
 
 .if !defined(WITHOUT_POSIX_REGEX)
 CONFIGURE_ARGS+=	--enable-posix_regex
-PLIST_SUB+=		POSIX_REGEX=""
+PLIST_SUB+=		POSIXREGEX=""
 .else
 CONFIGURE_ARGS+=	--disable-posix_regex
-PLIST_SUB+=		POSIX_REGEX="@comment "
+PLIST_SUB+=		POSIXREGEX="@comment "
+.endif
+
+.if defined(WITH_DAEMON_MAP)
+CONFIGURE_ARGS+=	--enable-daemon-map
+PLIST_SUB+=		DAEMONMAP=""
+LIB_DEPENDS+=		gdbm:${PORTSDIR}/databases/gdbm
+.else
+CONFIGURE_ARGS+=	--disable-daemon-map
+PLIST_SUB+=		DAEMONMAP="@comment "
 .endif
 
 .if defined(WITH_BDB)
@@ -129,7 +139,13 @@ CONFIGURE_ARGS+=	--disable-odbc
 PLIST_SUB+=		ODBC="@comment "
 .endif
 
+pre-everything:: show-options
+
+show-options:
+	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/etc/pam.d/perdition ${DOCSDIR}/perdition-pam.sample
 	@${ECHO_MSG} ""
@@ -138,5 +154,6 @@ post-install:
 	@${ECHO_MSG} " ${DOCSDIR}/perdition-pam.sample"
 	@${ECHO_MSG} "/********************************************************/"
 	@${ECHO_MSG} ""
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/perdition/distinfo b/mail/perdition/distinfo
index 9276fb41916b..072e02dd7a8c 100644
--- a/mail/perdition/distinfo
+++ b/mail/perdition/distinfo
@@ -1 +1 @@
-MD5 (perdition-1.11.tar.gz) = 4499246c5380a843b1f2e7da0aecc0eb
+MD5 (perdition-1.12.tar.gz) = c0c0edd864fd707e327aa6ac7706ce32
diff --git a/mail/perdition/files/patch-perdition::Makefile.in b/mail/perdition/files/patch-perdition::Makefile.in
new file mode 100644
index 000000000000..bf8081697eb4
--- /dev/null
+++ b/mail/perdition/files/patch-perdition::Makefile.in
@@ -0,0 +1,11 @@
+--- perdition/Makefile.in.orig	Mon Dec 15 08:19:21 2003
++++ perdition/Makefile.in	Mon Dec 15 14:35:08 2003
+@@ -573,8 +573,6 @@
+ 	for i in pop3 pop3s imap4 imap4s imaps; do \
+ 		(cd $(DESTDIR)$(sbindir) && rm -f perdition.$$i && \
+ 			ln -sf perdition perdition.$$i); \
+-		(cd $(DESTDIR)$(mandir)/man8 && rm -f perdition.$$i && \
+-			ln -sf perdition.8 perdition.$$i.8); \
+ 	done
+ 
+ uninstall-local:
diff --git a/mail/perdition/files/patch-perdition::db::daemon::Makefile.in b/mail/perdition/files/patch-perdition::db::daemon::Makefile.in
new file mode 100644
index 000000000000..a06156c5ad52
--- /dev/null
+++ b/mail/perdition/files/patch-perdition::db::daemon::Makefile.in
@@ -0,0 +1,11 @@
+--- perdition/db/daemon/Makefile.in.orig	Mon Dec 15 12:24:51 2003
++++ perdition/db/daemon/Makefile.in	Mon Dec 15 12:27:20 2003
+@@ -155,7 +155,7 @@
+ 
+ libperditiondb_daemon_la_LDFLAGS = -version-info 0:0:0
+ 
+-libperditiondb_daemon_la_LIBADD = -ldb
++libperditiondb_daemon_la_LIBADD = -lgdbm
+ 
+ noinst_PROGRAMS = client server
+ 
diff --git a/mail/perdition/files/patch-perdition::perdition.c b/mail/perdition/files/patch-perdition::perdition.c
new file mode 100644
index 000000000000..59fdf764679d
--- /dev/null
+++ b/mail/perdition/files/patch-perdition::perdition.c
@@ -0,0 +1,17 @@
+--- perdition/perdition.c.orig	Mon Dec  1 02:31:37 2003
++++ perdition/perdition.c	Mon Dec 15 12:07:31 2003
+@@ -65,6 +65,14 @@
+ #include <dmalloc.h>
+ #endif
+ 
++#include <sys/param.h>
++#ifdef __FreeBSD__
++# if __FreeBSD_version < 500112
++#   include <machine/limits.h>
++# else
++#   include <sys/limits.h>
++# endif
++#endif
+ 
+ /*Use uname information here and there to idinify this system*/
+ struct utsname *system_uname;
diff --git a/mail/perdition/pkg-plist b/mail/perdition/pkg-plist
index 08f5547566c0..f06cb55347d3 100644
--- a/mail/perdition/pkg-plist
+++ b/mail/perdition/pkg-plist
@@ -4,7 +4,7 @@
 %%ODBC%%bin/perditiondb_odbc_makedb
 %%MYSQL%%bin/perditiondb_mysql_makedb
 %%PGSQL%%bin/perditiondb_postgresql_makedb
-%%POSIX_REGEX%%etc/perdition/popmap.re-dist
+%%POSIXREGEX%%etc/perdition/popmap.re-dist
 etc/perdition/perdition.conf-dist
 etc/perdition/popmap-dist
 etc/perdition/Makefile.popmap-dist
@@ -14,22 +14,22 @@ lib/libjain.so.0
 lib/libjain.so
 lib/libjain.la
 lib/libjain.a
-%%GDBM%%lib/libperditiondb_gdbm.so.0
-%%GDBM%%lib/libperditiondb_gdbm.so
-%%GDBM%%lib/libperditiondb_gdbm.la
-%%GDBM%%lib/libperditiondb_gdbm.a
 %%BDB%%lib/libperditiondb_bdb.so.0
 %%BDB%%lib/libperditiondb_bdb.so
 %%BDB%%lib/libperditiondb_bdb.la
 %%BDB%%lib/libperditiondb_bdb.a
+%%DAEMONMAP%%libperditiondb_daemon.so.0
+%%DAEMONMAP%%libperditiondb_daemon.so
+%%DAEMONMAP%%libperditiondb_daemon.la
+%%DAEMONMAP%%libperditiondb_daemon.a
+%%GDBM%%lib/libperditiondb_gdbm.so.0
+%%GDBM%%lib/libperditiondb_gdbm.so
+%%GDBM%%lib/libperditiondb_gdbm.la
+%%GDBM%%lib/libperditiondb_gdbm.a
 %%OPENLDAP%%lib/libperditiondb_ldap.so.0
 %%OPENLDAP%%lib/libperditiondb_ldap.so
 %%OPENLDAP%%lib/libperditiondb_ldap.la
 %%OPENLDAP%%lib/libperditiondb_ldap.a
-%%ODBC%%lib/libperditiondb_odbc.so.0
-%%ODBC%%lib/libperditiondb_odbc.so
-%%ODBC%%lib/libperditiondb_odbc.la
-%%ODBC%%lib/libperditiondb_odbc.a
 %%MYSQL%%lib/libperditiondb_mysql.so.0
 %%MYSQL%%lib/libperditiondb_mysql.so
 %%MYSQL%%lib/libperditiondb_mysql.la
@@ -38,14 +38,18 @@ lib/libjain.a
 %%NIS%%lib/libperditiondb_nis.so
 %%NIS%%lib/libperditiondb_nis.la
 %%NIS%%lib/libperditiondb_nis.a
+%%ODBC%%lib/libperditiondb_odbc.so.0
+%%ODBC%%lib/libperditiondb_odbc.so
+%%ODBC%%lib/libperditiondb_odbc.la
+%%ODBC%%lib/libperditiondb_odbc.a
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.so.0
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.so
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.la
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.a
 %%PGSQL%%lib/libperditiondb_postgresql.so.0
 %%PGSQL%%lib/libperditiondb_postgresql.so
 %%PGSQL%%lib/libperditiondb_postgresql.la
 %%PGSQL%%lib/libperditiondb_postgresql.a
-%%POSIX_REGEX%%lib/libperditiondb_posix_regex.so.0
-%%POSIX_REGEX%%lib/libperditiondb_posix_regex.so
-%%POSIX_REGEX%%lib/libperditiondb_posix_regex.la
-%%POSIX_REGEX%%lib/libperditiondb_posix_regex.a
 sbin/perdition
 sbin/perdition.pop3
 sbin/perdition.pop3s