svn commit: r328968 - head/www/web2ldap

Boris Samorodov bsam at FreeBSD.org
Tue Oct 1 17:06:13 UTC 2013


Author: bsam
Date: Tue Oct  1 17:06:12 2013
New Revision: 328968
URL: http://svnweb.freebsd.org/changeset/ports/328968

Log:
  . update to version 1.1.46;
  . support staging.

Modified:
  head/www/web2ldap/Makefile
  head/www/web2ldap/distinfo
  head/www/web2ldap/pkg-plist

Modified: head/www/web2ldap/Makefile
==============================================================================
--- head/www/web2ldap/Makefile	Tue Oct  1 16:49:54 2013	(r328967)
+++ head/www/web2ldap/Makefile	Tue Oct  1 17:06:12 2013	(r328968)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	web2ldap
-PORTVERSION=	1.1.45
+PORTVERSION=	1.1.46
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.sfr-fresh.com/unix/www/
@@ -15,7 +15,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap
 		${PYTHON_SITELIBDIR}/ipaddr.py:${PORTSDIR}/devel/py-ipaddr \
 		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
-NO_STAGE=	yes
 OPTIONS_DEFINE=	DOCS
 USE_PYTHON=	yes
 SUB_FILES=	pkg-message
@@ -30,24 +29,16 @@ do-build:
 
 do-install:
 	@${ECHO_MSG} "==> Installing program files..."
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC}; \
-		${FIND} * -type d | ${GREP} -vE "^htdocs" | ${CPIO} -p ${DATADIR}; \
-		${FIND} * -type f | ${GREP} -vE "^htdocs" | ${CPIO} -pd ${DATADIR})
-
-.include <bsd.port.options.mk>
+		${FIND} * -type d | ${GREP} -vE "^htdocs" | ${CPIO} -p ${STAGEDIR}${DATADIR}; \
+		${FIND} * -type f | ${GREP} -vE "^htdocs" | ${CPIO} -pd ${STAGEDIR}${DATADIR})
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "==> Installing document files..."
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}; \
-		${FIND} * -type d | ${GREP} "^htdocs" | ${CPIO} -p ${DOCSDIR}; \
-		${FIND} * -type f | ${GREP} "^htdocs" | ${CPIO} -pd ${DOCSDIR})
-.endif
-	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+		${FIND} * -type d | ${GREP} "^htdocs" | ${CPIO} -p ${STAGEDIR}${DOCSDIR}; \
+		${FIND} * -type f | ${GREP} "^htdocs" | ${CPIO} -pd ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/www/web2ldap/distinfo
==============================================================================
--- head/www/web2ldap/distinfo	Tue Oct  1 16:49:54 2013	(r328967)
+++ head/www/web2ldap/distinfo	Tue Oct  1 17:06:12 2013	(r328968)
@@ -1,2 +1,2 @@
-SHA256 (web2ldap-1.1.45.tar.gz) = 4fa495d47c72321b4fcd07e9ae4e755171741b4e3ac6f57f1bab87f995d384a2
-SIZE (web2ldap-1.1.45.tar.gz) = 509930
+SHA256 (web2ldap-1.1.46.tar.gz) = 25c9a4aa323f3d1504caac258580482478ca37b34ee12f4a0acd79b1770d5e78
+SIZE (web2ldap-1.1.46.tar.gz) = 510057

Modified: head/www/web2ldap/pkg-plist
==============================================================================
--- head/www/web2ldap/pkg-plist	Tue Oct  1 16:49:54 2013	(r328967)
+++ head/www/web2ldap/pkg-plist	Tue Oct  1 17:06:12 2013	(r328968)
@@ -1,3 +1,60 @@
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/.htaccess
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.10.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.11.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.12.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.13.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.14.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.15.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.16.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.7.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.8.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.9.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-1.0.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-1.1.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-ancient.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/compability.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap.de-screen.css
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap/default.css
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap/hippie.css
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap/print.css
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap/terminal.css
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/demo.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/docs.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/download.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/download/.htaccess
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/download/redirect-to-download.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/features.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/feedback.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/files.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/img/ldif_template_select_list.jpg
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/install.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/install_debian.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/install_opensuse.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/install_rhel.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/install_windows.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/news.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/related.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/roadmap.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/robots.txt
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/security.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/sidebars/mozilla-add-sidebar.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/sidebars/mozilla-sidebar.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/ssi/changes_navigation.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/ssi/footer.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/ssi/head.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/ssi/navigation.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/support.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/usability.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldap.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_fastcgi.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_hosts.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_misc.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_monitor.html
+%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_standalone.html
 %%DATADIR%%/AUTHORS
 %%DATADIR%%/CHANGES
 %%DATADIR%%/INSTALL
@@ -317,95 +374,36 @@
 %%DATADIR%%/sbin/compile.pyc
 %%DATADIR%%/sbin/web2ldap.py
 %%DATADIR%%/sbin/web2ldap.pyc
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/.htaccess
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.10.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.11.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.12.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.13.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.14.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.15.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.16.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.7.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.8.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-0.9.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-1.0.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-1.1.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes-ancient.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/changes.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/compability.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap.de-screen.css
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap/default.css
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap/hippie.css
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap/print.css
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/css/web2ldap/terminal.css
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/demo.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/docs.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/download.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/download/.htaccess
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/download/redirect-to-download.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/features.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/feedback.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/files.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/img/ldif_template_select_list.jpg
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/install.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/install_debian.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/install_opensuse.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/install_rhel.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/install_windows.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/news.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/related.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/roadmap.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/robots.txt
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/security.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/sidebars/mozilla-add-sidebar.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/sidebars/mozilla-sidebar.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/ssi/changes_navigation.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/ssi/footer.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/ssi/head.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/ssi/navigation.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/support.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/usability.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldap.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_fastcgi.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_hosts.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_misc.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_monitor.html
-%%PORTDOCS%%%%DOCSDIR%%/htdocs/web2ldapcnf_standalone.html
- at comment directories in revers order
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htdocs/ssi
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htdocs/sidebars
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htdocs/img
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htdocs/download
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htdocs/css/web2ldap
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htdocs/css
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/htdocs
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrmtry /var/log/web2ldap
- at dirrm %%DATADIR%%/var/run
- at dirrm %%DATADIR%%/var/log
- at dirrm %%DATADIR%%/var
- at dirrm %%DATADIR%%/sbin
- at dirrm %%DATADIR%%/pylib/w2lapp/schema/plugins
- at dirrm %%DATADIR%%/pylib/w2lapp/schema
- at dirrm %%DATADIR%%/pylib/w2lapp
- at dirrm %%DATADIR%%/pylib/pisces
- at dirrm %%DATADIR%%/pylib/mspki
- at dirrm %%DATADIR%%/pylib/ldaputil
- at dirrm %%DATADIR%%/pylib
- at dirrm %%DATADIR%%/fcgi
- at dirrm %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins
- at dirrm %%DATADIR%%/etc/web2ldap/web2ldapcnf
- at dirrm %%DATADIR%%/etc/web2ldap/templates
- at dirrm %%DATADIR%%/etc/web2ldap/ssl/crt
- at dirrm %%DATADIR%%/etc/web2ldap/ssl
- at dirrm %%DATADIR%%/etc/web2ldap/properties
- at dirrm %%DATADIR%%/etc/web2ldap
- at dirrm %%DATADIR%%/etc/systemd
- at dirrm %%DATADIR%%/etc/init.d
- at dirrm %%DATADIR%%/etc/httpd
- at dirrm %%DATADIR%%/etc
- at dirrm %%DATADIR%%/cgi-bin
- at dirrm %%DATADIR%%
+ at dirrmtry %%DATADIR%%/var/run
+ at dirrmtry %%DATADIR%%/var/log
+ at dirrmtry %%DATADIR%%/var
+ at dirrmtry %%DATADIR%%/sbin
+ at dirrmtry %%DATADIR%%/pylib/w2lapp/schema/plugins
+ at dirrmtry %%DATADIR%%/pylib/w2lapp/schema
+ at dirrmtry %%DATADIR%%/pylib/w2lapp
+ at dirrmtry %%DATADIR%%/pylib/pisces
+ at dirrmtry %%DATADIR%%/pylib/mspki
+ at dirrmtry %%DATADIR%%/pylib/ldaputil
+ at dirrmtry %%DATADIR%%/pylib
+ at dirrmtry %%DATADIR%%/fcgi
+ at dirrmtry %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins
+ at dirrmtry %%DATADIR%%/etc/web2ldap/web2ldapcnf
+ at dirrmtry %%DATADIR%%/etc/web2ldap/templates
+ at dirrmtry %%DATADIR%%/etc/web2ldap/ssl/crt
+ at dirrmtry %%DATADIR%%/etc/web2ldap/ssl
+ at dirrmtry %%DATADIR%%/etc/web2ldap/properties
+ at dirrmtry %%DATADIR%%/etc/web2ldap
+ at dirrmtry %%DATADIR%%/etc/systemd
+ at dirrmtry %%DATADIR%%/etc/init.d
+ at dirrmtry %%DATADIR%%/etc/httpd
+ at dirrmtry %%DATADIR%%/etc
+ at dirrmtry %%DATADIR%%/cgi-bin
+ at dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/ssi
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/sidebars
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/img
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/download
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/css/web2ldap
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs/css
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/htdocs
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%


More information about the svn-ports-all mailing list