Index: head/astro/merkaartor/Makefile =================================================================== --- head/astro/merkaartor/Makefile (revision 391656) +++ head/astro/merkaartor/Makefile (revision 391657) @@ -1,58 +1,60 @@ # Created by: Slaven Rezic # $FreeBSD$ PORTNAME= merkaartor PORTVERSION= 0.18.1 PORTREVISION= 8 CATEGORIES= astro MASTER_SITES= http://merkaartor.be/attachments/download/301/ \ https://secure.ohos.nl/downloads/ MAINTAINER= dev2@heesakkers.info COMMENT= Openstreetmap mapping program LICENSE= GPLv2 LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ libproj.so:${PORTSDIR}/graphics/proj +BROKEN= does not build with GDAL 2.0 + USES= qmake tar:bzip2 USE_LDCONFIG= yes USE_QT4= uic_build moc_build rcc_build \ gui network svg webkit xml imageformats script scripttools OPTIONS_DEFINE= DEBUG GEOIMAGE NLS ZBAR OPTIONS_DEFAULT= GEOIMAGE GEOIMAGE_DESC= Enable geotagged images (needs exiv2) GEOIMAGE_QMAKE_ON= GEOIMAGE=1 GEOIMAGE_LIB_DEPENDS= libexiv2.so:${PORTSDIR}/graphics/exiv2 ZBAR_DESC= Read barcodes from walking papers (BROKEN) ZBAR_QMAKE_ON= ZBAR=1 ZBAR_LIB_DEPENDS= libzbar.so:${PORTSDIR}/graphics/zbar DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1 OPTIONS_SUB= yes .include .if ${PORT_OPTIONS:MZBAR} BROKEN= Does not build with option ZBAR selected .endif .if ${PORT_OPTIONS:MNLS} USE_QT4+= linguist_build pre-build: @cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro post-install: @${MKDIR} ${STAGEDIR}${DATADIR}/translations @(cd ${WRKSRC}/translations && ${COPYTREE_SHARE} "merkaartor_*.qm" \ ${STAGEDIR}${DATADIR}/translations) .endif .include Index: head/astro/osmium/Makefile =================================================================== --- head/astro/osmium/Makefile (revision 391656) +++ head/astro/osmium/Makefile (revision 391657) @@ -1,68 +1,68 @@ # Created by: Dmitry Marakasov # $FreeBSD$ PORTNAME= osmium PORTVERSION= git20130522 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= astro geography devel MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++/Javascript framework for working with OSM files LICENSE= GPLv3 LGPL3 LICENSE_COMB= dual LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ libboost_regex.so:${PORTSDIR}/devel/boost-libs \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libexpat.so:${PORTSDIR}/textproc/expat2 \ libgeos.so:${PORTSDIR}/graphics/geos \ libprotobuf.so:${PORTSDIR}/devel/protobuf BUILD_DEPENDS= google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash RUN_DEPENDS= google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash USE_GITHUB= yes GH_ACCOUNT= joto GH_TAGNAME= 1a5bb26 CXXFLAGS+= -I${LOCALBASE}/include \ -L${LOCALBASE}/lib NO_ARCH= yes PORTDOCS= * OPTIONS_DEFINE= JAVASCRIPT DOXYGEN DOCS OPTIONS_DEFAULT=JAVASCRIPT JAVASCRIPT_DESC=Enable javascript support JAVASCRIPT_LIB_DEPENDS= libv8.so:${PORTSDIR}/lang/v8 \ libshp.so:${PORTSDIR}/devel/shapelib \ libicuuc.so:${PORTSDIR}/devel/icu .include .if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen .endif do-build: .if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKR_ARGS} doc .else ${TRUE} .endif regression-test: cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${SH} run_tests.sh do-install: cd ${WRKSRC}/include && ${COPYTREE_SHARE} '${PORTNAME} ${PORTNAME}.hpp' \ ${STAGEDIR}${PREFIX}/include/ ${MKDIR} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MDOXYGEN} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/ .endif ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/THANKS \ ${WRKSRC}/NOTES_FOR_DEVELOPERS ${STAGEDIR}${DOCSDIR}/ .include Index: head/astro/qlandkartegt/Makefile =================================================================== --- head/astro/qlandkartegt/Makefile (revision 391656) +++ head/astro/qlandkartegt/Makefile (revision 391657) @@ -1,24 +1,24 @@ # Created by: Mykola Dzham # $FreeBSD$ PORTNAME= qlandkartegt PORTVERSION= 1.7.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarte%20GT%20${PORTVERSION} MAINTAINER= i@levsha.me COMMENT= The ultimate outdoor aficionado's tool LICENSE= GPLv3 LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ libproj.so:${PORTSDIR}/graphics/proj \ libgps.so:${PORTSDIR}/astro/gpsd USES= cmake USE_QT4= dbus gui opengl network sql xml linguist_build \ moc_build uic_build rcc_build qmake_build USE_GL= glu .include Index: head/databases/grass/Makefile =================================================================== --- head/databases/grass/Makefile (revision 391656) +++ head/databases/grass/Makefile (revision 391657) @@ -1,148 +1,148 @@ # Created by: reg # $FreeBSD$ PORTNAME= grass PORTVERSION= 6.4.4 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 2 CATEGORIES= databases geography MASTER_SITES= http://grass.osgeo.org/%SUBDIR%/ \ http://grass.cict.fr/%SUBDIR%/ \ http://grass.fbk.eu/%SUBDIR%/ \ http://grass.gis-lab.info/%SUBDIR%/ \ http://grass.meteo.uni.wroc.pl/%SUBDIR%/ \ http://grass.polytechnic.edu.na/%SUBDIR%/ \ http://grass.unibuc.ro/%SUBDIR%/ \ http://mirrors.ibiblio.org/grass/%SUBDIR%/ \ http://pinus.gntech.ac.kr/grass/%SUBDIR%/ \ http://wgbis.ces.iisc.ernet.in/grass/%SUBDIR%/ \ http://wgrass.media.osaka-cu.ac.jp/grassh/%SUBDIR%/ MASTER_SITE_SUBDIR= grass64/source MAINTAINER= ports@FreeBSD.org COMMENT= Open source Geographical Information System (GIS) LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ libpng.so:${PORTSDIR}/graphics/png \ libproj.so:${PORTSDIR}/graphics/proj \ libtiff.so:${PORTSDIR}/graphics/tiff \ libfftw3.so:${PORTSDIR}/math/fftw3 \ libfreetype.so:${PORTSDIR}/print/freetype2 RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USES= fortran gettext gmake iconv jpeg perl5 pkgconfig python:2 readline \ shebangfix tk SHEBANG_FILES= scripts/i.spectral/i.spectral \ scripts/r.tileset/r.tileset PATCH_TCL_SCRIPTS=lib/init/init.sh PATCH_TK_SCRIPTS=lib/init/init.sh USE_XORG= sm ice x11 xext xi xmu xt USE_GL= glu USE_GNOME= cairo USE_WX= 2.8 WX_COMPS= wx:build python:run USE_GCC= yes GNU_CONFIGURE= yes CONFIGURE_ENV= PERL="${PERL}" CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ --with-libs=${LOCALBASE}/lib \ --with-tcltk-includes="${TCL_INCLUDEDIR} ${TK_INCLUDEDIR}" \ --with-opengl-includes=${LOCALBASE}/include/ \ --with-opengl-libs=${LOCALBASE}/lib/ \ --with-freetype \ --with-freetype-includes=${LOCALBASE}/include/freetype2 \ --with-blas \ --with-lapack \ --with-cairo \ --with-nls \ --with-cxx \ --with-readline \ --with-curses \ --enable-largefile \ --with-python=${PYTHON_CMD}-config \ --with-wxwidgets=${WX_CONFIG} ALL_TARGET= default USE_LDCONFIG= ${PREFIX}/${GRASS_INST_DIR}/lib MAKE_JOBS_UNSAFE=yes PLIST_SUB= GRASS_INST_DIR="${GRASS_INST_DIR}" \ VERSION="${PORTVERSION}" \ VER="${PORTVERSION:R:C/\.//}" BROKEN_sparc64= Does not configure on sparc64 OPTIONS_DEFINE= ATLAS FFMPEG MOTIF MYSQL ODBC PGSQL SQLITE OPTIONS_DEFAULT= PGSQL OPTIONS_SUB= yes ATLAS_DESC= Use ATLAS for BLAS and LAPACK ATLAS_USES= blaslapack:atlas ATLAS_USES_OFF= blaslapack FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg FFMPEG_CONFIGURE_ON= --with-ffmpeg \ --with-ffmpeg-includes="${LOCALBASE}/include/libavcodec \ ${LOCALBASE}/include/libavformat \ ${LOCALBASE}/include/libavutil \ ${LOCALBASE}/include/libswscale" \ --with-ffmpeglibs=${LOCALBASE}/lib MOTIF_USES= motif MOTIF_USE= GL=glw MOTIF_CONFIGURE_ON= --with-motif --with-glw MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ON= --with-mysql \ --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libs=${LOCALBASE}/lib/mysql ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC ODBC_CONFIGURE_ON= --with-odbc PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-postgres SQLITE_USE= SQLITE=yes SQLITE_CONFIGURE_ON= --with-sqlite .include .if !defined (GRASS_INST_DIR) GRASS_INST_DIR= ${PORTNAME}-${PORTVERSION} .endif pre-configure: ${REINPLACE_CMD} -e \ 's|-lblas|${BLASLIB}| ; \ s|-llapack|${LAPACKLIB}| ; \ s|g2c|f2c|' ${WRKSRC}/configure ${REINPLACE_CMD} -e \ 's|make -C|$$(MAKE) -C| ; \ /^BINDIR/s|=.*|= $${DESTDIR}$${UNIX_BIN}| ; \ /test /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \ /tar /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \ /chmod /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \ /tar /s| $${INST_DIR}| $${DESTDIR}$${INST_DIR}|g ; \ s|> $${INST_DIR}|> $${DESTDIR}$${INST_DIR}|' ${WRKSRC}/Makefile ${REINPLACE_CMD} -e \ 's|^CC=.*|CC?=cc| ; \ s|^CFLAGS=.*|CFLAGS+=-fno-common|' ${WRKSRC}/gem/Makefile ${REINPLACE_CMD} -e \ 's|= python|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gem64 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*.* .for i in HTMLMAP PNG PS XDRIVER cairo @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/${i} .endfor @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/* .for i in bmif_to_cell clean_temp current_time_s_ms echo frame.* grocat \ i.ask i.find i.photo.* lock mod* mon.* poly_to_bmif r.watershed.* \ run set_data @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i} .endfor @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/form/form @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/lister/* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/nviz2.2/nviz @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/libgrass_*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo .include Index: head/graphics/R-cran-rgdal/Makefile =================================================================== --- head/graphics/R-cran-rgdal/Makefile (revision 391656) +++ head/graphics/R-cran-rgdal/Makefile (revision 391657) @@ -1,23 +1,24 @@ # Created by: TAKATSU Tomonari # $FreeBSD$ PORTNAME= rgdal DISTVERSION= 1.0-4 +PORTREVISION= 1 CATEGORIES= graphics DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= tota@FreeBSD.org COMMENT= Bindings for the Geospatial Data Abstraction Library LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ libproj.so:${PORTSDIR}/graphics/proj RUN_DEPENDS= R-cran-sp>=1.1.0:${PORTSDIR}/math/R-cran-sp USES= cran:auto-plist R_POSTCMD_INSTALL_OPTIONS+= --configure-args="--with-proj-lib=${LOCALBASE}/lib" .include Index: head/graphics/gdal/Makefile =================================================================== --- head/graphics/gdal/Makefile (revision 391656) +++ head/graphics/gdal/Makefile (revision 391657) @@ -1,151 +1,150 @@ # Created by: Randall Hopper # $FreeBSD$ PORTNAME= gdal -PORTVERSION= 1.11.2 -PORTREVISION= 3 +PORTVERSION= 2.0.0 CATEGORIES= graphics geography MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \ ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= Translator library for raster geospatial data formats LICENSE= MIT LIB_DEPENDS= libgeotiff.so:${PORTSDIR}/graphics/libgeotiff \ libgif.so:${PORTSDIR}/graphics/giflib \ libjson-c.so:${PORTSDIR}/devel/json-c \ 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_DEFAULT=JASPER OPTIONS_RADIO= PDF OPTIONS_RADIO_PDF= PODOFO POPPLER PCRE_DESC= Regular expression support for SQLite CFLAGS+= -fPIC CONFIGURE_ARGS= --datadir=${DATADIR} \ --enable-static=yes \ --with-geotiff=${LOCALBASE} \ --with-gif=${LOCALBASE} \ --with-jpeg=${LOCALBASE} \ --with-libjson-c=${LOCALBASE} \ --with-liblzma=yes \ --with-libtiff=${LOCALBASE} \ --with-libz=/usr \ --with-png=${LOCALBASE} \ --with-threads=yes \ --without-libtool GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes MAKEFILE= GNUmakefile USE_LDCONFIG= yes USES= gmake jpeg tar:xz -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= MAJOR_VER=${PORTVERSION:R:R} PORTVERSION=${PORTVERSION} PORTDATA= * SLAVEDIRS= graphics/p5-Geo-GDAL graphics/php-gdal graphics/py-gdal graphics/ruby-gdal ARMADILLO_CONFIGURE_OFF=--with-armadillo=no ARMADILLO_CONFIGURE_ON= --with-armadillo=${LOCALBASE} ARMADILLO_LIB_DEPENDS= libarmadillo.so:${PORTSDIR}/math/armadillo CFITSIO_CONFIGURE_OFF= --with-cfitsio=no CFITSIO_CONFIGURE_ON= --with-cfitsio=${LOCALBASE} CFITSIO_LIB_DEPENDS= libcfitsio.so:${PORTSDIR}/astro/cfitsio CURL_CONFIGURE_OFF= --with-curl=no CURL_CONFIGURE_ON= --with-curl=${LOCALBASE}/bin/curl-config CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl ECW_CONFIGURE_OFF= --with-ecw=no ECW_CONFIGURE_ON= --with-ecw=${LOCALBASE} ECW_LIB_DEPENDS= libNCSEcw.so:${PORTSDIR}/graphics/libecwj2 EXPAT_CONFIGURE_OFF= --with-expat=no EXPAT_CONFIGURE_ON= --with-expat=${LOCALBASE} EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 FREEXL_CONFIGURE_OFF= --with-freexl=no FREEXL_CONFIGURE_ON= --with-freexl=${LOCALBASE} FREEXL_LIB_DEPENDS= libfreexl.so:${PORTSDIR}/textproc/freexl GEOS_CONFIGURE_OFF= --with-geos=no GEOS_CONFIGURE_ON= --with-geos=${LOCALBASE}/bin/geos-config GEOS_LIB_DEPENDS= libgeos.so:${PORTSDIR}/graphics/geos GTA_CONFIGURE_OFF= --with-gta=no GTA_CONFIGURE_ON= --with-gta=${LOCALBASE} GTA_LIB_DEPENDS= libgta.so:${PORTSDIR}/devel/libgta 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 KML_CONFIGURE_OFF= --with-libkml=no KML_CONFIGURE_ON= --with-libkml=${LOCALBASE} KML_LIB_DEPENDS= libkmlbase.so:${PORTSDIR}/science/libkml LIBXML2_CONFIGURE_OFF= --with-xml2=no LIBXML2_CONFIGURE_ON= --with-xml2=${LOCALBASE}/bin/xml2-config LIBXML2_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 MYSQL_CONFIGURE_OFF= --with-mysql=no MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config MYSQL_USE= MYSQL=yes NETCDF_CONFIGURE_OFF= --with-netcdf=no NETCDF_CONFIGURE_ON= --with-netcdf=${LOCALBASE} NETCDF_LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf ODBC_CONFIGURE_OFF= --with-odbc=no ODBC_CONFIGURE_ON= --with-odbc=${LOCALBASE} ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC OPENJPEG_CONFIGURE_OFF= --with-openjpeg=no OPENJPEG_CONFIGURE_ON= --with-openjpeg=${LOCALBASE} OPENJPEG_LIB_DEPENDS= libopenjp2.so:${PORTSDIR}/graphics/openjpeg PCRE_CONFIGURE_OFF= --with-pcre=no PCRE_CONFIGURE_ON= --with-pcre=${LOCALBASE} PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PGSQL_CONFIGURE_OFF= --with-pg=no PGSQL_CONFIGURE_ON= --with-pg=${LOCALBASE}/bin/pg_config PGSQL_USES= pgsql PODOFO_CONFIGURE_OFF= --with-podofo=no PODOFO_CONFIGURE_ON= --with-podofo=${LOCALBASE} PODOFO_LIB_DEPENDS= libpodofo.so:${PORTSDIR}/graphics/podofo POPPLER_CONFIGURE_OFF= --with-poppler=no POPPLER_CONFIGURE_ON= --with-poppler=${LOCALBASE} POPPLER_LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler PROJ_CONFIGURE_OFF= --with-static-proj4=no PROJ_CONFIGURE_ON= --with-static-proj4=${LOCALBASE} PROJ_LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj SQLITE_CONFIGURE_OFF= --with-sqlite3=no SQLITE_CONFIGURE_ON= --with-sqlite3=${LOCALBASE} SQLITE_USE= SQLITE=yes WEBP_CONFIGURE_OFF= --with-webp=no WEBP_CONFIGURE_ON= --with-webp=${LOCALBASE} WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp XERCES_CONFIGURE_OFF= --with-xerces=no XERCES_CONFIGURE_ON= --with-xerces=${LOCALBASE} XERCES_LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 post-patch: @${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile # Cleanup bundled libraries @${RM} -fr ${WRKSRC}/frmts/gif/giflib/ @${RM} -fr ${WRKSRC}/frmts/gtiff/libgeotiff/ @${RM} -fr ${WRKSRC}/frmts/gtiff/libtiff/ @${RM} -fr ${WRKSRC}/frmts/jpeg/libjpeg/ @${RM} -fr ${WRKSRC}/frmts/jpeg/libjpeg12/ @${RM} -fr ${WRKSRC}/frmts/png/libpng/ @${RM} -fr ${WRKSRC}/frmts/zlib/ @${RM} -fr ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/ post-install: ${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}/bin/* ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION} .include Index: head/graphics/gdal/distinfo =================================================================== --- head/graphics/gdal/distinfo (revision 391656) +++ head/graphics/gdal/distinfo (revision 391657) @@ -1,2 +1,2 @@ -SHA256 (gdal-1.11.2.tar.xz) = b7a18956dde45d636330d558a3a804684565f9356b517ddec223462f2430075f -SIZE (gdal-1.11.2.tar.xz) = 6473004 +SHA256 (gdal-2.0.0.tar.xz) = 91704fafeea2349c5e268dc1e2d03921b3aae64b05ee01d59fdfc1a6b0ffc061 +SIZE (gdal-2.0.0.tar.xz) = 6967656 Index: head/graphics/gdal/pkg-plist =================================================================== --- head/graphics/gdal/pkg-plist (revision 391656) +++ head/graphics/gdal/pkg-plist (revision 391657) @@ -1,92 +1,95 @@ bin/gdal-config bin/gdal_contour bin/gdal_grid bin/gdal_rasterize bin/gdal_translate bin/gdaladdo bin/gdalbuildvrt bin/gdaldem bin/gdalenhance bin/gdalinfo bin/gdallocationinfo bin/gdalmanage bin/gdalserver bin/gdalsrsinfo bin/gdaltindex bin/gdaltransform bin/gdalwarp bin/nearblack bin/ogr2ogr bin/ogrinfo bin/ogrlineref bin/ogrtindex bin/testepsg include/cpl_atomic_ops.h include/cpl_config.h include/cpl_config_extras.h include/cpl_conv.h include/cpl_csv.h include/cpl_error.h include/cpl_hash_set.h include/cpl_http.h include/cpl_list.h include/cpl_minixml.h include/cpl_minizip_ioapi.h include/cpl_minizip_unzip.h include/cpl_minizip_zip.h include/cpl_multiproc.h include/cpl_odbc.h include/cpl_port.h include/cpl_progress.h include/cpl_quad_tree.h include/cpl_spawn.h include/cpl_string.h include/cpl_time.h include/cpl_virtualmem.h include/cpl_vsi.h include/cpl_vsi_virtual.h include/cpl_vsil_curl_priv.h include/cpl_win32ce_api.h include/cpl_wince.h include/cplkeywordparser.h include/gdal.h include/gdal_alg.h include/gdal_alg_priv.h include/gdal_csv.h include/gdal_frmts.h +include/gdal_mdreader.h include/gdal_pam.h include/gdal_priv.h include/gdal_proxy.h include/gdal_rat.h include/gdal_simplesurf.h include/gdal_version.h include/gdal_vrt.h include/gdalexif.h include/gdalgeorefpamdataset.h include/gdalgrid.h include/gdalgrid_priv.h include/gdaljp2abstractdataset.h include/gdaljp2metadata.h +include/gdaljp2metadatagenerator.h +include/gdalsse_priv.h include/gdalwarper.h include/gdalwarpkernel_opencl.h include/gvgcpfit.h include/memdataset.h include/ogr_api.h include/ogr_core.h include/ogr_feature.h include/ogr_featurestyle.h include/ogr_geocoding.h include/ogr_geometry.h include/ogr_p.h include/ogr_spatialref.h include/ogr_srs_api.h include/ogrsf_frmts.h include/rawdataset.h include/thinplatespline.h include/vrtdataset.h lib/gdalplugins/.keepme lib/libgdal.a lib/libgdal.so -lib/libgdal.so.1 +lib/libgdal.so.%%MAJOR_VER%% lib/libgdal.so.%%PORTVERSION%% libdata/pkgconfig/gdal.pc Index: head/graphics/gdal-grass/Makefile =================================================================== --- head/graphics/gdal-grass/Makefile (revision 391656) +++ head/graphics/gdal-grass/Makefile (revision 391657) @@ -1,36 +1,37 @@ # Created by: Laurent Courty # $FreeBSD$ PORTNAME= gdal-grass PORTVERSION= 1.11.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://download.osgeo.org/gdal/ MAINTAINER= ports@FreeBSD.org COMMENT= GDAL drivers for GRASS raster and vector files LICENSE= MIT BUILD_DEPENDS= grass>=6:${PORTSDIR}/databases/grass LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ libgrass_gis.so:${PORTSDIR}/databases/grass RUN_DEPENDS= grass>=6:${PORTSDIR}/databases/grass USES= gmake USE_GCC= yes # from databases/grass GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-autoload=${PREFIX}/lib/gdalplugins \ --with-gdal=${LOCALBASE}/bin/gdal-config \ --with-grass=${LOCALBASE}/${GRASS_INST_DIR} ALL_TARGET= default GRASS_INST_DIR!=${MAKE} -C ${.CURDIR}/../../databases/grass/ -V GRASS_INST_DIR pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gdalplugins @${MKDIR} ${STAGEDIR}${PREFIX}/share/gdal post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gdalplugins/*_GRASS.so .include Index: head/graphics/gdal-grass/files/patch-ogrgrass.h =================================================================== --- head/graphics/gdal-grass/files/patch-ogrgrass.h (nonexistent) +++ head/graphics/gdal-grass/files/patch-ogrgrass.h (revision 391657) @@ -0,0 +1,11 @@ +--- ogrgrass.h.orig 2015-02-06 15:30:50 UTC ++++ ogrgrass.h +@@ -55,7 +55,7 @@ class OGRGRASSLayer : public OGRLayer + + // Layer info + OGRFeatureDefn * GetLayerDefn() { return poFeatureDefn; } +- int GetFeatureCount( int ); ++ GIntBig GetFeatureCount( int ); + OGRErr GetExtent(OGREnvelope *psExtent, int bForce); + virtual OGRSpatialReference *GetSpatialRef(); + int TestCapability( const char * ); Property changes on: head/graphics/gdal-grass/files/patch-ogrgrass.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/gdal-grass/files/patch-ogrgrasslayer.cpp =================================================================== --- head/graphics/gdal-grass/files/patch-ogrgrasslayer.cpp (nonexistent) +++ head/graphics/gdal-grass/files/patch-ogrgrasslayer.cpp (revision 391657) @@ -0,0 +1,11 @@ +--- ogrgrasslayer.cpp.orig 2015-02-06 15:30:50 UTC ++++ ogrgrasslayer.cpp +@@ -1013,7 +1013,7 @@ OGRErr OGRGRASSLayer::CreateFeature( OGR + /* Eventually we should consider implementing a more efficient */ + /* way of counting features matching a spatial query. */ + /************************************************************************/ +-int OGRGRASSLayer::GetFeatureCount( int bForce ) ++GIntBig OGRGRASSLayer::GetFeatureCount( int bForce ) + { + if( m_poFilterGeom != NULL || m_poAttrQuery != NULL ) + return OGRLayer::GetFeatureCount( bForce ); Property changes on: head/graphics/gdal-grass/files/patch-ogrgrasslayer.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/gmt/Makefile =================================================================== --- head/graphics/gmt/Makefile (revision 391656) +++ head/graphics/gmt/Makefile (revision 391657) @@ -1,101 +1,101 @@ # Created by: sec@42.org # $FreeBSD$ PORTNAME= gmt PORTVERSION= 4.5.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.soest.hawaii.edu/%SUBDIR%/ \ ftp://ftp.geologi.uio.no/pub/%SUBDIR%/ \ ftp://ftp.iag.usp.br/%SUBDIR%/ \ ftp://ftp.scc.u-tokai.ac.jp/pub/%SUBDIR%/ \ http://gd.tuwien.ac.at/graphics/visual/%SUBDIR%/ \ http://gmt.mirror.ac.za/%SUBDIR%/ \ ftp://ftp.soest.hawaii.edu/gshhg/:gshhg \ ftp://ftp.scc.u-tokai.ac.jp/pub/gmt/:gshhg MASTER_SITE_SUBDIR= ${PORTNAME} ${PORTNAME}/legacy DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} \ ${GSHHG_DISTNAME}.tar.gz:gshhg MAINTAINER= ports@FreeBSD.org COMMENT= Generic Mapping Tools - data processing and display software package LICENSE= GPLv2 LGPL3 LICENSE_COMB= multi LICENSE_DISTFILES_GPLv2= ${DISTNAME}${EXTRACT_SUFX} LICENSE_DISTFILES_LGPL3= ${GSHHG_DISTNAME}${EXTRACT_SUFX} LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf RUN_DEPENDS= bash:${PORTSDIR}/shells/bash WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USES= gmake shebangfix tar:bzip2 SHEBANG_FILES= gmtswitch doc/examples/*/*.sh src/GMT.in \ src/gmt_shell_functions.sh.in src/gmtget.in \ src/gmtlogo.in src/isogmt.in USE_AUTOTOOLS= autoconf CONFIGURE_ARGS= --datadir=${DATADIR} \ --with-gshhg-dir=${DATADIR}/coast INSTALL_TARGET= install-gmt install-data install-man install-doc MAKE_JOBS_UNSAFE= yes PORTDOCS= * PORTSCOUT= limitw:0,even OPTIONS_DEFINE= DEBUG DOCS EPS GDAL IMPERIAL OCTAVE SHARED X11 OPTIONS_DEFAULT= GDAL SHARED X11 OPTIONS_SUB= yes DEBUG_CONFIGURE_ON= --enable-debug --enable-devdebug EPS_DESC= Set .eps as default output format, otherwise .ps EPS_CONFNIGURE_ON= --enable-eps GDAL_DESC= Compile in experimental GDAL support GDAL_LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal GDAL_CONFIGURE_ON= --enable-gdal IMPERIAL_DESC= Choose Imperial (inch) units over metric (cm) IMPERIAL_CONFIGURE_ON= --enable-US OCTAVE_DESC= Build GMT-octave interface OCTAVE_RUN_DEPENDS= octave:${PORTSDIR}/math/octave OCTAVE_CONFIGURE_ON= --enable-octave --enable-mex OCTAVE_CONFIGURE_OFF= --disable-mex SHARED_DESC= Build shared (dynamic) libraries SHARED_CONFIGURE_ON= --enable-shared SHARED_USE= LDCONFIG=yes X11_USE= XORG=x11,xaw,xmu,xt X11_CONFIGURE_OFF= --disable-xgrid STRIP_FILES= blockmean blockmedian blockmode filter1d fitcircle \ gmt2rgb gmtconvert gmtdefaults gmtmath gmtselect \ gmtset grd2cpt grd2xyz grdblend grdclip \ grdcontour grdcut grdedit grdfft grdfilter \ grdgradient grdhisteq grdimage grdinfo grdlandmask \ grdmask grdmath grdpaste grdproject grdreformat \ grdsample grdtrack grdtrend grdvector grdview \ grdvolume greenspline makecpt mapproject minmax \ nearneighbor project ps2raster psbasemap psclip \ pscoast pscontour pshistogram psimage pslegend \ psmask psrose psscale pstext pswiggle \ psxy psxyz sample1d spectrum1d splitxyz \ surface trend1d trend2d triangulate xyz2grd # http://www.soest.hawaii.edu/pwessel/gshhg/ GSHHG_DISTNAME= gshhg-gmt-2.3.0 .include post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so @${MKDIR} ${STAGEDIR}${DATADIR}/coast (cd ${WRKDIR}/${GSHHG_DISTNAME} && ${INSTALL_DATA} README.TXT *.nc \ ${STAGEDIR}${DATADIR}/coast) .if ${PORT_OPTIONS:MX11} (cd ${WRKSRC}/src/xgrid && ${INSTALL_PROGRAM} xgridedit \ ${STAGEDIR}${PREFIX}/bin) .endif .for i in ${STRIP_FILES} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor .include Index: head/graphics/mapnik/Makefile =================================================================== --- head/graphics/mapnik/Makefile (revision 391656) +++ head/graphics/mapnik/Makefile (revision 391657) @@ -1,144 +1,144 @@ # Created by: Wen Heping # $FreeBSD$ PORTNAME= mapnik PORTVERSION= 2.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics geography MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/ MAINTAINER= littlesavage@rambler.ru COMMENT= Free Toolkit For Developing Mapping Applications LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \ libicuuc.so:${PORTSDIR}/devel/icu \ libboost_system.so:${PORTSDIR}/devel/boost-libs \ libboost_python.so:${PORTSDIR}/devel/boost-python-libs BUILD_DEPENDS= ${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \ ${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu USES= pkgconfig python scons tar:bzip2 USE_GNOME= libxml2 USE_LDCONFIG= yes WARNING_CXXFLAGS?= -w INPUT_PLUGINS= geojson python raster shape NO_OPTIONS_SORT= yes OPTIONS_DEFINE= CAIRO CSV GDAL OGR OSM POSTGIS SQLITE3 JPEG PNG TIFF OPTIONS_DEFAULT= CAIRO CSV GDAL OGR OSM POSTGIS SQLITE3 JPEG PNG TIFF CAIRO_DESC= Enable cairo rendering CSV_DESC= CSV input plugin GDAL_DESC= GDAL input plugin OGR_DESC= OGR input plugin OSM_DESC= OSM input plugin POSTGIS_DESC= PostGIS input plugin SQLITE3_DESC= SQLite input plugin OPTIONS_SUB= yes PORTDOCS= * DOCSRCDIR1= ${WRKSRC} DOC_FILES1= AUTHORS.md CHANGELOG.md README.md DOCSRCDIR2= ${WRKSRC}/docs DOCSDIR2= ${DOCSDIR}/docs DOC_FILES2= * .include .if ${PORT_OPTIONS:MCAIRO} LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:${PORTSDIR}/graphics/py-cairo .else MAKE_ARGS+= CAIRO=False .endif .if ${PORT_OPTIONS:MCSV} INPUT_PLUGINS+= csv .endif .if ${PORT_OPTIONS:MGDAL} INPUT_PLUGINS+= gdal LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal .endif .if ${PORT_OPTIONS:MOGR} INPUT_PLUGINS+= ogr LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal .endif .if ${PORT_OPTIONS:MOSM} INPUT_PLUGINS+= osm LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl .endif .if ${PORT_OPTIONS:MPOSTGIS} INPUT_PLUGINS+= postgis USES+= pgsql .endif .if ${PORT_OPTIONS:MSQLITE3} INPUT_PLUGINS+= sqlite LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite3 BUILD_DEPENDS+= sqlite3>=3.7.12:${PORTSDIR}/databases/sqlite3 .endif .if ${PORT_OPTIONS:MJPEG} USES+= jpeg .else MAKE_ARGS+= JPEG=False .endif .if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png .else MAKE_ARGS+= PNG=False .endif .if ${PORT_OPTIONS:MTIFF} LIB_DEPENDS+= libtiff.so:${PORTSDIR}/graphics/tiff .else MAKE_ARGS+= TIFF=False .endif .include .if ${ARCH} == "powerpc" IGNORE= does not install: runs out of virtual memory .endif MAKE_ARGS+= WARNING_CXXFLAGS=${WARNING_CXXFLAGS} MAKE_ARGS+= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`" MAKE_ARGS+= JOBS=${MAKE_JOBS_NUMBER} MAKE_ARGS+= ${MAKE_ENV} pre-configure: .if ${PORT_OPTIONS:MSQLITE3} @if ! ${LOCALBASE}/bin/sqlite3 :memory: 'create virtual table foo using rtree(pkid, xmin, xmax, ymin, ymax)' > /dev/null 2>&1; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "The SQLite plugin requires libsqlite3 built with RTREE support"; \ ${ECHO_MSG} "Please, reinstall 'databases/sqlite3' port with R*Tree module enabled"; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif post-patch: @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ -e 's#/usr/include#${LOCALBASE}/include#g' \ ${WRKSRC}/SConstruct post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR2} ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} .include Index: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.cpp =================================================================== --- head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.cpp (nonexistent) +++ head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.cpp (revision 391657) @@ -0,0 +1,54 @@ +Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53 + https://github.com/mapnik/mapnik/commit/f0821d897f66c31755f7012b68191a2ec7a060fb + +--- plugins/input/ogr/ogr_datasource.cpp.orig 2013-06-04 01:35:27 UTC ++++ plugins/input/ogr/ogr_datasource.cpp +@@ -72,7 +72,11 @@ ogr_datasource::~ogr_datasource() + { + // free layer before destroying the datasource + layer_.free_layer(); ++#if GDAL_VERSION_MAJOR >= 2 ++ GDALClose(( GDALDatasetH) dataset_); ++#else + OGRDataSource::DestroyDataSource (dataset_); ++#endif + } + + void ogr_datasource::init(mapnik::parameters const& params) +@@ -82,6 +86,7 @@ void ogr_datasource::init(mapnik::parame + #endif + + // initialize ogr formats ++ // NOTE: in GDAL >= 2.0 this is the same as GDALAllRegister() + OGRRegisterAll(); + + boost::optional file = params.get("file"); +@@ -112,17 +117,26 @@ void ogr_datasource::init(mapnik::parame + + if (! driver.empty()) + { ++#if GDAL_VERSION_MAJOR >= 2 ++ unsigned int nOpenFlags = GDAL_OF_READONLY | GDAL_OF_VECTOR; ++ const char* papszAllowedDrivers[] = { driver.c_str(), NULL }; ++ dataset_ = static_cast(GDALOpenEx(dataset_name_.c_str(),nOpenFlags,papszAllowedDrivers,NULL,NULL)); ++#else + OGRSFDriver * ogr_driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driver.c_str()); + if (ogr_driver && ogr_driver != NULL) + { + dataset_ = ogr_driver->Open((dataset_name_).c_str(), FALSE); + } +- ++#endif + } + else + { + // open ogr driver +- dataset_ = OGRSFDriverRegistrar::Open((dataset_name_).c_str(), FALSE); ++#if GDAL_VERSION_MAJOR >= 2 ++ dataset_ = static_cast(OGROpen(dataset_name_.c_str(), FALSE, NULL)); ++#else ++ dataset_ = OGRSFDriverRegistrar::Open(dataset_name_.c_str(), FALSE); ++#endif + } + + if (! dataset_) Property changes on: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.hpp =================================================================== --- head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.hpp (nonexistent) +++ head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.hpp (revision 391657) @@ -0,0 +1,13 @@ +Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53 + +--- plugins/input/ogr/ogr_datasource.hpp.orig ++++ plugins/input/ogr/ogr_datasource.hpp +@@ -63,7 +63,7 @@ class ogr_datasource : public mapnik::datasource + mapnik::datasource::datasource_t type_; + std::string dataset_name_; + std::string index_name_; +- OGRDataSource* dataset_; ++ gdal_dataset_type dataset_; + ogr_layer_ptr layer_; + std::string layer_name_; + mapnik::layer_descriptor desc_; Property changes on: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_datasource.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_layer_ptr.hpp =================================================================== --- head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_layer_ptr.hpp (nonexistent) +++ head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_layer_ptr.hpp (revision 391657) @@ -0,0 +1,59 @@ +Obtained from: https://github.com/mapnik/mapnik/commit/f68291c5b47b5189d967dba01542262f2013da53 + https://github.com/mapnik/mapnik/commit/f0821d897f66c31755f7012b68191a2ec7a060fb + +--- plugins/input/ogr/ogr_layer_ptr.hpp.orig ++++ plugins/input/ogr/ogr_layer_ptr.hpp +@@ -29,9 +29,16 @@ + // stl + #include + +-// ogr ++// gdal ++#include + #include + ++#if GDAL_VERSION_MAJOR >= 2 ++typedef GDALDataset* gdal_dataset_type; ++#else ++typedef OGRDataSource* gdal_dataset_type; ++#endif ++ + class ogr_layer_ptr + { + public: +@@ -62,7 +69,7 @@ class ogr_layer_ptr + is_valid_ = false; + } + +- void layer_by_name(OGRDataSource* const datasource, ++ void layer_by_name(gdal_dataset_type const datasource, + std::string const& layer_name) + { + free_layer(); +@@ -84,7 +91,7 @@ class ogr_layer_ptr + #endif + } + +- void layer_by_index(OGRDataSource* const datasource, ++ void layer_by_index(gdal_dataset_type const datasource, + int layer_index) + { + free_layer(); +@@ -110,7 +117,7 @@ class ogr_layer_ptr + #endif + } + +- void layer_by_sql(OGRDataSource* const datasource, ++ void layer_by_sql(gdal_dataset_type const datasource, + std::string const& layer_sql) + { + free_layer(); +@@ -179,7 +186,7 @@ class ogr_layer_ptr + } + #endif + +- OGRDataSource* datasource_; ++ gdal_dataset_type datasource_; + OGRLayer* layer_; + std::string layer_name_; + bool owns_layer_; Property changes on: head/graphics/mapnik/files/patch-plugins-input-ogr-ogr_layer_ptr.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/mapserver/Makefile =================================================================== --- head/graphics/mapserver/Makefile (revision 391656) +++ head/graphics/mapserver/Makefile (revision 391657) @@ -1,209 +1,209 @@ # Created by: Douglas K. Rand # $FreeBSD$ PORTNAME= mapserver PORTVERSION= 6.4.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics www geography MASTER_SITES= http://download.osgeo.org/mapserver/ MAINTAINER= wen@FreeBSD.org COMMENT= System for developing web-based GIS applications LICENSE= MIT LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \ libproj.so:${PORTSDIR}/graphics/proj \ libpng.so:${PORTSDIR}/graphics/png \ libgif.so:${PORTSDIR}/graphics/giflib USES= cpe cmake:outsource jpeg CPE_VENDOR= umn USE_GNOME= libxml2 LDFLAGS+= -L${LOCALBASE} -pthread CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCALBASE} \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DWITH_GD=1 MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= FRIBIDI CURL GDAL GEOS KML POSTGIS PHP PERL PYTHON \ WMS WFS WCS FASTCGI DEBUG CAIRO CAIRO_SVG \ CLIENT_WMS CLIENT_WFS OPTIONS_DEFAULT= FRIBIDI GDAL GEOS CLIENT_WMS CLIENT_WFS CAIRO_SVG_DESC= Cairo SVG parser support GDAL_DESC= GDAL library support FRIBIDI_DESC= Fribidi library support KML_DESC= KML support WMS_DESC= WMS Server support WFS_DESC= WFS Server support WCS_DESC= WCS Server support .include .if ${PORT_OPTIONS:MPYTHON} USES+= python:2 BUILD_DEPENDS+= swig2.0:${PORTSDIR}/devel/swig20 CMAKE_ARGS+= -DWITH_PYTHON=yes PLIST_SUB+= PYTHON="" MAP_EGG= MapScript-${PORTVERSION}-${PYTHON_VERSION:S/thon//} PLIST_SUB+= MAP_EGG=${MAP_EGG} .else PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MCAIRO} LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo \ libexpat.so:${PORTSDIR}/textproc/expat2 CMAKE_ARGS+= -DWITH_CAIRO=1 .else CMAKE_ARGS+= -DWITH_CAIRO=0 .endif .if ${PORT_OPTIONS:MFRIBIDI} LIB_DEPENDS+= libfribidi.so:${PORTSDIR}/converters/fribidi CMAKE_ARGS+= -DWITH_FRIBIDI=1 .else CMAKE_ARGS+= -DWITH_FRIBIDI=0 .endif .if ${PORT_OPTIONS:MCAIRO_SVG} LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo \ libsvg-cairo.so:${PORTSDIR}/graphics/libsvg-cairo \ libexpat.so:${PORTSDIR}/textproc/expat2 CMAKE_ARGS+= -DWITH_SVGCAIRO=1 -DWITH_CAIRO=1 USES+= pkgconfig .else CMAKE_ARGS+= -DWITH_SVGCAIRO=0 .endif .if ${PORT_OPTIONS:MKML} LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 CMAKE_ARGS+= -DWITH_KML=1 .else CMAKE_ARGS+= -DWITH_KML=0 .endif .if ${PORT_OPTIONS:MWMS} CMAKE_ARGS+= -DWITH_WMS=1 .else CMAKE_ARGS+= -DWITH_WMS=0 .endif .if ${PORT_OPTIONS:MWFS} CMAKE_ARGS+= -DWITH_WFS=1 .else CMAKE_ARGS+= -DWITH_WFS=0 .endif .if ${PORT_OPTIONS:MWCS} CMAKE_ARGS+= -DWITH_WCS=1 .else CMAKE_ARGS+= -DWITH_WCS=0 .endif .if ${PORT_OPTIONS:MGDAL} USES+= iconv LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal CMAKE_ARGS+= -DWITH_GDAL=1 .else CMAKE_ARGS+= -DWITH_GDAL=0 .endif .if ${PORT_OPTIONS:MGEOS} LIB_DEPENDS+= libgeos.so:${PORTSDIR}/graphics/geos CMAKE_ARGS+= -DWITH_GEOS=1 .else CMAKE_ARGS+= -DWITH_GEOS=0 .endif .if ${PORT_OPTIONS:MPOSTGIS} USES+= pgsql CMAKE_ARGS+= -DWITH_POSTGIS=1 .else CMAKE_ARGS+= -DWITH_POSTGIS=0 .endif .if ${PORT_OPTIONS:MPHP} BUILD_DEPENDS+= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5 RUN_BUILDS+= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5 PHP_EXTENSION_DIR!= ${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e "s,/usr/local/,," CMAKE_ARGS+= -DWITH_PHP=1 PLIST_SUB+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} PLIST_SUB+= PHP="" .else CMAKE_ARGS+= -DWITH_PHP=0 PLIST_SUB+= PHP="@comment " .endif .if ${PORT_OPTIONS:MPERL} USES+= perl5 BUILD_DEPENDS= ${LOCALBASE}/bin/swig2.0:${PORTSDIR}/devel/swig20 CMAKE_ARGS+= -DWITH_PERL=1 PLIST_SUB+= PERL="" .else CMAKE_ARGS+= -DWITH_PERL=0 PLIST_SUB+= PERL="@comment " .endif .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl CMAKE_ARGS+= -DWITH_CURL=1 .else CMAKE_ARGS+= -DWITH_CURL=0 .endif .if ${PORT_OPTIONS:MFASTCGI} BUILD_DEPENDS+= ${LOCALBASE}/bin/cgi-fcgi:${PORTSDIR}/www/fcgi CMAKE_ARGS+= -DWITH_FCGI=1 .else CMAKE_ARGS+= -DWITH_FCGI=0 .endif .if ${PORT_OPTIONS:MDEBUG} CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug .else CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release .endif PROG_FILES= legend scalebar shp2img shptree shptreetst shptreevis \ sortshp msencrypt tile4ms mapserv .if ${PORT_OPTIONS:MCLIENT_WMS} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal CMAKE_ARGS+= -DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WMS=1 .endif .if ${PORT_OPTIONS:MCLIENT_WFS} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal CMAKE_ARGS+= -DWITH_CURL=1 -DWITH_GDAL=1 -DWITH_CLIENT_WFS=1 .endif do-install: .for f in ${PROG_FILES} ${STRIP_CMD} ${BUILD_WRKSRC}/${f} ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmapserver.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib .if ${PORT_OPTIONS:MPHP} @${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/mapscript/php/php_mapscript.so \ ${STAGEDIR}${PREFIX}/${PHP_EXTENSION_DIR}/ .endif .if ${PORT_OPTIONS:MPYTHON} @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/ (cd ${BUILD_WRKSRC}/mapscript/python && ${CP} mapscript.py _mapscript.so ${STAGEDIR}${PYTHON_SITELIBDIR}/) .endif post-install: @${LN} -s ${PREFIX}/lib/libmapserver.so.6.4.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so.1 @${LN} -s ${PREFIX}/lib/libmapserver.so.1 ${STAGEDIR}${PREFIX}/lib/libmapserver.so .if ${PORT_OPTIONS:MPHP} @${ECHO_MSG} "Please add the line extension=php_mapscript.so to ${PREFIX}/etc/php/extensions.ini" .endif .include Index: head/graphics/osgearth/Makefile =================================================================== --- head/graphics/osgearth/Makefile (revision 391656) +++ head/graphics/osgearth/Makefile (revision 391657) @@ -1,34 +1,34 @@ # Created by: lbartoletti # $FreeBSD$ PORTNAME= osgearth PORTVERSION= 2.5 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics geography MAINTAINER= coder@tuxfamily.org COMMENT= osgEarth is a C++ terrain rendering toolkit for OpenSceneGraph LICENSE= LGPL3 BUILD_DEPENDS= ${LOCALBASE}/bin/minizip:${PORTSDIR}/archivers/minizip LIB_DEPENDS= libosg.so:${PORTSDIR}/graphics/osg \ libgdal.so:${PORTSDIR}/graphics/gdal \ libcurl.so:${PORTSDIR}/ftp/curl USE_GITHUB= yes GH_ACCOUNT= gwaldron USE_LDCONFIG= YES USE_SQLITE= 3 USES= cmake gmake pkgconfig PLIST_SUB= OSGVERSION=3.2.1 CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \ -DMINIZIP_INCLUDE_DIR=${LOCALBASE}/include/minizip \ -DCMAKE_LIBRARY_PATH:PATH=${LOCALBASE}/lib \ -DLIB_POSTFIX:STRING="" \ -DOSGEARTH_USE_QT:BOOL=FALSE .include Index: head/graphics/qgis/Makefile =================================================================== --- head/graphics/qgis/Makefile (revision 391656) +++ head/graphics/qgis/Makefile (revision 391657) @@ -1,129 +1,130 @@ # Created by: Laurent Courty # $FreeBSD$ PORTNAME= qgis PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de COMMENT= Geographical Information System (GIS) data viewer LICENSE= GPLv2 BUILD_DEPENDS= txt2tags:${PORTSDIR}/textproc/txt2tags LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ libgdal.so:${PORTSDIR}/graphics/gdal \ libgeos.so:${PORTSDIR}/graphics/geos \ libgsl.so:${PORTSDIR}/math/gsl \ libproj.so:${PORTSDIR}/graphics/proj \ libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \ libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \ libspatialindex.so:${PORTSDIR}/devel/spatialindex \ libspatialite.so:${PORTSDIR}/databases/spatialite USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} GH_TAGNAME= 5cd8d08 USES= cpe bison cmake fortran gmake python USE_SQLITE= yes USE_QT4= gui svg xml network sql designer testlib linguist_build \ qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes OPTIONS_DEFINE= POSTGIS PYTHON GRASS SERVER DEBUG OPTIONS_DEFAULT= POSTGIS PYTHON NO_OPTIONS_SORT= yes SERVER_DESC= Enable QGIS server .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000033 USES+= compiler:features .else USES+= compiler:gcc-c++11-lib BUILD_DEPENDS+= flex>=2.5.39:${PORTSDIR}/textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex CXXFLAGS+= -I${LOCALBASE}/include/flex .endif .if ${PORT_OPTIONS:MGRASS} .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 BROKEN= GRASS plugin not supported on FreeBSD 8.x and 9.x .endif BUILD_DEPENDS+= grass64:${PORTSDIR}/databases/grass \ ${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass RUN_DEPENDS+= grass64:${PORTSDIR}/databases/grass \ ${LOCALBASE}/lib/gdalplugins/gdal_GRASS.so:${PORTSDIR}/graphics/gdal-grass CMAKE_ARGS+= -DWITH_GRASS:BOOL=TRUE -DGRASS_PREFIX=${LOCALBASE}/grass-6.4.4 FORCE_MAKE_JOBS= NO PLIST_SUB+= GRASS="" .else CMAKE_ARGS+= -DWITH_GRASS:BOOL=FALSE PLIST_SUB+= GRASS="@comment " .endif .if ${PORT_OPTIONS:MPOSTGIS} USES+= pgsql CMAKE_ARGS+= -DWITH_POSTGRESQL:BOOL=TRUE PLIST_SUB+= PGSQL="" .else CMAKE_ARGS+= -DWITH_POSTGRESQL:BOOL=FALSE PLIST_SUB+= PGSQL="@comment " .endif .if ${PORT_OPTIONS:MSERVER} CMAKE_ARGS+= -DWITH_SERVER:BOOL=TRUE PLIST_SUB+= QGIS_SERVER="" LIB_DEPENDS+= libfcgi.so:${PORTSDIR}/www/fcgi .else CMAKE_ARGS+= -DWITH_SERVER:BOOL=FALSE PLIST_SUB+= QGIS_SERVER="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=TRUE PLIST_SUB+= QGIS_PYTHON="" BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \ ${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \ ${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \ ${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \ ${PYTHON_PKGNAMEPREFIX}sip>=4.14.6:${PORTSDIR}/devel/py-sip \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gdal>=1.11.1:${PORTSDIR}/graphics/py-gdal \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1:${PORTSDIR}/math/py-numpy \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:${PORTSDIR}/databases/py-psycopg2 \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:${PORTSDIR}/databases/pyspatialite \ ${PYTHON_PKGNAMEPREFIX}qt4-core>=4.8.5:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=4.8.5:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5:${PORTSDIR}/net/py-qt4-network \ ${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.8.3:${PORTSDIR}/devel/py-qt4-qscintilla2 \ ${PYTHON_PKGNAMEPREFIX}qt4-svg>=4.8.5:${PORTSDIR}/graphics/py-qt4-svg \ ${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.11.1:${PORTSDIR}/www/py-qt4-webkit \ ${PYTHON_PKGNAMEPREFIX}qt4-xml>=4.5.4:${PORTSDIR}/textproc/py-qt4-xml \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.6:${PORTSDIR}/databases/py-sqlite3 .else CMAKE_ARGS+= -DWITH_BINDINGS:BOOL=FALSE PLIST_SUB+= QGIS_PYTHON="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug PLIST_SUB+= DEBUG="" .else CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release PLIST_SUB+= DEBUG="@comment " .endif pre-patch: @${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "%1" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "" + tr( "${GH_TAGNAME}" ) + ""|g' \ ${WRKSRC}/src/app/qgisapp.cpp .include Index: head/math/pdal/Makefile =================================================================== --- head/math/pdal/Makefile (revision 391656) +++ head/math/pdal/Makefile (revision 391657) @@ -1,61 +1,62 @@ # Created by: bart # $FreeBSD$ PORTNAME= pdal PORTVERSION= 0.9.8 +PORTREVISION= 1 CATEGORIES= math databases graphics MAINTAINER= coder@tuxfamily.org COMMENT= Library for translating and manipulating point cloud data LICENSE= BSD3CLAUSE USES= cmake compiler compiler_ARGS= c++11-lang USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} GH_PROJECT= ${GH_ACCOUNT} OPTIONS_DEFINE= GDAL GEOTIFF LIBXML2 EMBED_BOOST OPTIONS_DEFAULT= GDAL GEOTIFF LIBXML2 .include .if ${PORT_OPTIONS:MGDAL} CMAKE_ARGS+= -DWITH_GDAL:BOOL=TRUE LIB_DEPENDS+= libgdal.so:${PORTSDIR}/graphics/gdal PLIST_SUB+= GDAL="" .else CMAKE_ARGS+= -DWITH_GDAL:BOOL=FALSE PLIST_SUB+= GDAL="@comment " .endif .if ${PORT_OPTIONS:MGEOTIFF} CMAKE_ARGS+= -DWITH_GEOTIFF:BOOL=TRUE LIB_DEPENDS+= libgeotiff.so:${PORTSDIR}/graphics/libgeotiff PLIST_SUB+= GEOTIFF="" .else CMAKE_ARGS+= -DWITH_GEOTIFF:BOOL=FALSE PLIST_SUB+= GEOTIFF="@comment " .endif .if ${PORT_OPTIONS:MLIBXML2} CMAKE_ARGS+= -DWITH_LIBXML2:BOOL=TRUE LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 PLIST_SUB+= LIBXML2="" .else CMAKE_ARGS+= -DWITH_LIBXML2:BOOL=FALSE PLIST_SUB+= LIBXML2="@comment " .endif .if ${PORT_OPTIONS:MEMBED_BOOST} CMAKE_ARGS+= -DPDAL_EMBED_BOOST:BOOL=TRUE PLIST_SUB+= EMBED_BOOST="" .else CMAKE_ARGS+= -DPDAL_EMBED_BOOST:BOOL=FALSE LIB_DEPENDS+= libboost_thread.so:${PORTSDIR}/devel/boost-libs PLIST_SUB+= EMBED_BOOST="@comment " .endif .include Index: head/math/saga/Makefile =================================================================== --- head/math/saga/Makefile (revision 391656) +++ head/math/saga/Makefile (revision 391657) @@ -1,114 +1,115 @@ # Created by: Rainer Hurling # $FreeBSD$ PORTNAME= saga PORTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= rhurlin@gwdg.de COMMENT= System for Automated Geoscientific Analyses LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= swig3.0:${PORTSDIR}/devel/swig30 LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \ libgdal.so:${PORTSDIR}/graphics/gdal \ libhpdf.so:${PORTSDIR}/print/libharu \ libjasper.so:${PORTSDIR}/graphics/jasper \ libtiff.so:${PORTSDIR}/graphics/tiff \ libodbc.so:${PORTSDIR}/databases/unixODBC \ liblas.so:${PORTSDIR}/devel/liblas12 \ libopencv_ml.so:${PORTSDIR}/graphics/opencv RUN_DEPENDS:= ${BUILD_DEPENDS} CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ --enable-python CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0" CFLAGS+= -I${LOCALBASE}/include GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib -lopencv_contrib USE_LDCONFIG= yes USE_CXXSTD= c++11 USE_WX= 3.0+ USES= autoreconf compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool python:2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WX_UNICODE= yes DESKTOP_ENTRIES= "SAGA GIS" "${COMMENT}" "${DATADIR}/saga.png" \ "saga_gui" "Science;Geoscience;Math;" true INSTALLS_ICONS= yes DOS2UNIX_GLOB= *.cpp *.h PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= PGSQL OPENMP VIGRA OPTIONS_DEFAULT= PGSQL OPENMP VIGRA NO_OPTIONS_SORT= yes OPTIONS_SUB= yes OPENMP_DESC= Enable Multiprocessing VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp OPENMP_LDFLAGS= -pthread PGSQL_CONFIGURE_OFF= --with-postgresql=no PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config PGSQL_LIB_DEPENDS= libpq.so:${PORTSDIR}/databases/postgresql93-client VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:${PORTSDIR}/graphics/vigra .include post-extract: @${REINPLACE_CMD} -e 's|wx-config |${WX_CONFIG} |g' \ ${WRKSRC}/configure.ac \ ${WRKSRC}/src/saga_core/saga_api/Makefile.am \ ${WRKSRC}/src/saga_core/saga_cmd/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gdi/Makefile.am \ ${WRKSRC}/src/saga_core/saga_gui/Makefile.am \ ${WRKSRC}/src/modules/garden/garden_3d_viewer/Makefile.am \ ${WRKSRC}/src/modules/garden/garden_webservices/Makefile.am \ ${WRKSRC}/src/modules/io/io_grid_image/Makefile.am \ ${WRKSRC}/src/modules/io/io_shapes/Makefile.am \ ${WRKSRC}/src/modules/pointcloud/pointcloud_tools/Makefile.am \ ${WRKSRC}/src/modules/pointcloud/pointcloud_viewer/Makefile.am \ ${WRKSRC}/src/modules/tin/tin_viewer/Makefile.am \ ${WRKSRC}/src/modules/statistics/statistics_kriging/Makefile.am post-patch: @${REINPLACE_CMD} -e 's|-lcv|-lopencv_core -lopencv_imgproc|g' \ ${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am @${REINPLACE_CMD} -e 's|\[cv\]|\[opencv_core\]|' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2537)" + "\\n"|' \ ${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp .if ${ARCH} == "powerpc" @${REINPLACE_CMD} -e 's|typedef unsigned long DWORD;|typedef unsigned int DWORD;|' \ ${WRKSRC}/src/saga_core/saga_api/api_core.h .endif post-configure: @${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \ ${WRKSRC}/src/saga_core/saga_gui/Makefile @${REINPLACE_CMD} -e 's|mv saga_srs.txt saga_prj.srs|mv ${STAGEDIR}${DATADIR}/saga_srs.txt ${STAGEDIR}${DATADIR}/saga_prj.srs|g' \ ${WRKSRC}/src/saga_core/saga_gui/Makefile @${REINPLACE_CMD} -e 's|mv saga_dic.txt saga_prj.dic|mv ${STAGEDIR}${DATADIR}/saga_dic.txt ${STAGEDIR}${DATADIR}/saga_prj.dic|g' \ ${WRKSRC}/src/saga_core/saga_gui/Makefile post-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga_tip.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.lng.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.ger.txt ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \ ${STAGEDIR}${PREFIX}/share/applications/ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_api-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_saga_api-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsaga_gdi-${PORTVERSION}.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/saga/*.so # library helper files are not needed and cripple some math/qgis extensions @${RM} ${STAGEDIR}${PREFIX}/lib/saga/*.la .include