2 files changed, 55 insertions, 49 deletions

diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index c7a2e563ff1c..b141eaebd889 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -3,11 +3,11 @@
 
 PORTNAME=	perdition
 PORTVERSION=	1.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail net security
 MASTER_SITES=	http://horms.net/projects/perdition/download/${PORTVERSION}/
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POP3 & IMAP4 proxy that can map users to multiple backend servers
 
 LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
@@ -15,22 +15,17 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libvanessa_socket.so:${PORTSDIR}/devel/libvanessa_socket \
 		libvanessa_adt.so:${PORTSDIR}/devel/libvanessa_adt
 
-MAN5=		perditiondb.5
-MAN8=		perdition.8
-MLINKS=		perdition.8 perdition.imap4.8 \
-		perdition.8 perdition.imap4s.8 \
-		perdition.8 perdition.imaps.8 \
-		perdition.8 perdition.pop3.8 \
-		perdition.8 perdition.pop3s.8
-MANCOMPRESSED=	no
-
-USE_AUTOTOOLS=	libtool
-USES=		gettext
+USES=		gettext libtool shebangfix
+SHEBANG_FILES=	${WRKSRC}/perdition/db/ldap/perditiondb_ldap_makedb \
+		${WRKSRC}/perdition/db/mysql/perditiondb_mysql_makedb \
+		${WRKSRC}/perdition/db/odbc/perditiondb_odbc_makedb \
+		${WRKSRC}/perdition/db/postgresql/perditiondb_postgresql_makedb
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	DOCSDIR=${DOCSDIR}
 CONFIGURE_ARGS+=--localstatedir=/var
+INSTALL_TARGET=	install-strip
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	perdition perdition.pop3 perdition.pop3s \
@@ -44,7 +39,6 @@ DAEMON_MAP_DESC=	Daemon Map support
 GDBM_DESC=		GDBM database
 POSIX_REGEX_DESC=	Native regex support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
@@ -76,7 +70,6 @@ CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
 CONFIGURE_ARGS+=	--enable-bdb
 PLIST_SUB+=		BDB=""
 USE_BDB=		yes
-MAN1+=			makebdb.1
 .else
 CONFIGURE_ARGS+=	--disable-bdb
 PLIST_SUB+=		BDB="@comment "
@@ -94,7 +87,6 @@ PLIST_SUB+=		NIS="@comment "
 CONFIGURE_ARGS+=	--enable-gdbm
 LIB_DEPENDS+=		libgdbm.so:${PORTSDIR}/databases/gdbm
 PLIST_SUB+=		GDBM=""
-MAN1+=			makegdbm.1
 .else
 CONFIGURE_ARGS+=	--disable-gdbm
 PLIST_SUB+=		GDBM="@comment "
@@ -104,7 +96,6 @@ PLIST_SUB+=		GDBM="@comment "
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--enable-mysql
 PLIST_SUB+=		MYSQL=""
-MAN8+=			perditiondb_mysql_makedb.8
 .else
 CONFIGURE_ARGS+=	--disable-mysql
 PLIST_SUB+=		MYSQL="@comment "
@@ -114,7 +105,6 @@ PLIST_SUB+=		MYSQL="@comment "
 CONFIGURE_ARGS+=	--enable-pg
 USE_PGSQL=		yes
 PLIST_SUB+=		PGSQL=""
-MAN8+=			perditiondb_postgresql_makedb.8
 .else
 CONFIGURE_ARGS+=	--disable-pg
 PLIST_SUB+=		PGSQL="@comment "
@@ -126,7 +116,6 @@ CONFIGURE_ARGS+=	--enable-ldap \
 			--with-ldap-schema-directory=${LOCALBASE}/etc/openldap/schema/ \
 			--disable-ldap-doc
 PLIST_SUB+=		LDAP=""
-MAN8+=			perditiondb_ldap_makedb.8
 .else
 CONFIGURE_ARGS+=	--disable-ldap
 PLIST_SUB+=		LDAP="@comment "
@@ -136,7 +125,6 @@ PLIST_SUB+=		LDAP="@comment "
 CONFIGURE_ARGS+=	--enable-odbc
 LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
 PLIST_SUB+=		ODBC=""
-MAN8+=			perditiondb_odbc_makedb.8
 .else
 CONFIGURE_ARGS+=	--disable-odbc
 PLIST_SUB+=		ODBC="@comment "
@@ -150,8 +138,8 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/etc/pam.d/perdition ${DOCSDIR}/perdition-pam.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/etc/pam.d/perdition ${STAGEDIR}${DOCSDIR}/perdition-pam.sample
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "/********************************************************/"
 	@${ECHO_MSG} " If you want to use PAM with perdition, have a look at :"
diff --git a/mail/perdition/pkg-plist b/mail/perdition/pkg-plist
index 60b7e3aa6c6f..5778f21c9fed 100644
--- a/mail/perdition/pkg-plist
+++ b/mail/perdition/pkg-plist
@@ -9,42 +9,59 @@ etc/perdition/perdition.conf-dist
 etc/perdition/popmap-dist
 etc/perdition/Makefile.popmap-dist
 etc/perdition/Makefile
-%%BDB%%lib/libperditiondb_bdb.so.0
-%%BDB%%lib/libperditiondb_bdb.so
-%%BDB%%lib/libperditiondb_bdb.la
 %%BDB%%lib/libperditiondb_bdb.a
-%%DAEMONMAP%%lib/libperditiondb_daemon.so.0
-%%DAEMONMAP%%lib/libperditiondb_daemon.so
-%%DAEMONMAP%%lib/libperditiondb_daemon.la
+%%BDB%%lib/libperditiondb_bdb.so
+%%BDB%%lib/libperditiondb_bdb.so.0
+%%BDB%%lib/libperditiondb_bdb.so.0.0.0
 %%DAEMONMAP%%lib/libperditiondb_daemon.a
-%%GDBM%%lib/libperditiondb_gdbm.so.0
-%%GDBM%%lib/libperditiondb_gdbm.so
-%%GDBM%%lib/libperditiondb_gdbm.la
+%%DAEMONMAP%%lib/libperditiondb_daemon.so
+%%DAEMONMAP%%lib/libperditiondb_daemon.so.0
+%%DAEMONMAP%%lib/libperditiondb_daemon.so.0.0.0
+%%DAEMONMAP%%lib/libperditiondb_daemon_base.a
+%%DAEMONMAP%%lib/libperditiondb_daemon_base.so
+%%DAEMONMAP%%lib/libperditiondb_daemon_base.so.0
+%%DAEMONMAP%%lib/libperditiondb_daemon_base.so.0.0.0
 %%GDBM%%lib/libperditiondb_gdbm.a
-%%LDAP%%lib/libperditiondb_ldap.so.0
-%%LDAP%%lib/libperditiondb_ldap.so
-%%LDAP%%lib/libperditiondb_ldap.la
+%%GDBM%%lib/libperditiondb_gdbm.so
+%%GDBM%%lib/libperditiondb_gdbm.so.0
+%%GDBM%%lib/libperditiondb_gdbm.so.0.0.0
 %%LDAP%%lib/libperditiondb_ldap.a
-%%MYSQL%%lib/libperditiondb_mysql.so.0
-%%MYSQL%%lib/libperditiondb_mysql.so
-%%MYSQL%%lib/libperditiondb_mysql.la
+%%LDAP%%lib/libperditiondb_ldap.so
+%%LDAP%%lib/libperditiondb_ldap.so.0
+%%LDAP%%lib/libperditiondb_ldap.so.0.0.0
 %%MYSQL%%lib/libperditiondb_mysql.a
-%%NIS%%lib/libperditiondb_nis.so.0
-%%NIS%%lib/libperditiondb_nis.so
-%%NIS%%lib/libperditiondb_nis.la
+%%MYSQL%%lib/libperditiondb_mysql.so
+%%MYSQL%%lib/libperditiondb_mysql.so.0
+%%MYSQL%%lib/libperditiondb_mysql.so.0.0.0
 %%NIS%%lib/libperditiondb_nis.a
-%%ODBC%%lib/libperditiondb_odbc.so.0
-%%ODBC%%lib/libperditiondb_odbc.so
-%%ODBC%%lib/libperditiondb_odbc.la
+%%NIS%%lib/libperditiondb_nis.so
+%%NIS%%lib/libperditiondb_nis.so.0
+%%NIS%%lib/libperditiondb_nis.so.0.0.0
 %%ODBC%%lib/libperditiondb_odbc.a
-%%POSIXREGEX%%lib/libperditiondb_posix_regex.so.0
-%%POSIXREGEX%%lib/libperditiondb_posix_regex.so
-%%POSIXREGEX%%lib/libperditiondb_posix_regex.la
+%%ODBC%%lib/libperditiondb_odbc.so
+%%ODBC%%lib/libperditiondb_odbc.so.0
+%%ODBC%%lib/libperditiondb_odbc.so.0.0.0
 %%POSIXREGEX%%lib/libperditiondb_posix_regex.a
-%%PGSQL%%lib/libperditiondb_postgresql.so.0
-%%PGSQL%%lib/libperditiondb_postgresql.so
-%%PGSQL%%lib/libperditiondb_postgresql.la
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.so
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.so.0
+%%POSIXREGEX%%lib/libperditiondb_posix_regex.so.0.0.0
 %%PGSQL%%lib/libperditiondb_postgresql.a
+%%PGSQL%%lib/libperditiondb_postgresql.so
+%%PGSQL%%lib/libperditiondb_postgresql.so.0
+%%PGSQL%%lib/libperditiondb_postgresql.so.0.0.0
+%%BDB%%man/man1/makebdb.1.gz
+%%GDBM%%man/man1/makegdbm.1.gz
+man/man5/perditiondb.5.gz
+man/man8/perdition.8.gz
+man/man8/perdition.imap4.8.gz
+man/man8/perdition.imap4s.8.gz
+man/man8/perdition.imaps.8.gz
+%%LDAP%%man/man8/perditiondb_ldap_makedb.8.gz
+%%MYSQL%%man/man8/perditiondb_mysql_makedb.8.gz
+%%ODBC%%man/man8/perditiondb_odbc_makedb.8.gz
+%%PGSQL%%man/man8/perditiondb_postgresql_makedb.8.gz
+man/man8/perdition.pop3.8.gz
+man/man8/perdition.pop3s.8.gz
 sbin/perdition
 sbin/perdition.pop3
 sbin/perdition.pop3s
@@ -53,4 +70,5 @@ sbin/perdition.imap4s
 sbin/perdition.imaps
 %%PORTDOCS%%%%DOCSDIR%%/perdition-pam.sample
 @dirrmtry etc/perdition
+@dirrmtry etc/openldap/schema
 %%PORTDOCS%%@dirrm %%DOCSDIR%%