diff options
author | gdt <gdt> | 2010-03-05 14:55:21 +0000 |
---|---|---|
committer | gdt <gdt> | 2010-03-05 14:55:21 +0000 |
commit | f12516dc0051bc56460c4490db61e2167f8431bd (patch) | |
tree | 84edfff00f1024a93766dbc5f9cd0fc4f4fd913f /databases/postgresql-postgis | |
parent | bc5ac67f55ef84fd981a742451ad579786550d45 (diff) | |
download | pkgsrc-f12516dc0051bc56460c4490db61e2167f8431bd.tar.gz |
Update to 1.5.0. Some rough edges due to pkgsrc's replacement of
pgsql's Makefile.shlib are patched around. ('make test' passes on
netbsd-5/i386 with postgresql84.)
This is a major release adding a significant number of new features including:
* New "geography" type for managing geodetic (lat/lon) data
* Performance-enhanced distance calculations
* GML and KML format readers
* Improved shape loading GUI
* And more!
Release Notes
Important Changes
* =~ operator now indicates bounding box equality, not feature equality
* GEOS 3.1 is now the minimum accepted version of GEOS
* GEOS 3.2 is needed if you want to use enhanced buffering features and ST_HausdorffDistance
* GEOS, LibXML2, and Proj4 are now mandatory dependencies
New Features
* Added Hausdorff distance calculations (#209) (Vincent Picavet)
* Added parameters argument to ST_Buffer operation to support one-sided buffering and other buffering styles (Sandro Santilli)
* Performance improvements to ST_Distance (Nicklas Avén)
* Addition of other Distance related visualization and analysis functions (Nicklas Avén)
* ST_ClosestPoint
* ST_DFullyWithin
* ST_LongestLine
* ST_MaxDistance
* ST_ShortestLine
* KML, GML input via ST_GeomFromGML and ST_GeomFromKML (Olivier Courtin)
* Extract homogeneous collection with ST_CollectionExtract (Paul Ramsey)
* Add measure values to existing linestring with ST_AddMeasure (Paul Ramsey)
* History table implementation in utils (George Silva)
* Win32 support and improvement of core shp2pgsql-gui (Mark Cave-Ayland)
* In place 'make check' support (Paul Ramsey)
* Geography type and supporting functions
o Spherical algorithms from Dave Skea
o Object/index implementation from Paul Ramsey
o Selectivitiy implementation from Mark Cave-Ayland
o Serializations (KML, GML, JSON) from Olivier Courtin
o ST_Area, ST_Distance, ST_DWithin, ST_GeogFromText, ST_GeogFromWKB, ST_Intersects, ST_Covers, ST_Buffer
* Documentation updates and improvements (Regina Obe, Kevin Neufeld)
* Testing and quality control (Regina Obe)
* PostGIS 1.5 support PostgreSQL 8.5 trunk (Guillaume Lelarge)
* Many, many other changes
Diffstat (limited to 'databases/postgresql-postgis')
-rw-r--r-- | databases/postgresql-postgis/Makefile | 11 | ||||
-rw-r--r-- | databases/postgresql-postgis/PLIST | 50 | ||||
-rw-r--r-- | databases/postgresql-postgis/distinfo | 16 | ||||
-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 |
8 files changed, 135 insertions, 56 deletions
diff --git a/databases/postgresql-postgis/Makefile b/databases/postgresql-postgis/Makefile index c1e202f8e7e..473a99b331d 100644 --- a/databases/postgresql-postgis/Makefile +++ b/databases/postgresql-postgis/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2010/02/10 19:34:06 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2010/03/05 14:55:21 gdt Exp $ -DISTNAME= postgis-1.4.1 +DISTNAME= postgis-1.5.0 PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME} -PKGREVISION= 1 CATEGORIES= databases geography MASTER_SITES= http://postgis.refractions.net/download/ @@ -44,17 +43,21 @@ SUBST_STAGE.paths= pre-configure INSTALLATION_DIRS= ${DOCDIR} ${DOCDIR}/images ${PKGMANDIR}/man1 +# libtool complexities: +# http://lists.gnu.org/archive/html/libtool/2006-09/msg00075.html + post-install: ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/liblwgeom/liblwgeom.la ${DESTDIR}${PREFIX}/lib ${INSTALL_DATA} ${BUILD_DIRS:Q}/README.postgis ${DESTDIR}${DOCDIR} ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/html/postgis.html ${DESTDIR}${DOCDIR} ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/html/style.css ${DESTDIR}${DOCDIR} ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/html/images/* ${DESTDIR}${DOCDIR}/images - ${INSTALL_DATA} ${BUILD_DIRS:Q}/postgis_comments.sql ${DESTDIR}${PREFIX}/share/postgresql/contrib + ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/postgis_comments.sql ${DESTDIR}${PREFIX}/share/postgresql/contrib ${INSTALL_MAN} ${BUILD_DIRS:Q}/doc/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../geography/geos/buildlink3.mk" .include "../../misc/proj/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-postgis/PLIST b/databases/postgresql-postgis/PLIST index e75cf331f67..b385d4b051b 100644 --- a/databases/postgresql-postgis/PLIST +++ b/databases/postgresql-postgis/PLIST @@ -1,23 +1,47 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/21 12:53:18 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2010/03/05 14:55:21 gdt Exp $ bin/pgsql2shp bin/shp2pgsql lib/liblwgeom.la -lib/libpostgis-1.4.la +lib/libpostgis-1.5.la man/man1/pgsql2shp.1 man/man1/shp2pgsql.1 share/doc/postgis/README.postgis share/doc/postgis/images/caution.png share/doc/postgis/images/check.png +share/doc/postgis/images/de9im01.png +share/doc/postgis/images/de9im02.png +share/doc/postgis/images/de9im03.png +share/doc/postgis/images/de9im04.png +share/doc/postgis/images/de9im05.png +share/doc/postgis/images/de9im06.png +share/doc/postgis/images/de9im07.png +share/doc/postgis/images/de9im08.png +share/doc/postgis/images/de9im09.png +share/doc/postgis/images/de9im10.png +share/doc/postgis/images/de9im11.png +share/doc/postgis/images/de9im12.png +share/doc/postgis/images/de9im13.png share/doc/postgis/images/important.png +share/doc/postgis/images/matrix_autocast.png +share/doc/postgis/images/matrix_checkmark.png +share/doc/postgis/images/matrix_transform.png share/doc/postgis/images/note.png share/doc/postgis/images/st_buffer01.png share/doc/postgis/images/st_buffer02.png +share/doc/postgis/images/st_buffer03.png +share/doc/postgis/images/st_buffer04.png +share/doc/postgis/images/st_buffer05.png +share/doc/postgis/images/st_buffer06.png +share/doc/postgis/images/st_buffer07.png +share/doc/postgis/images/st_buffer08.png share/doc/postgis/images/st_buildarea01.png share/doc/postgis/images/st_buildarea02.png share/doc/postgis/images/st_centroid01.png share/doc/postgis/images/st_centroid02.png share/doc/postgis/images/st_centroid03.png share/doc/postgis/images/st_centroid04.png +share/doc/postgis/images/st_closestpoint01.png +share/doc/postgis/images/st_closestpoint02.png share/doc/postgis/images/st_contains01.png share/doc/postgis/images/st_contains02.png share/doc/postgis/images/st_contains03.png @@ -26,15 +50,12 @@ share/doc/postgis/images/st_contains05.png share/doc/postgis/images/st_contains06.png share/doc/postgis/images/st_convexhull01.png share/doc/postgis/images/st_crosses-math.gif -share/doc/postgis/images/st_crosses01.gif share/doc/postgis/images/st_crosses01.png -share/doc/postgis/images/st_crosses02.gif share/doc/postgis/images/st_crosses02.png -share/doc/postgis/images/st_crosses03.gif share/doc/postgis/images/st_crosses03.png -share/doc/postgis/images/st_crosses04.gif share/doc/postgis/images/st_crosses04.png share/doc/postgis/images/st_difference01.png +share/doc/postgis/images/st_dumppoints01.png share/doc/postgis/images/st_issimple01.png share/doc/postgis/images/st_issimple02.png share/doc/postgis/images/st_issimple03.png @@ -56,7 +77,12 @@ share/doc/postgis/images/st_linecrossingdirection01.png share/doc/postgis/images/st_linecrossingdirection02.png share/doc/postgis/images/st_linecrossingdirection03.png share/doc/postgis/images/st_linecrossingdirection04.png +share/doc/postgis/images/st_longestline01.png +share/doc/postgis/images/st_longestline02.png +share/doc/postgis/images/st_longestline03.png share/doc/postgis/images/st_minimumboundingcircle01.png +share/doc/postgis/images/st_shortestline01.png +share/doc/postgis/images/st_shortestline02.png share/doc/postgis/images/st_symdifference01.png share/doc/postgis/images/st_symdifference02.png share/doc/postgis/images/st_touches-math.gif @@ -71,10 +97,10 @@ share/doc/postgis/images/tip.png share/doc/postgis/images/warning.png share/doc/postgis/postgis.html share/doc/postgis/style.css -share/postgresql/contrib/postgis.sql +share/postgresql/contrib/postgis-1.5/postgis.sql +share/postgresql/contrib/postgis-1.5/postgis_upgrade_13_to_15.sql +share/postgresql/contrib/postgis-1.5/postgis_upgrade_14_to_15.sql +share/postgresql/contrib/postgis-1.5/postgis_upgrade_15_minor.sql +share/postgresql/contrib/postgis-1.5/spatial_ref_sys.sql +share/postgresql/contrib/postgis-1.5/uninstall_postgis.sql share/postgresql/contrib/postgis_comments.sql -share/postgresql/contrib/postgis_upgrade_12_to_14.sql -share/postgresql/contrib/postgis_upgrade_13_to_14.sql -share/postgresql/contrib/postgis_upgrade_14_minor.sql -share/postgresql/contrib/spatial_ref_sys.sql -share/postgresql/contrib/uninstall_postgis.sql diff --git a/databases/postgresql-postgis/distinfo b/databases/postgresql-postgis/distinfo index a0cb5ab6075..b23b7c7c323 100644 --- a/databases/postgresql-postgis/distinfo +++ b/databases/postgresql-postgis/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/01/21 12:53:18 adam Exp $ +$NetBSD: distinfo,v 1.2 2010/03/05 14:55:21 gdt Exp $ -SHA1 (postgis-1.4.1.tar.gz) = e30062d6e38f787374866a6f4bc2920e032bc0e7 -RMD160 (postgis-1.4.1.tar.gz) = 5c4b23dc4139297cbff03b023643bddd20183bfa -Size (postgis-1.4.1.tar.gz) = 3273182 bytes -SHA1 (patch-aa) = a33884dc72985b3ddc4f95072a352b8ff895eb59 -SHA1 (patch-ab) = 6c85596f0c7043e3c2dfb1be22c78c15c9da014d -SHA1 (patch-ac) = 6783cf54b07286b5e9ae88fef8c10a51b213f626 +SHA1 (postgis-1.5.0.tar.gz) = 8addacea2439a52f07735b58268dcef8df46912c +RMD160 (postgis-1.5.0.tar.gz) = 815c445d7ab628254130d2277648913e945b2af9 +Size (postgis-1.5.0.tar.gz) = 3752211 bytes +SHA1 (patch-aa) = 5a1a9d2f5d05cad95f03ad1f01259dacd57939aa +SHA1 (patch-ab) = 731c73a1c20a24d90f360de9c87ec380ef39ab50 +SHA1 (patch-ac) = ee7530f9e17ed4385f3294b5a95d500943fad74e +SHA1 (patch-ad) = 166b84a97c4519fecd52430705f89e9ca5536cdc +SHA1 (patch-ae) = 0c1404741b507d939142eb2bea062868bcd41b8f 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: |