diff options
Diffstat (limited to 'databases/postgis/files')
| -rw-r--r-- | databases/postgis/files/README.upgrade | 16 | ||||
| -rw-r--r-- | databases/postgis/files/UPDATE | 14 | ||||
| -rw-r--r-- | databases/postgis/files/patch-a | 42 | ||||
| -rw-r--r-- | databases/postgis/files/patch-b | 18 | ||||
| -rw-r--r-- | databases/postgis/files/patch-c | 61 | ||||
| -rw-r--r-- | databases/postgis/files/patch-d | 38 | ||||
| -rw-r--r-- | databases/postgis/files/updatedb.default | 3 |
7 files changed, 95 insertions, 97 deletions
diff --git a/databases/postgis/files/README.upgrade b/databases/postgis/files/README.upgrade new file mode 100644 index 000000000000..88eb5382d465 --- /dev/null +++ b/databases/postgis/files/README.upgrade @@ -0,0 +1,16 @@ +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 --git a/databases/postgis/files/UPDATE b/databases/postgis/files/UPDATE deleted file mode 100644 index 1478cf65c0f1..000000000000 --- a/databases/postgis/files/UPDATE +++ /dev/null @@ -1,14 +0,0 @@ -Updating databases from old versions of Postgis - -Due the libpostgis.so.0 path modification, databases created with older -versions of postgis won't work properly. -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 libpostgis -references updated. -After that you can restore your database using updated file. - - psql -f dump.sql.updated database diff --git a/databases/postgis/files/patch-a b/databases/postgis/files/patch-a index a4b087664a67..9052c9938605 100644 --- a/databases/postgis/files/patch-a +++ b/databases/postgis/files/patch-a @@ -1,17 +1,22 @@ ---- doc/Makefile Thu Sep 9 17:51:32 2004 -+++ doc/Makefile.new Wed Dec 29 09:49:05 2004 -@@ -5,14 +5,16 @@ +--- doc/Makefile Thu Jan 13 07:42:40 2005 ++++ doc/Makefile Mon Jan 31 16:48:51 2005 +@@ -1,20 +1,22 @@ + COMMONOPTS = -f docbook -b html -e no-valid + LAST_RELEASE_VERSION = 1.0.0RC1 + ++include ../Makefile.config ++include $(top_srcdir)/src/Makefile.shlib + postgis-out.xml: postgis.xml cat $< | sed "s/@@LAST_RELEASE_VERSION@@/$(LAST_RELEASE_VERSION)/g" > $@ -+# html/ch01.html html/ch02.html html/ch03.html html/ch04.html html/ch05.html html/index.html -+ chunked-html: postgis-out.xml -- xsltproc \ + xsltproc \ - --param shade.verbatim 1 \ -+ xsltproc --param shade.verbatim 1 \ - --param chunk.section.depth 0 \ + --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 \ @@ -21,25 +26,16 @@ html: postgis-out.xml xsltproc \ -@@ -20,11 +22,20 @@ - --param shade.verbatim 1 \ - --param chunk.section.depth 0 \ - --stringparam html.stylesheet style.css \ -- /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl \ -+ /usr/local/share/xsl/docbook/html/docbook.xsl \ - $< - - jw: postgis-out.xml - jw $(COMMONOPTS) -o html/ postgis-out.xml +@@ -53,3 +55,12 @@ + postgis.out \ + postgis.log - clean: -+ rm -f postgis-out.xml chunked-html 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/index.html $(DOCSDIR)/index.html - ++ $(INSTALL_DATA) html/ch06.html $(DOCSDIR)/ch06.html diff --git a/databases/postgis/files/patch-b b/databases/postgis/files/patch-b index 35124669b8fb..b7686f0ab4ea 100644 --- a/databases/postgis/files/patch-b +++ b/databases/postgis/files/patch-b @@ -1,6 +1,14 @@ ---- loader/Makefile Wed Dec 29 16:31:54 2004 -+++ loader/Makefile.new Wed Dec 29 16:32:25 2004 -@@ -50,8 +50,8 @@ +--- 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 @@ -9,5 +17,5 @@ + $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)$(BINDIR)/pgsql2shp$(EXE) + $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)$(BINDIR)/shp2pgsql$(EXE) - clean: - @rm -f $(OBJS) shp2pgsql.o pgsql2shp.o shp2pgsql$(EXE) pgsql2shp$(EXE) + uninstall: + rm -f $(DESTDIR)$(bindir)/pgsql2shp$(EXE) diff --git a/databases/postgis/files/patch-c b/databases/postgis/files/patch-c index 4e473d10e814..7c806d014fa7 100644 --- a/databases/postgis/files/patch-c +++ b/databases/postgis/files/patch-c @@ -1,64 +1,17 @@ ---- Makefile Wed Dec 29 09:44:01 2004 -+++ Makefile.new Wed Dec 29 09:56:30 2004 -@@ -28,7 +28,7 @@ - # - # Download from: http://geos.refractions.net - # --USE_GEOS=1 -+#USE_GEOS=1 - ifeq (${GEOS_DIR},) - GEOS_DIR=/usr/local - endif -@@ -105,10 +105,10 @@ - SCRIPTS_VERSION=0.0.1 - 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 +--- Makefile Mon Jan 31 12:51:48 2005 ++++ Makefile Mon Jan 31 12:56:14 2005 +@@ -5,8 +5,14 @@ + #----------------------------------------------------- - #--------------------------------------------------------------- -@@ -191,6 +191,10 @@ - postgis_geos_wrapper.o: postgis_geos_wrapper.cpp - - all: $(GEOS_RULES) all-lib postgis.sql postgis_undef.sql loaderdumper + all: liblwgeom loaderdumper +ifneq ($(WITH-DOC),) + $(MAKE) -C doc chunked-html +endif -+ - - loaderdumper: - $(MAKE) -C loader -@@ -207,11 +211,15 @@ - perl create_undef.pl $< $(USE_VERSION) > $@ - install: all installdirs install-postgis-lib -- $(INSTALL_DATA) postgis.sql $(DESTDIR)$(datadir) -- $(INSTALL_DATA) postgis_undef.sql $(DESTDIR)$(datadir) -- $(INSTALL_DATA) spatial_ref_sys.sql $(DESTDIR)$(datadir) -- $(INSTALL_DATA) README.postgis $(DESTDIR)$(datadir) -+ $(INSTALL_DATA) postgis.sql $(DESTDIR)$(DATADIR)/postgis.sql.default -+ $(INSTALL_DATA) postgis_undef.sql $(DESTDIR)$(DATADIR) -+ $(INSTALL_DATA) spatial_ref_sys.sql $(DESTDIR)$(DATADIR) -+ $(INSTALL_DATA) README.postgis $(DESTDIR)$(DATADIR) - $(MAKE) DESTDIR=$(DESTDIR) -C loader install + install: all liblwgeom-install loaderdumper-install +ifneq ($(WITH-DOC),) + $(MAKE) INSTALL_DATA="$(INSTALL_DATA)" DOCSDIR=$(DOCSDIR) -C doc install +endif -+ - - #- This has been copied from postgresql and adapted - install-postgis-lib: $(shlib) -@@ -235,7 +243,7 @@ - ./geos_version.sh $(GEOS_DIR) > postgis_geos_version.h - installdirs: -- $(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir) -+ $(mkinstalldirs) $(DATADIR) $(libdir) + uninstall: liblwgeom-uninstall loaderdumper-uninstall - uninstall: uninstall-lib - @rm -f $(docdir)/contrib/README.postgis $(datadir)/contrib/postgis.sql diff --git a/databases/postgis/files/patch-d b/databases/postgis/files/patch-d new file mode 100644 index 000000000000..f0a45875c854 --- /dev/null +++ b/databases/postgis/files/patch-d @@ -0,0 +1,38 @@ +--- lwgeom/Makefile Wed Jan 26 06:35:56 2005 ++++ lwgeom/Makefile Mon Jan 31 13:28:00 2005 +@@ -21,10 +21,10 @@ + SCRIPTS_VERSION=0.1.0 + 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 + + #--------------------------------------------------------------- +@@ -123,7 +123,7 @@ + install: all installdirs install-lwgeom-lib install-lwgeom-scripts + + install-lwgeom-scripts: +- $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir) ++ $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(DATADIR)/lwpostgis.sql.default + + #- This has been copied from postgresql and adapted + install-lwgeom-lib: $(shlib) +@@ -147,10 +147,11 @@ + sh ../geos_version.sh $(GEOS_DIR) > postgis_geos_version.h + + installdirs: +- $(mkinstalldirs) $(libdir) ++ $(mkinstalldirs) $(LIBDIR) ++ $(mkinstalldirs) $(DATADIR) + + uninstall-lwgeom-scripts: +- rm -f $(DESTDIR)$(datadir)/lwpostgis.sql ++ rm -f $(DESTDIR)$(DATADIR)/lwpostgis.sql + + uninstall: uninstall-lib uninstall-lwgeom-scripts + diff --git a/databases/postgis/files/updatedb.default b/databases/postgis/files/updatedb.default index 2af237355add..b2d44e6848df 100644 --- a/databases/postgis/files/updatedb.default +++ b/databases/postgis/files/updatedb.default @@ -2,4 +2,5 @@ LIBDIR=%%LIBDIR%% -sed "s|'.*/libpostgis.so.0'|'${LIBDIR}/libpostgis.so.0'|g" $1 > $1.updated +sed "s|'.*/libpostgis\.so\.0'|'${LIBDIR}/liblwgeom.so.1'|g + s|'.*/liblwgeom\.so\.1'|'${LIBDIR}/liblwgeom.so.1'|g $1 > $1.updated |