[pkgsrc/trunk]: pkgsrc/databases/phpmyadmin Improve handling of configuration...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4e25fe140ab
branches:  trunk
changeset: 535738:e4e25fe140ab
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Nov 27 15:20:47 2007 +0000

description:
Improve handling of configuration files and don't create obsolete "css"
directory. Problems noted by Stoned Elipot and Martti Kuparinen in
private e-mail. Bump package revision because of these changes.

diffstat:

 databases/phpmyadmin/INSTALL  |  11 +++++++++++
 databases/phpmyadmin/MESSAGE  |   4 ++--
 databases/phpmyadmin/Makefile |  21 +++++++++------------
 databases/phpmyadmin/PLIST    |   5 ++---
 4 files changed, 24 insertions(+), 17 deletions(-)

diffs (118 lines):

diff -r 92232ee96226 -r e4e25fe140ab databases/phpmyadmin/INSTALL
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/phpmyadmin/INSTALL      Tue Nov 27 15:20:47 2007 +0000
@@ -0,0 +1,11 @@
+# $NetBSD: INSTALL,v 1.1 2007/11/27 15:20:47 tron Exp $
+
+CONF_INC_PHP=@CONF_INC_PHP@
+PMCONFFILE=@PMCONFFILE@
+
+case ${STAGE} in
+POST-INSTALL)
+        ${RM} -f ${CONF_INC_PHP}
+        ${LN} -s ${PMCONFFILE} ${CONF_INC_PHP}
+       ;;
+esac
diff -r 92232ee96226 -r e4e25fe140ab databases/phpmyadmin/MESSAGE
--- a/databases/phpmyadmin/MESSAGE      Tue Nov 27 08:29:01 2007 +0000
+++ b/databases/phpmyadmin/MESSAGE      Tue Nov 27 15:20:47 2007 +0000
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.9 2005/09/28 14:15:49 rillig Exp $
+$NetBSD: MESSAGE,v 1.10 2007/11/27 15:20:47 tron Exp $
 
-Do *not* edit "${PMDIR}/config.inc.php" to customize
+Do *not* edit "${CONF_INC_PHP}" to customize
 this package because it is a link which will removed during upgrades.
 The actual configuration file is "${PMCONFFILE}".
 
diff -r 92232ee96226 -r e4e25fe140ab databases/phpmyadmin/Makefile
--- a/databases/phpmyadmin/Makefile     Tue Nov 27 08:29:01 2007 +0000
+++ b/databases/phpmyadmin/Makefile     Tue Nov 27 15:20:47 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2007/11/12 14:05:26 tron Exp $
+# $NetBSD: Makefile,v 1.63 2007/11/27 15:20:47 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
@@ -13,10 +14,9 @@
 DEPENDS+=      ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../misc/php-mbstring
 DEPENDS+=      ${PHP_PKG_PREFIX}-mysql{,i}>=4.3.3:../../databases/php-mysql
 
-PLIST_SUBST+=  CP=${CP:Q} DIST_VERSION=${DIST_VERSION:Q} \
-               PMCONFFILE=${PMCONFFILE:Q} TEST=${TEST:Q}
-MESSAGE_SUBST+=        PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} \
-               PMCONFFILE=${PMCONFFILE:Q} PMDIR=${PMDIR:Q} \
+FILES_SUBST+=  CONF_INC_PHP=${CONF_INC_PHP:Q} PMCONFFILE=${PMCONFFILE:Q}
+PLIST_SUBST+=  DIST_VERSION=${DIST_VERSION:Q}
+MESSAGE_SUBST+=        CONF_INC_PHP=${CONF_INC_PHP} PMCONFFILE=${PMCONFFILE:Q} \
                EXDIR=${EXDIR:Q}
 USE_TOOLS+=    perl:run
 
@@ -30,6 +30,7 @@
 APACHE_GROUP?= www
 PKG_GROUPS=    ${APACHE_GROUP}
 PKG_USERS=     ${APACHE_USER}:${APACHE_GROUP}
+BUILD_DEFS+=   APACHE_USER APACHE_GROUP
 
 PKG_USERS_VARS+=       APACHE_USER
 PKG_GROUPS_VARS+=      APACHE_GROUP
@@ -39,15 +40,11 @@
 PMDIR=         ${PREFIX}/share/phpmyadmin
 REPLACE_PERL+= scripts/convertcfg.pl
 
-CONF_FILES_PERMS=      ${EXDIR}/config.inc.php \
-                       ${PKG_SYSCONFDIR}/config.inc.php \
-                       ${APACHE_USER} ${APACHE_GROUP} 0600
-
 PKG_SYSCONFSUBDIR?=    phpmyadmin
 
 NO_BUILD=              yes
 
-INSTALL_DIRS=  css js lang libraries libraries/auth libraries/dbg \
+INSTALL_DIRS=  js lang libraries libraries/auth libraries/dbg \
                libraries/dbi libraries/engines libraries/export \
                libraries/import libraries/tcpdf libraries/tcpdf/font \
                libraries/transformations pmd pmd/images pmd/scripts \
@@ -70,10 +67,10 @@
        done
        ${INSTALL_DATA_DIR} ${PMDIR}/scripts
 
-       ${RM} -f ${CONF_INC_PHP}        # just in case
-       ${LN} -s ${PMCONFFILE} ${CONF_INC_PHP}
        ${INSTALL_DATA} ${WRKSRC}/*.php ${PMDIR}
        ${INSTALL_DATA} ${WRKSRC}/*.css ${PMDIR}
+       ${MV} ${PREFIX}/share/phpmyadmin/config.sample.inc.php \
+         ${EXDIR}/config.inc.php
 
        ${INSTALL_DATA} ${WRKSRC}/Documentation.html ${PMDIR}
        ${INSTALL_DATA} ${WRKSRC}/translators.html ${PMDIR}
diff -r 92232ee96226 -r e4e25fe140ab databases/phpmyadmin/PLIST
--- a/databases/phpmyadmin/PLIST        Tue Nov 27 08:29:01 2007 +0000
+++ b/databases/phpmyadmin/PLIST        Tue Nov 27 15:20:47 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/11/13 12:44:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/11/27 15:20:47 tron Exp $
 share/doc/phpmyadmin/CREDITS
 share/doc/phpmyadmin/ChangeLog
 share/doc/phpmyadmin/Documentation.txt
@@ -8,14 +8,13 @@
 share/doc/phpmyadmin/RELEASE-DATE-${DIST_VERSION}
 share/doc/phpmyadmin/TODO
 share/examples/phpmyadmin/apache.conf
+share/examples/phpmyadmin/config.inc.php
 share/phpmyadmin/ChangeLog
 share/phpmyadmin/Documentation.html
 share/phpmyadmin/browse_foreigners.php
 share/phpmyadmin/calendar.php
 share/phpmyadmin/changelog.php
 share/phpmyadmin/chk_rel.php
-share/phpmyadmin/config.inc.php
-share/phpmyadmin/config.sample.inc.php
 share/phpmyadmin/db_create.php
 share/phpmyadmin/db_datadict.php
 share/phpmyadmin/db_export.php