diff options
Diffstat (limited to 'databases/postgresql-postgis/patches')
| -rw-r--r-- | databases/postgresql-postgis/patches/patch-aa | 16 | ||||
| -rw-r--r-- | databases/postgresql-postgis/patches/patch-ab | 23 | ||||
| -rw-r--r-- | databases/postgresql-postgis/patches/patch-ac | 39 | ||||
| -rw-r--r-- | databases/postgresql-postgis/patches/patch-ad | 19 | ||||
| -rw-r--r-- | databases/postgresql-postgis/patches/patch-ae | 17 |
5 files changed, 81 insertions, 33 deletions
diff --git a/databases/postgresql-postgis/patches/patch-aa b/databases/postgresql-postgis/patches/patch-aa index e970a0338ec..8a6855e02ff 100644 --- a/databases/postgresql-postgis/patches/patch-aa +++ b/databases/postgresql-postgis/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/01/21 12:53:19 adam Exp $ +$NetBSD: patch-aa,v 1.2 2010/03/05 14:55:21 gdt Exp $ ---- postgis/Makefile.in.orig 2009-11-13 22:26:00.000000000 +0000 +--- postgis/Makefile.in.orig 2010-01-08 22:48:29.000000000 +0000 +++ postgis/Makefile.in -@@ -60,7 +60,7 @@ OBJS=$(PG_OBJS) +@@ -69,7 +69,7 @@ OBJS=$(PG_OBJS) # older version of PostGIS, rather than with the static liblwgeom.a # supplied with newer versions of PostGIS PG_CPPFLAGS+=@CPPFLAGS@ -I../liblwgeom @@ -11,12 +11,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/01/21 12:53:19 adam Exp $ # Extra files to remove during 'make clean' EXTRA_CLEAN=$(SQL_OBJS) -@@ -73,7 +73,7 @@ include $(PGXS) +@@ -103,7 +103,7 @@ endif # Borrow the $libdir substitution from PGXS but customise by adding the version number %.sql: %.sql.in -- sed 's,MODULE_PATHNAME,$$libdir/$*-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@ -+ sed 's,MODULE_PATHNAME,$$libdir/../lib$*-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@ +- sed 's,MODULE_PATHNAME,$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@ ++ sed 's,MODULE_PATHNAME,$$libdir/libpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@ - postgis_upgrade_14_minor.sql: postgis.sql - $(PERL) ../utils/postgis_proc_upgrade.pl $< 1.4 > $@ + postgis_upgrade_15_minor.sql: postgis.sql + $(PERL) ../utils/postgis_proc_upgrade.pl $< 1.5 > $@ diff --git a/databases/postgresql-postgis/patches/patch-ab b/databases/postgresql-postgis/patches/patch-ab index 831b04ed64a..89bd92bb52a 100644 --- a/databases/postgresql-postgis/patches/patch-ab +++ b/databases/postgresql-postgis/patches/patch-ab @@ -1,29 +1,34 @@ -$NetBSD: patch-ab,v 1.1.1.1 2010/01/21 12:53:19 adam Exp $ +$NetBSD: patch-ab,v 1.2 2010/03/05 14:55:21 gdt Exp $ ---- liblwgeom/Makefile.in.orig 2009-01-13 12:27:39.000000000 +0000 +--- liblwgeom/Makefile.in.orig 2010-01-29 21:24:24.000000000 +0000 +++ liblwgeom/Makefile.in -@@ -48,10 +48,12 @@ SA_HEADERS = \ +@@ -60,10 +60,12 @@ SA_HEADERS = \ liblwgeom.h \ lwalgorithm.h -all: liblwgeom.a +all: liblwgeom.la --liblwgeom.a: $(SA_OBJS) $(SA_HEADERS) -- ar rs liblwgeom.a $(SA_OBJS) -+liblwgeom.la: $(SA_OBJS) $(SA_HEADERS) +-liblwgeom.a: $(SA_OBJS) $(NM_OBJS) $(SA_HEADERS) +- ar rs liblwgeom.a $(SA_OBJS) $(NM_OBJS) ++liblwgeom.la: $(SA_OBJS) $(NM_OBJS) $(SA_HEADERS) + ${LIBTOOL} --mode=link ${CC} -o liblwgeom.la \ -+ ${SA_OBJS:.o=.lo} -rpath ${PREFIX}/lib \ ++ ${SA_OBJS:.o=.lo} ${NM_OBJS:.o=.lo} -rpath ${PREFIX}/lib \ + -version-info @POSTGIS_MAJOR_VERSION@:@POSTGIS_MINOR_VERSION@ clean: rm -f $(SA_OBJS) -@@ -62,7 +64,7 @@ check: liblwgeom.a +@@ -75,11 +77,11 @@ check: liblwgeom.a # Command to build each of the .o files $(SA_OBJS): %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< + ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c -o $@ $< + # Command to build each of the .o files + $(NM_OBJS): %.o: %.c +- $(CC) $(CFLAGS) $(NUMERICFLAGS) -c -o $@ $< ++ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) $(NUMERICFLAGS) -c -o $@ $< + + # Commands to generate the lexer and parser from input files - wktparse.tab.c: wktparse.y diff --git a/databases/postgresql-postgis/patches/patch-ac b/databases/postgresql-postgis/patches/patch-ac index 2a40b64741f..6fcad88448d 100644 --- a/databases/postgresql-postgis/patches/patch-ac +++ b/databases/postgresql-postgis/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.1.1.1 2010/01/21 12:53:19 adam Exp $ +$NetBSD: patch-ac,v 1.2 2010/03/05 14:55:21 gdt Exp $ ---- loader/Makefile.in.orig 2009-10-06 08:51:49.000000000 +0000 +--- loader/Makefile.in.orig 2010-01-02 07:01:49.000000000 +0000 +++ loader/Makefile.in -@@ -39,7 +39,7 @@ PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@ - ICONV_LDFLAGS=@ICONV_LDFLAGS@ +@@ -39,7 +39,7 @@ ICONV_LDFLAGS=@ICONV_LDFLAGS@ + ICONV_CFLAGS=@ICONV_CFLAGS@ # liblwgeom -LIBLWGEOM=../liblwgeom/liblwgeom.a @@ -11,27 +11,34 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/01/21 12:53:19 adam Exp $ # GTK includes and libraries GTK_CFLAGS = @GTK_CFLAGS@ -@@ -60,10 +60,10 @@ pgsql2shp.o: pgsql2shp.c - $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $< +@@ -79,16 +79,16 @@ pgsql2shp.o: pgsql2shp.c + $(CC) $(CFLAGS) $(ICONV_CFLAGS) $(PGSQL_FE_CPPFLAGS) -c $< $(PGSQL2SHP): shpopen.o dbfopen.o getopt.o pgsql2shp.o $(LIBLWGEOM) - $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@ -+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@ ++ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm -o $@ - $(SHP2PGSQL): shpopen.o dbfopen.o getopt.o shp2pgsql.o $(LIBLWGEOM) -- $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) -lm -o $@ -+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $^ $(ICONV_LDFLAGS) -lm -o $@ + $(SHP2PGSQL-CLI): stringbuffer.o shpopen.o dbfopen.o getopt.o shp2pgsql-core.o shp2pgsql-cli.o $(LIBLWGEOM) +- $(CC) $(CFLAGS) $^ -o $@ $(ICONV_LDFLAGS) -lm ++ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $^ -o $@ $(ICONV_LDFLAGS) -lm - shp2pgsql-core-gui.o: shp2pgsql-core.c - $(CC) $(CFLAGS) -DPGUI -c -o $@ $^ -@@ -79,8 +79,8 @@ $(SHP2PGSQL-CLI): stringbuffer.o shpopen + shp2pgsql-gui.o: shp2pgsql-gui.c + $(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) $(GTK_CFLAGS) -o $@ -c shp2pgsql-gui.c - install: all + $(SHP2PGSQL-GUI): stringbuffer.o shpopen.o dbfopen.o shp2pgsql-core.o shp2pgsql-gui.o getopt.o $(LIBLWGEOM) $(GTK_WIN32_RES) +- $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm ++ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm + + installdir: @mkdir -p $(DESTDIR)$(bindir) +@@ -97,8 +97,8 @@ install: installdir + ifdef gtk_build + $(INSTALL) $(SHP2PGSQL-GUI) $(DESTDIR)$(bindir) + endif - $(INSTALL) $(PGSQL2SHP) $(DESTDIR)$(bindir) -- $(INSTALL) $(SHP2PGSQL) $(DESTDIR)$(bindir) +- $(INSTALL) $(SHP2PGSQL-CLI) $(DESTDIR)$(bindir) + ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $(PGSQL2SHP) $(DESTDIR)$(bindir) -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $(SHP2PGSQL) $(DESTDIR)$(bindir) ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $(SHP2PGSQL-CLI) $(DESTDIR)$(bindir) uninstall: @rm -f $(DESTDIR)$(bindir)/$(PGSQL2SHP) diff --git a/databases/postgresql-postgis/patches/patch-ad b/databases/postgresql-postgis/patches/patch-ad new file mode 100644 index 00000000000..a4a04e42413 --- /dev/null +++ b/databases/postgresql-postgis/patches/patch-ad @@ -0,0 +1,19 @@ +$NetBSD: patch-ad,v 1.1 2010/03/05 14:55:21 gdt Exp $ + +There is confusion in the pkgsrc-provided Makefile.shlib about what's +a shared library vs a module. This patch is wrong, but fits with the +existing problems to create a consistent build. All that really +matters is that the postgis module be dlopenable and everything think +it is in the same place. + +--- postgis/Makefile.pgxs.orig 2010-01-12 10:33:49.000000000 +0000 ++++ postgis/Makefile.pgxs +@@ -55,7 +55,7 @@ ifdef SCRIPTS_built + done + endif # SCRIPTS_built + ifdef MODULE_big +- $(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)' ++ $(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(libdir)/lib$(MODULE_big)$(DLSUFFIX)' + endif # MODULE_big + + installdirs: diff --git a/databases/postgresql-postgis/patches/patch-ae b/databases/postgresql-postgis/patches/patch-ae new file mode 100644 index 00000000000..acf3b7b19d9 --- /dev/null +++ b/databases/postgresql-postgis/patches/patch-ae @@ -0,0 +1,17 @@ +$NetBSD: patch-ae,v 1.1 2010/03/05 14:55:21 gdt Exp $ + +The regress target puts the postgis library as @prefix@/lib within the +regress destdir, rather than in plain lib, so point the loader script +at it. + +--- regress/Makefile.in.orig 2010-01-21 07:19:31.000000000 +0000 ++++ regress/Makefile.in +@@ -87,7 +87,7 @@ all: test + test check: + $(MAKE) -C ../postgis REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install + $(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install +- sed 's,$$libdir,$(REGRESS_INSTALLDIR)/lib,g' ../postgis/postgis.sql > postgis.sql ++ sed 's,$$libdir,$(REGRESS_INSTALLDIR)/@prefix@/lib,g' ../postgis/postgis.sql > postgis.sql + @USE_VERSION=$(POSTGIS_PGSQL_VERSION) ./run_test $(TESTS) + + cleanup: |