- Update to 2.6.1

- Substitude shared lib versions in plist, as they're likely to change often
- Add mirror

PR:		128880
Submitted by:	Hardy Schumacher <hardy dot schumacher at amd dot com>

3 files changed, 90 insertions, 88 deletions

diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index d705d803622a..8b0c569924b0 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	osg
-PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTVERSION=	2.6.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-2.6/
+MASTER_SITES=	http://www.openscenegraph.org/downloads/developer_releases/ \
+		http://www.amdmi3.ru/distfiles/
 DISTNAME=	OpenSceneGraph-${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -25,6 +25,8 @@ USE_GL=		gl glu
 WANT_SDL=	yes
 USE_LDCONFIG=	yes
 
+PLIST_SUB=	OSG_VERSION=2.6.1 OSG_SHLIBVER=48
+
 OPTIONS=	CURL		"Support for cURL"		off \
 		FREETYPE	"Support for FreeType"		on \
 		GDAL		"Support for GDAL"		off \
diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo
index e5a12f286b62..67eea1af68e2 100644
--- a/graphics/osg/distinfo
+++ b/graphics/osg/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenSceneGraph-2.6.0.zip) = b29c7383f4c5f4b42aef9fcebe4a5539
-SHA256 (OpenSceneGraph-2.6.0.zip) = 458e3de77a1db7d4741205f306778b518e9edb4e3f9495dc8b51540d77dfc14a
-SIZE (OpenSceneGraph-2.6.0.zip) = 5841956
+MD5 (OpenSceneGraph-2.6.1.zip) = 0955d92af64e48d2bdda464103962f92
+SHA256 (OpenSceneGraph-2.6.1.zip) = 4eb0765f168fe136e97539a90e25556b2cdfa52e3309697cf82159c51e43b096
+SIZE (OpenSceneGraph-2.6.1.zip) = 5849143
diff --git a/graphics/osg/pkg-plist b/graphics/osg/pkg-plist
index 4cb8ebeaaf9e..4665ca629edb 100644
--- a/graphics/osg/pkg-plist
+++ b/graphics/osg/pkg-plist
@@ -420,100 +420,100 @@ lib/libOpenThreads.so
 lib/libOpenThreads.so.11
 lib/libOpenThreads.so.2.3.0
 lib/libosg.so
-lib/libosg.so.2.6.0
-lib/libosg.so.44
+lib/libosg.so.%%OSG_VERSION%%
+lib/libosg.so.%%OSG_SHLIBVER%%
 lib/libosgDB.so
-lib/libosgDB.so.2.6.0
-lib/libosgDB.so.44
+lib/libosgDB.so.%%OSG_VERSION%%
+lib/libosgDB.so.%%OSG_SHLIBVER%%
 lib/libosgFX.so
-lib/libosgFX.so.2.6.0
-lib/libosgFX.so.44
+lib/libosgFX.so.%%OSG_VERSION%%
+lib/libosgFX.so.%%OSG_SHLIBVER%%
 lib/libosgGA.so
-lib/libosgGA.so.2.6.0
-lib/libosgGA.so.44
+lib/libosgGA.so.%%OSG_VERSION%%
+lib/libosgGA.so.%%OSG_SHLIBVER%%
 lib/libosgManipulator.so
-lib/libosgManipulator.so.2.6.0
-lib/libosgManipulator.so.44
+lib/libosgManipulator.so.%%OSG_VERSION%%
+lib/libosgManipulator.so.%%OSG_SHLIBVER%%
 lib/libosgParticle.so
-lib/libosgParticle.so.2.6.0
-lib/libosgParticle.so.44
+lib/libosgParticle.so.%%OSG_VERSION%%
+lib/libosgParticle.so.%%OSG_SHLIBVER%%
 lib/libosgShadow.so
-lib/libosgShadow.so.2.6.0
-lib/libosgShadow.so.44
+lib/libosgShadow.so.%%OSG_VERSION%%
+lib/libosgShadow.so.%%OSG_SHLIBVER%%
 lib/libosgSim.so
-lib/libosgSim.so.2.6.0
-lib/libosgSim.so.44
+lib/libosgSim.so.%%OSG_VERSION%%
+lib/libosgSim.so.%%OSG_SHLIBVER%%
 lib/libosgTerrain.so
-lib/libosgTerrain.so.2.6.0
-lib/libosgTerrain.so.44
+lib/libosgTerrain.so.%%OSG_VERSION%%
+lib/libosgTerrain.so.%%OSG_SHLIBVER%%
 lib/libosgText.so
-lib/libosgText.so.2.6.0
-lib/libosgText.so.44
+lib/libosgText.so.%%OSG_VERSION%%
+lib/libosgText.so.%%OSG_SHLIBVER%%
 lib/libosgUtil.so
-lib/libosgUtil.so.2.6.0
-lib/libosgUtil.so.44
+lib/libosgUtil.so.%%OSG_VERSION%%
+lib/libosgUtil.so.%%OSG_SHLIBVER%%
 lib/libosgViewer.so
-lib/libosgViewer.so.2.6.0
-lib/libosgViewer.so.44
+lib/libosgViewer.so.%%OSG_VERSION%%
+lib/libosgViewer.so.%%OSG_SHLIBVER%%
 lib/libosgWidget.so
-lib/libosgWidget.so.2.6.0
-lib/libosgWidget.so.44
-lib/osgPlugins-2.6.0/osgdb_3dc.so
-lib/osgPlugins-2.6.0/osgdb_3ds.so
-lib/osgPlugins-2.6.0/osgdb_ac.so
-lib/osgPlugins-2.6.0/osgdb_bmp.so
-lib/osgPlugins-2.6.0/osgdb_cfg.so
-%%CURL%%lib/osgPlugins-2.6.0/osgdb_curl.so
-lib/osgPlugins-2.6.0/osgdb_dds.so
-lib/osgPlugins-2.6.0/osgdb_dw.so
-lib/osgPlugins-2.6.0/osgdb_dxf.so
-%%FREETYPE%%lib/osgPlugins-2.6.0/osgdb_freetype.so
-%%GDAL%%lib/osgPlugins-2.6.0/osgdb_gdal.so
-lib/osgPlugins-2.6.0/osgdb_geo.so
-%%GIF%%lib/osgPlugins-2.6.0/osgdb_gif.so
-lib/osgPlugins-2.6.0/osgdb_glsl.so
-lib/osgPlugins-2.6.0/osgdb_hdr.so
-lib/osgPlugins-2.6.0/osgdb_ive.so
-lib/osgPlugins-2.6.0/osgdb_jpeg.so
-%%JASPER%%lib/osgPlugins-2.6.0/osgdb_jp2.so
-lib/osgPlugins-2.6.0/osgdb_logo.so
-lib/osgPlugins-2.6.0/osgdb_lwo.so
-lib/osgPlugins-2.6.0/osgdb_lws.so
-lib/osgPlugins-2.6.0/osgdb_md2.so
-lib/osgPlugins-2.6.0/osgdb_normals.so
-lib/osgPlugins-2.6.0/osgdb_obj.so
-%%GDAL%%lib/osgPlugins-2.6.0/osgdb_ogr.so
-lib/osgPlugins-2.6.0/osgdb_openflight.so
-lib/osgPlugins-2.6.0/osgdb_osg.so
-lib/osgPlugins-2.6.0/osgdb_osga.so
-lib/osgPlugins-2.6.0/osgdb_osgfx.so
-lib/osgPlugins-2.6.0/osgdb_osgparticle.so
-lib/osgPlugins-2.6.0/osgdb_osgshadow.so
-lib/osgPlugins-2.6.0/osgdb_osgsim.so
-lib/osgPlugins-2.6.0/osgdb_osgterrain.so
-lib/osgPlugins-2.6.0/osgdb_osgtext.so
-lib/osgPlugins-2.6.0/osgdb_osgtgz.so
-lib/osgPlugins-2.6.0/osgdb_osgviewer.so
-lib/osgPlugins-2.6.0/osgdb_osgwidget.so
-lib/osgPlugins-2.6.0/osgdb_pic.so
-lib/osgPlugins-2.6.0/osgdb_png.so
-lib/osgPlugins-2.6.0/osgdb_pnm.so
-lib/osgPlugins-2.6.0/osgdb_rgb.so
-lib/osgPlugins-2.6.0/osgdb_rot.so
-lib/osgPlugins-2.6.0/osgdb_scale.so
-lib/osgPlugins-2.6.0/osgdb_shp.so
-lib/osgPlugins-2.6.0/osgdb_stl.so
-lib/osgPlugins-2.6.0/osgdb_tga.so
-lib/osgPlugins-2.6.0/osgdb_tgz.so
-lib/osgPlugins-2.6.0/osgdb_tiff.so
-lib/osgPlugins-2.6.0/osgdb_trans.so
-lib/osgPlugins-2.6.0/osgdb_txf.so
-lib/osgPlugins-2.6.0/osgdb_txp.so
-%%OPENVRML%%lib/osgPlugins-2.6.0/osgdb_vrml.so
-lib/osgPlugins-2.6.0/osgdb_x.so
-%%XINE%%lib/osgPlugins-2.6.0/osgdb_xine.so
-lib/osgPlugins-2.6.0/osgdb_zip.so
-@dirrm lib/osgPlugins-2.6.0
+lib/libosgWidget.so.%%OSG_VERSION%%
+lib/libosgWidget.so.%%OSG_SHLIBVER%%
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_3dc.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_3ds.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_ac.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_bmp.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_cfg.so
+%%CURL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_curl.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_dds.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_dw.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so
+%%FREETYPE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_freetype.so
+%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gdal.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_geo.so
+%%GIF%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gif.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so
+%%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_logo.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_lwo.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_lws.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_md2.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_normals.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_obj.so
+%%GDAL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ogr.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_openflight.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osg.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osga.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgfx.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgparticle.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgshadow.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgsim.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgterrain.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgtext.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgtgz.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgviewer.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_osgwidget.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_pic.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_png.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_scale.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_shp.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_stl.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_tga.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_tgz.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_tiff.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_trans.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_txf.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so
+%%OPENVRML%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vrml.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_x.so
+%%XINE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_xine.so
+lib/osgPlugins-%%OSG_VERSION%%/osgdb_zip.so
+@dirrm lib/osgPlugins-%%OSG_VERSION%%
 @dirrm include/osgWidget
 @dirrm include/osgViewer/api/X11
 @dirrm include/osgViewer/api