From owner-svn-ports-head@FreeBSD.ORG Tue Oct 1 17:06:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 5DF984A0; Tue, 1 Oct 2013 17:06:13 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3C0202A01; Tue, 1 Oct 2013 17:06:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r91H6Duq078605; Tue, 1 Oct 2013 17:06:13 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r91H6CJP078602; Tue, 1 Oct 2013 17:06:12 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201310011706.r91H6CJP078602@svn.freebsd.org> From: Boris Samorodov Date: Tue, 1 Oct 2013 17:06:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328968 - head/www/web2ldap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Oct 2013 17:06:13 -0000 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 + ${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 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 -@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%% -@dirrmtry /var/log/web2ldap -@dirrm %%DATADIR%%/var/run -@dirrm %%DATADIR%%/var/log -@dirrm %%DATADIR%%/var -@dirrm %%DATADIR%%/sbin -@dirrm %%DATADIR%%/pylib/w2lapp/schema/plugins -@dirrm %%DATADIR%%/pylib/w2lapp/schema -@dirrm %%DATADIR%%/pylib/w2lapp -@dirrm %%DATADIR%%/pylib/pisces -@dirrm %%DATADIR%%/pylib/mspki -@dirrm %%DATADIR%%/pylib/ldaputil -@dirrm %%DATADIR%%/pylib -@dirrm %%DATADIR%%/fcgi -@dirrm %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins -@dirrm %%DATADIR%%/etc/web2ldap/web2ldapcnf -@dirrm %%DATADIR%%/etc/web2ldap/templates -@dirrm %%DATADIR%%/etc/web2ldap/ssl/crt -@dirrm %%DATADIR%%/etc/web2ldap/ssl -@dirrm %%DATADIR%%/etc/web2ldap/properties -@dirrm %%DATADIR%%/etc/web2ldap -@dirrm %%DATADIR%%/etc/systemd -@dirrm %%DATADIR%%/etc/init.d -@dirrm %%DATADIR%%/etc/httpd -@dirrm %%DATADIR%%/etc -@dirrm %%DATADIR%%/cgi-bin -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%%/var/run +@dirrmtry %%DATADIR%%/var/log +@dirrmtry %%DATADIR%%/var +@dirrmtry %%DATADIR%%/sbin +@dirrmtry %%DATADIR%%/pylib/w2lapp/schema/plugins +@dirrmtry %%DATADIR%%/pylib/w2lapp/schema +@dirrmtry %%DATADIR%%/pylib/w2lapp +@dirrmtry %%DATADIR%%/pylib/pisces +@dirrmtry %%DATADIR%%/pylib/mspki +@dirrmtry %%DATADIR%%/pylib/ldaputil +@dirrmtry %%DATADIR%%/pylib +@dirrmtry %%DATADIR%%/fcgi +@dirrmtry %%DATADIR%%/etc/web2ldap/web2ldapcnf/plugins +@dirrmtry %%DATADIR%%/etc/web2ldap/web2ldapcnf +@dirrmtry %%DATADIR%%/etc/web2ldap/templates +@dirrmtry %%DATADIR%%/etc/web2ldap/ssl/crt +@dirrmtry %%DATADIR%%/etc/web2ldap/ssl +@dirrmtry %%DATADIR%%/etc/web2ldap/properties +@dirrmtry %%DATADIR%%/etc/web2ldap +@dirrmtry %%DATADIR%%/etc/systemd +@dirrmtry %%DATADIR%%/etc/init.d +@dirrmtry %%DATADIR%%/etc/httpd +@dirrmtry %%DATADIR%%/etc +@dirrmtry %%DATADIR%%/cgi-bin +@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%%