Date: Thu, 24 Sep 2015 16:21:21 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397696 - head/graphics/gdal Message-ID: <201509241621.t8OGLLTv015574@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Thu Sep 24 16:21:20 2015 New Revision: 397696 URL: https://svnweb.freebsd.org/changeset/ports/397696 Log: - Remove ICONV option and enable iconv unconditionally - Bump PORTREVISION for dependency change Modified: head/graphics/gdal/Makefile Modified: head/graphics/gdal/Makefile ============================================================================== --- head/graphics/gdal/Makefile Thu Sep 24 15:59:19 2015 (r397695) +++ head/graphics/gdal/Makefile Thu Sep 24 16:21:20 2015 (r397696) @@ -3,7 +3,7 @@ PORTNAME= gdal PORTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \ ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ @@ -20,9 +20,9 @@ LIB_DEPENDS= libgeotiff.so:${PORTSDIR}/g libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff -OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 ICONV \ - JASPER KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL PROJ \ - SQLITE WEBP XERCES +OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \ + KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL PROJ SQLITE \ + WEBP XERCES OPTIONS_DEFAULT=JASPER OPTIONS_RADIO= PDF OPTIONS_RADIO_PDF= PODOFO POPPLER @@ -40,12 +40,15 @@ CONFIGURE_ARGS= --datadir=${DATADIR} \ --with-libz=/usr \ --with-png=${LOCALBASE} \ --with-threads=yes \ - --without-libtool + --without-libtool \ + ${ICONV_CONFIGURE_ARG} +CPPFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes +LDFLAGS+= -L${ICONV_PREFIX}/lib ${ICONV_LIB} MAKE_JOBS_UNSAFE= yes MAKEFILE= GNUmakefile USE_LDCONFIG= yes -USES= gmake jpeg tar:xz +USES= gmake iconv jpeg tar:xz PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} PORTVERSION=${PORTVERSION} PORTDATA= * @@ -79,11 +82,6 @@ GTA_LIB_DEPENDS= libgta.so:${PORTSDIR}/d HDF5_CONFIGURE_OFF= --with-hdf5=no HDF5_CONFIGURE_ON= --with-hdf5=${LOCALBASE} HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 -ICONV_CONFIGURE_OFF= --with-libiconv-prefix=no -ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} -ICONV_CPPFLAGS= -I${LOCALBASE}/include -ICONV_LDFLAGS= -L${ICONV_PREFIX}/lib ${ICONV_LIB} -ICONV_USES= iconv JASPER_CONFIGURE_OFF= --with-jasper=no JASPER_CONFIGURE_ON= --with-jasper=${LOCALBASE} JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509241621.t8OGLLTv015574>