From 4fdf322a3c7915da2345a615d8f301ecb46a413c Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 6 Sep 2005 06:07:28 +0000
Subject: Correct some minor errors to the way that this package set
 PKG_SYSCONFDIR and MAKE_DIRS:

    * There is no need to set PKG_SYSCONFDIR as the concept is quite
      meaningless for PHP applications.  Simply copy the CONF_FILES
      from the examples directory into ${PREFIX}/share/phppgadmin/conf.

    * Use REQD_DIRS instead of MAKE_DIRS since these directories are
      under ${PREFIX} and we want to always create/remove these
      directories regardless of the value of PKG_CONFIG.

Bump the PKGREVISION to 1 due to changes in the +INSTALL and +DEINSTALL
scripts.
---
 databases/phppgadmin/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'databases/phppgadmin')

diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 89a19875efe..01807b6f592 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/09/05 18:14:39 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/09/06 06:07:28 jlam Exp $
 
 DISTNAME=	phpPgAdmin-3.5.5
 PKGNAME=	${DISTNAME:S/PgAdmin/pgadmin/}
+PKGREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=phppgadmin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,13 +24,12 @@ PHPPGHIER=	classes/HTML_TreeMenu/images images/themes/default \
 		libraries/adodb/datadict libraries/adodb/drivers \
 		classes/database lang/recoded themes/default sql conf
 
-PKG_SYSCONFDIR.phppgadmin=	${PREFIX}/share/phppgadmin/conf
 EGDIR=		${PREFIX}/share/examples/phppgadmin
 DOCDIR=		${PREFIX}/share/doc/phppgadmin
-CONF_FILES=	${EGDIR}/config.inc.php-dist ${PKG_SYSCONFDIR}/config.inc.php
+CONF_FILES=	${EGDIR}/config.inc.php-dist ${PHPPGBASE}/conf/config.inc.php
 DOC_FILES=	CREDITS DEVELOPERS FAQ HISTORY INSTALL LICENSE TODO \
 		TRANSLATORS
-MAKE_DIRS+=	${PREFIX}/share/phppgadmin/conf ${PREFIX}/share/phppgadmin
+REQD_DIRS+=	${PHPPGBASE} ${PHPPGBASE}/conf
 
 do-configure:
 	@${SED} -e "s#/usr/bin/pg#${PREFIX}/bin/pg#" \
-- 
cgit v1.2.3