Updated proj to version 4.4.3.

Rel. 4.4.3 2001/04/20
-------------------------------------------------------------------------

2001-04-20  Frank Warmerdam  <warmerdam@pobox.com>

	* Don't install test files in /usr/local/share/proj.

	* Made WGS84 the default in proj_def.dat

	* nad/test27,test83: Use -b flag for diff to avoid differences on
	Windows due to CR/LF issues.

	* src/makefile.vc: default to building "all".

	* src/pj_init.c: call pj_open_lib() with mode of "rt" to ensure
	correct handling of def files on DOS based systems.

	* Updated for 4.4.3 release (pj_release.c, Makefile.am, etc).

2001-04-05  Frank Warmerdam  <warmerdam@pobox.com>

	* Introduce proj_api.h as a public include file with projects.h
	now intended to be private.

	* pj_datums.c: added ntv1_can.dat to list for NAD27 datum.

	* nad_init(): added support for loading NTv1 style datum shift files.

	* cs2cs.c: use pj_latlong_from_proj()

	* pj_init.c: added pj_init_plus().

	* pj_utils.c: new with pj_is_latlong(), and pj_latlong_from_proj()
	functions.

	* pj_strerror.c: added error -43.

2001-04-04  Frank Warmerdam  <warmerdam@pobox.com>

	* rewrote 7 param datum shift to match EPSG:9606, now works with
	example.

2001-03-20  Frank Warmerdam  <warmerdam@pobox.com>

	* Added -DPROJ_LIB=\"C:/PROJ/\" in src/makefile.vc to provide for
	a default proj data file search directory.

	* Added HOWTO-RELEASE document in CVS.

2001-03-15  Frank Warmerdam  <warmerdam@pobox.com>

	* src/pj_apply_gridshift.c: fixed bug in pj_load_nadgrids() which
	would sometimes result in the load function failing because of a
	buffer overrun in the grid list string.

2001-03-14  Frank Warmerdam  <warmerdam@pobox.com>

	* added nad/epsg database of translations between EPSG PCS/GCS
	codes and PROJ.4 definitions.

2001-02-24  Frank Warmerdam  <warmerdam@pobox.com>

	* Include +ellps in proj example as per suggestion from Michael
	DeChaine.

2001-02-07  Frank Warmerdam  <warmerdam@pobox.com>

	* Cleaned up various warnings when compiled with -Wall.

2001-02-03  Frank Warmerdam  <warmerdam@pobox.com>

	* Added cs2cs.1 man page, and minor updates to nad2nad.1 and proj.1.

	* Added pj_transform docs to pj_init.3.

2001-01-25  Frank Warmerdam  <warmerdam@pobox.com>

	* Fixed pj_init() check for WGS84 match as per Bart Adriaanse bug rep.

2000-12-15  Frank Warmerdam  <warmerdam@pobox.com>

	* src/makefile.vc: only delete proj.lib if it exists.

2000-12-01  Frank Warmerdam  <warmerdam@pobox.com>

	* Added proj.def to extra_dist in src/Makefile.am.

2000-11-29  Frank Warmerdam  <warmerdam@pobox.com>

	* Changed strtod() to proj_strtod() in strtod.c, and make use
	of it in dmstor() to avoid having stuff like "5d10" interpreted
	as exponential notation on MSVC.

2000-11-18  Frank Warmerdam  <warmerda@cs46980-c>

	* Patch from Craig Bruce to adjlon.c to avoid wrong results,
	and near-hangs when adjusting very large numbers.
	http://bugzilla.remotesensing.org/show_bug.cgi?id=27

Rel. 4.4.2 2000/09/22
-------------------------------------------------------------------------

2000-09-22  Frank Warmerdam  <warmerda@cs46980-c>

	* Fixed src/Makefile.am install-exec-local target, and added
	geocent.h, and emess.h.  Reissued 4.4.2 distribution files.

	* Update version to 4.4.2, in preparation for 4.4.2 release.

	* Ensure makefile.vc is distributed, and mention windows building
	in README.

	* Cast args to freev2() in bch2bps.c, and mk_cheby.c to avoid errors
	on the Cray.

2000-09-21  Frank Warmerdam  <warmerda@cs46980-c>

	* Added "sphere" to pj_ellps.c.

2000-07-06  Frank Warmerdam  <warmerda@cs46980-c>

	* Fixed bug in nad_init() with path for datum shifting files.

	* Implemented cs2cs program for transforming between coordinate systems
	including datum shifts.

	* Implemented proj=latlong pseudo-projection.

	* Implemented pj_transform() to transform from one coordinate system
	to another, including applying geocentric datum shifts, and NAD27
	grid shifts.

	* Implemented 3/7 parameter geocentric datum shift support.

	* Added support for +datum, +towgs84, and +nadgrids parameters
	when defining PJ's (for pj_init()).  Added datum_type, and datum_params
	to PJ structure.

2000-07-04  Frank Warmerdam  <warmerda@cs46980-c>

	* Patched proj.c to handle binary io properly on Windows and DOS.
	Patch submitted by Thomas Knudsen <thk@kms.dk>.

2000-04-26  Frank Warmerdam  <warmerda@cs46980-c>

	* Added #define USE_PROJUV to projects.h to allow apps to
	work properly against old and new version.

2000-04-04  Frank Warmerdam  <warmerda@rommel.atlsci.com>

	* Patch from Craig Bruce (cbruce@cubewerx.com) for PJ_ortho.c
	to make INVERSE() work well for points near zero.

2000-03-29  Frank Warmerdam  <warmerda@cs46980-c>

	* Added hard links for invproj->proj and invgeod->geod in
	src/Makefile.{am,in}.

Rel. 4.4.1 2000/03/27
-------------------------------------------------------------------------

2000-03-27  Frank Warmerdam  <warmerda@cs46980-c>

	* Issued V4.4.1 Release.

	* Re-added install target for NADCON data files when available.

	* At the suggestion of John Evans, I have rolled the nad conversion
	functions into the core library.

	* Updated COPYING file to MIT style license.  Added man_proj.html
	in html directory.

	* Add rules to install nad data files in $(prefix)/share/proj.

2000-03-21  Frank Warmerdam  <warmerda@rommel.atlsci.com>

	* Converted to use libtool.

	* Wrote new configure.in, and use automake to generate makefiles.

	* Renamed UV to projUV to avoid conflicts on windows.

	* Reorganize ChangeLog, and start work on 4.4.
This commit is contained in:
jtb 2001-04-20 20:38:16 +00:00
parent 07e617a9dc
commit ed53068286
6 changed files with 40 additions and 255 deletions

View file

@ -1,43 +1,21 @@
# $NetBSD: Makefile,v 1.3 2001/04/14 21:43:58 jtb Exp $
# $NetBSD: Makefile,v 1.4 2001/04/20 20:38:16 jtb Exp $
DISTNAME= PROJ.4.3.3
PKGNAME= proj-4.3.3
DISTNAME= proj-4.4.3
CATEGORIES= misc
MASTER_SITES= ftp://kai.er.usgs.gov/pub/Proj.4/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} PROJ.4.3.ps.gz \
OF90-284.ps.gz SWISS.ps.gz
MASTER_SITES= ftp://ftp.remotesensing.org/pub/proj/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} proj-pdf-docs.tar.gz
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://kai.er.usgs.gov/intro/MAPGENdetails.html
COMMENT= Cartesian cartographic projection library and programs
HOMEPAGE= http://www.remotesensing.org/proj/
COMMENT= Cartographic projection software
WRKSRC= ${WRKDIR}/PROJ.4
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= ${PKGNAME}
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
do-build:
(cd ${WRKSRC}/src && ${GMAKE})
do-install:
(cd ${WRKSRC}/src && ${GMAKE} install)
${INSTALL_DATA} ${WRKSRC}/src/projects.h ${PREFIX}/include
${INSTALL_DATA_DIR} ${PREFIX}/share/proj
@for i in GL27 nad27 nad83 proj_def.dat world; do \
c="${INSTALL_DATA} ${WRKSRC}/nad/$$i ${PREFIX}/share/proj/"; \
${ECHO} $$c; $$c; \
done
@for i in ${WRKSRC}/man/man1/*; do \
c="${INSTALL_DATA} $$i ${PREFIX}/man/man1/"; \
${ECHO} $$c; $$c; \
done
${INSTALL_DATA} ${WRKSRC}/man/man3/pj_init.3 ${PREFIX}/man/man3/
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proj
@for d in PROJ.4.3.ps.gz OF90-284.ps.gz SWISS.ps.gz; do \
c="${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$d ${PREFIX}/share/doc/proj/"; \
${ECHO} $$c; $$c; \
done
${INSTALL_DATA} ${WRKDIR}/*.pdf ${PREFIX}/share/doc/proj/
.include "../../mk/bsd.pkg.mk"

View file

@ -1,12 +1,6 @@
$NetBSD: distinfo,v 1.2 2001/04/20 13:52:19 agc Exp $
$NetBSD: distinfo,v 1.3 2001/04/20 20:38:16 jtb Exp $
SHA1 (proj-4.3.3/PROJ.4.3.3.tar.gz) = 3ba76974ec470142df89f62afc2689de3dd0615f
Size (proj-4.3.3/PROJ.4.3.3.tar.gz) = 131859 bytes
SHA1 (proj-4.3.3/PROJ.4.3.ps.gz) = 1ef121eba90c34bf54496745860194b73288c031
Size (proj-4.3.3/PROJ.4.3.ps.gz) = 255063 bytes
SHA1 (proj-4.3.3/OF90-284.ps.gz) = 32959295cb5396e45cda7a5f187f4097198d8267
Size (proj-4.3.3/OF90-284.ps.gz) = 875193 bytes
SHA1 (proj-4.3.3/SWISS.ps.gz) = b3df5c687fe3e3a3739846ed93b4c871cb856771
Size (proj-4.3.3/SWISS.ps.gz) = 16747 bytes
SHA1 (patch-aa) = e79752ecd054668f57bf36f1c713a59b102f7523
SHA1 (patch-ab) = f9899735e46dbe2b76571a80fe1f86c2783975be
SHA1 (proj-4.4.3.tar.gz) = 496d6ec8bd198d5cda6ddd6a406e4f6f4ad85374
Size (proj-4.4.3.tar.gz) = 282160 bytes
SHA1 (proj-pdf-docs.tar.gz) = c83a154ac00058fba5097eb39cfc8d27706be4d8
Size (proj-pdf-docs.tar.gz) = 6918448 bytes

View file

@ -1,173 +0,0 @@
$NetBSD: patch-aa,v 1.2 2001/01/29 02:48:11 jtb Exp $
--- src/Makefile.in.orig Sun Sep 24 17:07:52 1995
+++ src/Makefile.in
@@ -19,60 +19,61 @@
bindir = $(exec_prefix)/bin
libdir = $(exec_prefix)/lib
+sharedir = $(exec_prefix)/share
incdir = $(exec_prefix)/include
-LDEF = -DPROJ_LIB=\"$(libdir)/$(LIB_DIR_NAME)\"
+LDEF = -DPROJ_LIB=\"$(sharedir)/proj\"
CFLAGS = -O -I./ $(DEFS) $(LDEF)
SHELL = /bin/sh
-L = libproj.a
+L = libproj.la
.PRECIOUS: $L
azimuthal = \
- $L(PJ_aeqd.o) $L(PJ_gnom.o) $L(PJ_laea.o) $L(PJ_mod_ster.o) \
- $L(PJ_nsper.o) $L(PJ_nzmg.o) $L(PJ_ortho.o) $L(PJ_stere.o)
+ PJ_aeqd.o PJ_gnom.o PJ_laea.o PJ_mod_ster.o \
+ PJ_nsper.o PJ_nzmg.o PJ_ortho.o PJ_stere.o
conic = \
- $L(PJ_aea.o) $L(PJ_bipc.o) $L(PJ_bonne.o) $L(PJ_eqdc.o) \
- $L(PJ_imw_p.o) $L(PJ_lcc.o) $L(PJ_mpoly.o) $L(PJ_poly.o) \
- $L(PJ_rpoly.o) $L(PJ_sconics.o)
+ PJ_aea.o PJ_bipc.o PJ_bonne.o PJ_eqdc.o \
+ PJ_imw_p.o PJ_lcc.o PJ_mpoly.o PJ_poly.o \
+ PJ_rpoly.o PJ_sconics.o
cylinder = \
- $L(PJ_cass.o) $L(PJ_cc.o) $L(PJ_cea.o) $L(PJ_eqc.o) \
- $L(PJ_gall.o) $L(PJ_labrd.o) $L(PJ_lsat.o) $L(PJ_merc.o) \
- $L(PJ_mill.o) $L(PJ_ocea.o) $L(PJ_omerc.o) $L(PJ_somerc.o) \
- $L(PJ_tcc.o) $L(PJ_tcea.o) $L(PJ_tmerc.o)
+ PJ_cass.o PJ_cc.o PJ_cea.o PJ_eqc.o \
+ PJ_gall.o PJ_labrd.o PJ_lsat.o PJ_merc.o \
+ PJ_mill.o PJ_ocea.o PJ_omerc.o PJ_somerc.o \
+ PJ_tcc.o PJ_tcea.o PJ_tmerc.o
misc = \
- $L(PJ_airy.o) $L(PJ_aitoff.o) $L(PJ_august.o) $L(PJ_bacon.o) \
- $L(PJ_chamb.o) $L(PJ_hammer.o) $L(PJ_lagrng.o) $L(PJ_larr.o) \
- $L(PJ_lask.o) $L(PJ_nocol.o) $L(PJ_ob_tran.o) $L(PJ_oea.o) \
- $L(PJ_tpeqd.o) $L(PJ_vandg.o) $L(PJ_vandg2.o) $L(PJ_vandg4.o) \
- $L(PJ_wag7.o)
+ PJ_airy.o PJ_aitoff.o PJ_august.o PJ_bacon.o \
+ PJ_chamb.o PJ_hammer.o PJ_lagrng.o PJ_larr.o \
+ PJ_lask.o PJ_nocol.o PJ_ob_tran.o PJ_oea.o \
+ PJ_tpeqd.o PJ_vandg.o PJ_vandg2.o PJ_vandg4.o \
+ PJ_wag7.o
pseudo = \
- $L(PJ_boggs.o) $L(PJ_collg.o) $L(PJ_crast.o) $L(PJ_denoy.o) \
- $L(PJ_eck1.o) $L(PJ_eck2.o) $L(PJ_eck3.o) $L(PJ_eck4.o) \
- $L(PJ_eck5.o) $L(PJ_fahey.o) $L(PJ_fouc_s.o) $L(PJ_gins8.o) \
- $L(PJ_gn_sinu.o) $L(PJ_goode.o) $L(PJ_hatano.o) $L(PJ_loxim.o) \
- $L(PJ_mbt_fps.o) $L(PJ_mbtfpp.o) $L(PJ_mbtfpq.o) $L(PJ_moll.o) \
- $L(PJ_nell.o) $L(PJ_nell_h.o) $L(PJ_putp2.o) $L(PJ_putp3.o) \
- $L(PJ_putp4p.o) $L(PJ_putp5.o) $L(PJ_putp6.o) $L(PJ_robin.o) \
- $L(PJ_sts.o) $L(PJ_urm5.o) $L(PJ_urmfps.o) $L(PJ_wag2.o) \
- $L(PJ_wag3.o) $L(PJ_wink1.o) $L(PJ_wink2.o)
+ PJ_boggs.o PJ_collg.o PJ_crast.o PJ_denoy.o \
+ PJ_eck1.o PJ_eck2.o PJ_eck3.o PJ_eck4.o \
+ PJ_eck5.o PJ_fahey.o PJ_fouc_s.o PJ_gins8.o \
+ PJ_gn_sinu.o PJ_goode.o PJ_hatano.o PJ_loxim.o \
+ PJ_mbt_fps.o PJ_mbtfpp.o PJ_mbtfpq.o PJ_moll.o \
+ PJ_nell.o PJ_nell_h.o PJ_putp2.o PJ_putp3.o \
+ PJ_putp4p.o PJ_putp5.o PJ_putp6.o PJ_robin.o \
+ PJ_sts.o PJ_urm5.o PJ_urmfps.o PJ_wag2.o \
+ PJ_wag3.o PJ_wink1.o PJ_wink2.o
support = \
- $L(aasincos.o) $L(adjlon.o) $L(bch2bps.o) $L(bchgen.o) \
- $L(biveval.o) $L(dmstor.o) $L(mk_cheby.o) $L(pj_auth.o) \
- $L(pj_deriv.o) $L(pj_ell_set.o) $L(pj_ellps.o) $L(pj_errno.o) \
- $L(pj_factors.o) $L(pj_fwd.o) $L(pj_init.o) $L(pj_inv.o) \
- $L(pj_list.o) $L(pj_malloc.o) $L(pj_mlfn.o) $L(pj_msfn.o) \
- $L(pj_open_lib.o) $L(pj_param.o) $L(pj_phi2.o) $L(pj_pr_list.o) \
- $L(pj_qsfn.o) $L(pj_strerrno.o) $L(pj_tsfn.o) $L(pj_units.o) \
- $L(pj_zpoly1.o) $L(rtodms.o) $L(vector1.o)
+ aasincos.o adjlon.o bch2bps.o bchgen.o \
+ biveval.o dmstor.o mk_cheby.o pj_auth.o \
+ pj_deriv.o pj_ell_set.o pj_ellps.o pj_errno.o \
+ pj_factors.o pj_fwd.o pj_init.o pj_inv.o \
+ pj_list.o pj_malloc.o pj_mlfn.o pj_msfn.o \
+ pj_open_lib.o pj_param.o pj_phi2.o pj_pr_list.o \
+ pj_qsfn.o pj_strerrno.o pj_tsfn.o pj_units.o \
+ pj_zpoly1.o rtodms.o vector1.o
LLIST = $(azimuthal) $(conic) $(cylinder) $(misc) $(pseudo) $(support)
@@ -81,47 +82,50 @@
all: @PROGS@
-PROJ.o = proj.o gen_cheb.o p_series.o emess.o
+PROJ = proj.o gen_cheb.o p_series.o emess.o
-proj: $(PROJ.o) $L
- $(CC) -o $@ $(PROJ.o) $L $(LIBS)
+proj: $(PROJ) $L
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(PROJ:.o=.lo) $L $(LIBS)
-NAD2NAD.o = nad2nad.o nad_cvt.o nad_init.o nad_intr.o emess.o
+NAD2NAD = nad2nad.o nad_cvt.o nad_init.o nad_intr.o emess.o
-nad2nad: $(NAD2NAD.o) $L
- $(CC) -o $@ $(NAD2NAD.o) $L $(LIBS)
+nad2nad: $(NAD2NAD) $L
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(NAD2NAD:.o=.lo) $L $(LIBS)
nad2nad: nad_list.h
nad2bin: nad2bin.o
- $(CC) -o $@ nad2bin.o $(LIBS)
+ $(LIBTOOL) --mode=link $(CC) -o $@ nad2bin.lo $(LIBS)
-RLIB = $L(pj_release.o)
+RLIB = pj_release.o
-libproj: $(RLIB) $(LLIST) $(PJ_ADDL)
- $(RANLIB) $L
+libproj.la: $(RLIB) $(LLIST) $(PJ_ADDL)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ \
+ $(RLIB:.o=.lo) $(LLIST:.o=.lo) $(PJ_ADDL:.o=.lo) -lm \
+ -rpath $(libdir) --version-info 0:0
-GEOD.o = geod.o geod_set.o geod_for.o geod_inv.o emess.o
+GEOD = geod.o geod_set.o geod_for.o geod_inv.o emess.o
-geod: $(GEOD.o) $L
- $(CC) -o $@ $(GEOD.o) $L $(LIBS)
+geod: $(GEOD) $L
+ $(LIBTOOL) --mode=link $(CC) -o $@ $(GEOD:.o=.lo) $L $(LIBS)
install: all
- cp proj geod nad2nad $(bindir)
- chmod 755 $(bindir)/proj $(bindir)/geod $(bindir)/nad2nad
- cp projects.h $(incdir)
- chmod 644 $(incdir)/projects.h
- cp libproj.a $(libdir)
- chmod 644 $(libdir)/libproj.a
- $(RANLIB) $(libdir)/libproj.a
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $L $(libdir)
+ @for i in proj geod nad2nad ; do \
+ c="$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$i $(bindir)" ; \
+ echo $$c; $$c; \
+ done
clean:
- /bin/rm -f core *.o
+ /bin/rm -f -r core *.o *.lo .libs libproj.la
-$(GEOD.o): geodesic.h
+$(GEOD): geodesic.h
$(RLIB) : projects.h pj_list.h
nad2nad.o geod.o proj.o: emess.h projects.h
-nad2bin.o: projects.h
+nad2bin: projects.h
+
+.c.o:
+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ab,v 1.1 2001/01/29 02:48:11 jtb Exp $
--- configure.orig Mon Jan 29 02:46:23 2001
+++ configure
@@ -128,7 +128,7 @@
# Save the original args to write them into config.status later.
configure_args="$*"
-PROGS="libproj proj geod nad2nad nad2bin"
+PROGS="libproj.la proj geod nad2nad nad2bin"
LIB_DIR="proj.4"
if test -z "$RANLIB"; then
# Extract the first word of `ranlib', so it can be a program name with args.

View file

@ -1,15 +1,4 @@
PROJ is a collection of three programs and a library for performing
PROJ is a collection of programs and a library for performing
cartographic projections. The programs are designed as a standard UNIX
filters to be used with other programs in the generation of maps and
charts, and as map digitizing applications. `proj' performs forward
and inverse transformation of cartographic data to or from Cartesian
coordinates with a wide range of available projection mapping
functions; `geod' performs geodesic computations for determining the
latitude, longitude and back azimuth of a terminus point given an
initial point latitude, longitude, azimuth and distance (direct) or
the forward and back azimuths and the distance between the initial and
terminus point latitudes and longitudes (inverse); `nad2nad' is a
North American Datum conversion filter to convert between the Datum of
1927 (NAD27) and that of 1983 (and which can also process State Plane
Coordinate System (SPCS) and Universal Transverse Mercator (UTM) grid
data as well as geographic data for both input and output).
charts, and as map digitizing applications.

View file

@ -1,24 +1,34 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/20 02:18:02 jtb Exp $
@comment $NetBSD: PLIST,v 1.2 2001/04/20 20:38:17 jtb Exp $
bin/cs2cs
bin/geod
bin/invgeod
bin/invproj
bin/nad2bin
bin/nad2nad
bin/proj
include/nad_list.h
include/proj_api.h
include/projects.h
lib/libproj.a
lib/libproj.la
lib/libproj.so
lib/libproj.so.0
lib/libproj.so.0.0
share/doc/proj/OF90-284.ps.gz
share/doc/proj/PROJ.4.3.ps.gz
share/doc/proj/SWISS.ps.gz
share/proj/GL27
share/proj/nad27
share/proj/nad83
share/proj/proj_def.dat
share/proj/world
lib/libproj.so.2
lib/libproj.so.2.0
man/man1/cs2cs.1
man/man1/geod.1
man/man1/nad2nad.1
man/man1/proj.1
man/man3/pj_init.3
share/doc/proj/OF90-284.pdf
share/doc/proj/PROJ.4.3.I2.pdf
share/doc/proj/PROJ.4.3.pdf
share/doc/proj/SWISS.pdf
share/proj/GL27
share/proj/epsg
share/proj/nad.lst
share/proj/nad27
share/proj/nad83
share/proj/proj_def.dat
share/proj/world
@dirrm share/doc/proj
@dirrm share/proj