Date: Thu, 23 Jan 2014 08:23:43 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340806 - head/graphics/osgearth Message-ID: <201401230823.s0N8NhC7031005@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu Jan 23 08:23:43 2014 New Revision: 340806 URL: http://svnweb.freebsd.org/changeset/ports/340806 QAT: https://qat.redports.org/buildarchive/r340806/ Log: Move port to depend on graphics/osg, which was recently updated to 3.2.0, and osgearth's requirement was 3.0.1, to avoid conflicts with other ports that depend on graphics/osg. Make the graphics/osg version a variable, to ease maintainer's jobs as graphics/osg gets updated (which requires osgearth's PORTREVISION and PLIST_SUB to be bumped). Some part of the discussion around PLIST_SUB is not recorded in the PR, but it is still related to PR: ports/184706 Submitted by: amdmi3 Modified: head/graphics/osgearth/Makefile head/graphics/osgearth/pkg-plist Modified: head/graphics/osgearth/Makefile ============================================================================== --- head/graphics/osgearth/Makefile Thu Jan 23 08:05:14 2014 (r340805) +++ head/graphics/osgearth/Makefile Thu Jan 23 08:23:43 2014 (r340806) @@ -12,7 +12,7 @@ COMMENT= osgEarth is a C++ terrain rende LICENSE= LGPL3 BUILD_DEPENDS= ${LOCALBASE}/bin/minizip:${PORTSDIR}/archivers/minizip -LIB_DEPENDS= libosg.so:${PORTSDIR}/graphics/osg-devel \ +LIB_DEPENDS= libosg.so:${PORTSDIR}/graphics/osg \ libgdal.so:${PORTSDIR}/graphics/gdal \ libcurl.so:${PORTSDIR}/ftp/curl @@ -22,6 +22,7 @@ USE_LDCONFIG= YES USE_SQLITE= 3 USE_ZIP= YES USES= cmake gmake pkgconfig +PLIST_SUB= OSGVERSION=3.2.0 CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:PATH=${LOCALBASE}/include \ -DMINIZIP_INCLUDE_DIR=${LOCALBASE}/include/minizip \ Modified: head/graphics/osgearth/pkg-plist ============================================================================== --- head/graphics/osgearth/pkg-plist Thu Jan 23 08:05:14 2014 (r340805) +++ head/graphics/osgearth/pkg-plist Thu Jan 23 08:23:43 2014 (r340806) @@ -400,45 +400,45 @@ lib/libosgEarthSymbology.so.2.5.0 lib/libosgEarthUtil.so lib/libosgEarthUtil.so.0 lib/libosgEarthUtil.so.2.5.0 -lib/osgPlugins-3.1.3/osgdb_earth.so -lib/osgPlugins-3.1.3/osgdb_kml.so -lib/osgPlugins-3.1.3/osgdb_osgearth_agglite.so -lib/osgPlugins-3.1.3/osgdb_osgearth_arcgis.so -lib/osgPlugins-3.1.3/osgdb_osgearth_arcgis_map_cache.so -lib/osgPlugins-3.1.3/osgdb_osgearth_bing.so -lib/osgPlugins-3.1.3/osgdb_osgearth_cache_filesystem.so -lib/osgPlugins-3.1.3/osgdb_osgearth_debug.so -lib/osgPlugins-3.1.3/osgdb_osgearth_engine_byo.so -lib/osgPlugins-3.1.3/osgdb_osgearth_engine_mp.so -lib/osgPlugins-3.1.3/osgdb_osgearth_engine_osgterrain.so -lib/osgPlugins-3.1.3/osgdb_osgearth_engine_quadtree.so -lib/osgPlugins-3.1.3/osgdb_osgearth_feature_ogr.so -lib/osgPlugins-3.1.3/osgdb_osgearth_feature_tfs.so -lib/osgPlugins-3.1.3/osgdb_osgearth_feature_wfs.so -lib/osgPlugins-3.1.3/osgdb_osgearth_gdal.so -lib/osgPlugins-3.1.3/osgdb_osgearth_label_annotation.so -lib/osgPlugins-3.1.3/osgdb_osgearth_label_overlay.so -lib/osgPlugins-3.1.3/osgdb_osgearth_mask_feature.so -lib/osgPlugins-3.1.3/osgdb_osgearth_mbtiles.so -lib/osgPlugins-3.1.3/osgdb_osgearth_model_feature_geom.so -lib/osgPlugins-3.1.3/osgdb_osgearth_model_feature_stencil.so -lib/osgPlugins-3.1.3/osgdb_osgearth_model_simple.so -lib/osgPlugins-3.1.3/osgdb_osgearth_ocean_surface.so -lib/osgPlugins-3.1.3/osgdb_osgearth_osg.so -lib/osgPlugins-3.1.3/osgdb_osgearth_refresh.so -lib/osgPlugins-3.1.3/osgdb_osgearth_tilecache.so -lib/osgPlugins-3.1.3/osgdb_osgearth_tileindex.so -lib/osgPlugins-3.1.3/osgdb_osgearth_tileservice.so -lib/osgPlugins-3.1.3/osgdb_osgearth_tms.so -lib/osgPlugins-3.1.3/osgdb_osgearth_vdatum_egm2008.so -lib/osgPlugins-3.1.3/osgdb_osgearth_vdatum_egm84.so -lib/osgPlugins-3.1.3/osgdb_osgearth_vdatum_egm96.so -lib/osgPlugins-3.1.3/osgdb_osgearth_vpb.so -lib/osgPlugins-3.1.3/osgdb_osgearth_wcs.so -lib/osgPlugins-3.1.3/osgdb_osgearth_wms.so -lib/osgPlugins-3.1.3/osgdb_osgearth_xyz.so -lib/osgPlugins-3.1.3/osgdb_osgearth_yahoo.so -@dirrmtry lib/osgPlugins-3.1.3 +lib/osgPlugins-%%OSGVERSION%%/osgdb_earth.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_kml.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_agglite.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_arcgis.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_arcgis_map_cache.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_bing.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_cache_filesystem.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_debug.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_byo.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_mp.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_osgterrain.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_engine_quadtree.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_ogr.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_tfs.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_feature_wfs.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_gdal.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_label_annotation.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_label_overlay.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_mask_feature.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_mbtiles.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_model_feature_geom.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_model_feature_stencil.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_model_simple.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_ocean_surface.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_osg.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_refresh.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_tilecache.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_tileindex.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_tileservice.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_tms.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_vdatum_egm2008.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_vdatum_egm84.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_vdatum_egm96.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_vpb.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_wcs.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_wms.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_xyz.so +lib/osgPlugins-%%OSGVERSION%%/osgdb_osgearth_yahoo.so +@dirrmtry lib/osgPlugins-%%OSGVERSION%% @dirrmtry include/osgEarthUtil @dirrmtry include/osgEarthSymbology @dirrmtry include/osgEarthFeatures
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401230823.s0N8NhC7031005>