- Convert to new options helper

- Sort LIB_DEPENDS
- Use CONFLICTS_INSTALL instead of CONFLICTS
- Use USES=libtool
- Use WANT_PGSQL
- Fix shebang
- Remove PKGINSTALL
- Do not silence post-install:
- Cosmetic change
- Bump PORTREVISION for package change

databases/postgis20/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	postgis
 PORTVERSION=	2.0.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases geography
 MASTER_SITES=	http://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	20
@@ -12,70 +12,57 @@ COMMENT=	Geographic objects support for PostgreSQL databases
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
+LIB_DEPENDS=	libgeos.so:${PORTSDIR}/graphics/geos \
-		libgeos.so:${PORTSDIR}/graphics/geos \
+		libjson.so:${PORTSDIR}/devel/json-c \
-		libjson.so:${PORTSDIR}/devel/json-c
+		libproj.so:${PORTSDIR}/graphics/proj
-RUN_DEPENDS=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
 
-CONFLICTS=	postgis-1.* postgis-2.1.*
+CONFLICTS_INSTALL=	postgis-1.* postgis-2.1.*
-
-USE_GNOME=	libxml2
-USES=		gmake iconv perl5 pgsql libtool:keepla
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USE_PERL5=	build
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY
-OPTIONS_DEFAULT=	TOPOLOGY
 
+OPTIONS_DEFINE=	LOADERGUI RASTER TOPOLOGY
+OPTIONS_DEFAULT=TOPOLOGY
+OPTIONS_SUB=	yes
 LOADERGUI_DESC=	Enable shp2pgsql-gui
-RASTER_DESC=	Build with raster support
+RASTER_DESC=	Build raster support
-TOPOLOGY_DESC=	Build with topology support
+TOPOLOGY_DESC=	Build topology support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLOADERGUI}
-USE_GNOME+=		gtk20
-CONFIGURE_ARGS+=	--with-gui
-PLIST_SUB+=		LOADERGUI=""
-.else
-# Definning without-gui / with-gui=no explicitely enables gui
-# CONFIGURE_ARGS+=	--without-gui
-PLIST_SUB+=		LOADERGUI="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MRASTER}
-.if ${OSVERSION} < 900033
-BROKEN=			Raster suppport is broken on FreeBSD < 9.x
-.endif
-LIB_DEPENDS+=		libgdal.so:${PORTSDIR}/graphics/gdal
-CONFIGURE_ARGS+=	--with-raster --with-gdalconfig=${LOCALBASE}/bin/gdal-config
-PLIST_SUB+=		RASTER=""
-.else
-CONFIGURE_ARGS+=	--without-raster
-PLIST_SUB+=		RASTER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTOPOLOGY}
-CONFIGURE_ARGS+=	--with-topology
-PLIST_SUB+=		TOPOLOGY=""
-.else
-CONFIGURE_ARGS+=	--without-topology
-PLIST_SUB+=		TOPOLOGY="@comment "
-.endif
 
 CFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
+USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
+USE_PERL5=	build
+USES=		gmake iconv libtool perl5 pgsql shebangfix
+WANT_PGSQL=	server
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+SHEBANG_FILES=	astyle.sh \
+		extras/tiger_geocoder/tiger_2006andbefore/import/newdb.sh \
+		extras/tiger_geocoder/tiger_2006andbefore/import/tigerimport.sh \
+		extras/tiger_geocoder/tiger_2010/create_geocode.sh \
+		extras/tiger_geocoder/tiger_2010/legacy_import/tiger2008/import_tiger_shps.sh \
+		extras/tiger_geocoder/tiger_2010/upgrade_geocoder.sh \
+		raster/test/regress/testgdalraster \
+		utils/uninstall_script
+
+#LOADERGUI_CONFIGURE_OFF=--without-gui
+LOADERGUI_CONFIGURE_ON=	--with-gui
+LOADERGUI_USE=		GNOME=gtk20
+RASTER_CONFIGURE_OFF=	--without-raster
+RASTER_CONFIGURE_ON=	--with-gdalconfig=${LOCALBASE}/bin/gdal-config --with-raster
+RASTER_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
+TOPOLOGY_CONFIGURE_WITH=topology
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MRASTER} && ${OSVERSION} < 900033
+BROKEN=		Raster suppport is broken on FreeBSD < 9.x
+.endif
 
 post-patch:
 	@${GREP} -lR 'bin/bash' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e "s|/bin/bash|/bin/sh|"
 
-pre-configure:
+post-install:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-
-post-install: .SILENT
 	${MKDIR} ${STAGEDIR}/${DATADIR}/tiger_2010
 	(cd ${WRKSRC}/extras/tiger_geocoder/tiger_2010/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/tiger_2010/ "! ( -name *\.orig -o -name *\.bak )" )
 	${MKDIR} ${STAGEDIR}/${DATADIR}/utils
@@ -84,4 +71,4 @@ post-install: .SILENT
 		${STAGEDIR}/${PREFIX}/lib/*.so \
 		${STAGEDIR}/${PREFIX}/bin/*
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

databases/postgis20/pkg-install

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-msg(){
- echo "
-  ======================= GEOS Support Notice ========================
-  In order to use the GEOS support, you may need to specially compile
-  your version of PostgreSQL to link the C++ runtime library.
-  To do this, invoke the PostgreSQL Makefile script this way:
-
-  on csh shell:
-
-  setenv LDFLAGS -lstdc++
-  make
-
-  on sh or bash shell:
-
-  export LDFLAGS=-lstdc++
-  make
-
-  The initial LDFLAGS variable is passed through to the Makefile and
-  adds the C++ library to the linking stage.
-
-  ====================================================================
-"
-if [ -n "${PACKAGE_BUILDING}" ]; then
-    sleep 10
-fi
-
-
-}
-
-case "$2" in
-    PRE-INSTALL)
-        msg ;;
-    MESSAGE)
-        msg ;;
-esac

databases/postgis20/pkg-plist

@@ -7,7 +7,6 @@ lib/postgresql/postgis-2.0.so
 %%RASTER%%lib/postgresql/rtpostgis-2.0.so
 lib/liblwgeom-%%PORTVERSION%%.so
 lib/liblwgeom.a
-lib/liblwgeom.la
 lib/liblwgeom.so
 %%DATADIR%%/tiger_2010/README
 %%DATADIR%%/tiger_2010/census_loader.sql