4 files changed, 41 insertions, 20 deletions

diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 7dcff9983f1f..ec2fa7866a1b 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	web2ldap
-PORTVERSION=	0.15.22
+PORTVERSION=	0.16.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		ftp://ftp.ipt.ru/pub/download/
@@ -26,29 +26,24 @@ SUB_FILES=	pkg-message
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/etc/web2ldap/web2ldapcnf/standalone.py
+	@${FIND} ${WRKSRC} -name '*.orig'  -o -name '*.bak' | ${XARGS} ${RM}
 
 do-build:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} ./sbin/compile.py)
 
 do-install:
-	@${RM} -f ${WRKSRC}/fcgi/web2ldap.py.orig
-	@${RM} -f ${WRKSRC}/scgi/web2ldap.py.orig
-	@${RM} -f ${WRKSRC}/etc/web2ldap/web2ldapcnf/standalone.py.orig
-	@${RM} -f ${WRKSRC}/etc/web2ldap/web2ldapcnf/standalone.py.bak
-	@${RM} -f ${WRKSRC}/sbin/compile.py.orig
-	@${RM} -f ${WRKSRC}/sbin/web2ldap.py.orig
-	@${ECHO} "Installing program files..."
-	@cd ${WRKSRC}; \
-	${FIND} * -type f | ${GREP} -vE "^htdocs" | ${CPIO} -pd ${DATADIR}
-	@${MKDIR} ${DATADIR}/var ${DATADIR}/var/run ${DATADIR}/var/log
-	@if [ -w /var/log ]; then ${MKDIR} /var/log/web2ldap; fi
-.if !defined(NOPORTDOCS)
-	@${ECHO} "Installing document files..."
-	@cd ${WRKSRC}; \
-	${FIND} * -type f | ${GREP} "^htdocs" | ${CPIO} -pd ${DOCSDIR}
-.endif
+	@${ECHO_CMD} "==> Installing program files..."
+	@${MKDIR} ${DATADIR}
+	@(cd ${WRKSRC}; \
+		${FIND} * -type f | ${GREP} -vE "^htdocs" | ${CPIO} -pd ${DATADIR})
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${ECHO_CMD} "==> Installing document files..."
+	@(cd ${WRKSRC}; \
+		${FIND} * -type f | ${GREP} "^htdocs" | ${CPIO} -pd ${DOCSDIR})
+.endif
+	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/web2ldap/distinfo b/www/web2ldap/distinfo
index ab726e28fb66..b18d2ba0194c 100644
--- a/www/web2ldap/distinfo
+++ b/www/web2ldap/distinfo
@@ -1,2 +1,2 @@
-MD5 (web2ldap-0.15.22.tar.gz) = 93692c56c71d7c0985a660d4ea8640d6
-SIZE (web2ldap-0.15.22.tar.gz) = 287214
+MD5 (web2ldap-0.16.0.tar.gz) = 8958b9b85204972a47ee1c4b97a6cc63
+SIZE (web2ldap-0.16.0.tar.gz) = 293842
diff --git a/www/web2ldap/pkg-install b/www/web2ldap/pkg-install
new file mode 100644
index 000000000000..bf61fd239c86
--- /dev/null
+++ b/www/web2ldap/pkg-install
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PREFIX=${PKG_PREFIX:-/usr/local}
+DATADIR=${PREFIX}/share/web2ldap
+
+MKDIR=/bin/mkdir
+
+case "$2" in
+POST-INSTALL)
+	${MKDIR} -p ${DATADIR}/var ${DATADIR}/var/log ${DATADIR}/var/run
+	if [ -w /var/log ]; then
+		${MKDIR} /var/log/web2ldap
+	fi
+	;;
+esac
+
+exit 0
diff --git a/www/web2ldap/pkg-plist b/www/web2ldap/pkg-plist
index dc3b4c1c387f..7ef10dd954b8 100644
--- a/www/web2ldap/pkg-plist
+++ b/www/web2ldap/pkg-plist
@@ -61,6 +61,9 @@
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/exchange.py
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/posixaccount.py
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/activedirectory.py
+%%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/ibmds.py
+%%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/pilotperson.py
+%%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/vpim.py
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/__init__.py
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/entrust.py
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/samba.pyc
@@ -69,6 +72,9 @@
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/exchange.pyc
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/posixaccount.pyc
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/activedirectory.pyc
+%%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/ibmds.pyc
+%%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/pilotperson.pyc
+%%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/vpim.pyc
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/__init__.pyc
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/entrust.pyc
 %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins/ppolicy.py
@@ -122,6 +128,7 @@
 %%DATADIR%%/etc/web2ldap/templates/add_olcBdbConfig_AddressBook.ldif
 %%DATADIR%%/etc/web2ldap/templates/add_olcHdbConfig_UnixUsers.ldif
 %%DATADIR%%/etc/web2ldap/templates/add_olcSchemaConfig.ldif
+%%DATADIR%%/etc/web2ldap/templates/add_olcIncludeFile.ldif
 %%DATADIR%%/etc/web2ldap/templates/inputform_olcBdbConfig.html
 %%DATADIR%%/etc/dumpasn1.cfg
 %%DATADIR%%/fcgi/web2ldap.py
@@ -249,7 +256,6 @@
 %%DATADIR%%/scgi/web2ldap.py
 %%DATADIR%%/scgi/web2ldap.pyc
 %%DATADIR%%/web2ldap.spec
-@exec mkdir -p /var/log/web2ldap
 @unexec rmdir /var/log/web2ldap 2>/dev/null || true
 @dirrm %%DATADIR%%/var/run
 @dirrm %%DATADIR%%/var/log