svn commit: r337295 - in head/databases/postgis20: . files
Ruslan Makhmatkhanov
rm at FreeBSD.org
Mon Dec 23 20:59:45 UTC 2013
Author: rm
Date: Mon Dec 23 20:59:44 2013
New Revision: 337295
URL: http://svnweb.freebsd.org/changeset/ports/337295
Log:
- update to 2.0.4
- replace LATEST_LINK with PKGNAMESUFFIX
- add conflicts with other postgis branches
- add staging support
- add patch to link with json-c (upstream ticket #2213)
- define LICENSE (GPLv2)
- update COMMENT
PR: 182031
Submitted by: Trevor Caira <trevor at bitba.se>, romain
Approved by: maintainer timeout (3 months)
Added:
head/databases/postgis20/files/
head/databases/postgis20/files/patch-configure (contents, props changed)
Modified:
head/databases/postgis20/Makefile
head/databases/postgis20/distinfo
head/databases/postgis20/pkg-descr
head/databases/postgis20/pkg-plist
Modified: head/databases/postgis20/Makefile
==============================================================================
--- head/databases/postgis20/Makefile Mon Dec 23 20:57:30 2013 (r337294)
+++ head/databases/postgis20/Makefile Mon Dec 23 20:59:44 2013 (r337295)
@@ -1,21 +1,22 @@
# $FreeBSD$
PORTNAME= postgis
-PORTVERSION= 2.0.2
-PORTREVISION= 4
+PORTVERSION= 2.0.4
CATEGORIES= databases geography
MASTER_SITES= http://download.osgeo.org/postgis/source/
+PKGNAMESUFFIX= 20
MAINTAINER= matt.trisoline at intermedix.com
-COMMENT= Adds support for geographic objects to PostgreSQL databases
+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
RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-CONFLICTS= postgis-1.*
-LATEST_LINK= postgis20
+CONFLICTS= postgis-1.* postgis-2.1.*
USE_GNOME= libxml2
USE_PGSQL= yes
@@ -24,6 +25,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_PERL5= build
+PLIST_SUB+= PORTVERSION=${PORTVERSION}
+
OPTIONS_DEFINE= LOADERGUI RASTER TOPOLOGY
OPTIONS_DEFAULT= TOPOLOGY
@@ -31,7 +34,6 @@ LOADERGUI_DESC= Enable shp2pgsql-gui
RASTER_DESC= Build with raster support
TOPOLOGY_DESC= Build with topology support
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MLOADERGUI}
@@ -39,7 +41,8 @@ USE_GNOME+= gtk20
CONFIGURE_ARGS+= --with-gui
PLIST_SUB+= LOADERGUI=""
.else
-CONFIGURE_ARGS+= --without-gui
+# Definning without-gui / with-gui=no explicitely enables gui
+# CONFIGURE_ARGS+= --without-gui
PLIST_SUB+= LOADERGUI="@comment "
.endif
@@ -73,9 +76,12 @@ pre-configure:
@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
post-install: .SILENT
- ${MKDIR} ${DATADIR}/tiger_2010
- (cd ${WRKSRC}/extras/tiger_geocoder/tiger_2010/ && ${COPYTREE_SHARE} \* ${DATADIR}/tiger_2010/ "! ( -name *\.orig -o -name *\.bak )" )
- ${MKDIR} ${DATADIR}/utils
- (cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} \* ${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak )" )
+ ${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
+ (cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak )" )
+ ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/postgresql/*.so \
+ ${STAGEDIR}/${PREFIX}/lib/*.so \
+ ${STAGEDIR}/${PREFIX}/bin/*
.include <bsd.port.mk>
Modified: head/databases/postgis20/distinfo
==============================================================================
--- head/databases/postgis20/distinfo Mon Dec 23 20:57:30 2013 (r337294)
+++ head/databases/postgis20/distinfo Mon Dec 23 20:59:44 2013 (r337295)
@@ -1,2 +1,2 @@
-SHA256 (postgis-2.0.2.tar.gz) = 57746d040080e624f3e81633a180d8a5fc16b0c035d94fe2c16306023ab1c391
-SIZE (postgis-2.0.2.tar.gz) = 5573652
+SHA256 (postgis-2.0.4.tar.gz) = ad5016dce0a41dd81a64315ac9b46ebf77641e74d281017438eb8caeb6254be3
+SIZE (postgis-2.0.4.tar.gz) = 5534746
Added: head/databases/postgis20/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/postgis20/files/patch-configure Mon Dec 23 20:59:44 2013 (r337295)
@@ -0,0 +1,19 @@
+--- configure.orig
++++ configure
+@@ -19041,7 +19041,7 @@
+ $as_echo "Using user-specified json-c directory: $JSONDIR" >&6; }
+
+ JSON_CPPFLAGS="-I$JSONDIR/include"
+- JSON_LDFLAGS="-L$JSONDIR/lib -ljson"
++ JSON_LDFLAGS="-L$JSONDIR/lib -ljson-c"
+ fi
+ fi
+
+@@ -19104,7 +19104,7 @@
+ $as_echo "#define HAVE_LIBJSON 1" >>confdefs.h
+
+ if test "x$JSON_LDFLAGS" = "x"; then
+- JSON_LDFLAGS="-ljson"
++ JSON_LDFLAGS="-ljson-c"
+ fi
+ fi
Modified: head/databases/postgis20/pkg-descr
==============================================================================
--- head/databases/postgis20/pkg-descr Mon Dec 23 20:57:30 2013 (r337294)
+++ head/databases/postgis20/pkg-descr Mon Dec 23 20:59:44 2013 (r337295)
@@ -8,6 +8,6 @@ compliant with the "Types and Functions"
PostGIS development was started by Refractions Research as a project in open
source spatial database technology. PostGIS is released under the GNU General
Public License. PostGIS continues to be developed by a group of contributors led
-by a Project Steering Committee and new features continue to be added.
+by a Project Steering Committee and new features continue to be added.
WWW: http://www.postgis.org/
Modified: head/databases/postgis20/pkg-plist
==============================================================================
--- head/databases/postgis20/pkg-plist Mon Dec 23 20:57:30 2013 (r337294)
+++ head/databases/postgis20/pkg-plist Mon Dec 23 20:59:44 2013 (r337295)
@@ -5,7 +5,7 @@ bin/shp2pgsql
include/liblwgeom.h
lib/postgresql/postgis-2.0.so
%%RASTER%%lib/postgresql/rtpostgis-2.0.so
-lib/liblwgeom-2.0.2.so
+lib/liblwgeom-%%PORTVERSION%%.so
lib/liblwgeom.a
lib/liblwgeom.la
lib/liblwgeom.so
@@ -89,39 +89,25 @@ share/postgresql/contrib/postgis-2.0/leg
%%TOPOLOGY%%share/postgresql/contrib/postgis-2.0/uninstall_topology.sql
share/postgresql/contrib/postgis-2.0/postgis_restore.pl
%%RASTER%%share/postgresql/extension/postgis.control
-%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha3--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha4--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.1--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha5--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0beta3--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0beta4--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0rc2--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha6--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha1--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--unpackaged--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0beta1--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0beta2--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0rc1--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis--2.0.0alpha2--2.0.2.sql
+%%RASTER%%share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.0.0beta4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.0.0rc1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.0.0rc2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_topology.control
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta4--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha6--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha1--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--unpackaged--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta2--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta1--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc1--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha2--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha3--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha4--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.1--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc2--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0alpha5--2.0.2.sql
-%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta3--2.0.2.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0beta4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.0.0rc2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
@dirrm share/postgresql/contrib/postgis-2.0
@dirrmtry share/postgresql/contrib
@dirrm share/postgis/tiger_2010/legacy_import/tiger2008
More information about the svn-ports-all
mailing list