svn commit: r362205 - in head: astro/osmium converters/osm2pgsql databases/postgis20 databases/postgis21 databases/spatialite devel/libgpkg devel/py-shapely graphics/geos graphics/librasterlite gra...

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Fri Jul 18 13:07:27 UTC 2014 

Author: sunpoet
Date: Fri Jul 18 13:07:23 2014
New Revision: 362205
URL: http://svnweb.freebsd.org/changeset/ports/362205
QAT: https://qat.redports.org/buildarchive/r362205/

Log:
  - Add missing USE_LDCONFIG
  - Use USES=libtool
  - Fix USE_PYTHON
  - Convert to new options helper
  - Bump PORTREVISION for package change
  - Do not hard-coded PORTVERSION in PLIST
  - Bump PORTREVISION for graphics/geos shlib change

Modified:
  head/astro/osmium/Makefile
  head/converters/osm2pgsql/Makefile
  head/databases/postgis20/Makefile
  head/databases/postgis21/Makefile
  head/databases/spatialite/Makefile
  head/devel/libgpkg/Makefile
  head/devel/py-shapely/Makefile
  head/graphics/geos/Makefile
  head/graphics/geos/pkg-plist
  head/graphics/librasterlite/Makefile
  head/graphics/libreatlas/Makefile
  head/graphics/mapserver/Makefile
  head/graphics/qgis/Makefile

Modified: head/astro/osmium/Makefile
==============================================================================
--- head/astro/osmium/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/astro/osmium/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,7 +3,7 @@
 
 PORTNAME=	osmium
 PORTVERSION=	git20130522
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro geography devel
 
 MAINTAINER=	amdmi3 at FreeBSD.org

Modified: head/converters/osm2pgsql/Makefile
==============================================================================
--- head/converters/osm2pgsql/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/converters/osm2pgsql/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,7 +3,7 @@
 
 PORTNAME=	osm2pgsql
 PORTVERSION=	0.84.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3 at FreeBSD.org

Modified: head/databases/postgis20/Makefile
==============================================================================
--- head/databases/postgis20/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/databases/postgis20/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -2,7 +2,7 @@
 
 PORTNAME=	postgis
 PORTVERSION=	2.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases geography
 MASTER_SITES=	http://download.osgeo.org/postgis/source/
 PKGNAMESUFFIX=	20

Modified: head/databases/postgis21/Makefile
==============================================================================
--- head/databases/postgis21/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/databases/postgis21/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -2,7 +2,7 @@
 
 PORTNAME=	postgis
 PORTVERSION=	2.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases geography
 MASTER_SITES=	http://download.osgeo.org/postgis/source/
 

Modified: head/databases/spatialite/Makefile
==============================================================================
--- head/databases/spatialite/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/databases/spatialite/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,7 +3,7 @@
 
 PORTNAME=	spatialite
 PORTVERSION=	4.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}

Modified: head/devel/libgpkg/Makefile
==============================================================================
--- head/devel/libgpkg/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/devel/libgpkg/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libgpkg
 PORTVERSION=	0.9.18
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://bitbucket.org/luciad/libgpkg/get/ \
 		LOCAL/sunpoet/${PORTNAME}

Modified: head/devel/py-shapely/Makefile
==============================================================================
--- head/devel/py-shapely/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/devel/py-shapely/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,6 +3,7 @@
 
 PORTNAME=	Shapely
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Modified: head/graphics/geos/Makefile
==============================================================================
--- head/graphics/geos/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/graphics/geos/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,47 +3,38 @@
 
 PORTNAME=	geos
 PORTVERSION=	3.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
-MASTER_SITES=	http://download.osgeo.org/geos/
+MASTER_SITES=	http://download.osgeo.org/geos/ \
+		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	GEOS implements all the OpenGIS "Simple Features for SQL"
 
 LICENSE=	LGPL21
 
-USE_AUTOTOOLS=	libtool
-USES=		gmake tar:bzip2
-GNU_CONFIGURE=	yes
-
 OPTIONS_DEFINE=	PHP PYTHON RUBY
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USES=		gmake libtool tar:bzip2
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-.if ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MRUBY}
-BUILD_DEPENDS+=	swig1.3:${PORTSDIR}/devel/swig13
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON=		yes
-CONFIGURE_ARGS+=	--enable-python
-.endif
-
-.if ${PORT_OPTIONS:MPHP}
-USE_PHP=		yes
-USE_PHP_BUILD=		yes
-CONFIGURE_ARGS+=	--enable-php
-.endif
-
-.if ${PORT_OPTIONS:MRUBY}
-USE_RUBY=		yes
-CONFIGURE_ARGS+=	--enable-ruby
-CONFIGURE_ENV+=		RUBY="${RUBY}"
-.endif
+PHP_BUILD_DEPENDS=	${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
+PHP_CONFIGURE_ENABLE=	php
+PHP_USE=		PHP=yes PHP_BUILD=yes
+PYTHON_BUILD_DEPENDS=	${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
+PYTHON_CONFIGURE_ENABLE=python
+PYTHON_USE=		PYTHON=2
+RUBY_BUILD_DEPENDS=	${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
+RUBY_CONFIGURE_ENABLE=	ruby
+RUBY_CONFIGURE_ENV=	RUBY="${RUBY}"
+RUBY_USE=		RUBY=yes
 
 post-install:
-	@${LN} -s ${PREFIX}/lib/libgeos-${PORTVERSION}.so \
-		${STAGEDIR}${PREFIX}/lib/libgeos.so.0
+	${LN} -s ${PREFIX}/lib/libgeos-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libgeos.so.0
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgeos-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libgeos_c.so.1.8.2
 
 .include <bsd.port.mk>

Modified: head/graphics/geos/pkg-plist
==============================================================================
--- head/graphics/geos/pkg-plist	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/graphics/geos/pkg-plist	Fri Jul 18 13:07:23 2014	(r362205)
@@ -372,15 +372,14 @@ include/geos/util/UnsupportedOperationEx
 include/geos/util/math.h
 include/geos/version.h
 include/geos_c.h
-lib/libgeos-3.4.2.so
+lib/libgeos-%%PORTVERSION%%.so
 lib/libgeos.a
-lib/libgeos.la
 lib/libgeos.so
 lib/libgeos.so.0
 lib/libgeos_c.a
-lib/libgeos_c.la
 lib/libgeos_c.so
-lib/libgeos_c.so.9
+lib/libgeos_c.so.1
+lib/libgeos_c.so.1.8.2
 @dirrmtry lib/geos
 @dirrm include/geos/util
 @dirrm include/geos/triangulate/quadedge
@@ -423,7 +422,6 @@ lib/libgeos_c.so.9
 @dirrm include/geos
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos.pth
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/_geos.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/geos/geos.pyc
@@ -431,7 +429,6 @@ lib/libgeos_c.so.9
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/geos
 %%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.a
-%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.la
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/geos.so
 %%RUBY%%@dirrmtry %%RUBY_SITEARCHLIBDIR%%/
 %%PHP%%lib/php/20100525/geos.so

Modified: head/graphics/librasterlite/Makefile
==============================================================================
--- head/graphics/librasterlite/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/graphics/librasterlite/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,7 +3,7 @@
 
 PORTNAME=	librasterlite
 PORTVERSION=	1.1g
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/librasterlite-sources/
 

Modified: head/graphics/libreatlas/Makefile
==============================================================================
--- head/graphics/libreatlas/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/graphics/libreatlas/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libreatlas
 PORTVERSION=	1.0.0a
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 

Modified: head/graphics/mapserver/Makefile
==============================================================================
--- head/graphics/mapserver/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/graphics/mapserver/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,7 +3,7 @@
 
 PORTNAME=		mapserver
 PORTVERSION=		6.4.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=		graphics www geography
 MASTER_SITES=		http://download.osgeo.org/mapserver/
 

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Fri Jul 18 13:05:28 2014	(r362204)
+++ head/graphics/qgis/Makefile	Fri Jul 18 13:07:23 2014	(r362205)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qgis
 PORTVERSION=	2.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin at gwdg.de

More information about the svn-ports-all mailing list