ports/122910: [maintainer] databases/phpmyadmin, net/phpldapadmin, net/phpldapadmin098 /usr/sbin/pw -> ${PW}

[Matthew Seaman]

>Number:         122910
>Category:       ports
>Synopsis:       [maintainer] databases/phpmyadmin, net/phpldapadmin, net/phpldapadmin098 /usr/sbin/pw -> ${PW}
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 19 12:10:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Matthew Seaman
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 7.0-STABLE FreeBSD 7.0-STABLE #33: Thu Apr 17 09:31:47 BST 2008 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386


	
>Description:

Now that ports/119821 has been committed, use the ${PW} variable.


>How-To-Repeat:
	
>Fix:

	

--- phpmyadmin.diff begins here ---
diff -Nur /usr/ports/databases/phpmyadmin/Makefile phpmyadmin/Makefile
--- /usr/ports/databases/phpmyadmin/Makefile	2008-03-02 04:40:51.000000000 +0000
+++ phpmyadmin/Makefile	2008-04-19 11:36:43.000000000 +0100
@@ -105,7 +105,7 @@
 
 .include <bsd.port.pre.mk>
 
-_PMA_GID!=	/usr/sbin/pw group show -n ${PMA_GRP} | ${CUT} -d : -f 3
+_PMA_GID!=	${PW} group show -n ${PMA_GRP} | ${CUT} -d : -f 3
 .if empty(_PMA_GID)
 _PMA_GID=	80
 .endif
@@ -130,11 +130,11 @@
 	${ECHO_MSG} "databases/phpmyadmin"
 	${ECHO_MSG} ""
 .if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
-	@if /usr/sbin/pw show -n phpmyadm >/dev/null 2>&1 ; then              \
+	@if ${PW} show -n phpmyadm >/dev/null 2>&1 ; then                     \
 	    ${ECHO_MSG} "===> WARNING ******************************" ;       \
 	    ${ECHO_MSG} "The default username used by ${PKNAME} has changed"; \
 	    ${ECHO_MSG} "to ${PMA_USR} -- you should delete the old user:" ;  \
-	    ${ECHO_MSG} "  # /usr/sbin/pw user del -n phpmyadm" ;             \
+	    ${ECHO_MSG} "  # ${PW} user del -n phpmyadm" ;                    \
 	    ${ECHO_MSG} "" ;                                                  \
 	fi
 .endif
--- phpmyadmin.diff ends here ---

--- phpldapadmin.diff begins here ---
diff -Nur /usr/ports/net/phpldapadmin/Makefile phpldapadmin/Makefile
--- /usr/ports/net/phpldapadmin/Makefile	2008-03-09 04:45:38.000000000 +0000
+++ phpldapadmin/Makefile	2008-04-19 11:37:08.000000000 +0100
@@ -66,7 +66,7 @@
 SUB_FILES+=	pkg-message
 
 .include <bsd.port.pre.mk>
-_PLA_GID!=	/usr/sbin/pw group show -n ${PLA_GRP} | ${CUT} -d : -f 3
+_PLA_GID!=	${PW} group show -n ${PLA_GRP} | ${CUT} -d : -f 3
 .if empty(_PLA_GID)
 _PLA_GID=	80
 .endif
@@ -84,11 +84,11 @@
 	${ECHO_MSG} "please use the net/phpldapadmin098 port instead."
 	${ECHO_MSG} ""
 .if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
-	@if /usr/sbin/pw show -n pldapadm >/dev/null 2>&1 ; then	      \
+	@if ${PW} show -n pldapadm >/dev/null 2>&1 ; then	              \
 	    ${ECHO_MSG} "===> WARNING ******************************" ;	      \
 	    ${ECHO_MSG} "The default username used by ${PKNAME} has changed"; \
 	    ${ECHO_MSG} "to ${PLA_USR} -- you should delete the old user:" ;  \
-	    ${ECHO_MSG} "  # /usr/sbin/pw user del -n pldapadm" ;	      \
+	    ${ECHO_MSG} "  # ${PW} user del -n pldapadm" ;	              \
 	    ${ECHO_MSG} "" ;						      \
 	fi
 .endif
--- phpldapadmin.diff ends here ---

--- phpldapadmin098.diff begins here ---
diff -Nur /usr/ports/net/phpldapadmin098/Makefile phpldapadmin098/Makefile
--- /usr/ports/net/phpldapadmin098/Makefile	2008-03-09 04:45:39.000000000 +0000
+++ phpldapadmin098/Makefile	2008-04-19 11:37:30.000000000 +0100
@@ -65,7 +65,7 @@
 SUB_FILES+=	pkg-message
 
 .include <bsd.port.pre.mk>
-_PLA_GID!=	/usr/sbin/pw group show -n ${PLA_GRP} | ${CUT} -d : -f 3
+_PLA_GID!=	${PW} group show -n ${PLA_GRP} | ${CUT} -d : -f 3
 .if empty(_PLA_GID)
 _PLA_GID=	80
 .endif
@@ -84,11 +84,11 @@
 	${ECHO_MSG} "net/phpldapadmin port instead."
 	${ECHO_MSG} ""
 .if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
-	@if /usr/sbin/pw show -n pldapadm >/dev/null 2>&1 ; then	      \
+	@if ${PW} show -n pldapadm >/dev/null 2>&1 ; then	              \
 	    ${ECHO_MSG} "===> WARNING ******************************" ;	      \
 	    ${ECHO_MSG} "The default username used by ${PKNAME} has changed"; \
 	    ${ECHO_MSG} "to ${PLA_USR} -- you should delete the old user:" ;  \
-	    ${ECHO_MSG} "  # /usr/sbin/pw user del -n pldapadm" ;	      \
+	    ${ECHO_MSG} "  # ${PW} user del -n pldapadm" ;	              \
 	    ${ECHO_MSG} "" ;						      \
 	fi
 .endif
--- phpldapadmin098.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: