svn commit: r429113 - head/graphics/gdal
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Wed Dec 21 20:46:08 UTC 2016
Author: sunpoet
Date: Wed Dec 21 20:46:06 2016
New Revision: 429113
URL: https://svnweb.freebsd.org/changeset/ports/429113
Log:
- Remove GNM option and enable it unconditionally
- Bump PORTREVISION for package change
Modified:
head/graphics/gdal/Makefile
head/graphics/gdal/pkg-plist
Modified: head/graphics/gdal/Makefile
==============================================================================
--- head/graphics/gdal/Makefile Wed Dec 21 20:46:03 2016 (r429112)
+++ head/graphics/gdal/Makefile Wed Dec 21 20:46:06 2016 (r429113)
@@ -3,7 +3,7 @@
PORTNAME= gdal
PORTVERSION= 2.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \
ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
@@ -22,14 +22,13 @@ LIB_DEPENDS= libgeotiff.so:graphics/libg
libproj.so:graphics/proj \
libtiff.so:graphics/tiff
-OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GNM GTA HDF5 \
- JASPER KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL \
- SPATIALITE SQLITE WEBP XERCES
+OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \
+ KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SPATIALITE \
+ SQLITE WEBP XERCES
OPTIONS_DEFAULT=JASPER
OPTIONS_RADIO= PDF
OPTIONS_RADIO_PDF= PODOFO POPPLER
OPTIONS_SUB= yes
-GNM_DESC= Geographical networks support
PCRE_DESC= Regular expression support for SQLite
CFLAGS+= -fPIC
@@ -37,6 +36,7 @@ CONFIGURE_ARGS= --datadir=${DATADIR} \
--enable-static=yes \
--with-geotiff=yes \
--with-gif=yes \
+ --with-gnm=yes \
--with-jpeg=yes \
--with-libjson-c=yes \
--with-liblzma=yes \
@@ -75,7 +75,6 @@ FREEXL_LIB_DEPENDS= libfreexl.so:textpro
GEOS_CONFIGURE_OFF= --with-geos=no
GEOS_CONFIGURE_ON= --with-geos=${LOCALBASE}/bin/geos-config
GEOS_LIB_DEPENDS= libgeos.so:graphics/geos
-GNM_CONFIGURE_WITH= gnm
GTA_CONFIGURE_WITH= gta
GTA_LIB_DEPENDS= libgta.so:devel/libgta
HDF5_CONFIGURE_WITH= hdf5
@@ -134,12 +133,10 @@ post-patch:
@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
post-install:
+ cd ${WRKSRC}/gnm/ && ${INSTALL_DATA} gnm.h gnm_api.h gnm_priv.h gnmgraph.h ${STAGEDIR}${PREFIX}/include/
${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme
${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}
-post-install-GNM-on:
- cd ${WRKSRC}/gnm/ && ${INSTALL_DATA} gnm.h gnm_api.h gnm_priv.h gnmgraph.h ${STAGEDIR}${PREFIX}/include/
-
.include <bsd.port.post.mk>
Modified: head/graphics/gdal/pkg-plist
==============================================================================
--- head/graphics/gdal/pkg-plist Wed Dec 21 20:46:03 2016 (r429112)
+++ head/graphics/gdal/pkg-plist Wed Dec 21 20:46:06 2016 (r429113)
@@ -15,8 +15,8 @@ bin/gdalsrsinfo
bin/gdaltindex
bin/gdaltransform
bin/gdalwarp
-%%GNM%%bin/gnmanalyse
-%%GNM%%bin/gnmmanage
+bin/gnmanalyse
+bin/gnmmanage
bin/nearblack
bin/ogr2ogr
bin/ogrinfo
@@ -78,10 +78,10 @@ include/gdalpansharpen.h
include/gdalsse_priv.h
include/gdalwarper.h
include/gdalwarpkernel_opencl.h
-%%GNM%%include/gnm.h
-%%GNM%%include/gnm_api.h
-%%GNM%%include/gnm_priv.h
-%%GNM%%include/gnmgraph.h
+include/gnm.h
+include/gnm_api.h
+include/gnm_priv.h
+include/gnmgraph.h
include/gvgcpfit.h
include/internal_qhull_headers.h
include/memdataset.h
More information about the svn-ports-head
mailing list