Honour PKG_SYSCONFDIR and don't write unconditionally to /etc/default.

Bump revision.

8 files changed, 89 insertions, 3 deletions

diff --git a/geography/postgresql81-postgis/Makefile b/geography/postgresql81-postgis/Makefile
index f3eac697ac1..d04eea84885 100644
--- a/geography/postgresql81-postgis/Makefile
+++ b/geography/postgresql81-postgis/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/06/29 23:35:32 joerg Exp $
 
 DISTNAME=		postgis-${VERSION}
 VERSION=		1.2.1
+PKGREVISION=		1
 PKGNAME=		postgresql81-postgis-${VERSION}
 MASTER_SITES=		http://postgis.refractions.net/download/
 CATEGORIES=		databases geography
@@ -25,6 +26,16 @@ CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/postgresql/contrib
 DOCDIR=		${PREFIX}/share/doc/postgis
 HTMLDIR=	${PREFIX}/share/doc/html/postgis
 
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	extras/template_gis/profile \
+			extras/template_gis/createdb.postgis.1 \
+			extras/template_gis/mktemplate_gis.1 \
+			extras/template_gis/postgis_env.sh.in
+SUBST_VARS.paths+=	PKG_SYSCONFDIR
+SUBST_STAGE.paths=	pre-configure
+
+CONF_FILES=	share/examples/postgis/profile ${PKG_SYSCONFDIR}/postgis
+
 # Install is manual because distribution fails if docbook prereqs are not
 # satisfied, rather than using the prebuilt versions which are actually
 # in the distfile.
diff --git a/geography/postgresql81-postgis/PLIST b/geography/postgresql81-postgis/PLIST
index 11766fada74..fe0d6298900 100644
--- a/geography/postgresql81-postgis/PLIST
+++ b/geography/postgresql81-postgis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2007/01/12 18:11:49 gdt Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/06/29 23:35:32 joerg Exp $
 bin/mktemplate_gis.sh
 bin/pgsql2shp
 bin/postgis_env.sh
@@ -19,9 +19,11 @@ share/doc/postgis/README.postgis
 share/doc/postgis/ZMSgeoms.txt
 share/doc/postgis/long_xact.xml
 share/doc/postgis/postgis.xml
+share/examples/postgis/profile
 share/postgresql/contrib/lwpostgis.sql
 share/postgresql/contrib/lwpostgis_upgrade.sql
 share/postgresql/contrib/spatial_ref_sys.sql
 @dirrm share/postgresql/contrib
+@dirrm share/examples/postgis
 @dirrm share/doc/postgis
 @dirrm share/doc/html/postgis
diff --git a/geography/postgresql81-postgis/distinfo b/geography/postgresql81-postgis/distinfo
index c51f4c9bb73..d272904b509 100644
--- a/geography/postgresql81-postgis/distinfo
+++ b/geography/postgresql81-postgis/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.7 2007/01/12 18:11:49 gdt Exp $
+$NetBSD: distinfo,v 1.8 2007/06/29 23:35:33 joerg Exp $
 
 SHA1 (postgis-1.2.1.tar.gz) = 0a47bde414bf691fb624ead37cc119687aba14df
 RMD160 (postgis-1.2.1.tar.gz) = b5f8c542a143d460ebc1387a0d9e4b69335e73c3
 Size (postgis-1.2.1.tar.gz) = 2084672 bytes
 SHA1 (patch-aa) = 9660b7e2be9a039bca88f0f66e9075faf97fe41d
+SHA1 (patch-ab) = 5bd37a8c5cd71c0e90c3ccd43d6e658d840e4b3a
+SHA1 (patch-ac) = ecee68429d1d27241d1bfe96ca45053b4368fffc
+SHA1 (patch-ad) = 7ca1849a616d4ffc3dbcf9030b216b93c5d06168
+SHA1 (patch-ae) = 17d5844ed09e0299081906b949ec503f6f8f515c
+SHA1 (patch-af) = c4a63c071db31fd1c018142a24fb1e4ca9043578
diff --git a/geography/postgresql81-postgis/patches/patch-ab b/geography/postgresql81-postgis/patches/patch-ab
new file mode 100644
index 00000000000..55131ee4724
--- /dev/null
+++ b/geography/postgresql81-postgis/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2007/06/29 23:35:33 joerg Exp $
+
+--- extras/template_gis/Makefile.orig	2007-06-29 22:50:54.000000000 +0000
++++ extras/template_gis/Makefile
+@@ -31,8 +31,8 @@ MAN1_TARGET=$(MAN1_TARGETDIR)/$(MAN1)
+ MAN1_INSTALL=$(INSTALL_DATA) $(MAN1) $(MAN1_TARGET)
+ MAN1_UNINSTALL=rm -f $(MAN1_TARGET)
+ 
+-DEFAULTS_DIR=$(DESTDIR)/etc/default
+-SCRIPT_DEFAULTS=$(DEFAULTS_DIR)/postgis
++DEFAULTS_DIR=$(DESTDIR)${prefix}/share/examples/postgis
++SCRIPT_DEFAULTS=$(DEFAULTS_DIR)
+ 
+ all: $(SCRIPTS_IN)
+ 	$(foreach SCRIPT, $(SCRIPTS), $(SCRIPT_PREPARE);)
diff --git a/geography/postgresql81-postgis/patches/patch-ac b/geography/postgresql81-postgis/patches/patch-ac
new file mode 100644
index 00000000000..c4b7da45b13
--- /dev/null
+++ b/geography/postgresql81-postgis/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/06/29 23:35:33 joerg Exp $
+
+--- extras/template_gis/createdb.postgis.1.orig	2007-06-29 23:04:29.000000000 +0000
++++ extras/template_gis/createdb.postgis.1
+@@ -43,7 +43,7 @@ is set, its value is used as the default
+ .LP
+ The environment variables for template_gis creation, removal and usage may be stored in files, as follows:
+ .TP
+-.B /etc/default/postgis
++.B @PKG_SYSCONFDIR@/postgis
+ will designate default values for the whole system.
+ .TP
+ .B $HOME/.postgis/profile
diff --git a/geography/postgresql81-postgis/patches/patch-ad b/geography/postgresql81-postgis/patches/patch-ad
new file mode 100644
index 00000000000..896924cf4c3
--- /dev/null
+++ b/geography/postgresql81-postgis/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/06/29 23:35:33 joerg Exp $
+
+--- extras/template_gis/mktemplate_gis.1.orig	2007-06-29 23:04:07.000000000 +0000
++++ extras/template_gis/mktemplate_gis.1
+@@ -89,7 +89,7 @@ scripts/contrib directory for this postg
+ .LP
+ The environment variables for template_gis creation, removal and usage may be stored in files, as follows:
+ .TP
+-.B /etc/default/postgis
++.B @PKG_SYSCONFDIR@/postgis
+ will designate default values for the whole system.
+ .TP
+ .B $HOME/.postgis/profile
diff --git a/geography/postgresql81-postgis/patches/patch-ae b/geography/postgresql81-postgis/patches/patch-ae
new file mode 100644
index 00000000000..ab13b392c44
--- /dev/null
+++ b/geography/postgresql81-postgis/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/06/29 23:35:34 joerg Exp $
+
+--- extras/template_gis/postgis_env.sh.in.orig	2007-06-29 23:03:21.000000000 +0000
++++ extras/template_gis/postgis_env.sh.in
+@@ -3,7 +3,7 @@
+ # environment variables for postgis
+ 
+ #read optional configuration files. last prevails
+-for file in "/etc/default/postgis" "$HOME/.postgis/profile" ; do
++for file in "@PKG_SYSCONFDIR@/postgis" "$HOME/.postgis/profile" ; do
+ 	if [ -f "$file" ]; then
+ 		tmpval=`grep "^TEMPLATEDB=" $file | cut -d= -f2`
+ 		if [ -n "$tmpval" ]; then
diff --git a/geography/postgresql81-postgis/patches/patch-af b/geography/postgresql81-postgis/patches/patch-af
new file mode 100644
index 00000000000..4360510ce28
--- /dev/null
+++ b/geography/postgresql81-postgis/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2007/06/29 23:35:34 joerg Exp $
+
+--- extras/template_gis/profile.orig	2007-06-29 23:03:59.000000000 +0000
++++ extras/template_gis/profile
+@@ -1,7 +1,7 @@
+ 
+ #those are the default variables for postgresql-postgis.
+-#this file will be scanned from /etc/default/postgis,
+-#and then from $HOME/postgis/profile
++#this file will be scanned from @PKG_SYSCONFDIR@/postgis,
++#and then from $HOME/.postgis/profile
+ 
+ #values should NOT be in quotes
+