ports/189540: [UPDATE] databases/postgis21
lbartoletti
coder at tuxfamily.org
Sat May 10 05:50:01 UTC 2014
>Number: 189540
>Category: ports
>Synopsis: [UPDATE] databases/postgis21
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat May 10 05:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: lbartoletti
>Release:
>Organization:
>Environment:
>Description:
Update databases/postgis21
- Add SFCGAL option (ports/188927)
- Add Licenses
- Add stage
- Fix iconv (ports/186563)
Logs :
https://redports.org/buildarchive/20140509210601-39633/
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN a/databases/postgis21/Makefile b/databases/postgis21/Makefile
--- a/databases/postgis21/Makefile 2014-04-18 20:17:43.629271977 +0200
+++ b/databases/postgis21/Makefile 2014-05-10 07:36:00.186961881 +0200
@@ -2,13 +2,15 @@
PORTNAME= postgis
PORTVERSION= 2.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases geography
MASTER_SITES= http://download.osgeo.org/postgis/source/
MAINTAINER= trevor at bitba.se
COMMENT= Geographic objects support for PostgreSQL databases
+LICENSE= GPLv2
+
LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \
libgeos.so:${PORTSDIR}/graphics/geos \
libjson.so:${PORTSDIR}/devel/json-c
@@ -19,12 +21,12 @@
USE_GNOME= libxml2
USE_PGSQL= yes
-USES= gmake iconv perl5 pkgconfig
+USES= gmake iconv:wchar_t perl5 pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_PERL5= build
-OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY
+OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY SFCGAL
OPTIONS_DEFAULT= TOPOLOGY
PLIST_SUB+= PORTVERSION=${PORTVERSION}
@@ -32,8 +34,8 @@
LOADERGUI_DESC= Enable shp2pgsql-gui
RASTER_DESC= Raster support
TOPOLOGY_DESC= Topology support
+SFCGAL_DESC= Enable sfcgal
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MLOADERGUI}
@@ -65,6 +67,15 @@
PLIST_SUB+= TOPOLOGY="@comment "
.endif
+.if ${PORT_OPTIONS:MSFCGAL}
+LIB_DEPENDS+= libSFCGAL.so:${PORTSDIR}/databases/sfcgal
+CONFIGURE_ARGS+= --with-sfcgal=${LOCALBASE}/bin/sfcgal-config
+PLIST_SUB+= SFCGAL=""
+.else
+CONFIGURE_ARGS+= --without-sfcgal
+PLIST_SUB+= SFCGAL="@comment "
+.endif
+
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -75,9 +86,9 @@
@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
post-install: .SILENT
- ${MKDIR} ${DATADIR}/tiger_2011
- (cd ${WRKSRC}/extras/tiger_geocoder/tiger_2011/ && ${COPYTREE_SHARE} \* ${DATADIR}/tiger_2011/ "! ( -name *\.orig -o -name *\.bak )" )
- ${MKDIR} ${DATADIR}/utils
- (cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak )" )
+ ${MKDIR} ${STAGEDIR}/${DATADIR}/tiger_2011
+ (cd ${WRKSRC}/extras/tiger_geocoder/tiger_2011/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/tiger_2011/ "! ( -name *\.orig -o -name *\.bak )" )
+ ${MKDIR} ${STAGEDIR}/${DATADIR}/utils
+ (cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak )" )
.include <bsd.port.mk>
diff -ruN a/databases/postgis21/pkg-plist b/databases/postgis21/pkg-plist
--- a/databases/postgis21/pkg-plist 2014-02-07 18:52:39.985366809 +0100
+++ b/databases/postgis21/pkg-plist 2014-05-09 22:43:04.440386794 +0200
@@ -88,6 +88,7 @@
share/postgresql/contrib/postgis-2.1/uninstall_legacy.sql
share/postgresql/contrib/postgis-2.1/uninstall_postgis.sql
share/postgresql/contrib/postgis-2.1/uninstall_sfcgal.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-2.1/sfcgal.sql
%%RASTER%%share/postgresql/contrib/postgis-2.1/rtpostgis.sql
%%RASTER%%share/postgresql/contrib/postgis-2.1/rtpostgis_legacy.sql
%%RASTER%%share/postgresql/contrib/postgis-2.1/rtpostgis_upgrade_20_21.sql
@@ -150,3 +151,4 @@
@dirrm %%DATADIR%%
@dirrm share/postgresql/contrib/postgis-2.1
@dirrmtry share/postgresql/contrib
+
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list