From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 25 13:00:37 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5BF316A4D6 for ; Fri, 25 Jun 2004 13:00:37 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82F7643D2F for ; Fri, 25 Jun 2004 13:00:37 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i5PD0bSt059267 for ; Fri, 25 Jun 2004 13:00:37 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5PD0bBm059266; Fri, 25 Jun 2004 13:00:37 GMT (envelope-from gnats) Resent-Date: Fri, 25 Jun 2004 13:00:37 GMT Resent-Message-Id: <200406251300.i5PD0bBm059266@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sam Lawrance Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1411116A4CE for ; Fri, 25 Jun 2004 12:56:10 +0000 (GMT) Received: from bloodwood.hunterlink.net.au (smtp-local.hunterlink.net.au [203.12.144.17]) by mx1.FreeBSD.org (Postfix) with ESMTP id A896B43D53 for ; Fri, 25 Jun 2004 12:56:08 +0000 (GMT) (envelope-from boris@brooknet.com.au) Received: from localhost (ppp2803.dyn.pacific.net.au [61.8.40.3]) i5PCn17K003945 for ; Fri, 25 Jun 2004 22:49:02 +1000 Received: by localhost (Postfix, from userid 0) id AD5A0859; Fri, 25 Jun 2004 22:57:06 +1000 (EST) Message-Id: <20040625125706.AD5A0859@localhost> Date: Fri, 25 Jun 2004 22:57:06 +1000 (EST) From: Sam Lawrance To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/68321: [NEW PORT] databases/postgis: PostGIS spatial extensions to PostgreSQL X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 13:00:37 -0000 >Number: 68321 >Category: ports >Synopsis: [NEW PORT] databases/postgis: PostGIS spatial extensions to PostgreSQL >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jun 25 13:00:36 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Sam Lawrance >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD dirk.no.domain 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Thu Jun 24 18:30:51 EST 2004 >Description: PostGIS provides a module for PostgreSQL which implements GIS simple features, ties the features to rtree indexing, and provides some spatial functions for accessing and analyzing geographic data. WWW: http://postgis.refractions.net >How-To-Repeat: >Fix: --- postgis-0.8.2.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # postgis # postgis/pkg-descr # postgis/distinfo # postgis/pkg-plist # postgis/Makefile # postgis/files # postgis/files/patch-lwgeom # postgis/files/patch-Makefiles # echo c - postgis mkdir -p postgis > /dev/null 2>&1 echo x - postgis/pkg-descr sed 's/^X//' >postgis/pkg-descr << 'END-of-postgis/pkg-descr' XPostGIS provides a module for PostgreSQL which implements GIS Xsimple features, ties the features to rtree indexing, and Xprovides some spatial functions for accessing and analyzing Xgeographic data. X XWWW: http://postgis.refractions.net END-of-postgis/pkg-descr echo x - postgis/distinfo sed 's/^X//' >postgis/distinfo << 'END-of-postgis/distinfo' XMD5 (postgis-0.8.2.tar.gz) = 0a2ed054e7a1ad74153eb844d1b56046 XSIZE (postgis-0.8.2.tar.gz) = 1875280 END-of-postgis/distinfo echo x - postgis/pkg-plist sed 's/^X//' >postgis/pkg-plist << 'END-of-postgis/pkg-plist' Xbin/pgsql2shp Xbin/shp2pgsql Xlib/postgresql/libpostgis.so Xlib/postgresql/libpostgis.so.0 X%%EXAMPLESDIR%%/README.postgis X%%EXAMPLESDIR%%/postgis.sql X%%EXAMPLESDIR%%/postgis_undef.sql X%%EXAMPLESDIR%%/spatial_ref_sys.sql X%%LG%%lib/postgresql/liblwgeom.so X%%LG%%lib/postgresql/liblwgeom.so.0 X%%LG%%%%EXAMPLESDIR%%/lwgeom.sql X@dirrm %%EXAMPLESDIR%% X@dirrm share/doc/postgis X@dirrm lib/postgresql END-of-postgis/pkg-plist echo x - postgis/Makefile sed 's/^X//' >postgis/Makefile << 'END-of-postgis/Makefile' X# New ports collection makefile for: postgis X# Date created: June 25 2004 X# Whom: Sam Lawrance X# X# $FreeBSD$ X# X XPORTNAME= postgis XPORTVERSION= 0.8.2 XCATEGORIES= databases XMASTER_SITES= http://postgis.refractions.net/ X XMAINTAINER= boris@brooknet.com.au XCOMMENT= PostGIS spatial extensions to PostgreSQL X XBUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/databases/postgresql7:build XLIB_DEPENDS+= geos:${PORTSDIR}/graphics/geos \ X proj:${PORTSDIR}/graphics/proj X XUSE_GMAKE= YES XUSE_REINPLACE= YES XMAKE_ARGS= PGSQL_SRC="${PORTSDIR}/databases/postgresql7/work/postgresql-7.4.2" \ X WITH_LWGEOM="${WITH_LWGEOM}" \ X WITH_DOC="${WITH_DOC}" \ X EXAMPLESDIR="${EXAMPLESDIR}" \ X DOCSDIR="${DOCSDIR}" \ X DESTDIR="${PREFIX}" X X.if defined(WITH_LWGEOM) XPLIST_SUB+= LG="" X.else XPLIST_SUB+= LG="@comment " X.endif X X.if !defined(NOPORTDOCS) XWITH_DOC= YES XPORTDOCS= * X.endif X Xpre-everything:: X @${ECHO} "" X @${ECHO} "The following tunables are available for ${PORTNAME}:" X @${ECHO} "" X @${ECHO} " WITH_LWGEOM Lightweight geometry types (experimental)" X @${ECHO} "" X X.include END-of-postgis/Makefile echo c - postgis/files mkdir -p postgis/files > /dev/null 2>&1 echo x - postgis/files/patch-lwgeom sed 's/^X//' >postgis/files/patch-lwgeom << 'END-of-postgis/files/patch-lwgeom' Xdiff -urN lwgeom.old/stringBuffer.c lwgeom/stringBuffer.c X--- lwgeom.old/stringBuffer.c Thu Apr 8 09:12:31 2004 X+++ lwgeom/stringBuffer.c Sun Jun 20 16:02:11 2004 X@@ -1,7 +1,7 @@ X #include "postgres.h" X #include X #include "stdio.h" X-#include X+#include X #include X #include "stringBuffer.h" X Xdiff -urN lwgeom.old/wktparse.y lwgeom/wktparse.y X--- lwgeom.old/wktparse.y Wed Apr 28 03:46:46 2004 X+++ lwgeom/wktparse.y Sun Jun 20 16:04:59 2004 X@@ -107,13 +107,13 @@ X X a_point : point_2d | point_3d | point_4d ; X X-point_2d : VALUE VALUE {alloc_point_2d($1,$2) }; X+point_2d : VALUE VALUE {alloc_point_2d($1,$2); }; X X-point_3d : VALUE VALUE VALUE {alloc_point_3d($1,$2,$3) }; X+point_3d : VALUE VALUE VALUE {alloc_point_3d($1,$2,$3); }; X X-point_4d : VALUE VALUE VALUE VALUE {alloc_point_4d($1,$2,$3,$4) }; X+point_4d : VALUE VALUE VALUE VALUE {alloc_point_4d($1,$2,$3,$4); }; X X-empty : EMPTY {alloc_empty() } ; X+empty : EMPTY {alloc_empty(); } ; X %% X X END-of-postgis/files/patch-lwgeom echo x - postgis/files/patch-Makefiles sed 's/^X//' >postgis/files/patch-Makefiles << 'END-of-postgis/files/patch-Makefiles' Xdiff -ur ../postgis-0.8.2.orig/Makefile ./Makefile X--- ../postgis-0.8.2.orig/Makefile Fri Jun 25 21:06:17 2004 X+++ ./Makefile Fri Jun 25 21:06:20 2004 X@@ -159,9 +159,17 @@ X X include $(top_srcdir)/src/Makefile.shlib X X+.EXPORT_ALL_VARIABLES: X+ X postgis_geos_wrapper.o: postgis_geos_wrapper.cpp X X all: all-lib postgis.sql postgis_undef.sql loaderdumper X+ifneq ($(WITH_DOC),) X+ $(MAKE) -C doc X+endif X+ifneq ($(WITH_LWGEOM),) X+ $(MAKE) -C lwgeom X+endif X X loaderdumper: X $(MAKE) -C loader X@@ -169,29 +177,35 @@ X # Shared library stuff X X postgis.sql: postgis.sql.in X- cpp -P -traditional-cpp -DUSE_VERSION=$(USE_VERSION) $< | sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g' > $@ X+ cpp -P -traditional-cpp -DUSE_VERSION=$(USE_VERSION) $< | sed -e 's:@MODULE_FILENAME@:$(DESTDIR)/lib/postgresql/$(shlib):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g' > $@ X X postgis_undef.sql: postgis.sql create_undef.pl X perl create_undef.pl $< $(USE_VERSION) > $@ X X install: all installdirs install-postgis-lib X- $(INSTALL_DATA) postgis.sql $(DESTDIR)$(datadir) X- $(INSTALL_DATA) postgis_undef.sql $(DESTDIR)$(datadir) X- $(INSTALL_DATA) spatial_ref_sys.sql $(DESTDIR)$(datadir) X- $(INSTALL_DATA) README.postgis $(DESTDIR)$(datadir) X+ $(INSTALL_DATA) postgis.sql $(EXAMPLESDIR) X+ $(INSTALL_DATA) postgis_undef.sql $(EXAMPLESDIR) X+ $(INSTALL_DATA) spatial_ref_sys.sql $(EXAMPLESDIR) X+ $(INSTALL_DATA) README.postgis $(EXAMPLESDIR) X $(MAKE) DESTDIR=$(DESTDIR) -C loader install X+ifneq ($(WITH_DOC),) X+ $(MAKE) DESTDIR=$(DESTDIR) -C doc install X+endif X+ifneq ($(WITH_LWGEOM),) X+ $(MAKE) DESTDIR=$(DESTDIR) -C lwgeom install X+endif X X #- This has been copied from postgresql and adapted X install-postgis-lib: $(shlib) X- $(INSTALL_SHLIB) $< $(DESTDIR)$(MODULE_INSTALLDIR)/$(shlib) X+ $(INSTALL_SHLIB) $< $(DESTDIR)/lib/postgresql/$(shlib) X ifneq ($(PORTNAME), win) X ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)) X- cd $(DESTDIR)$(MODULE_INSTALLDIR) && \ X+ cd $(DESTDIR)/lib/postgresql && \ X rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) && \ X $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) X endif X ifneq ($(shlib), lib$(NAME)$(DLSUFFIX)) X- cd $(DESTDIR)$(MODULE_INSTALLDIR) && \ X+ cd $(DESTDIR)/lib/postgresql && \ X rm -f lib$(NAME)$(DLSUFFIX) && \ X $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX) X endif X@@ -200,7 +214,7 @@ X #---------------------------------------------------------- X X installdirs: X- $(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir) X+ $(mkinstalldirs) $(DESTDIR)/lib/postgresql $(EXAMPLESDIR) $(DOCSDIR) X X uninstall: uninstall-lib X @rm -f $(docdir)/contrib/README.postgis $(datadir)/contrib/postgis.sql X@@ -209,4 +223,3 @@ X @rm -f $(OBJS) postgis.sql postgis_undef.sql X $(MAKE) -C loader clean X $(MAKE) -C doc clean X- Xdiff -ur ../postgis-0.8.2.orig/doc/Makefile ./doc/Makefile X--- ../postgis-0.8.2.orig/doc/Makefile Fri Jun 25 21:06:17 2004 X+++ ./doc/Makefile Fri Jun 25 21:06:20 2004 X@@ -1,4 +1,4 @@ X-COMMONOPTS = -f docbook -b html -e no-valid X+COMMONOPTS = -d docbook -f html X LAST_RELEASE_VERSION = 0.8 X X html: html/index.html X@@ -7,7 +7,12 @@ X cat $< | sed "s/@@LAST_RELEASE_VERSION@@/$(LAST_RELEASE_VERSION)/g" > $@ X X html/index.html: postgis-out.xml X- jw $(COMMONOPTS) -o html/ $< X+ sgmlfmt $(COMMONOPTS) $< X+ mv postgis-out.html html/index.html X+ X+install: html/index.html X+ [ -d $(DOCSDIR) ] || mkdir $(DOCSDIR) X+ $(INSTALL_DATA) html/index.html $(DOCSDIR) X X clean: X #rm -f html/*.html postgis-out.xml Xdiff -ur ../postgis-0.8.2.orig/loader/Makefile ./loader/Makefile X--- ../postgis-0.8.2.orig/loader/Makefile Fri Jun 25 21:06:17 2004 X+++ ./loader/Makefile Fri Jun 25 21:06:20 2004 X@@ -50,8 +50,8 @@ X $(CC) $(CFLAGS) $(OBJS) shp2pgsql.o $(LDFLAGS) -o $@ X X install: all X- $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)$(bindir)/pgsql2shp$(EXE) X- $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)$(bindir)/shp2pgsql$(EXE) X+ $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)/bin/pgsql2shp$(EXE) X+ $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)/bin/shp2pgsql$(EXE) X X clean: X @rm -f $(OBJS) shp2pgsql.o pgsql2shp.o shp2pgsql$(EXE) pgsql2shp$(EXE) Xdiff -ur ../postgis-0.8.2.orig/lwgeom/Makefile ./lwgeom/Makefile X--- ../postgis-0.8.2.orig/lwgeom/Makefile Fri Jun 25 21:06:17 2004 X+++ ./lwgeom/Makefile Fri Jun 25 21:07:29 2004 X@@ -143,7 +143,7 @@ X include $(top_srcdir)/src/Makefile.shlib X X wktparse.tab.c: wktparse.y X- $(YACC) -vd -p lwg_parse_yy wktparse.y X+ $(YACC) -vd -p lwg_parse_yy wktparse.y -o $@ X X lex.yy.c: wktparse.lex wktparse.tab.c X $(FLEX) -Plwg_parse_yy -if -o'lex.yy.c' wktparse.lex X@@ -153,22 +153,22 @@ X # Shared library stuff X X lwgeom.sql: lwgeom.sql.in X- cat lwgeom.sql.in | sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g' > $@ X+ cat lwgeom.sql.in | sed -e 's:@MODULE_FILENAME@:$(DESTDIR)/lib/postgresql/$(shlib):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g' > $@ X X install: all installdirs install-lwgeom-lib X- $(INSTALL_DATA) lwgeom.sql $(DESTDIR)$(datadir) X+ $(INSTALL_DATA) lwgeom.sql $(EXAMPLESDIR) X X #- This has been copied from postgresql and adapted X install-lwgeom-lib: $(shlib) X- $(INSTALL_SHLIB) $< $(DESTDIR)$(MODULE_INSTALLDIR)/$(shlib) X+ $(INSTALL_SHLIB) $< $(DESTDIR)/lib/postgresql/$(shlib) X ifneq ($(PORTNAME), win) X ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)) X- cd $(DESTDIR)$(MODULE_INSTALLDIR) && \ X+ cd $(DESTDIR)/lib/postgresql && \ X rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) && \ X $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) X endif X ifneq ($(shlib), lib$(NAME)$(DLSUFFIX)) X- cd $(DESTDIR)$(MODULE_INSTALLDIR) && \ X+ cd $(DESTDIR)/lib/postgresql && \ X rm -f lib$(NAME)$(DLSUFFIX) && \ X $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX) X endif END-of-postgis/files/patch-Makefiles exit --- postgis-0.8.2.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted: