5 files changed, 38 insertions, 29 deletions

diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile
index 9b70eb361b2a..99b8f85ca76f 100644
--- a/databases/postgis/Makefile
+++ b/databases/postgis/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	postgis
-DISTVERSION=	1.0.5
+DISTVERSION=	1.0.6
 CATEGORIES=	databases
 MASTER_SITES=	http://postgis.refractions.net/download/
 
 MAINTAINER=	anderson@cnpm.embrapa.br
 COMMENT=	Adds support for geographic objects to PostgreSQL databases
 
+BUILD_DEPENDS=	${NONEXISTENT}:${PGSQL_PORTDIR}:configure
 LIB_DEPENDS=	proj.5:${PORTSDIR}/graphics/proj
 
+USE_PGSQL=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_PERL5_BUILD=	yes
 
-PGSQL_SRC=	${WRKDIR}/pgsql/postgresql
+MAN1=		pgsql2shp.1 shp2pgsql.1
 
 INSTALL_TARGET=	install
 INSTALLS_SHLIB=	no
@@ -27,10 +29,6 @@ INSTALLS_SHLIB=	no
 OPTIONS=	GEOS "Include GEOS - the OpenGIS 'Simple Features for SQL'" off \
 		UTF8 "UTF-8 support for shp2pgsql. (needs libiconv)" off
 
-USE_PGSQL=	YES
-
-.include <bsd.port.pre.mk>
-
 MAKE_ARGS=	PGSQL_SRC="${PGSQL_SRC}" \
 		USE_PROJ=1 \
 		DATADIR="${PREFIX}/share/postgis" \
@@ -38,9 +36,20 @@ MAKE_ARGS=	PGSQL_SRC="${PGSQL_SRC}" \
 		BINDIR="${PREFIX}/bin" \
 		LIBDIR="${PREFIX}/lib"
 
-PGSQL_PORTDIR=	${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
+.include <bsd.port.pre.mk>
 
-MAN1=		pgsql2shp.1 shp2pgsql.1
+#Setting/finding PostgreSQL version we want.
+.if exists(${LOCALBASE}/bin/postmaster)
+PGSQL_VER!=	${LOCALBASE}/bin/postmaster -V | \
+		${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p'
+.elif exists(${LOCALBASE}/bin/pg_config)
+PGSQL_VER!=	${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p'
+.else
+PGSQL_VER=	${DEFAULT_PGSQL_VER}
+.endif
+
+PGSQL_PORTDIR=	${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
+PGSQL_SRC!=	cd ${PGSQL_PORTDIR} && ${MAKE} -V WRKSRC
 
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
@@ -56,7 +65,7 @@ MAKE_ARGS+=	USE_ICONV=1
 .endif
 
 .if defined(WITH_GEOS)
-LIB_DEPENDS+=	geos.4:${PORTSDIR}/graphics/geos
+LIB_DEPENDS+=	geos:${PORTSDIR}/graphics/geos
 MAKE_ARGS+=	USE_GEOS=1
 .else
 MAKE_ARGS+=	USE_GEOS=0
@@ -65,14 +74,8 @@ MAKE_ARGS+=	USE_GEOS=0
 pre-everything::
 	@${SH} ${PKGINSTALL} ${PORTNAME} MESSAGE
 
-pre-configure:
-	@([ -d ${WRKDIR}/pgsql ] || ${MKDIR} ${WRKDIR}/pgsql) && \
-	cd ${PGSQL_PORTDIR} && \
-	${MAKE} WRKDIR=${WRKDIR}/pgsql configure && \
-	${MV} ${WRKDIR}/pgsql/postgresql* ${PGSQL_SRC} \
-
 post-install:
-	@([ -d ${PREFIX}/lib/postgresql ] || ${MKDIR} ${PREFIX}/lib/postgresql )
+	@ ${MKDIR} ${PREFIX}/lib/postgresql
 	@ ${LN} ${PREFIX}/lib/liblwgeom.so.1 ${PREFIX}/lib/postgresql
 	@ ${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGINSTALL} ${PORTNAME} POST-INSTALL
diff --git a/databases/postgis/distinfo b/databases/postgis/distinfo
index 69baac5b1e29..66e80c3fe230 100644
--- a/databases/postgis/distinfo
+++ b/databases/postgis/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgis-1.0.5.tar.gz) = 0fb63a885a723b2d71b52207fd05888a
-SHA256 (postgis-1.0.5.tar.gz) = 35aa79f660c1b2071557e4e6525654acfc03ff4a80710dd2456250d2693c8436
-SIZE (postgis-1.0.5.tar.gz) = 1396740
+MD5 (postgis-1.0.6.tar.gz) = 34925b24c77045b1b23a9a06e47a9a22
+SHA256 (postgis-1.0.6.tar.gz) = 0c22c834c32e2e355a0a5fa0f9ff61602ea0243964bbc9731f3a47887e4b25fe
+SIZE (postgis-1.0.6.tar.gz) = 1399206
diff --git a/databases/postgis/files/patch-doc b/databases/postgis/files/patch-doc
index 3d87ee3c56ab..17606bc0e664 100644
--- a/databases/postgis/files/patch-doc
+++ b/databases/postgis/files/patch-doc
@@ -1,5 +1,5 @@
 --- doc/Makefile	Tue Apr 12 08:17:04 2005
-+++ doc/Makefile	Thu Apr 21 17:20:56 2005
++++ doc/Makefile	Fri Dec  9 23:36:05 2005
 @@ -1,11 +1,14 @@
  COMMONOPTS = -f docbook -b html -e no-valid
  
@@ -32,7 +32,7 @@
  
  html/postgis.html: postgis-out.xml
  	xsltproc \
-@@ -67,6 +69,15 @@
+@@ -67,6 +69,16 @@
  maintainer-clean: clean
  	@rm -f html/*.html
  
@@ -47,6 +47,7 @@
 +	$(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
 +	$(INSTALL_DATA)	html/apa.html $(DOCSDIR)/apa.html
 + 
  .PHONY: html 
diff --git a/databases/postgis/files/patch-loader b/databases/postgis/files/patch-loader
index b7686f0ab4ea..4578f090a97d 100644
--- a/databases/postgis/files/patch-loader
+++ b/databases/postgis/files/patch-loader
@@ -1,13 +1,5 @@
 --- 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 $@ 
  
diff --git a/databases/postgis/files/patch-main b/databases/postgis/files/patch-main
index 20e86467469a..bb69bbd559c9 100644
--- a/databases/postgis/files/patch-main
+++ b/databases/postgis/files/patch-main
@@ -16,3 +16,16 @@
  
  uninstall: liblwgeom-uninstall loaderdumper-uninstall
  
+--- Makefile.config	Thu Dec  1 07:26:49 2005
++++ Makefile.config	Fri Dec  9 23:27:18 2005
+@@ -75,8 +75,8 @@
+ # Use ICONV_LDFLAGS and ICONV_CFLAGS to fine-tune usage.
+ #
+ USE_ICONV ?= 0
+-ICONV_CFLAGS ?=
+-ICONV_LDFLAGS ?=
++ICONV_CFLAGS ?=-I/usr/local/include
++ICONV_LDFLAGS ?=-L/usr/local/lib -liconv
+ 
+ #
+ # Path to library (to be specified in CREATE FUNCTION queries)