rename loader script to epsg-load, and install in ${PREFIX}/bin

PKGREVISION++

4 files changed, 11 insertions, 14 deletions

diff --git a/geography/epsg/MESSAGE b/geography/epsg/MESSAGE
index 312b160e048..762b2181fac 100644
--- a/geography/epsg/MESSAGE
+++ b/geography/epsg/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2006/10/03 12:53:44 gdt Exp $
+$NetBSD: MESSAGE,v 1.3 2006/10/04 14:25:57 gdt Exp $
 
 Before the EPSG data can be used, it must be installed into a
-relational database.  The data files are installed in ${EPSGDIR}.  For
-an example script that will install the data, see ${EGDIR}/epsg.
+relational database.  The data files are installed in ${EPSGDIR}.  A
+script "epsg-load" to install the data is provided.
 
 See the following two documents, which are located in ${DOCDIR},
 for a complete description of the dataset.
diff --git a/geography/epsg/Makefile b/geography/epsg/Makefile
index 7066ed41bac..b9341f37384 100644
--- a/geography/epsg/Makefile
+++ b/geography/epsg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/10/03 12:53:44 gdt Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/04 14:25:57 gdt Exp $
 #
 
 DISTNAME=		epsg-v6_11sql-PostgreSQL
 PKGNAME=		epsg-6.11
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		geography databases
 MASTER_SITES+=		http://www.epsg.org/databases/
 DISTFILES+=		epsg-v6_11sql-PostgreSQL.zip \
@@ -31,12 +31,11 @@ WRKSRC.mysql=		${WRKDIR}/epsg-v6_11sql-mySQL
 
 NO_BUILD=		yes
 
+BINDIR=			${PREFIX}/bin
 DOCDIR=			${PREFIX}/share/doc/epsg
-EGDIR=			${PREFIX}/share/examples/epsg
 EPSGDIR=		${PREFIX}/share/epsg
 
 MESSAGE_SUBST+=		DOCDIR=${DOCDIR:Q}
-MESSAGE_SUBST+=		EGDIR=${EGDIR:Q}
 MESSAGE_SUBST+=		EPSGDIR=${EPSGDIR:Q}
 
 DATAFILES.pgsql+=	EPSG_v6_11.mdb_Data_PostgreSQL.sql
@@ -57,16 +56,15 @@ SUBST_MESSAGE.epsg=	Fixing EPSG example script
 post-extract:
 	${CP} ${_DISTDIR}/G7-1.pdf ${WRKSRC}
 	${CP} ${_DISTDIR}/G7-2.pdf ${WRKSRC}
-	${CP} ${FILESDIR}/epsg.sh ${WRKSRC}
+	${CP} ${FILESDIR}/epsg-load ${WRKSRC}
 
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
 	${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_SCRIPT} ${WRKSRC}/epsg.sh ${EGDIR}/epsg
+	${INSTALL_SCRIPT} ${WRKSRC}/epsg-load ${BINDIR}
 .for d in pgsql mysql
 .for f in ${DATAFILES.${d}}
 	${INSTALL_DATA} ${WRKSRC.${d}}/${f} ${EPSGDIR:Q}/${f}
diff --git a/geography/epsg/PLIST b/geography/epsg/PLIST
index 094989a2293..539a84e96e1 100644
--- a/geography/epsg/PLIST
+++ b/geography/epsg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2006/10/03 12:53:44 gdt Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/10/04 14:25:57 gdt Exp $
+bin/epsg-load
 share/doc/epsg/G7-1.pdf
 share/doc/epsg/G7-2.pdf
 share/doc/epsg/epsg-v6_11-readme.pdf
@@ -8,7 +9,5 @@ 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/examples/epsg/epsg
-@dirrm share/examples/epsg
 @dirrm share/epsg
 @dirrm share/doc/epsg
diff --git a/geography/epsg/files/epsg.sh b/geography/epsg/files/epsg-load
index f1abc551bbc..ae8983de153 100644..100755
--- a/geography/epsg/files/epsg.sh
+++ b/geography/epsg/files/epsg-load
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: epsg.sh,v 1.2 2006/10/03 12:55:47 gdt Exp $
+# $NetBSD: epsg-load,v 1.1 2006/10/04 14:25:57 gdt Exp $
 
 # epsg - import EPSG data into a relational database