From 61a8320e094bcc5c2c13f6f8a975e215d6557561 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Fri, 11 Jul 2014 11:16:06 +0000 Subject: [PATCH] - Remove USE_AUTOTOOLS=libtool - Bump PORTREVISION for package change - Bump PORTREVISION for graphics/gdal shlib change [1] Approved by: portmgr (implicit) [1] --- astro/merkaartor/Makefile | 2 +- astro/osmium/Makefile | 2 +- astro/qlandkartegt/Makefile | 2 +- comms/xastir/Makefile | 2 +- databases/grass/Makefile | 2 +- databases/postgis20/Makefile | 2 +- databases/postgis21/Makefile | 2 +- graphics/R-cran-rgdal/Makefile | 2 +- graphics/gdal-grass/Makefile | 2 +- graphics/gdal/Makefile | 11 +++++++---- graphics/gdal/pkg-plist | 4 ++-- graphics/gmt/Makefile | 2 +- graphics/mapnik/Makefile | 2 +- graphics/mapserver/Makefile | 2 +- graphics/osg-devel/Makefile | 2 +- graphics/osg/Makefile | 2 +- graphics/osgearth/Makefile | 2 +- graphics/p5-Geo-GDAL/Makefile | 1 + graphics/php-gdal/Makefile | 1 + graphics/py-gdal/Makefile | 1 + graphics/qgis/Makefile | 2 +- graphics/visionworkbench/Makefile | 2 +- math/saga/Makefile | 2 +- 23 files changed, 30 insertions(+), 24 deletions(-) diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile index 707d75672005..5783c6210d7c 100644 --- a/astro/merkaartor/Makefile +++ b/astro/merkaartor/Makefile @@ -3,7 +3,7 @@ PORTNAME= merkaartor PORTVERSION= 0.18.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= astro MASTER_SITES= http://merkaartor.be/attachments/download/301/ \ https://secure.ohos.nl/downloads/ diff --git a/astro/osmium/Makefile b/astro/osmium/Makefile index c2dc998b2b0f..ccc265fef526 100644 --- a/astro/osmium/Makefile +++ b/astro/osmium/Makefile @@ -3,7 +3,7 @@ PORTNAME= osmium PORTVERSION= git20130522 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro geography devel MAINTAINER= amdmi3@FreeBSD.org diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile index c53efe7a5627..6fdf6ec62c7f 100644 --- a/astro/qlandkartegt/Makefile +++ b/astro/qlandkartegt/Makefile @@ -3,7 +3,7 @@ PORTNAME= qlandkartegt PORTVERSION= 1.7.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarte%20GT%20${PORTVERSION} diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 1881f54e0707..3fbd58458b58 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -3,7 +3,7 @@ PORTNAME= xastir PORTVERSION= 2.0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION} diff --git a/databases/grass/Makefile b/databases/grass/Makefile index 807510387463..473a28473aae 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -3,7 +3,7 @@ PORTNAME= grass PORTVERSION= 6.4.3 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= databases geography MASTER_SITES= http://grass.osgeo.org/%SUBDIR%/ \ diff --git a/databases/postgis20/Makefile b/databases/postgis20/Makefile index 156f65babcb4..217cd902cf1f 100644 --- a/databases/postgis20/Makefile +++ b/databases/postgis20/Makefile @@ -2,7 +2,7 @@ PORTNAME= postgis PORTVERSION= 2.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ PKGNAMESUFFIX= 20 diff --git a/databases/postgis21/Makefile b/databases/postgis21/Makefile index 9a3572174f97..4ff3d067aba5 100644 --- a/databases/postgis21/Makefile +++ b/databases/postgis21/Makefile @@ -2,7 +2,7 @@ PORTNAME= postgis PORTVERSION= 2.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases geography MASTER_SITES= http://download.osgeo.org/postgis/source/ diff --git a/graphics/R-cran-rgdal/Makefile b/graphics/R-cran-rgdal/Makefile index d0ec85dac505..3145be1d06c2 100644 --- a/graphics/R-cran-rgdal/Makefile +++ b/graphics/R-cran-rgdal/Makefile @@ -3,7 +3,7 @@ PORTNAME= rgdal DISTVERSION= 0.8-16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${DISTVERSION} diff --git a/graphics/gdal-grass/Makefile b/graphics/gdal-grass/Makefile index 9db4c3052c5c..d2e22024730b 100644 --- a/graphics/gdal-grass/Makefile +++ b/graphics/gdal-grass/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdal-grass PORTVERSION= 1.4.3 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= graphics MASTER_SITES= http://download.osgeo.org/gdal/ diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 6d0929acde39..efc45a4b7dfc 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdal PORTVERSION= 1.11.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \ ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ @@ -24,15 +24,17 @@ PCRE_DESC= Regular expression support for SQLite CFLAGS+= -fPIC CONFIGURE_ARGS= --datadir=${DATADIR} \ - --with-libz=/usr --with-liblzma=yes --with-threads=yes + --enable-static=yes \ + --with-liblzma=yes --with-libz=/usr --with-threads=yes \ + --without-libtool GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE} -pthread MAKE_JOBS_UNSAFE= yes MAKEFILE= GNUmakefile -USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USES= gmake +PLIST_SUB= PORTVERSION=${PORTVERSION} PORTDATA= * SLAVEDIRS= graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal @@ -131,8 +133,9 @@ post-patch: @${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile post-install: + ${INSTALL_LIB} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/ ${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme ${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/ - -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libgdal.so.19 + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION} .include diff --git a/graphics/gdal/pkg-plist b/graphics/gdal/pkg-plist index 8fdac28b2cb5..14121d20250b 100644 --- a/graphics/gdal/pkg-plist +++ b/graphics/gdal/pkg-plist @@ -86,8 +86,8 @@ include/thinplatespline.h include/vrtdataset.h lib/gdalplugins/.keepme lib/libgdal.a -lib/libgdal.la lib/libgdal.so -lib/libgdal.so.19 +lib/libgdal.so.1 +lib/libgdal.so.%%PORTVERSION%% libdata/pkgconfig/gdal.pc @dirrm lib/gdalplugins diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile index fdd5b49ecbd7..668fc6d57124 100644 --- a/graphics/gmt/Makefile +++ b/graphics/gmt/Makefile @@ -3,7 +3,7 @@ PORTNAME= gmt PORTVERSION= 4.5.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \ ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \ diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index 07e04ec8270f..5ccd9ac3664c 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -4,7 +4,7 @@ PORTNAME= mapnik PORTVERSION= 2.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics geography MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/ diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index e211749001b9..2a066dfa1e11 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -3,7 +3,7 @@ PORTNAME= mapserver PORTVERSION= 6.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index 8026baa2a1d7..d5690c94909a 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= osg PORTVERSION= 3.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 4f5db8ffb9ea..9039a22cb8a5 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -3,7 +3,7 @@ PORTNAME= osg PORTVERSION= 3.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 71b21244e11c..a99d4ab440c3 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -3,7 +3,7 @@ PORTNAME= osgearth PORTVERSION= 2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics geography MASTER_SITES= https://github.com/gwaldron/${PORTNAME}/archive/ diff --git a/graphics/p5-Geo-GDAL/Makefile b/graphics/p5-Geo-GDAL/Makefile index 9910dd7dff4b..c8850e141e7a 100644 --- a/graphics/p5-Geo-GDAL/Makefile +++ b/graphics/p5-Geo-GDAL/Makefile @@ -3,6 +3,7 @@ PORTNAME= Geo-GDAL PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://download.osgeo.org/gdal/ \ ftp://ftp.remotesensing.org/pub/gdal/ \ diff --git a/graphics/php-gdal/Makefile b/graphics/php-gdal/Makefile index a9906dfdcce2..6397c4619131 100644 --- a/graphics/php-gdal/Makefile +++ b/graphics/php-gdal/Makefile @@ -3,6 +3,7 @@ PORTNAME= gdal PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.osgeo.org/gdal/ \ ftp://ftp.remotesensing.org/pub/gdal/ \ diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile index b7703ce1c3ff..16d536e456c5 100644 --- a/graphics/py-gdal/Makefile +++ b/graphics/py-gdal/Makefile @@ -3,6 +3,7 @@ PORTNAME= gdal PORTVERSION= 1.11.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= http://download.osgeo.org/gdal/ \ ftp://ftp.remotesensing.org/pub/gdal/ \ diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 5669dc1a7831..350e329d5353 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -3,7 +3,7 @@ PORTNAME= qgis PORTVERSION= 2.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile index 1a55bf416777..430ed4320a0e 100644 --- a/graphics/visionworkbench/Makefile +++ b/graphics/visionworkbench/Makefile @@ -3,7 +3,7 @@ PORTNAME= visionworkbench PORTVERSION= 2.2.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/ DISTNAME= VisionWorkbench-${PORTVERSION} diff --git a/math/saga/Makefile b/math/saga/Makefile index 948dc79d6c55..182dc8e79b2e 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -3,7 +3,7 @@ PORTNAME= saga PORTVERSION= 2.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}