pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/databases/phpmyadmin Fix various problems:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ab3dbddc617
branches:  trunk
changeset: 521912:4ab3dbddc617
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Nov 27 17:30:56 2006 +0000

description:
Fix various problems:
1.) Don't use hardcoded group "wheel". Use "APACHE_GROUP" instead which
    defaults to "www".
2.) Create user and group if necessary. This fixces PR pkg/35141 by
    Wouter Schoot.
3.) Fix path to Perl interpreter in helper script "convertcfg.pl" and
    add missing dependence on Perl package.
Bump package revision because of these fixes.

diffstat:

 databases/phpmyadmin/Makefile |  14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r d94c747a1239 -r 4ab3dbddc617 databases/phpmyadmin/Makefile
--- a/databases/phpmyadmin/Makefile     Mon Nov 27 17:24:11 2006 +0000
+++ b/databases/phpmyadmin/Makefile     Mon Nov 27 17:30:56 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2006/11/19 15:55:54 tron Exp $
+# $NetBSD: Makefile,v 1.56 2006/11/27 17:30:56 tron Exp $
 
 DISTNAME=      phpMyAdmin-${DIST_VERSION}-all-languages
 PKGNAME=       phpmyadmin-${DIST_VERSION:S/-//}
+PKGREVISION=   1
 CATEGORIES=    databases www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=phpmyadmin/}
 EXTRACT_SUFX=  .tar.bz2
@@ -18,6 +19,7 @@
 MESSAGE_SUBST+=        PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} \
                PMCONFFILE=${PMCONFFILE:Q} PMDIR=${PMDIR:Q} \
                EXDIR=${EXDIR:Q}
+USE_TOOLS+=    perl:run
 
 CONF_INC_PHP=  ${PREFIX}/share/phpmyadmin/config.inc.php
 DIST_VERSION=  2.9.1.1
@@ -26,12 +28,18 @@
                RELEASE-DATE-${DIST_VERSION} TODO
 
 APACHE_USER?=  www
+APACHE_GROUP?= www
+PKG_GROUPS=    ${APACHE_GROUP}
+PKG_USERS=     ${APACHE_USER}:${APACHE_GROUP}
+BUILD_DEFS+=   APACHE_USER APACHE_GROUP
+
 EXDIR=         ${PREFIX}/share/examples/phpmyadmin
 PMCONFFILE=    ${PKG_SYSCONFDIR}/config.inc.php
 PMDIR=         ${PREFIX}/share/phpmyadmin
 CONF_FILES=    ${EXDIR}/config.inc.php ${PKG_SYSCONFDIR}/config.inc.php
-SPECIAL_PERMS= ${PKG_SYSCONFDIR}/config.inc.php ${APACHE_USER} wheel 0600
-BUILD_DEFS+=   APACHE_USER
+REPLACE_PERL+= scripts/convertcfg.pl
+SPECIAL_PERMS= ${PKG_SYSCONFDIR}/config.inc.php ${APACHE_USER} \
+               ${APACHE_GROUP} 0600
 
 PKG_SYSCONFSUBDIR?=    phpmyadmin
 



Home | Main Index | Thread Index | Old Index