svn commit: r363139 - head/databases/postgis20

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Mon Jul 28 12:54:26 2014
New Revision: 363139
URL: http://svnweb.freebsd.org/changeset/ports/363139
QAT: https://qat.redports.org/buildarchive/r363139/

Log:
  - 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

Deleted:
  head/databases/postgis20/pkg-install
Modified:
  head/databases/postgis20/Makefile
  head/databases/postgis20/pkg-plist

Modified: head/databases/postgis20/Makefile
==============================================================================
--- head/databases/postgis20/Makefile	Mon Jul 28 12:54:21 2014	(r363138)
+++ head/databases/postgis20/Makefile	Mon Jul 28 12:54:26 2014	(r363139)
@@ -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 
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libjson.so:${PORTSDIR}/devel/json-c
-RUN_DEPENDS=	postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
-
-CONFLICTS=	postgis-1.* postgis-2.1.*
+LIB_DEPENDS=	libgeos.so:${PORTSDIR}/graphics/geos \
+		libjson.so:${PORTSDIR}/devel/json-c \
+		libproj.so:${PORTSDIR}/graphics/proj
+
+CONFLICTS_INSTALL=	postgis-1.* postgis-2.1.*
+
+OPTIONS_DEFINE=	LOADERGUI RASTER TOPOLOGY
+OPTIONS_DEFAULT=TOPOLOGY
+OPTIONS_SUB=	yes
+LOADERGUI_DESC=	Enable shp2pgsql-gui
+RASTER_DESC=	Build raster support
+TOPOLOGY_DESC=	Build topology support
 
+CFLAGS+=	-I${LOCALBASE}/include
+GNU_CONFIGURE=	yes
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GNOME=	libxml2
-USES=		gmake iconv perl5 pgsql libtool:keepla
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
 USE_PERL5=	build
+USES=		gmake iconv libtool perl5 pgsql shebangfix
+WANT_PGSQL=	server
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-OPTIONS_DEFINE=		LOADERGUI RASTER TOPOLOGY
-OPTIONS_DEFAULT=	TOPOLOGY
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-LOADERGUI_DESC=	Enable shp2pgsql-gui
-RASTER_DESC=	Build with raster support
-TOPOLOGY_DESC=	Build with topology support
+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.options.mk>
+.include <bsd.port.pre.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 "
+.if ${PORT_OPTIONS:MRASTER} && ${OSVERSION} < 900033
+BROKEN=		Raster suppport is broken on FreeBSD < 9.x
 .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
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 post-patch:
 	@${GREP} -lR 'bin/bash' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e "s|/bin/bash|/bin/sh|"
 
-pre-configure:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-
-post-install: .SILENT
+post-install:
 	${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>

Modified: head/databases/postgis20/pkg-plist
==============================================================================
--- head/databases/postgis20/pkg-plist	Mon Jul 28 12:54:21 2014	(r363138)
+++ head/databases/postgis20/pkg-plist	Mon Jul 28 12:54:26 2014	(r363139)
@@ -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