View | Details | Raw Unified | Return to bug 122910 | Differences between
and this patch

Collapse All | Expand All

(-)phpmyadmin/Makefile (-3 / +3 lines)
Lines 105-111 Link Here
105
105
106
.include <bsd.port.pre.mk>
106
.include <bsd.port.pre.mk>
107
107
108
_PMA_GID!=	/usr/sbin/pw group show -n ${PMA_GRP} | ${CUT} -d : -f 3
108
_PMA_GID!=	${PW} group show -n ${PMA_GRP} | ${CUT} -d : -f 3
109
.if empty(_PMA_GID)
109
.if empty(_PMA_GID)
110
_PMA_GID=	80
110
_PMA_GID=	80
111
.endif
111
.endif
Lines 130-140 Link Here
130
	${ECHO_MSG} "databases/phpmyadmin"
130
	${ECHO_MSG} "databases/phpmyadmin"
131
	${ECHO_MSG} ""
131
	${ECHO_MSG} ""
132
.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
132
.if defined(WITH_SUPHP) && !defined(WITHOUT_SUPHP)
133
	@if /usr/sbin/pw show -n phpmyadm >/dev/null 2>&1 ; then              \
133
	@if ${PW} show -n phpmyadm >/dev/null 2>&1 ; then                     \
134
	    ${ECHO_MSG} "===> WARNING ******************************" ;       \
134
	    ${ECHO_MSG} "===> WARNING ******************************" ;       \
135
	    ${ECHO_MSG} "The default username used by ${PKNAME} has changed"; \
135
	    ${ECHO_MSG} "The default username used by ${PKNAME} has changed"; \
136
	    ${ECHO_MSG} "to ${PMA_USR} -- you should delete the old user:" ;  \
136
	    ${ECHO_MSG} "to ${PMA_USR} -- you should delete the old user:" ;  \
137
	    ${ECHO_MSG} "  # /usr/sbin/pw user del -n phpmyadm" ;             \
137
	    ${ECHO_MSG} "  # ${PW} user del -n phpmyadm" ;                    \
138
	    ${ECHO_MSG} "" ;                                                  \
138
	    ${ECHO_MSG} "" ;                                                  \
139
	fi
139
	fi
140
.endif
140
.endif

Return to bug 122910