Date: Mon, 28 Mar 2005 11:04:16 -0300 (BRT) From: "Anderson S.Ferreira" <anderson@cnpm.embrapa.br> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/79301: [maintainer update] Postgis upgrade from 1.0.0-RC4 to 1.0.0-RC5 Message-ID: <20050328140416.0E5C88444C@ipe.cnpm.embrapa.br> Resent-Message-ID: <200503281410.j2SEA2fw085055@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79301 >Category: ports >Synopsis: [maintainer update] Postgis upgrade from 1.0.0-RC4 to 1.0.0-RC5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Mar 28 14:10:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Anderson S. Ferreira >Release: FreeBSD 5.4-PRERELEASE i386 >Organization: Embrapa Monitoramento por Satélite >Environment: System: FreeBSD ipe.cnpm.embrapa.br 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #14: Mon Mar 7 11:36:29 BRT 2005 root@ipe.cnpm.embrapa.br:/usr/src/sys/i386/compile/IPE i386 >Description: Postgis upgrade from 1.0.0-RC4 to 1.0.0-RC5 Note: The PR ports/79083 (not committed yet), must be applied before use this patch. >How-To-Repeat: >Fix: --- postgis.patch begins here --- diff -ruN postgis/Makefile postgis.new/Makefile --- postgis/Makefile Mon Mar 21 08:31:11 2005 +++ postgis/Makefile Mon Mar 28 10:30:10 2005 @@ -6,7 +6,7 @@ # PORTNAME= postgis -DISTVERSION= 1.0.0-rc4 +DISTVERSION= 1.0.0-rc5 CATEGORIES= databases MASTER_SITES= http://postgis.refractions.net/ @@ -71,8 +71,6 @@ ${MV} ${WRKDIR}/pgsql/postgresql* ${PGSQL_SRC} \ post-install: - @ ${INSTALL_DATA} ${FILESDIR}/updatedb.default ${PREFIX}/share/postgis - @ ${INSTALL_DATA} ${FILESDIR}/README.upgrade ${PREFIX}/share/postgis @ ${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL @ ${CAT} ${PKGMESSAGE} diff -ruN postgis/distinfo postgis.new/distinfo --- postgis/distinfo Mon Mar 21 08:31:01 2005 +++ postgis.new/distinfo Mon Mar 28 08:52:49 2005 @@ -1,2 +1,2 @@ -MD5 (postgis-1.0.0-rc4.tar.gz) = 2170316edab9dac2329fb62d6c4a8652 -SIZE (postgis-1.0.0-rc4.tar.gz) = 1369615 +MD5 (postgis-1.0.0-rc5.tar.gz) = 6918a4c11ca70ab5685effd0f39b3ecf +SIZE (postgis-1.0.0-rc5.tar.gz) = 1372632 diff -ruN postgis/files/README.upgrade postgis.new/files/README.upgrade --- postgis/files/README.upgrade Sat Feb 19 06:26:43 2005 +++ postgis.new/files/README.upgrade Wed Dec 31 21:00:00 1969 @@ -1,16 +0,0 @@ -Updating databases from old versions of Postgis - -The postgis library has its name changed, now the library is called -liblwgeom.so.1 instead of libpostgis.so.0 . -Databases created with older versions of postgis won't work properly, -until all references of libpostgis.so.0 be corrected. -To solve this problem, please, make a dump (on text format) of your -database and use the PREFIX/share/updatedb script. - - sh PREFIX/share/updatedb dump.sql - -A new file with '.updated' extension will be created with the library -references updated. -After that, you can restore your database using the updated file. - - psql -f dump.sql.updated database diff -ruN postgis/files/patch-a postgis.new/files/patch-a --- postgis/files/patch-a Mon Mar 21 09:08:34 2005 +++ postgis.new/files/patch-a Wed Dec 31 21:00:00 1969 @@ -1,50 +0,0 @@ ---- doc/Makefile Fri Mar 4 16:34:47 2005 -+++ doc/Makefile Mon Mar 21 09:07:57 2005 -@@ -1,11 +1,14 @@ - COMMONOPTS = -f docbook -b html -e no-valid - -+include ../Makefile.config -+include $(top_srcdir)/src/Makefile.shlib -+ - # fetch version numbers from central repository - include ../Version.config - - LAST_RELEASE_VERSION = $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_MICRO_VERSION) - --XSLBASE?=/usr/share/sgml/docbook/xsl-stylesheets -+XSLBASE?=/usr/local/share/xsl/docbook - - all: html - -@@ -15,14 +18,13 @@ - chunked-html: postgis-out.xml - xsltproc \ - --output html/ \ -- --param shade.verbatim 1 \ - --param chunk.section.depth 0 \ - --param section.autolabel 1 \ - --param section.label.includes.component.label 1 \ - --stringparam html.stylesheet style.css \ - --stringparam saxon.character.representation decimal \ - $(XSLBASE)/html/chunk.xsl \ -- $< -+ $< && touch chunked-html - - html/postgis.html: postgis-out.xml - xsltproc \ -@@ -66,5 +68,15 @@ - maintainer-clean: clean - @rm -f html/*.html - -+install: chunked-html -+ $(mkinstalldirs) $(DOCSDIR) -+ $(INSTALL_DATA) html/index.html $(DOCSDIR)/index.html -+ $(INSTALL_DATA) html/ch01.html $(DOCSDIR)/ch01.html -+ $(INSTALL_DATA) html/ch02.html $(DOCSDIR)/ch02.html -+ $(INSTALL_DATA) html/ch03.html $(DOCSDIR)/ch03.html -+ $(INSTALL_DATA) html/ch04.html $(DOCSDIR)/ch04.html -+ $(INSTALL_DATA) html/ch05.html $(DOCSDIR)/ch05.html -+ $(INSTALL_DATA) html/ch06.html $(DOCSDIR)/ch06.html -+ $(INSTALL_DATA) html/ch07.html $(DOCSDIR)/ch07.html - - .PHONY: html diff -ruN postgis/files/patch-b postgis.new/files/patch-b --- postgis/files/patch-b Mon Feb 21 08:42:45 2005 +++ postgis.new/files/patch-b Wed Dec 31 21:00:00 1969 @@ -1,21 +0,0 @@ ---- loader/Makefile Wed Jan 12 15:03:57 2005 -+++ loader/Makefile Mon Jan 31 14:36:59 2005 -@@ -18,6 +18,7 @@ - - ifeq ($(USE_ICONV),1) - override CFLAGS += -DUSE_ICONV -+ override LDFLAGS += -liconv - endif - - override CFLAGS := -g -I.. -I$(srcdir) -I$(top_builddir)/src/interfaces/libpq $(CFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' -DUSE_VERSION=$(USE_VERSION) -@@ -31,8 +32,8 @@ - $(CC) $(CFLAGS) $(OBJS) shp2pgsql.o $(LDFLAGS) -o $@ - - install: all -- $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)$(bindir)/pgsql2shp$(EXE) -- $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)$(bindir)/shp2pgsql$(EXE) -+ $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)$(BINDIR)/pgsql2shp$(EXE) -+ $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)$(BINDIR)/shp2pgsql$(EXE) - - uninstall: - rm -f $(DESTDIR)$(bindir)/pgsql2shp$(EXE) diff -ruN postgis/files/patch-c postgis.new/files/patch-c --- postgis/files/patch-c Mon Mar 21 08:49:03 2005 +++ postgis.new/files/patch-c Wed Dec 31 21:00:00 1969 @@ -1,17 +0,0 @@ ---- Makefile Tue Mar 8 13:46:23 2005 -+++ Makefile Mon Mar 21 08:48:21 2005 -@@ -5,8 +5,14 @@ - #----------------------------------------------------- - - all: liblwgeom loaderdumper utils -+ifneq ($(WITH-DOC),) -+ $(MAKE) -C doc chunked-html -+endif - - install: all liblwgeom-install loaderdumper-install -+ifneq ($(WITH-DOC),) -+ $(MAKE) INSTALL_DATA="$(INSTALL_DATA)" DOCSDIR=$(DOCSDIR) -C doc install -+endif - - uninstall: liblwgeom-uninstall loaderdumper-uninstall - diff -ruN postgis/files/patch-d postgis.new/files/patch-d --- postgis/files/patch-d Mon Mar 21 09:10:55 2005 +++ postgis.new/files/patch-d Wed Dec 31 21:00:00 1969 @@ -1,41 +0,0 @@ ---- lwgeom/Makefile Fri Mar 18 09:43:23 2005 -+++ lwgeom/Makefile Mon Mar 21 08:58:26 2005 -@@ -21,10 +21,10 @@ - - ifeq (${USE_VERSION},71) - MODULE_FILENAME = $(LPATH)/$(shlib) -- MODULE_INSTALLDIR = $(libdir) -+ MODULE_INSTALLDIR = $(LIBDIR) - else - MODULE_FILENAME = $(LPATH)/$(shlib) -- MODULE_INSTALLDIR = $(pkglibdir) -+ MODULE_INSTALLDIR = $(LIBDIR) - endif - - #--------------------------------------------------------------- -@@ -143,9 +143,9 @@ - install: all installdirs install-lwgeom-lib install-lwgeom-scripts - - install-lwgeom-scripts: -- $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)/contrib/lwpostgis.sql -- $(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(datadir)/contrib/spatial_ref_sys.sql -- $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(docdir)/contrib/README.postgis -+ $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(DATADIR)/lwpostgis.sql.default -+ $(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(DATADIR)/spatial_ref_sys.sql -+ $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(DOCSDIR)/README.postgis - - #- This has been copied from postgresql and adapted - install-lwgeom-lib: $(shlib) -@@ -169,9 +169,9 @@ - sh ../geos_version.sh $(GEOS_DIR) > postgis_geos_version.h - - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(MODULE_INSTALLDIR) -- $(mkinstalldirs) $(DESTDIR)$(datadir)/contrib -- $(mkinstalldirs) $(DESTDIR)$(docdir)/contrib -+ $(mkinstalldirs) $(LIBDIR) -+ $(mkinstalldirs) $(DATADIR) -+ $(mkinstalldirs) $(DOCSDIR) - - uninstall-lwgeom-scripts: - rm -f $(DESTDIR)$(datadir)/contrib/lwpostgis.sql diff -ruN postgis/files/patch-doc postgis.new/files/patch-doc --- postgis/files/patch-doc Wed Dec 31 21:00:00 1969 +++ postgis.new/files/patch-doc Mon Mar 21 09:08:34 2005 @@ -0,0 +1,50 @@ +--- doc/Makefile Fri Mar 4 16:34:47 2005 ++++ doc/Makefile Mon Mar 21 09:07:57 2005 +@@ -1,11 +1,14 @@ + COMMONOPTS = -f docbook -b html -e no-valid + ++include ../Makefile.config ++include $(top_srcdir)/src/Makefile.shlib ++ + # fetch version numbers from central repository + include ../Version.config + + LAST_RELEASE_VERSION = $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION).$(SO_MICRO_VERSION) + +-XSLBASE?=/usr/share/sgml/docbook/xsl-stylesheets ++XSLBASE?=/usr/local/share/xsl/docbook + + all: html + +@@ -15,14 +18,13 @@ + chunked-html: postgis-out.xml + xsltproc \ + --output html/ \ +- --param shade.verbatim 1 \ + --param chunk.section.depth 0 \ + --param section.autolabel 1 \ + --param section.label.includes.component.label 1 \ + --stringparam html.stylesheet style.css \ + --stringparam saxon.character.representation decimal \ + $(XSLBASE)/html/chunk.xsl \ +- $< ++ $< && touch chunked-html + + html/postgis.html: postgis-out.xml + xsltproc \ +@@ -66,5 +68,15 @@ + maintainer-clean: clean + @rm -f html/*.html + ++install: chunked-html ++ $(mkinstalldirs) $(DOCSDIR) ++ $(INSTALL_DATA) html/index.html $(DOCSDIR)/index.html ++ $(INSTALL_DATA) html/ch01.html $(DOCSDIR)/ch01.html ++ $(INSTALL_DATA) html/ch02.html $(DOCSDIR)/ch02.html ++ $(INSTALL_DATA) html/ch03.html $(DOCSDIR)/ch03.html ++ $(INSTALL_DATA) html/ch04.html $(DOCSDIR)/ch04.html ++ $(INSTALL_DATA) html/ch05.html $(DOCSDIR)/ch05.html ++ $(INSTALL_DATA) html/ch06.html $(DOCSDIR)/ch06.html ++ $(INSTALL_DATA) html/ch07.html $(DOCSDIR)/ch07.html + + .PHONY: html diff -ruN postgis/files/patch-loader postgis.new/files/patch-loader --- postgis/files/patch-loader Wed Dec 31 21:00:00 1969 +++ postgis.new/files/patch-loader Mon Feb 21 08:42:45 2005 @@ -0,0 +1,21 @@ +--- loader/Makefile Wed Jan 12 15:03:57 2005 ++++ loader/Makefile Mon Jan 31 14:36:59 2005 +@@ -18,6 +18,7 @@ + + ifeq ($(USE_ICONV),1) + override CFLAGS += -DUSE_ICONV ++ override LDFLAGS += -liconv + endif + + override CFLAGS := -g -I.. -I$(srcdir) -I$(top_builddir)/src/interfaces/libpq $(CFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' -DUSE_VERSION=$(USE_VERSION) +@@ -31,8 +32,8 @@ + $(CC) $(CFLAGS) $(OBJS) shp2pgsql.o $(LDFLAGS) -o $@ + + install: all +- $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)$(bindir)/pgsql2shp$(EXE) +- $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)$(bindir)/shp2pgsql$(EXE) ++ $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)$(BINDIR)/pgsql2shp$(EXE) ++ $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)$(BINDIR)/shp2pgsql$(EXE) + + uninstall: + rm -f $(DESTDIR)$(bindir)/pgsql2shp$(EXE) diff -ruN postgis/files/patch-lwgeom postgis.new/files/patch-lwgeom --- postgis/files/patch-lwgeom Wed Dec 31 21:00:00 1969 +++ postgis.new/files/patch-lwgeom Mon Mar 28 10:09:11 2005 @@ -0,0 +1,41 @@ +--- lwgeom/Makefile Fri Mar 18 09:43:23 2005 ++++ lwgeom/Makefile Mon Mar 21 08:58:26 2005 +@@ -21,10 +21,10 @@ + + ifeq (${USE_VERSION},71) + MODULE_FILENAME = $(LPATH)/$(shlib) +- MODULE_INSTALLDIR = $(libdir) ++ MODULE_INSTALLDIR = $(LIBDIR) + else + MODULE_FILENAME = $(LPATH)/$(shlib) +- MODULE_INSTALLDIR = $(pkglibdir) ++ MODULE_INSTALLDIR = $(LIBDIR) + endif + + #--------------------------------------------------------------- +@@ -143,9 +143,9 @@ + install: all installdirs install-lwgeom-lib install-lwgeom-scripts + + install-lwgeom-scripts: +- $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)/contrib/lwpostgis.sql +- $(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(datadir)/contrib/spatial_ref_sys.sql +- $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(docdir)/contrib/README.postgis ++ $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(DATADIR)/lwpostgis.sql.default ++ $(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(DATADIR)/spatial_ref_sys.sql ++ $(INSTALL_DATA) ../README.postgis $(DESTDIR)$(DATADIR)/README.postgis + + #- This has been copied from postgresql and adapted + install-lwgeom-lib: $(shlib) +@@ -169,9 +169,9 @@ + sh ../geos_version.sh $(GEOS_DIR) > postgis_geos_version.h + + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(MODULE_INSTALLDIR) +- $(mkinstalldirs) $(DESTDIR)$(datadir)/contrib +- $(mkinstalldirs) $(DESTDIR)$(docdir)/contrib ++ $(mkinstalldirs) $(LIBDIR) ++ $(mkinstalldirs) $(DATADIR) ++ $(mkinstalldirs) $(DOCSDIR) + + uninstall-lwgeom-scripts: + rm -f $(DESTDIR)$(datadir)/contrib/lwpostgis.sql diff -ruN postgis/files/patch-main postgis.new/files/patch-main --- postgis/files/patch-main Wed Dec 31 21:00:00 1969 +++ postgis.new/files/patch-main Mon Mar 28 09:30:44 2005 @@ -0,0 +1,18 @@ +--- Makefile Tue Mar 8 13:46:23 2005 ++++ Makefile Mon Mar 28 09:22:32 2005 +@@ -5,8 +5,15 @@ + #----------------------------------------------------- + + all: liblwgeom loaderdumper utils ++ifneq ($(WITH-DOC),) ++ $(MAKE) -C doc chunked-html ++endif + + install: all liblwgeom-install loaderdumper-install ++ $(MAKE) INSTALL_DATA="$(INSTALL_DATA)" DATADIR=$(DATADIR) -C utils install ++ifneq ($(WITH-DOC),) ++ $(MAKE) INSTALL_DATA="$(INSTALL_DATA)" DOCSDIR=$(DOCSDIR) -C doc install ++endif + + uninstall: liblwgeom-uninstall loaderdumper-uninstall + diff -ruN postgis/files/patch-utils postgis.new/files/patch-utils --- postgis/files/patch-utils Wed Dec 31 21:00:00 1969 +++ postgis.new/files/patch-utils Mon Mar 28 09:48:38 2005 @@ -0,0 +1,21 @@ +--- utils/Makefile Tue Mar 8 09:11:29 2005 ++++ utils/Makefile Mon Mar 28 09:45:41 2005 +@@ -1,3 +1,6 @@ ++include ../Makefile.config ++include $(top_srcdir)/src/Makefile.shlib ++ + SCRIPTS = \ + postgis_restore.pl \ + profile_intersects.pl \ +@@ -6,3 +9,11 @@ + + all: + chmod +x $(SCRIPTS) ++ ++install: ++ $(mkinstalldirs) $(DATADIR)/utils ++ $(INSTALL_DATA) README $(DATADIR)/utils/README ++ $(INSTALL_DATA) postgis_restore.pl $(DATADIR)/utils/postgis_restore.pl ++ $(INSTALL_DATA) profile_intersects.pl $(DATADIR)/utils/profile_intersects.pl ++ $(INSTALL_DATA) test_estimation.pl $(DATADIR)/utils/test_estimation.pl ++ $(INSTALL_DATA) test_joinestimation.pl $(DATADIR)/utils/test_joinestimation.pl diff -ruN postgis/files/updatedb.default postgis.new/files/updatedb.default --- postgis/files/updatedb.default Mon Feb 21 08:42:45 2005 +++ postgis.new/files/updatedb.default Wed Dec 31 21:00:00 1969 @@ -1,6 +0,0 @@ -#!/bin/sh - -LIBDIR=%%LIBDIR%% - -sed "s|'.*/libpostgis\.so\.0'|'${LIBDIR}/liblwgeom.so.1'|g - s|'.*/liblwgeom\.so\.1'|'${LIBDIR}/liblwgeom.so.1'|g $1 > $1.updated diff -ruN postgis/pkg-deinstall postgis.new/pkg-deinstall --- postgis/pkg-deinstall Mon Feb 21 08:42:45 2005 +++ postgis.new/pkg-deinstall Mon Mar 28 08:56:42 2005 @@ -1,11 +1,10 @@ #!/bin/sh - case "$2" in "POST-DEINSTALL") PREF=${PREFIX:-$PKG_PREFIX} SHAREDIR=${PREF}/share/postgis - rm -f ${SHAREDIR}/lwpostgis.sql ${SHAREDIR}/updatedb + rm -f ${SHAREDIR}/lwpostgis.sql rmdir ${SHAREDIR} ;; esac diff -ruN postgis/pkg-install postgis.new/pkg-install --- postgis/pkg-install Mon Feb 21 08:42:45 2005 +++ postgis.new/pkg-install Mon Mar 28 08:55:35 2005 @@ -42,8 +42,6 @@ SHAREDIR=${PREF}/share/postgis LIBDIR=${PREF}/lib sed -e "s|\$libdir|${LIBDIR}|g" ${SHAREDIR}/lwpostgis.sql.default > ${SHAREDIR}/lwpostgis.sql - sed -e "s|%%LIBDIR%%|${LIBDIR}|g" ${SHAREDIR}/updatedb.default > ${SHAREDIR}/updatedb - chmod 0755 ${SHAREDIR}/updatedb ;; "MESSAGE") msg diff -ruN postgis/pkg-message postgis.new/pkg-message --- postgis/pkg-message Mon Feb 21 08:42:45 2005 +++ postgis.new/pkg-message Mon Mar 28 10:09:27 2005 @@ -4,6 +4,6 @@ * The name of the postgis library has changed. Users from older versions (0.9.1 or older), *must* read - PREFIX/share/postgis/README.upgrade for instructions. + PREFIX/share/postgis/README.postgis for instructions. ============================================================= diff -ruN postgis/pkg-plist postgis.new/pkg-plist --- postgis/pkg-plist Mon Mar 21 09:15:01 2005 +++ postgis.new/pkg-plist Mon Mar 28 10:12:09 2005 @@ -2,10 +2,15 @@ bin/shp2pgsql lib/liblwgeom.so lib/liblwgeom.so.1 -%%DATADIR%%/README.upgrade -%%DATADIR%%/updatedb.default +%%DATADIR%%/README.postgis %%DATADIR%%/lwpostgis.sql.default %%DATADIR%%/spatial_ref_sys.sql +%%DATADIR%%/utils/postgis_restore.pl +%%DATADIR%%/utils/profile_intersects.pl +%%DATADIR%%/utils/test_estimation.pl +%%DATADIR%%/utils/test_joinestimation.pl +%%DATADIR%%/utils/README %%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +@unexec rmdir %D/%%DATADIR%%/utils 2>/dev/null || true @unexec rmdir %D/%%DATADIR%% 2>/dev/null || true @unexec rmdir %D/lib 2>/dev/null || true --- postgis.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050328140416.0E5C88444C>