- Update to 0.8.5

- Transfer maintainership on submitter

PR:		ports/76706
Submitted by:	Sam Lawrance <boris@brooknet.com.au>
Approved by:	Ying-Chieh Chen <yinjieh@csie.nctu.edu.tw> (maintainer)

7 files changed, 31 insertions, 102 deletions

diff --git a/graphics/openproducer/Makefile b/graphics/openproducer/Makefile
index ccb8a0f42880..ba31b0eb9f69 100644
--- a/graphics/openproducer/Makefile
+++ b/graphics/openproducer/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	openproducer
-PORTVERSION=	0.8.4.2
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.andesengineering.com/Producer/Download/
-DISTNAME=	Producer-${PORTVERSION:R}-${PORTVERSION:E}
+DISTNAME=	Producer-${PORTVERSION}-3
 
-MAINTAINER=	yinjieh@csie.nctu.edu.tw
+MAINTAINER=	boris@brooknet.com.au
 COMMENT=	A cross-platform C++/OpenGL library focused on camera control
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_MESA=	yes
+USE_GL=		yes
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
-ONLY_FOR_ARCHS=         i386
+ONLY_FOR_ARCHS=	i386
+PORTDOCS=	*
+INSTALLS_SHLIB=	yes
 
 WRKSRC=		${WRKDIR}/Producer
 MAKEFILE=	GNUmakefile
diff --git a/graphics/openproducer/distinfo b/graphics/openproducer/distinfo
index c656899dfc1b..2a13b08e74bf 100644
--- a/graphics/openproducer/distinfo
+++ b/graphics/openproducer/distinfo
@@ -1,2 +1,2 @@
-MD5 (Producer-0.8.4-2.tar.gz) = 9e14c27a0e927a19bb3666fa73755652
-SIZE (Producer-0.8.4-2.tar.gz) = 424104
+MD5 (Producer-0.8.5-3.tar.gz) = 889c99c47a3af7d8df03fb5584919cbe
+SIZE (Producer-0.8.5-3.tar.gz) = 502051
diff --git a/graphics/openproducer/files/patch-Make::makedefs b/graphics/openproducer/files/patch-Make::makedefs
index 24d9b8849982..7b0ee2d99e82 100644
--- a/graphics/openproducer/files/patch-Make::makedefs
+++ b/graphics/openproducer/files/patch-Make::makedefs
@@ -1,6 +1,7 @@
---- Make/makedefs.orig	Fri Oct  3 00:01:31 2003
-+++ Make/makedefs	Fri Oct 17 18:26:27 2003
-@@ -281,19 +281,25 @@
+diff -urN ../Producer.orig/Make/makedefs ./Make/makedefs
+--- ../Producer.orig/Make/makedefs	Fri Aug 20 10:00:23 2004
++++ ./Make/makedefs	Tue Jan 25 21:36:56 2005
+@@ -287,19 +287,25 @@
        CXX               = g++
      endif
    DEPARG            = -MM
diff --git a/graphics/openproducer/files/patch-Make::makerules b/graphics/openproducer/files/patch-Make::makerules
index f6c0d3678cd2..e51c6e3cf54d 100644
--- a/graphics/openproducer/files/patch-Make::makerules
+++ b/graphics/openproducer/files/patch-Make::makerules
@@ -1,6 +1,7 @@
---- Make/makerules.orig	Fri Oct 17 18:30:48 2003
-+++ Make/makerules	Fri Oct 17 18:31:13 2003
-@@ -89,7 +89,7 @@
+diff -urN ../Producer.orig/Make/makerules ./Make/makerules
+--- ../Producer.orig/Make/makerules	Wed Jul 28 04:02:15 2004
++++ ./Make/makerules	Tue Jan 25 21:36:58 2005
+@@ -83,7 +83,7 @@
  $(EXEC:=.opt) :
  	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
  	@cd $(OPTDIR); \
@@ -9,7 +10,7 @@
  	      THISDIR=../$(THISDIR)\
  	      MAKEDEPEND=Makedepend $(EXEC)
  	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
-@@ -98,7 +98,7 @@
+@@ -92,7 +92,7 @@
  $(LIB:=.opt) : 
  	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
  	@cd $(OPTDIR);\
diff --git a/graphics/openproducer/files/patch-src::ConfigParser.cpp b/graphics/openproducer/files/patch-src::ConfigParser.cpp
new file mode 100644
index 000000000000..8fb569ce3f3d
--- /dev/null
+++ b/graphics/openproducer/files/patch-src::ConfigParser.cpp
@@ -0,0 +1,11 @@
+--- src/ConfigParser.cpp.orig	Tue Jul 27 18:02:19 2004
++++ src/ConfigParser.cpp	Wed Jan 26 11:03:38 2005
+@@ -1686,7 +1686,7 @@
+ 
+ bool CameraConfig::parseFile( const std::string &file )
+ {
+-    fileName.clear();
++    fileName.erase();
+ 
+     fileName = findFile(file);
+ 
diff --git a/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp b/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp
index befa440fea35..a8ae7a66740a 100644
--- a/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp
+++ b/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp
@@ -4,7 +4,7 @@
  using namespace Producer; 
  
  // HP, SGI and SUN don't implement glXGetProcAddressARB...
--#if defined (__sgi) || defined (sun) || defined( __hpux )
+-#if defined (__sgi) || defined (sun) || defined( __hpux ) 
 +#if defined (__sgi) || defined (sun) || defined( __hpux ) || defined(__FreeBSD__)
  #include <dlfcn.h>
  void (*glXGetProcAddressARB(const GLubyte *procName))(void)
diff --git a/graphics/openproducer/pkg-plist b/graphics/openproducer/pkg-plist
index 91e8015eb708..0839f7d912d5 100644
--- a/graphics/openproducer/pkg-plist
+++ b/graphics/openproducer/pkg-plist
@@ -13,6 +13,7 @@ include/Producer/Math
 include/Producer/RefOpenThreads
 include/Producer/Referenced
 include/Producer/RenderSurface
+include/Producer/Thread
 include/Producer/Timer
 include/Producer/Trackball
 include/Producer/Types
@@ -21,89 +22,3 @@ include/Producer/VisualChooser
 include/Producer/Window3D
 lib/libProducer.so
 @dirrm include/Producer
-%%PORTDOCS%%%%DOCSDIR%%/CameraConfig.bnf
-%%PORTDOCS%%%%DOCSDIR%%/CameraConfig.example
-%%PORTDOCS%%%%DOCSDIR%%/Notes
-%%PORTDOCS%%%%DOCSDIR%%/directors_chair.jpg
-%%PORTDOCS%%%%DOCSDIR%%/documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/download.html
-%%PORTDOCS%%%%DOCSDIR%%/doxy.cfg
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/prerequisites.html
-%%PORTDOCS%%%%DOCSDIR%%/producer_name.html
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/index.html
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/producer_camera.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/producers_chair.jpg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Camera/GNUmakefile
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Camera/MySceneHandler
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Camera/example1.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Camera/glut_teapot.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/GNUmakefile
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/MySceneHandler
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/example1.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/example2.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/example3.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/glut_teapot.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/oneWindow.cfg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/twoProjectionRects.cfg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/CameraGroup/twoWindows.cfg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/GNUmakefile
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/GNUmakefile
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/MyKeyboardMouseCallback
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/MySceneHandler
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/MySceneHandler2
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/example1.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/example2.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/example3.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/example4.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/example5.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/example6.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/glut_teapot.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/threePipe.cfg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/twoPipe.cfg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse/twoWindows.cfg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Make/makedefs
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Make/makerules
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Motif/GNUmakefile
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Motif/MotifTest
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Motif/README
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Motif/example1.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Motif/example2.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Motif/gui.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Motif/gui.h
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Motif/test.cfg
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/RenderSurface/GNUmakefile
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/RenderSurface/MyGraphics
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/RenderSurface/example1.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/RenderSurface/glut_teapot.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Window3D/GNUmakefile
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Window3D/MyGraphics
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Window3D/glut_teapot.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/SourceCode/Window3D/main.cpp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/VC++6.0/CameraGroup_1/CameraGroup_1.dsp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/VC++6.0/CameraGroup_2/CameraGroup_2.dsp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/VC++6.0/Camera_1/Camera_1.dsp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/VC++6.0/KeyboardMouse_1/KeyboardMouse_1.dsp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/VC++6.0/KeyboardMouse_2/KeyboardMouse_2.dsp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/VC++6.0/KeyboardMouse_3/KeyboardMouse_3.dsp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/VC++6.0/KeyboardMouse_4/KeyboardMouse_4.dsp
-%%PORTDOCS%%%%DOCSDIR%%/Tutorial/VC++6.0/Tutorial.dsw
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/SourceCode/Camera
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/SourceCode/CameraGroup
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/SourceCode/KeyboardMouse
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/SourceCode/Make
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/SourceCode/Motif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/SourceCode/RenderSurface
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/SourceCode/Window3D
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/SourceCode
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/VC++6.0/CameraGroup_1
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/VC++6.0/CameraGroup_2
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/VC++6.0/Camera_1
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/VC++6.0/KeyboardMouse_1
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/VC++6.0/KeyboardMouse_2
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/VC++6.0/KeyboardMouse_3
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/VC++6.0/KeyboardMouse_4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial/VC++6.0
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/Tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%