From owner-svn-ports-all@freebsd.org Wed Dec 21 20:46:08 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1269DC8AEFA; Wed, 21 Dec 2016 20:46:08 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E176D1731; Wed, 21 Dec 2016 20:46:07 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBLKk7tA046855; Wed, 21 Dec 2016 20:46:07 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBLKk6Mp046853; Wed, 21 Dec 2016 20:46:06 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201612212046.uBLKk6Mp046853@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Wed, 21 Dec 2016 20:46:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429113 - head/graphics/gdal X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Dec 2016 20:46:08 -0000 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 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