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.

4 files changed, 24 insertions, 17 deletions

diff --git a/databases/phpmyadmin/INSTALL b/databases/phpmyadmin/INSTALL
new file mode 100644
index 00000000000..93d95c792ce
--- /dev/null
+++ b/databases/phpmyadmin/INSTALL
@@ -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 --git a/databases/phpmyadmin/MESSAGE b/databases/phpmyadmin/MESSAGE
index ec60a6eb9af..61446e34d9e 100644
--- a/databases/phpmyadmin/MESSAGE
+++ b/databases/phpmyadmin/MESSAGE
@@ -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 --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index b1efda2c4ab..bd15a7f04bd 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -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 @@ COMMENT=	Set of PHP-scripts to adminstrate MySQL over the WWW
 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_USER?=	www
 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 @@ PMCONFFILE=	${PKG_SYSCONFDIR}/config.inc.php
 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 @@ do-install:
 	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 --git a/databases/phpmyadmin/PLIST b/databases/phpmyadmin/PLIST
index 0283a00c387..efbc518d638 100644
--- a/databases/phpmyadmin/PLIST
+++ b/databases/phpmyadmin/PLIST
@@ -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/README
 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