Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Dec 2019 21:07:14 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r519633 - in head: devel/simgear games/flightgear games/openmw games/palomino graphics graphics/osg graphics/osg34 graphics/osgearth graphics/ossim misc/dartsim
Message-ID:  <201912092107.xB9L7Exl086007@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Dec  9 21:07:13 2019
New Revision: 519633
URL: https://svnweb.freebsd.org/changeset/ports/519633

Log:
  - Move graphics/osg to graphics/osg34 in preparation for update to 3.6
  
  PR:		230442

Added:
  head/graphics/osg34/
     - copied from r519632, head/graphics/osg/
Deleted:
  head/graphics/osg/
Modified:
  head/devel/simgear/Makefile
  head/games/flightgear/Makefile
  head/games/openmw/Makefile
  head/games/palomino/Makefile
  head/graphics/Makefile
  head/graphics/osg34/Makefile
  head/graphics/osgearth/Makefile
  head/graphics/ossim/Makefile
  head/misc/dartsim/Makefile

Modified: head/devel/simgear/Makefile
==============================================================================
--- head/devel/simgear/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/devel/simgear/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -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
 

Modified: head/games/flightgear/Makefile
==============================================================================
--- head/games/flightgear/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/games/flightgear/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -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 \

Modified: head/games/openmw/Makefile
==============================================================================
--- head/games/openmw/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/games/openmw/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -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

Modified: head/games/palomino/Makefile
==============================================================================
--- head/games/palomino/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/games/palomino/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -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 usi
 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

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/graphics/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -600,7 +600,7 @@
     SUBDIR += opensubdiv
     SUBDIR += optar
     SUBDIR += optipng
-    SUBDIR += osg
+    SUBDIR += osg34
     SUBDIR += osg-devel
     SUBDIR += osgearth
     SUBDIR += ossim

Modified: head/graphics/osg34/Makefile
==============================================================================
--- head/graphics/osg/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/graphics/osg34/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -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

Modified: head/graphics/osgearth/Makefile
==============================================================================
--- head/graphics/osgearth/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/graphics/osgearth/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -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 OpenSceneGr
 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 \

Modified: head/graphics/ossim/Makefile
==============================================================================
--- head/graphics/ossim/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/graphics/ossim/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -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

Modified: head/misc/dartsim/Makefile
==============================================================================
--- head/misc/dartsim/Makefile	Mon Dec  9 20:54:17 2019	(r519632)
+++ head/misc/dartsim/Makefile	Mon Dec  9 21:07:13 2019	(r519633)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912092107.xB9L7Exl086007>