diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/Makefile | 2 | ||||
| -rw-r--r-- | graphics/osg34/Makefile (renamed from graphics/osg/Makefile) | 3 | ||||
| -rw-r--r-- | graphics/osg34/distinfo (renamed from graphics/osg/distinfo) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-CMakeLists.txt (renamed from graphics/osg/files/patch-CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-CMakeModules-FindGTA.cmake (renamed from graphics/osg/files/patch-CMakeModules-FindGTA.cmake) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake (renamed from graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-shift-key-fix (renamed from graphics/osg/files/patch-shift-key-fix) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt (renamed from graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp (renamed from graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt (renamed from graphics/osg/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt (renamed from graphics/osg/files/patch-src_osgPlugins_gdal_CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt (renamed from graphics/osg/files/patch-src_osgPlugins_nvtt_CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt (renamed from graphics/osg/files/patch-src_osgPlugins_ogr_CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | graphics/osg34/pkg-descr (renamed from graphics/osg/pkg-descr) | 0 | ||||
| -rw-r--r-- | graphics/osg34/pkg-plist (renamed from graphics/osg/pkg-plist) | 0 | ||||
| -rw-r--r-- | graphics/osgearth/Makefile | 4 | ||||
| -rw-r--r-- | graphics/ossim/Makefile | 3 |
17 files changed, 7 insertions, 5 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index 255d3bbf4eaf..d057b38042d1 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -600,7 +600,7 @@ SUBDIR += opensubdiv SUBDIR += optar SUBDIR += optipng - SUBDIR += osg + SUBDIR += osg34 SUBDIR += osg-devel SUBDIR += osgearth SUBDIR += ossim diff --git a/graphics/osg/Makefile b/graphics/osg34/Makefile index dd5b6de7e004..485c022d68f7 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg34/Makefile @@ -6,6 +6,7 @@ PORTVERSION= 3.4.1 DISTVERSIONPREFIX= OpenSceneGraph- PORTREVISION= 12 CATEGORIES= graphics +PKGNAMESUFFIX= 34 MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering @@ -22,7 +23,7 @@ USE_GITHUB= yes GH_ACCOUNT= openscenegraph GH_PROJECT= OpenSceneGraph -CONFLICTS= osg-devel +CONFLICTS= osg-[0-9]* USES= alias cmake compiler:c++11-lang gl jpeg pkgconfig xorg USE_GL= gl glu diff --git a/graphics/osg/distinfo b/graphics/osg34/distinfo index 7b8e38def234..7b8e38def234 100644 --- a/graphics/osg/distinfo +++ b/graphics/osg34/distinfo diff --git a/graphics/osg/files/patch-CMakeLists.txt b/graphics/osg34/files/patch-CMakeLists.txt index d495019fab71..d495019fab71 100644 --- a/graphics/osg/files/patch-CMakeLists.txt +++ b/graphics/osg34/files/patch-CMakeLists.txt diff --git a/graphics/osg/files/patch-CMakeModules-FindGTA.cmake b/graphics/osg34/files/patch-CMakeModules-FindGTA.cmake index 8a648a5ac524..8a648a5ac524 100644 --- a/graphics/osg/files/patch-CMakeModules-FindGTA.cmake +++ b/graphics/osg34/files/patch-CMakeModules-FindGTA.cmake diff --git a/graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake b/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake index 7b3259726d4b..7b3259726d4b 100644 --- a/graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake +++ b/graphics/osg34/files/patch-CMakeModules_FindGStreamer.cmake diff --git a/graphics/osg/files/patch-shift-key-fix b/graphics/osg34/files/patch-shift-key-fix index 87d9003ae693..87d9003ae693 100644 --- a/graphics/osg/files/patch-shift-key-fix +++ b/graphics/osg34/files/patch-shift-key-fix diff --git a/graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt b/graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt index 675ef5a726a0..675ef5a726a0 100644 --- a/graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt +++ b/graphics/osg34/files/patch-src-OpenThreads-CMakeLists.txt diff --git a/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp b/graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp index eeaba23f077d..eeaba23f077d 100644 --- a/graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp +++ b/graphics/osg34/files/patch-src-OpenThreads-pthreads-PThread.cpp diff --git a/graphics/osg/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt index 426b4f3145b3..426b4f3145b3 100644 --- a/graphics/osg/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt +++ b/graphics/osg34/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt diff --git a/graphics/osg/files/patch-src_osgPlugins_gdal_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt index acdc497a60b1..acdc497a60b1 100644 --- a/graphics/osg/files/patch-src_osgPlugins_gdal_CMakeLists.txt +++ b/graphics/osg34/files/patch-src_osgPlugins_gdal_CMakeLists.txt diff --git a/graphics/osg/files/patch-src_osgPlugins_nvtt_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt index 40902a58bb5c..40902a58bb5c 100644 --- a/graphics/osg/files/patch-src_osgPlugins_nvtt_CMakeLists.txt +++ b/graphics/osg34/files/patch-src_osgPlugins_nvtt_CMakeLists.txt diff --git a/graphics/osg/files/patch-src_osgPlugins_ogr_CMakeLists.txt b/graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt index 73fd9c93c2ec..73fd9c93c2ec 100644 --- a/graphics/osg/files/patch-src_osgPlugins_ogr_CMakeLists.txt +++ b/graphics/osg34/files/patch-src_osgPlugins_ogr_CMakeLists.txt diff --git a/graphics/osg/pkg-descr b/graphics/osg34/pkg-descr index 614609091396..614609091396 100644 --- a/graphics/osg/pkg-descr +++ b/graphics/osg34/pkg-descr diff --git a/graphics/osg/pkg-plist b/graphics/osg34/pkg-plist index 8b0e12a6fefd..8b0e12a6fefd 100644 --- a/graphics/osg/pkg-plist +++ b/graphics/osg34/pkg-plist diff --git a/graphics/osgearth/Makefile b/graphics/osgearth/Makefile index 436670f9209f..3c23f79ddd4e 100644 --- a/graphics/osgearth/Makefile +++ b/graphics/osgearth/Makefile @@ -4,7 +4,7 @@ PORTNAME= osgearth PORTVERSION= 2.10.1 DISTVERSIONPREFIX= ${PORTNAME}- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics geography MAINTAINER= lbartoletti@tuxfamily.org @@ -13,7 +13,7 @@ COMMENT= C++ terrain rendering toolkit for OpenSceneGraph LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libosg.so:graphics/osg \ +LIB_DEPENDS= libosg.so:graphics/osg34 \ libgdal.so:graphics/gdal \ libcurl.so:ftp/curl \ libgeos.so:graphics/geos \ diff --git a/graphics/ossim/Makefile b/graphics/ossim/Makefile index 1635042b0316..5143eec459fb 100644 --- a/graphics/ossim/Makefile +++ b/graphics/ossim/Makefile @@ -3,6 +3,7 @@ PORTNAME= ossim DISTVERSIONPREFIX= Neptune- DISTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= lbartoletti@tuxfamily.org @@ -18,7 +19,7 @@ LIB_DEPENDS= libgeos.so:graphics/geos \ libtiff.so:graphics/tiff \ libopenjp2.so:graphics/openjpeg \ libfreetype.so:print/freetype2 \ - libOpenThreads.so:graphics/osg + libOpenThreads.so:graphics/osg34 USES= cmake compiler:c++11-lang jpeg localbase USE_GITHUB= yes |