ports/79083: [maintainer update] Postgis upgrade from 1.0.0-RC3 to 1.0.0-RC4
Anderson S.Ferreira
anderson at cnpm.embrapa.br
Mon Mar 21 13:00:11 UTC 2005
>Number: 79083
>Category: ports
>Synopsis: [maintainer update] Postgis upgrade from 1.0.0-RC3 to 1.0.0-RC4
>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 21 13:00:09 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 at ipe.cnpm.embrapa.br:/usr/src/sys/i386/compile/IPE i386
>Description:
Postgis upgrade from 1.0.0-RC3 to 1.0.0-RC4
>How-To-Repeat:
>Fix:
--- postgis.patch begins here ---
diff -urN postgis/Makefile postgis.new/Makefile
--- postgis/Makefile Mon Mar 7 07:39:55 2005
+++ postgis.new/Makefile Mon Mar 21 08:31:11 2005
@@ -6,7 +6,7 @@
#
PORTNAME= postgis
-DISTVERSION= 1.0.0-rc3
+DISTVERSION= 1.0.0-rc4
CATEGORIES= databases
MASTER_SITES= http://postgis.refractions.net/
diff -urN postgis/distinfo postgis.new/distinfo
--- postgis/distinfo Mon Mar 7 07:39:55 2005
+++ postgis.new/distinfo Mon Mar 21 08:31:01 2005
@@ -1,2 +1,2 @@
-MD5 (postgis-1.0.0-rc3.tar.gz) = 46091f2a9b8a32a23c5970e58d5f20bf
-SIZE (postgis-1.0.0-rc3.tar.gz) = 1358189
+MD5 (postgis-1.0.0-rc4.tar.gz) = 2170316edab9dac2329fb62d6c4a8652
+SIZE (postgis-1.0.0-rc4.tar.gz) = 1369615
diff -urN postgis/files/patch-a postgis.new/files/patch-a
--- postgis/files/patch-a Mon Feb 21 08:42:45 2005
+++ postgis.new/files/patch-a Mon Mar 21 09:08:34 2005
@@ -1,34 +1,40 @@
---- doc/Makefile Thu Jan 13 07:42:40 2005
-+++ doc/Makefile Mon Jan 31 16:48:51 2005
-@@ -1,20 +1,22 @@
+--- 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
- LAST_RELEASE_VERSION = 1.0.0RC1
+include ../Makefile.config
+include $(top_srcdir)/src/Makefile.shlib
++
+ # fetch version numbers from central repository
+ include ../Version.config
- postgis-out.xml: postgis.xml
- cat $< | sed "s/@@LAST_RELEASE_VERSION@@/$(LAST_RELEASE_VERSION)/g" > $@
+ 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 \
-+ --output html/ \
--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 \
-- /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl \
+ $(XSLBASE)/html/chunk.xsl \
- $<
-+ /usr/local/share/xsl/docbook/html/chunk.xsl \
+ $< && touch chunked-html
- html: postgis-out.xml
+ html/postgis.html: postgis-out.xml
xsltproc \
-@@ -53,3 +55,12 @@
- postgis.out \
- postgis.log
+@@ -66,5 +68,15 @@
+ maintainer-clean: clean
+ @rm -f html/*.html
+install: chunked-html
+ $(mkinstalldirs) $(DOCSDIR)
@@ -39,3 +45,6 @@
+ $(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 -urN postgis/files/patch-c postgis.new/files/patch-c
--- postgis/files/patch-c Mon Feb 21 08:42:45 2005
+++ postgis.new/files/patch-c Mon Mar 21 08:49:03 2005
@@ -1,9 +1,9 @@
---- Makefile Mon Jan 31 12:51:48 2005
-+++ Makefile Mon Jan 31 12:56:14 2005
+--- Makefile Tue Mar 8 13:46:23 2005
++++ Makefile Mon Mar 21 08:48:21 2005
@@ -5,8 +5,14 @@
#-----------------------------------------------------
- all: liblwgeom loaderdumper
+ all: liblwgeom loaderdumper utils
+ifneq ($(WITH-DOC),)
+ $(MAKE) -C doc chunked-html
+endif
diff -urN postgis/files/patch-d postgis.new/files/patch-d
--- postgis/files/patch-d Sat Feb 19 06:26:43 2005
+++ postgis.new/files/patch-d Mon Mar 21 09:10:55 2005
@@ -1,7 +1,7 @@
---- lwgeom/Makefile Wed Jan 26 06:35:56 2005
-+++ lwgeom/Makefile Mon Jan 31 13:28:00 2005
+--- lwgeom/Makefile Fri Mar 18 09:43:23 2005
++++ lwgeom/Makefile Mon Mar 21 08:58:26 2005
@@ -21,10 +21,10 @@
- SCRIPTS_VERSION=0.1.0
+
ifeq (${USE_VERSION},71)
MODULE_FILENAME = $(LPATH)/$(shlib)
- MODULE_INSTALLDIR = $(libdir)
@@ -13,26 +13,29 @@
endif
#---------------------------------------------------------------
-@@ -123,7 +123,7 @@
+@@ -143,9 +143,9 @@
install: all installdirs install-lwgeom-lib install-lwgeom-scripts
install-lwgeom-scripts:
-- $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)
+- $(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)
-@@ -147,10 +147,11 @@
+@@ -169,9 +169,9 @@
sh ../geos_version.sh $(GEOS_DIR) > postgis_geos_version.h
installdirs:
-- $(mkinstalldirs) $(libdir)
+- $(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)/lwpostgis.sql
-+ rm -f $(DESTDIR)$(DATADIR)/lwpostgis.sql
-
- uninstall: uninstall-lib uninstall-lwgeom-scripts
-
+ rm -f $(DESTDIR)$(datadir)/contrib/lwpostgis.sql
diff -urN postgis/pkg-plist postgis.new/pkg-plist
--- postgis/pkg-plist Mon Feb 21 08:42:45 2005
+++ postgis.new/pkg-plist Mon Mar 21 09:15:01 2005
@@ -5,6 +5,7 @@
%%DATADIR%%/README.upgrade
%%DATADIR%%/updatedb.default
%%DATADIR%%/lwpostgis.sql.default
+%%DATADIR%%/spatial_ref_sys.sql
%%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 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:
More information about the freebsd-ports-bugs
mailing list