5 files changed, 29 insertions, 18 deletions

diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 5610060996ac..ef84152c6c1e 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	web2ldap
-PORTVERSION=	0.15.9
+PORTVERSION=	0.15.10
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.tricknology.org/ports/
@@ -19,16 +19,18 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_ldap.so:${PORTSDIR}/net/py-ldap2
 NO_BUILD=	yes
 USE_PYTHON=	yes
 
+SUB_FILES=	pkg-message
+
 do-install:
 	@${MKDIR} ${PREFIX}/${PORTNAME}
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/fcgi/web2ldap.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/scgi/web2ldap.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/web2ldap/web2ldapcnf/standalone.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/etc/mime.types.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/compile.py.orig
-	@${RM} -f ${WRKDIR}/${PORTNAME}-${PORTVERSION}/sbin/web2ldap.py.orig
+	@${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/mime.types.orig
+	@${RM} -f ${WRKSRC}/sbin/compile.py.orig
+	@${RM} -f ${WRKSRC}/sbin/web2ldap.py.orig
 	@(cd ${WRKSRC} && ${LOCALBASE}/bin/python ./sbin/compile.py)
-	@${CP} -r ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ ${PREFIX}/${PORTNAME}
+	@${CP} -r ${WRKSRC}/ ${PREFIX}/${PORTNAME}
 	@if [ -w /var/log ]; then ${MKDIR} /var/log/web2ldap; fi
 
 post-install:
diff --git a/www/web2ldap/distinfo b/www/web2ldap/distinfo
index cab3d2be8585..709d402bbe8b 100644
--- a/www/web2ldap/distinfo
+++ b/www/web2ldap/distinfo
@@ -1,2 +1,2 @@
-MD5 (web2ldap-0.15.9.tar.gz) = 9f18ed4472428185eb081df008070181
-SIZE (web2ldap-0.15.9.tar.gz) = 228767
+MD5 (web2ldap-0.15.10.tar.gz) = 6ac0d5bfedc986b069123e6946918052
+SIZE (web2ldap-0.15.10.tar.gz) = 229153
diff --git a/www/web2ldap/files/pkg-message.in b/www/web2ldap/files/pkg-message.in
new file mode 100644
index 000000000000..74f14adc5718
--- /dev/null
+++ b/www/web2ldap/files/pkg-message.in
@@ -0,0 +1,15 @@
+===============================================================================
+Run:
+
+  %%PREFIX%%/web2ldap/sbin/web2ldap.py
+
+to start the standalone version of web2ldap. By default it only accepts
+connections from localhost, but this can be modified in:
+
+  %%PREFIX%%/web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
+
+For instructions on installing the CGI version of web2ldap, please look at the
+enclosed documentation in:
+
+  %%PREFIX%%/web2ldap/htdocs/
+===============================================================================
diff --git a/www/web2ldap/pkg-message b/www/web2ldap/pkg-message
deleted file mode 100644
index 1feb7e1f2401..000000000000
--- a/www/web2ldap/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-Run ${PREFIX}/web2ldap/sbin/web2ldap.py to start the standalone
-version of web2ldap. By default it only accepts connections from
-localhost, but this can be modified in:
-
-   ${PREFIX}/web2ldap/etc/web2ldap/web2ldapcnf/standalone.py
-
-For instructions on installing the CGI version of web2ldap, please
-look at the enclosed documentation in ${PREFIX}/web2ldap/htdocs/.
diff --git a/www/web2ldap/pkg-plist b/www/web2ldap/pkg-plist
index 7ee7100ffd17..177c9410b60a 100644
--- a/www/web2ldap/pkg-plist
+++ b/www/web2ldap/pkg-plist
@@ -231,6 +231,8 @@ web2ldap/sbin/checkinst.pyc
 web2ldap/scgi/web2ldap.py
 web2ldap/scgi/web2ldap.pyc
 web2ldap/web2ldap.spec
+@exec mkdir -p /var/log/web2ldap %B/var/log %B/var/run
+@unexec rmdir /var/log/web2ldap 2>/dev/null || true
 @dirrm web2ldap/var/run
 @dirrm web2ldap/var/log
 @dirrm web2ldap/var