aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2017-04-01 10:09:24 +0000
committerSunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>2017-04-01 10:09:24 +0000
commit995d6409b4234b211b27bd14989a9c467f4d4b1a (patch)
treefa5b927c06db15ec2c501cfbfe9f6996b00a0dc8
parent76fb5c84407fb2bc5f9c252208a26f3c10a67533 (diff)
downloadports-2017Q1.tar.gz
ports-2017Q1.zip
MFH: r436993 r4370232017Q1
Fix POPPLER option - Bump PORTREVISION for package change PR: 217581 Submitted by: Erik Gustafson <gustafson.erik+fbsdbugzilla@gmail.com> Use POPPLER_CONFIGURE_WITH Notified by: mat Approved by: ports-secteam (junovitch)
Notes
Notes: svn path=/branches/2017Q1/; revision=437405
-rw-r--r--graphics/gdal/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index ece8a8c5f0d1..6f7f897f0ab9 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -4,6 +4,7 @@
PORTNAME= gdal
PORTVERSION= 2.1.2
PORTREVISION= 2
+PORTREVISION= 1
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \
ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@@ -102,7 +103,7 @@ PGSQL_CONFIGURE_ON= --with-pg=${LOCALBASE}/bin/pg_config
PGSQL_USES= pgsql
PODOFO_CONFIGURE_WITH= podofo
PODOFO_LIB_DEPENDS= libpodofo.so:graphics/podofo
-POPPLER_CONFIGURE_WITH= poppler
+POPPLER_CONFIGURE_WITH= poppler=${LOCALBASE}
POPPLER_LIB_DEPENDS= libpoppler.so:graphics/poppler
SPATIALITE_CONFIGURE_WITH= spatialite
SPATIALITE_LIB_DEPENDS= libspatialite.so:databases/spatialite
@@ -116,7 +117,7 @@ XERCES_LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3
post-patch:
@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
@${REINPLACE_CMD} -e 's|-lminizip|-lkmlminizip|' ${WRKSRC}/configure
-# Cleanup bundled libraries
+# Clean up bundled libraries
@${RM} -r ${WRKSRC}/frmts/gif/giflib/
@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/