net/phpldapadmin optionally depends on www/suphp, which is expired. Mark the port as deprecated in this case. Fix: Patch attached with submission follows: How-To-Repeat: Tools/scripts/rmport www/suphp
Responsible Changed From-To: freebsd-ports-bugs->matthew Over to maintainer (via the GNATS Auto Assign Tool)
Author: matthew Date: Tue Dec 17 13:54:02 2013 New Revision: 336724 URL: http://svnweb.freebsd.org/changeset/ports/336724 Log: Drop the SUPHP option as the www/suphp port has expired. General cleanup: pkg-install and pkg-deinstall scripts were redundant, as they replicated @exec / @unexec actions from pkg-plist. Fix DEVELOPER_MODE complaint about shebangfix: it's a Makefile, not a shell script in any case. PR: ports/184925 Submitted by: rene Added: head/net/phpldapadmin/files/patch-tools__po__Makefile (contents, props changed) Deleted: head/net/phpldapadmin/files/pkg-deinstall.in Modified: head/net/phpldapadmin/Makefile Modified: head/net/phpldapadmin/Makefile ============================================================================== --- head/net/phpldapadmin/Makefile Tue Dec 17 13:42:42 2013 (r336723) +++ head/net/phpldapadmin/Makefile Tue Dec 17 13:54:02 2013 (r336724) @@ -3,7 +3,7 @@ PORTNAME= phpldapadmin PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION} @@ -19,24 +19,8 @@ NO_BUILD= yes USE_PHP= gettext ldap openssl pcre session xml iconv hash DEFAULT_PHP_VER= 5 -OPTIONS_DEFINE= SUPHP -SUPHP_DESCR= suPHP support - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSUPHP} - -PKGNAMESUFFIX+= -suphp -RUN_DEPENDS+= ${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp -WANT_PHP_CGI= yes - -.else - WANT_PHP_WEB= yes -.endif - -# USERS is only used when SUPHP option selected GROUPS?= ${WWWGRP} CFGDIR= config CFGFILE= config.php @@ -44,16 +28,6 @@ CFGFILE= config.php PLIST= ${WRKDIR}/plist PLIST_SUB+= PLA_GRP=${GROUPS} -.if ${PORT_OPTIONS:MSUPHP} - -USERS?= _pla - -SUB_LIST+= PLA_USR=${USERS} \ - PLA_GRP=${GROUPS} -SUB_FILES+= pkg-install pkg-deinstall - -.endif - SUB_LIST+= PKGNAME=${PKGNAME} SUB_FILES+= pkg-message @@ -62,34 +36,24 @@ SUB_FILES+= pkg-message post-patch: cd ${WRKSRC} ; \ ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore \ - ! -name .gitignore | ${SORT} | ${SED} -e "s!^\.!%%WWWDIR%%!" \ - >${PLIST} ; \ + ! -name .gitignore ! -name *.orig | ${SORT} | \ + ${SED} -e "s!^\.!%%WWWDIR%%!" >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ -e 's!^\./${CFGDIR}$$!@dirrmtry %%WWWDIR%%/${CFGDIR}!' \ -e 's!^\.$$!@dirrmtry %%WWWDIR%%!' \ -e 's!^\.!@dirrm %%WWWDIR%%!' >>${PLIST} -do-install: install-app install-conf - -install-app: - cd ${WRKSRC} ; \ - for src in $$( ${FIND} . ! -name .cvsignore \ - ! -name .gitignore ) ; do \ - dst=${STAGEDIR}${WWWDIR}$${src#.} ; \ - if ${TEST} -d $$src ; then \ - ${MKDIR} $$dst ; \ - else \ - ${INSTALL_DATA} $$src $$dst ; \ - fi \ +do-install: + cd ${WRKSRC} ; \ + for src in $$( ${FIND} . ! -name .cvsignore \ + ! -name .gitignore ! -name *.orig ) ; do \ + dst=${STAGEDIR}${WWWDIR}$${src#.} ; \ + if ${TEST} -d $$src ; then \ + ${MKDIR} $$dst ; \ + else \ + ${INSTALL_DATA} $$src $$dst ; \ + fi \ done -install-conf: - cd ${STAGEDIR}${WWWDIR}/${CFGDIR} ; \ - ${CHMOD} 0640 ${CFGFILE}.example ; \ - ${CHGRP} ${GROUPS} ${CFGFILE}.example ; \ - if ${TEST} ! -f ${CFGFILE} ; then \ - ${CP} -p ${CFGFILE}.example ${CFGFILE} ; \ - fi - .include <bsd.port.mk> Added: head/net/phpldapadmin/files/patch-tools__po__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/phpldapadmin/files/patch-tools__po__Makefile Tue Dec 17 13:54:02 2013 (r336724) @@ -0,0 +1,7 @@ +--- ./tools/po/Makefile.orig 2013-12-17 10:35:33.849229663 +0000 ++++ ./tools/po/Makefile 2013-12-17 10:35:42.989230589 +0000 +@@ -1,4 +1,3 @@ +-#!/bin/bash + # + # Makefile Utility to manipulate PO and POT files + # Copyright (c) 2009 Alessandro De Zorzi - <lota@nonlontano.it> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed suPHP support was removed from the port entirely. Thanks for the submission.