pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/licenses Update to 6.13, provided by Brook Milligan.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e3f100332091
branches: trunk
changeset: 531331:e3f100332091
user: gdt <gdt%pkgsrc.org@localhost>
date: Sat Jul 28 11:06:36 2007 +0000
description:
Update to 6.13, provided by Brook Milligan.
Update license, and unset RESTRICTED.
Documentation is lo longer included; see epsg-docs.
The new version has updated parameters and has rationalized the use of
terms "supersede", "retire" and "replace".
diffstat:
geography/epsg/DESCR | 14 ++-------
geography/epsg/MESSAGE | 13 +-------
geography/epsg/Makefile | 39 ++++++++------------------
geography/epsg/PLIST | 4 +--
geography/epsg/distinfo | 20 ++++---------
geography/epsg/files/epsg-load | 17 ++++++-----
licenses/epsg-license | 60 ++++++++++++++++++++++++++---------------
7 files changed, 72 insertions(+), 95 deletions(-)
diffs (297 lines):
diff -r 02b0763c02a7 -r e3f100332091 geography/epsg/DESCR
--- a/geography/epsg/DESCR Sat Jul 28 10:23:45 2007 +0000
+++ b/geography/epsg/DESCR Sat Jul 28 11:06:36 2007 +0000
@@ -1,7 +1,8 @@
EPSG Geodetic Parameters
-The OGP Surveying and Positioning Committee, through its geodesy
-sub-committee, maintains and publishes a dataset of parameters for
+The Surveying and Positioning Committee of the International
+Association of Oil and Gas Producers (OGP), through its Geodesy
+Subcommittee, maintains and publishes a dataset of parameters for
coordinate reference system and coordinate transformation description.
The EPSG Geodetic Parameter Dataset has been included as reference
data in UKOOA and SEG positioning data exchange formats, the GeoTIFF
@@ -9,14 +10,5 @@
Iris21, PPDM and POSC Epicentre data models. The dataset is
distributed in an MS Access relational database and SQL script files.
-This current release (Version 6.11) of the EPSG Geodetic Parameter
-Dataset comprises of data updates to the v6.10 release of April 2006.
-It also replaces interim releases v6.10.1 of May 2006 and v6.10.2 of
-June 2006 which included updates to the SQL scripts accompanying the
-v6.10 release. The EPSG Geodetic Parameter Dataset, or EPSG dataset,
-is maintained by the Geodesy Subcommittee of the Surveying and
-Positioning Committee of the International Association of Oil and Gas
-Producers (OGP).
-
This package includes the PostgreSQL and mySQL scripts for creating
the EPSG database.
diff -r 02b0763c02a7 -r e3f100332091 geography/epsg/MESSAGE
--- a/geography/epsg/MESSAGE Sat Jul 28 10:23:45 2007 +0000
+++ b/geography/epsg/MESSAGE Sat Jul 28 11:06:36 2007 +0000
@@ -1,17 +1,8 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2006/10/04 14:25:57 gdt Exp $
+$NetBSD: MESSAGE,v 1.4 2007/07/28 11:06:36 gdt Exp $
Before the EPSG data can be used, it must be installed into a
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.
-
- Using the EPSG Geodetic Parameter Dataset (Surveying and
- Positioning Guidance Note Number 7, part 1)
-
- Coordinate Conversions and Transformations including Formulas
- (Surveying and Positioning Guidance Note Number 7, part 2)
+script "${BINDIR}/epsg-load" to install the data is provided.
===========================================================================
diff -r 02b0763c02a7 -r e3f100332091 geography/epsg/Makefile
--- a/geography/epsg/Makefile Sat Jul 28 10:23:45 2007 +0000
+++ b/geography/epsg/Makefile Sat Jul 28 11:06:36 2007 +0000
@@ -1,36 +1,25 @@
-# $NetBSD: Makefile,v 1.6 2006/10/29 00:15:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/28 11:06:36 gdt Exp $
#
DISTNAME= epsg-v${VERS}sql-PostgreSQL
-PKGNAME= epsg-6.11.2
-VERS= 6_11_2
+PKGNAME= epsg-6.13
+VERS= 6_13
CATEGORIES= geography databases
MASTER_SITES+= http://www.epsg.org/databases/
DISTFILES+= epsg-v${VERS}sql-PostgreSQL.zip \
- epsg-v${VERS}sql-mySQL.zip \
- G7-1.pdf G7-2.pdf
-EXTRACT_ONLY= epsg-v${VERS}sql-PostgreSQL.zip \
epsg-v${VERS}sql-mySQL.zip
-DIST_SUBDIR= epsg-20061029
+DIST_SUBDIR= epsg-${VERS}
MAINTAINER= brook%nmsu.edu@localhost
HOMEPAGE= http://www.epsg.org/
-COMMENT= EPSG Geodetic Parameters database
+COMMENT= EPSG geodetic parameters database
-# don't make filenames lowercase
+# Don't make filenames lowercase.
EXTRACT_OPTS_ZIP= -aqo
LICENSE= epsg-license
-RESTRICTED= No commercial redistribution
-NO_SRC_ON_CDROM= ${RESTRICTED}
-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-v${VERS}sql-PostgreSQL
-WRKSRC.pgsql= ${WRKDIR}/epsg-v${VERS}sql-PostgreSQL
-WRKSRC.mysql= ${WRKDIR}/epsg-v${VERS}sql-mySQL
+WRKSRC= ${WRKDIR}
NO_BUILD= yes
@@ -38,7 +27,7 @@
DOCDIR= ${PREFIX}/share/doc/epsg
EPSGDIR= ${PREFIX}/share/epsg
-MESSAGE_SUBST+= DOCDIR=${DOCDIR:Q}
+MESSAGE_SUBST+= BINDIR=${BINDIR:Q}
MESSAGE_SUBST+= EPSGDIR=${EPSGDIR:Q}
DATAFILES.pgsql+= EPSG_v${VERS}.mdb_Data_PostgreSQL.sql
@@ -49,29 +38,25 @@
DATAFILES.mysql+= EPSG_v${VERS}.mdb_FKeys_MySQL.sql
DATAFILES.mysql+= EPSG_v${VERS}.mdb_Tables_MySQL.sql
-SUBST_STAGE.epsg= configure
+SUBST_CLASSES+= epsg
+SUBST_STAGE.epsg= do-configure
SUBST_FILES.epsg= epsg-load
-SUBST_SED.epsg= -e "s:@PREFIX@:${PREFIX:Q}:"
-SUBST_SED.epsg+= -e "s:@EPSGDIR@:${EPSGDIR:Q}:"
+SUBST_VARS.epsg= PREFIX EPSGDIR VERS
SUBST_MESSAGE.epsg= Fixing EPSG example script
PLIST_SUBST+= VERS=${VERS}
post-extract:
- ${CP} ${_DISTDIR}/G7-1.pdf ${WRKSRC}
- ${CP} ${_DISTDIR}/G7-2.pdf ${WRKSRC}
${CP} ${FILESDIR}/epsg-load ${WRKSRC}
do-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA_DIR} ${EPSGDIR}
- ${INSTALL_DATA} ${WRKSRC}/G7-1.pdf ${DOCDIR:Q}
- ${INSTALL_DATA} ${WRKSRC}/G7-2.pdf ${DOCDIR:Q}
${INSTALL_DATA} ${WRKSRC}/epsg-v${VERS}_Readme.pdf ${DOCDIR:Q}
${INSTALL_SCRIPT} ${WRKSRC}/epsg-load ${BINDIR}
.for d in pgsql mysql
.for f in ${DATAFILES.${d}}
- ${INSTALL_DATA} ${WRKSRC.${d}}/${f} ${EPSGDIR:Q}/${f}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${EPSGDIR:Q}/${f}
.endfor
.endfor
diff -r 02b0763c02a7 -r e3f100332091 geography/epsg/PLIST
--- a/geography/epsg/PLIST Sat Jul 28 10:23:45 2007 +0000
+++ b/geography/epsg/PLIST Sat Jul 28 11:06:36 2007 +0000
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2006/10/29 00:15:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/07/28 11:06:36 gdt Exp $
bin/epsg-load
-share/doc/epsg/G7-1.pdf
-share/doc/epsg/G7-2.pdf
share/doc/epsg/epsg-v${VERS}_Readme.pdf
share/epsg/EPSG_v${VERS}.mdb_Data_MySQL.sql
share/epsg/EPSG_v${VERS}.mdb_Data_PostgreSQL.sql
diff -r 02b0763c02a7 -r e3f100332091 geography/epsg/distinfo
--- a/geography/epsg/distinfo Sat Jul 28 10:23:45 2007 +0000
+++ b/geography/epsg/distinfo Sat Jul 28 11:06:36 2007 +0000
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.4 2006/10/29 00:15:43 wiz Exp $
+$NetBSD: distinfo,v 1.5 2007/07/28 11:06:36 gdt Exp $
-SHA1 (epsg-20061029/G7-1.pdf) = fdf31f6d4fe534011e62a1498d8b054bb1fd1025
-RMD160 (epsg-20061029/G7-1.pdf) = f331d158d241b128a2b9e1d2a63c06c0f6ae855c
-Size (epsg-20061029/G7-1.pdf) = 831907 bytes
-SHA1 (epsg-20061029/G7-2.pdf) = f3d7e1fe7cdf6029736dfcec478f6ad9056ff425
-RMD160 (epsg-20061029/G7-2.pdf) = bf684d8782f1dd729ddd246c4f7384615690ebdc
-Size (epsg-20061029/G7-2.pdf) = 952449 bytes
-SHA1 (epsg-20061029/epsg-v6_11_2sql-PostgreSQL.zip) = 0775a779bd163f830e26487341aa2d85726e6650
-RMD160 (epsg-20061029/epsg-v6_11_2sql-PostgreSQL.zip) = 72598e1dd13e8ba7fb586436a80a4819045d64f1
-Size (epsg-20061029/epsg-v6_11_2sql-PostgreSQL.zip) = 884901 bytes
-SHA1 (epsg-20061029/epsg-v6_11_2sql-mySQL.zip) = 49c1356795bd6dccf58363bb91e5c13dff41f4db
-RMD160 (epsg-20061029/epsg-v6_11_2sql-mySQL.zip) = 33ca67e55894b43bb5d8e8acc9cb8a27b0927a16
-Size (epsg-20061029/epsg-v6_11_2sql-mySQL.zip) = 884825 bytes
+SHA1 (epsg-6_13/epsg-v6_13sql-PostgreSQL.zip) = 5004f35422f6fb5c26cc5666a0397e908c029674
+RMD160 (epsg-6_13/epsg-v6_13sql-PostgreSQL.zip) = 5337617501f42d8b84f1225f1d4ec5e36451f9d3
+Size (epsg-6_13/epsg-v6_13sql-PostgreSQL.zip) = 924613 bytes
+SHA1 (epsg-6_13/epsg-v6_13sql-mySQL.zip) = fa4d370fd1c34040af184ceff0c2e45b61a4f69c
+RMD160 (epsg-6_13/epsg-v6_13sql-mySQL.zip) = 7c2123a0bc04302b1901ddf0da957d0df3569ee6
+Size (epsg-6_13/epsg-v6_13sql-mySQL.zip) = 924585 bytes
diff -r 02b0763c02a7 -r e3f100332091 geography/epsg/files/epsg-load
--- a/geography/epsg/files/epsg-load Sat Jul 28 10:23:45 2007 +0000
+++ b/geography/epsg/files/epsg-load Sat Jul 28 11:06:36 2007 +0000
@@ -1,9 +1,9 @@
#!/bin/sh
-# $NetBSD: epsg-load,v 1.2 2006/10/12 22:56:08 wiz Exp $
+# $NetBSD: epsg-load,v 1.3 2007/07/28 11:06:36 gdt Exp $
# epsg - import EPSG data into a relational database
-# Copyright (c) 2006 Brook Milligan <brook%nmsu.edu@localhost>
+# Copyright (c) 2006,2007 Brook Milligan <brook%nmsu.edu@localhost>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,7 @@
USE_PGSQL=0
USE_MYSQL=0
+VERS=@VERS@
SRCDIR=@EPSGDIR@
PSQL=@PREFIX@/bin/psql
@@ -103,14 +104,14 @@
if [ $USE_PGSQL -eq 1 ]; then
echo "importing into a PostgreSQL database ..."
- $PSQL -f $SRCDIR/EPSG_v6_11.mdb_Tables_PostgreSQL.sql $PSQL_FLAGS
- $PSQL -f $SRCDIR/EPSG_v6_11.mdb_Data_PostgreSQL.sql $PSQL_FLAGS
- $PSQL -f $SRCDIR/EPSG_v6_11.mdb_FKeys_PostgreSQL.sql $PSQL_FLAGS
+ $PSQL -f $SRCDIR/EPSG_v$VERS.mdb_Tables_PostgreSQL.sql $PSQL_FLAGS
+ $PSQL -f $SRCDIR/EPSG_v$VERS.mdb_Data_PostgreSQL.sql $PSQL_FLAGS
+ $PSQL -f $SRCDIR/EPSG_v$VERS.mdb_FKeys_PostgreSQL.sql $PSQL_FLAGS
fi
if [ $USE_MYSQL -eq 1 ]; then
echo "importing into a mySQL database ..."
- $MYSQL $MYSQL_FLAGS < $SRCDIR/EPSG_v6_11.mdb_Tables_MySQL.sql
- $MYSQL $MYSQL_FLAGS < $SRCDIR/EPSG_v6_11.mdb_Data_MySQL.sql
- $MYSQL $MYSQL_FLAGS < $SRCDIR/EPSG_v6_11.mdb_FKeys_MySQL.sql
+ $MYSQL $MYSQL_FLAGS < $SRCDIR/EPSG_v$VERS.mdb_Tables_MySQL.sql
+ $MYSQL $MYSQL_FLAGS < $SRCDIR/EPSG_v$VERS.mdb_Data_MySQL.sql
+ $MYSQL $MYSQL_FLAGS < $SRCDIR/EPSG_v$VERS.mdb_FKeys_MySQL.sql
fi
diff -r 02b0763c02a7 -r e3f100332091 licenses/epsg-license
--- a/licenses/epsg-license Sat Jul 28 10:23:45 2007 +0000
+++ b/licenses/epsg-license Sat Jul 28 11:06:36 2007 +0000
@@ -1,32 +1,48 @@
-$NetBSD: epsg-license,v 1.1 2006/08/16 14:37:43 gdt Exp $
+$NetBSD: epsg-license,v 1.2 2007/07/28 11:06:36 gdt Exp $
EPSG LICENSE CONDITIONS
Use of the Data
-1) All data pertinent to a specific coordinate reference system must
- be copied without modification and all related pages/records must
- be included;
-
-2) All components of this data set pertinent to any given coordinate
- reference system must be distributed together (complete
- distribution of all components of the data set is preferred, but
- the OGP recognises the need for a more limited distribution);
+The user assumes the entire risk as to the accuracy and the use of
+this data. The data may be used, copied and distributed subject to the
+following conditions
-3) The data may not be distributed for profit by any third party; and
-
-4) The original source [OGP] must be acknowledged.
-
-The user assumes the entire risk as to the accuracy and the use of
-this data. The data may be copied and distributed subject to the
-following conditions:
-
-INFORMATION PROVIDED IN THIS DOCUMENT IS PROVIDED "AS IS" WITHOUT
+1. INFORMATION PROVIDED IN THIS DOCUMENT IS PROVIDED "AS IS" WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT
LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS
FOR A PARTICULAR PURPOSE.
-With regard to (3) above, the data may be included within proprietary
-applications distributed on a commercial basis when the commerciality
-is based on application functionality and not on a value ascribed to
-the freely-distributed EPSG dataset.
+2. The data may be included in any commercial package provided that
+any commerciality is based on value added by the provider and not on a
+value ascribed to the EPSG dataset which is made available at no
+charge. The ownership of the EPSG dataset [OGP] must be acknowledged.
+
+3. Subsets of information may be extracted from the dataset. Users are
+advised that coordinate reference system and coordinate transformation
+descriptions are incomplete unless all elements detailed as essential
+in OGP Surveying and Positioning Guidance Note 7-1 annex F are
+included.
+
+4. Essental elements should preferably be reproduced as described in
+the dataset. Modification of parameter values is permitted as
+described in the table below [*] to allow change to the content of the
+information provided that numeric equivalence is achieved. Numeric
+equivalence refers to the results of geodetic calculations in which
+the parameters are used, for example (i) conversion of ellipsoid
+defining parameters, or (ii) conversion of parameters between one and
+two standard parallel projection methods, or (iii) conversion of
+parameters between 7-parameter geocentric transformation methods.
+
+5. No data that has been modified other than as permitted in these
+terms and conditions shall be described as or attributed to the EPSG
+dataset
+
+---
+[*] The full contents of this table are available in the following
+ locations:
+ - The EPSG web site: http://www.epsg.org/
+ - The file epsg-v6_13_Readme.pdf, which is distributed within the
+ geography/epsg package.
+ - The OGP Surveying and Positioning Guidance Note 7-1, which is
+ within the geography/epsg-docs package.
Home |
Main Index |
Thread Index |
Old Index