Update to 6.11.1 (old distfiles disappeared). Ok brook.

Version 6.11.1 is the current release of the EPSG dataset,
distributed in an MS Access 97 database and/or as SQL scripts.
It incorporates data received and verified since the release of
Version 6.11 in August 2006.

pkgsrc fixes: SUBST_* improvements (was patching nonexistent file)

4 files changed, 42 insertions, 41 deletions

diff --git a/geography/epsg/Makefile b/geography/epsg/Makefile
index b9341f37384..1d0a4867074 100644
--- a/geography/epsg/Makefile
+++ b/geography/epsg/Makefile
@@ -1,22 +1,24 @@
-# $NetBSD: Makefile,v 1.4 2006/10/04 14:25:57 gdt Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/12 22:56:08 wiz Exp $
 #
 
-DISTNAME=		epsg-v6_11sql-PostgreSQL
-PKGNAME=		epsg-6.11
-PKGREVISION=		2
+DISTNAME=		epsg-v6_11_1sql-PostgreSQL
+PKGNAME=		epsg-6.11.1
 CATEGORIES=		geography databases
 MASTER_SITES+=		http://www.epsg.org/databases/
-DISTFILES+=		epsg-v6_11sql-PostgreSQL.zip \
-			epsg-v6_11sql-mySQL.zip \
+DISTFILES+=		epsg-v6_11_1sql-PostgreSQL.zip \
+			epsg-v6_11_1sql-mySQL.zip \
 			G7-1.pdf G7-2.pdf
-EXTRACT_ONLY=		epsg-v6_11sql-PostgreSQL.zip \
-			epsg-v6_11sql-mySQL.zip
+EXTRACT_ONLY=		epsg-v6_11_1sql-PostgreSQL.zip \
+			epsg-v6_11_1sql-mySQL.zip
 DIST_SUBDIR=		epsg-20060823
 
 MAINTAINER=		brook@nmsu.edu
 HOMEPAGE=		http://www.epsg.org/
 COMMENT=		EPSG Geodetic Parameters database
 
+# don't make filenames lowercase
+EXTRACT_OPTS_ZIP=	-aqo
+
 LICENSE=		epsg-license
 RESTRICTED=		No commercial redistribution
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -25,9 +27,9 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 SITES.G7-1.pdf=		http://www.epsg.org/guides/docs/
 SITES.G7-2.pdf=		${SITES.G7-1.pdf}
 
-WRKSRC=			${WRKDIR}/epsg-v6_11sql-postgresql
-WRKSRC.pgsql=		${WRKDIR}/epsg-v6_11sql-PostgreSQL
-WRKSRC.mysql=		${WRKDIR}/epsg-v6_11sql-mySQL
+WRKSRC=			${WRKDIR}/epsg-v6_11_1sql-PostgreSQL
+WRKSRC.pgsql=		${WRKDIR}/epsg-v6_11_1sql-PostgreSQL
+WRKSRC.mysql=		${WRKDIR}/epsg-v6_11_1sql-mySQL
 
 NO_BUILD=		yes
 
@@ -38,19 +40,18 @@ EPSGDIR=		${PREFIX}/share/epsg
 MESSAGE_SUBST+=		DOCDIR=${DOCDIR:Q}
 MESSAGE_SUBST+=		EPSGDIR=${EPSGDIR:Q}
 
-DATAFILES.pgsql+=	EPSG_v6_11.mdb_Data_PostgreSQL.sql
-DATAFILES.pgsql+=	EPSG_v6_11.mdb_FKeys_PostgreSQL.sql
-DATAFILES.pgsql+=	EPSG_v6_11.mdb_Tables_PostgreSQL.sql
+DATAFILES.pgsql+=	EPSG_v6_11_1.mdb_Data_PostgreSQL.sql
+DATAFILES.pgsql+=	EPSG_v6_11_1.mdb_FKeys_PostgreSQL.sql
+DATAFILES.pgsql+=	EPSG_v6_11_1.mdb_Tables_PostgreSQL.sql
 
-DATAFILES.mysql+=	EPSG_v6_11.mdb_Data_MySQL.sql
-DATAFILES.mysql+=	EPSG_v6_11.mdb_FKeys_MySQL.sql
-DATAFILES.mysql+=	EPSG_v6_11.mdb_Tables_MySQL.sql
+DATAFILES.mysql+=	EPSG_v6_11_1.mdb_Data_MySQL.sql
+DATAFILES.mysql+=	EPSG_v6_11_1.mdb_FKeys_MySQL.sql
+DATAFILES.mysql+=	EPSG_v6_11_1.mdb_Tables_MySQL.sql
 
-SUBST_CLASSES+=		epsg
 SUBST_STAGE.epsg=	configure
-SUBST_FILES.epsg=	epsg.sh
-SUBST_SED.epsg=		-e "s:$$[{]PREFIX[}]:${PREFIX:Q}:"
-SUBST_SED.epsg+=	-e "s:$$[{]EPSGDIR[}]:${EPSGDIR:Q}:"
+SUBST_FILES.epsg=	epsg-load
+SUBST_SED.epsg=		-e "s:@PREFIX@:${PREFIX:Q}:"
+SUBST_SED.epsg+=	-e "s:@EPSGDIR@:${EPSGDIR:Q}:"
 SUBST_MESSAGE.epsg=	Fixing EPSG example script
 
 post-extract:
@@ -63,7 +64,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${EPSGDIR}
 	${INSTALL_DATA} ${WRKSRC}/G7-1.pdf ${DOCDIR:Q}
 	${INSTALL_DATA} ${WRKSRC}/G7-2.pdf ${DOCDIR:Q}
-	${INSTALL_DATA} ${WRKSRC}/epsg-v6_11-readme.pdf ${DOCDIR:Q}
+	${INSTALL_DATA} ${WRKSRC}/epsg-v6_11_1-Readme.pdf ${DOCDIR:Q}
 	${INSTALL_SCRIPT} ${WRKSRC}/epsg-load ${BINDIR}
 .for d in pgsql mysql
 .for f in ${DATAFILES.${d}}
diff --git a/geography/epsg/PLIST b/geography/epsg/PLIST
index 539a84e96e1..114213c65a7 100644
--- a/geography/epsg/PLIST
+++ b/geography/epsg/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.3 2006/10/04 14:25:57 gdt Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/10/12 22:56:08 wiz Exp $
 bin/epsg-load
 share/doc/epsg/G7-1.pdf
 share/doc/epsg/G7-2.pdf
-share/doc/epsg/epsg-v6_11-readme.pdf
-share/epsg/EPSG_v6_11.mdb_Data_MySQL.sql
-share/epsg/EPSG_v6_11.mdb_Data_PostgreSQL.sql
-share/epsg/EPSG_v6_11.mdb_FKeys_MySQL.sql
-share/epsg/EPSG_v6_11.mdb_FKeys_PostgreSQL.sql
-share/epsg/EPSG_v6_11.mdb_Tables_MySQL.sql
-share/epsg/EPSG_v6_11.mdb_Tables_PostgreSQL.sql
+share/doc/epsg/epsg-v6_11_1-Readme.pdf
+share/epsg/EPSG_v6_11_1.mdb_Data_MySQL.sql
+share/epsg/EPSG_v6_11_1.mdb_Data_PostgreSQL.sql
+share/epsg/EPSG_v6_11_1.mdb_FKeys_MySQL.sql
+share/epsg/EPSG_v6_11_1.mdb_FKeys_PostgreSQL.sql
+share/epsg/EPSG_v6_11_1.mdb_Tables_MySQL.sql
+share/epsg/EPSG_v6_11_1.mdb_Tables_PostgreSQL.sql
 @dirrm share/epsg
 @dirrm share/doc/epsg
diff --git a/geography/epsg/distinfo b/geography/epsg/distinfo
index fcc06b238e5..27b1205f782 100644
--- a/geography/epsg/distinfo
+++ b/geography/epsg/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.2 2006/10/03 12:53:44 gdt Exp $
+$NetBSD: distinfo,v 1.3 2006/10/12 22:56:08 wiz Exp $
 
-SHA1 (epsg-20060823/epsg-v6_11sql-PostgreSQL.zip) = 4c3733da69b9ca59ba76483f656cea8333428df1
-RMD160 (epsg-20060823/epsg-v6_11sql-PostgreSQL.zip) = 1359739ebb2bfce4ed09be38c93a80ae5f51cca5
-Size (epsg-20060823/epsg-v6_11sql-PostgreSQL.zip) = 1082987 bytes
-SHA1 (epsg-20060823/epsg-v6_11sql-mySQL.zip) = 9aea90ac8d7c0e9715735625fd57f4754dbbdabe
-RMD160 (epsg-20060823/epsg-v6_11sql-mySQL.zip) = 4247d8c7b0d10a2fa67c60b1a46483c64b5d9b5b
-Size (epsg-20060823/epsg-v6_11sql-mySQL.zip) = 1083069 bytes
 SHA1 (epsg-20060823/G7-1.pdf) = fdf31f6d4fe534011e62a1498d8b054bb1fd1025
 RMD160 (epsg-20060823/G7-1.pdf) = f331d158d241b128a2b9e1d2a63c06c0f6ae855c
 Size (epsg-20060823/G7-1.pdf) = 831907 bytes
 SHA1 (epsg-20060823/G7-2.pdf) = f3d7e1fe7cdf6029736dfcec478f6ad9056ff425
 RMD160 (epsg-20060823/G7-2.pdf) = bf684d8782f1dd729ddd246c4f7384615690ebdc
 Size (epsg-20060823/G7-2.pdf) = 952449 bytes
+SHA1 (epsg-20060823/epsg-v6_11_1sql-PostgreSQL.zip) = 4dd1f84e07a7c4a3fa21d44539020387769967cd
+RMD160 (epsg-20060823/epsg-v6_11_1sql-PostgreSQL.zip) = 5b8f7057904d503e9d62effcc3c747c4d15d7fc4
+Size (epsg-20060823/epsg-v6_11_1sql-PostgreSQL.zip) = 1044545 bytes
+SHA1 (epsg-20060823/epsg-v6_11_1sql-mySQL.zip) = 8996e7e7874f0f3e7dfce97a9afa30f94dd4c2a4
+RMD160 (epsg-20060823/epsg-v6_11_1sql-mySQL.zip) = cdbb46f795e830e13b056810e6b944f737b81fd4
+Size (epsg-20060823/epsg-v6_11_1sql-mySQL.zip) = 1044456 bytes
diff --git a/geography/epsg/files/epsg-load b/geography/epsg/files/epsg-load
index ae8983de153..e3e4bb9cc91 100755
--- a/geography/epsg/files/epsg-load
+++ b/geography/epsg/files/epsg-load
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: epsg-load,v 1.1 2006/10/04 14:25:57 gdt Exp $
+# $NetBSD: epsg-load,v 1.2 2006/10/12 22:56:08 wiz Exp $
 
 # epsg - import EPSG data into a relational database
 
@@ -41,10 +41,10 @@ HELP=0
 USE_PGSQL=0
 USE_MYSQL=0
 
-SRCDIR=${EPSGDIR}
+SRCDIR=@EPSGDIR@
 
-PSQL=${PREFIX}/bin/psql
-MYSQL=${PREFIX}/bin/mysql
+PSQL=@PREFIX@/bin/psql
+MYSQL=@PREFIX@/bin/mysql
 
 if [ $# = 0 ]; then
     HELP=1