summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/simgear/Makefile3
-rw-r--r--games/flightgear/Makefile3
-rw-r--r--games/openmw/Makefile4
-rw-r--r--games/palomino/Makefile4
-rw-r--r--graphics/Makefile2
-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/Makefile4
-rw-r--r--graphics/ossim/Makefile3
-rw-r--r--misc/dartsim/Makefile4
22 files changed, 17 insertions, 13 deletions
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index ef4d64e6b415..a0ff9166f841 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -2,6 +2,7 @@
PORTNAME= simgear
PORTVERSION= 2019.1.1
+PORTREVISION= 1
CATEGORIES= devel games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
@@ -13,7 +14,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib
LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
- libosg.so:graphics/osg \
+ libosg.so:graphics/osg34 \
libexpat.so:textproc/expat2 \
libcurl.so:ftp/curl
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 0415a2943623..a75e90678a57 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -3,6 +3,7 @@
PORTNAME= flightgear
PORTVERSION= 2019.1.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
@@ -15,7 +16,7 @@ LIB_DEPENDS= libpng.so:graphics/png \
libboost_thread.so:devel/boost-libs \
libfltk.so:x11-toolkits/fltk \
libfreetype.so:print/freetype2 \
- libosg.so:graphics/osg \
+ libosg.so:graphics/osg34 \
libspeex.so:audio/speex \
libspeexdsp.so:audio/speexdsp \
libcurl.so:ftp/curl \
diff --git a/games/openmw/Makefile b/games/openmw/Makefile
index fc5f2e3b567d..d0d1bcaa1115 100644
--- a/games/openmw/Makefile
+++ b/games/openmw/Makefile
@@ -4,7 +4,7 @@
PORTNAME= openmw
DISTVERSIONPREFIX= openmw-
DISTVERSION= 0.45.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -20,7 +20,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libboost_thread.so:devel/boost-libs \
libBulletCollision.so:devel/bullet \
libMyGUIEngine.so:x11-toolkits/mygui \
- libosg.so:graphics/osg \
+ libosg.so:graphics/osg34 \
libunshield.so:archivers/unshield
USES= cmake compiler:c++14-lang gl openal pkgconfig qt:5 sdl xorg
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 84addbe7a5ee..c321914bce04 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -3,7 +3,7 @@
PORTNAME= palomino
PORTVERSION= 20131231
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games
MASTER_SITES= SF/palomino-sim
DISTFILES= ${PORTNAME}_src_${PORTVERSION}.txz \
@@ -18,7 +18,7 @@ COMMENT= Action flight simulation computer program using OSG
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE_GNU_GPL_2.txt
-LIB_DEPENDS= libosg.so:graphics/osg
+LIB_DEPENDS= libosg.so:graphics/osg34
USES= alias compiler:c++11-lang cmake:insource,noninja gl lua:51 tar:xz
USE_CXXSTD= gnu++98
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
diff --git a/misc/dartsim/Makefile b/misc/dartsim/Makefile
index 9edcfbb76b2e..acad2c196144 100644
--- a/misc/dartsim/Makefile
+++ b/misc/dartsim/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dartsim
DISTVERSIONPREFIX= v
DISTVERSION= 6.8.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MAINTAINER= yuri@FreeBSD.org
@@ -26,7 +26,7 @@ LIB_DEPENDS= libassimp.so:multimedia/assimp \
liblz4.so:archivers/liblz4 \
liboctomap.so:math/octomap \
libode.so:devel/ode \
- libosg.so:graphics/osg \
+ libosg.so:graphics/osg34 \
libnlopt.so:math/nlopt \
libtinyxml2.so:textproc/tinyxml2 \
liburdfdom_world.so:devel/ros-urdfdom