Remove pkgsrc's attempt to force using libtool.

Postgresql upstream does not use libtool.  pkgsrc used to change
postgresql to use libtool, and this package was written to use the
pkgsrc-added libtool support.  pkgsrc no longer modifies postgresql to
use libtool, so postgis did not build.

In addition to backing out all the make-postgis-use-libtool packages,
this commit adds a patch to add rpath to the PGSQL_FE_LDFLAGS, which
upstream hand constructs from pg_config output.

PKGREVISION++, but no change in version or functionality (from the
previous state, which also didn't build) intended.

10 files changed, 48 insertions, 151 deletions

diff --git a/databases/postgresql-postgis/Makefile b/databases/postgresql-postgis/Makefile
index dd3288d7f9b..1a096a8e086 100644
--- a/databases/postgresql-postgis/Makefile
+++ b/databases/postgresql-postgis/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/03/14 16:32:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2011/12/31 17:14:16 gdt Exp $
 
 DISTNAME=	postgis-1.5.1
 PKGNAME=	postgresql${PGSQL_VERSION}-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://postgis.refractions.net/download/
 
@@ -44,11 +44,7 @@ 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}
diff --git a/databases/postgresql-postgis/PLIST b/databases/postgresql-postgis/PLIST
index b385d4b051b..3f00a3e9c12 100644
--- a/databases/postgresql-postgis/PLIST
+++ b/databases/postgresql-postgis/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2010/03/05 14:55:21 gdt Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/12/31 17:14:16 gdt Exp $
 bin/pgsql2shp
 bin/shp2pgsql
-lib/liblwgeom.la
-lib/libpostgis-1.5.la
+lib/postgresql/postgis-1.5.so
 man/man1/pgsql2shp.1
 man/man1/shp2pgsql.1
 share/doc/postgis/README.postgis
diff --git a/databases/postgresql-postgis/distinfo b/databases/postgresql-postgis/distinfo
index 8671023ff10..e634b98ffc2 100644
--- a/databases/postgresql-postgis/distinfo
+++ b/databases/postgresql-postgis/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/03/12 21:15:36 gdt Exp $
+$NetBSD: distinfo,v 1.5 2011/12/31 17:14:16 gdt Exp $
 
 SHA1 (postgis-1.5.1.tar.gz) = 9b7f2b6ce2cb1d23c88c0393f55f13ea9b172ff7
 RMD160 (postgis-1.5.1.tar.gz) = 7c8b600e60c751b0ddc6c76f6cbb41d5997366d6
 Size (postgis-1.5.1.tar.gz) = 3721030 bytes
-SHA1 (patch-aa) = 5d794483ad7699575ae4ac35b16024c9c0fe37eb
-SHA1 (patch-ab) = 731c73a1c20a24d90f360de9c87ec380ef39ab50
-SHA1 (patch-ac) = ee7530f9e17ed4385f3294b5a95d500943fad74e
-SHA1 (patch-ad) = 166b84a97c4519fecd52430705f89e9ca5536cdc
-SHA1 (patch-ae) = 183089452731ea22c78855f326ead6e7f1b361f7
+SHA1 (patch-configure) = 5995e773b9f8ec20e710d6cb690e928856c2650e
+SHA1 (patch-configure.ac) = 993358912b61670733602511d507e497c9677875
diff --git a/databases/postgresql-postgis/patches/patch-aa b/databases/postgresql-postgis/patches/patch-aa
deleted file mode 100644
index 43e4fea4d38..00000000000
--- a/databases/postgresql-postgis/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2010/03/12 01:06:16 gdt Exp $
-
---- postgis/Makefile.in.orig	2010-01-08 22:48:29.000000000 +0000
-+++ postgis/Makefile.in
-@@ -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
--SHLIB_LINK+=@SHLIB_LINK@ ../liblwgeom/liblwgeom.a
-+SHLIB_LINK+=@SHLIB_LINK@ ../liblwgeom/liblwgeom.la
- 
- # Extra files to remove during 'make clean'
- EXTRA_CLEAN=$(SQL_OBJS)
-@@ -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-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
-+	sed 's,MODULE_PATHNAME,$$libdir/../libpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@.so,g' $< >$@
- 
- 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
deleted file mode 100644
index 89bd92bb52a..00000000000
--- a/databases/postgresql-postgis/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2010/03/05 14:55:21 gdt Exp $
-
---- liblwgeom/Makefile.in.orig	2010-01-29 21:24:24.000000000 +0000
-+++ liblwgeom/Makefile.in
-@@ -60,10 +60,12 @@ SA_HEADERS = \
- 	liblwgeom.h \
- 	lwalgorithm.h
- 
--all: liblwgeom.a
-+all: liblwgeom.la
- 
--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} ${NM_OBJS:.o=.lo} -rpath ${PREFIX}/lib \
-+		-version-info @POSTGIS_MAJOR_VERSION@:@POSTGIS_MINOR_VERSION@
- 
- clean:
- 	rm -f $(SA_OBJS) 
-@@ -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
diff --git a/databases/postgresql-postgis/patches/patch-ac b/databases/postgresql-postgis/patches/patch-ac
deleted file mode 100644
index 6fcad88448d..00000000000
--- a/databases/postgresql-postgis/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2010/03/05 14:55:21 gdt Exp $
-
---- loader/Makefile.in.orig	2010-01-02 07:01:49.000000000 +0000
-+++ loader/Makefile.in
-@@ -39,7 +39,7 @@ ICONV_LDFLAGS=@ICONV_LDFLAGS@
- ICONV_CFLAGS=@ICONV_CFLAGS@
- 
- # liblwgeom
--LIBLWGEOM=../liblwgeom/liblwgeom.a
-+LIBLWGEOM=../liblwgeom/liblwgeom.la
- 
- # GTK includes and libraries
- GTK_CFLAGS = @GTK_CFLAGS@
-@@ -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 $@
- 
- $(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-gui.o: shp2pgsql-gui.c
- 	$(CC) $(CFLAGS) $(PGSQL_FE_CPPFLAGS) $(GTK_CFLAGS) -o $@ -c shp2pgsql-gui.c
- 
- $(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-CLI) $(DESTDIR)$(bindir)
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $(PGSQL2SHP) $(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
deleted file mode 100644
index a4a04e42413..00000000000
--- a/databases/postgresql-postgis/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$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
deleted file mode 100644
index e7ac789ed0f..00000000000
--- a/databases/postgresql-postgis/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2010/03/12 21:15:36 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:
diff --git a/databases/postgresql-postgis/patches/patch-configure b/databases/postgresql-postgis/patches/patch-configure
new file mode 100644
index 00000000000..866595b0582
--- /dev/null
+++ b/databases/postgresql-postgis/patches/patch-configure
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure,v 1.1 2011/12/31 17:14:16 gdt Exp $
+
+See configure.ac patch.
+
+--- configure.orig	2011-12-31 03:24:50.000000000 +0000
++++ configure
+@@ -16430,12 +16430,14 @@ fi
+ 
+ 
+ 
+-PGSQL_FE_LDFLAGS=-L`$PGCONFIG --libdir`" -lpq"
++
++PGSQL_FE_LDFLAGS="-L`$PGCONFIG --libdir` -R`$PGCONFIG --libdir` -lpq"
+ PGSQL_FE_CPPFLAGS=-I`$PGCONFIG --includedir`
+ 
+ 
+ 
+ 
++
+ PGSQL_DOCDIR=`$PGCONFIG --docdir`
+ PGSQL_MANDIR=`$PGCONFIG --mandir`
+ 
diff --git a/databases/postgresql-postgis/patches/patch-configure.ac b/databases/postgresql-postgis/patches/patch-configure.ac
new file mode 100644
index 00000000000..c7bb9f50ee3
--- /dev/null
+++ b/databases/postgresql-postgis/patches/patch-configure.ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure.ac,v 1.1 2011/12/31 17:14:16 gdt Exp $
+
+Upstream's configure hand-constructs LDFLAGS from using --libdir, and
+fails to address rpath.
+
+To be addressed with upstream by gdt after updating to 1.5.3 and
+understanding better.
+
+--- configure.ac.orig	2010-01-29 21:24:24.000000000 +0000
++++ configure.ac
+@@ -341,7 +341,7 @@ AC_SUBST([PGXSOVERRIDE])
+ dnl Note: We don't need the server-side LDFLAGS or CPPFLAGS because we get these from PGXS 
+ 
+ dnl Extract the linker and include flags for the frontend (for programs that use libpq)
+-PGSQL_FE_LDFLAGS=-L`$PGCONFIG --libdir`" -lpq"
++PGSQL_FE_LDFLAGS="-L`$PGCONFIG --libdir` -R`$PGCONFIG --libdir` -lpq"
+ PGSQL_FE_CPPFLAGS=-I`$PGCONFIG --includedir`
+ 
+ AC_SUBST([PGSQL_FE_LDFLAGS])