Update ports/graphics/openproducer to 0.8.4.2

PR:		58162
Submitted By:	MAINTAINER

7 files changed, 37 insertions, 36 deletions

diff --git a/graphics/openproducer/Makefile b/graphics/openproducer/Makefile
index 9d6d562ae7e..3f91f3fb56f 100644
--- a/graphics/openproducer/Makefile
+++ b/graphics/openproducer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openproducer
-PORTVERSION=	0.8.2.2
+PORTVERSION=	0.8.4.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.andesengineering.com/Producer/Download/
 DISTNAME=	Producer-${PORTVERSION:R}-${PORTVERSION:E}
@@ -14,15 +14,16 @@ DISTNAME=	Producer-${PORTVERSION:R}-${PORTVERSION:E}
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 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
-INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 ONLY_FOR_ARCHS=         i386
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/Producer
 MAKEFILE=	GNUmakefile
 
 # opt = optimized ($OPTF added); debug = debug ($DBGF added); opt is default
@@ -33,7 +34,6 @@ post-patch:
 	${WRKSRC}/Make/makedefs
 
 post-install:
-	${LN} -sf ${PREFIX}/lib/libProducer.so ${PREFIX}/lib/libProducer.so.0
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${CP} -r ${WRKSRC}/doc/ ${DOCSDIR}
diff --git a/graphics/openproducer/distinfo b/graphics/openproducer/distinfo
index f9ce0f34a60..8859f93bfbb 100644
--- a/graphics/openproducer/distinfo
+++ b/graphics/openproducer/distinfo
@@ -1 +1 @@
-MD5 (Producer-0.8.2-2.tar.gz) = 070fd2108c196506ebc3103628d28547
+MD5 (Producer-0.8.4-2.tar.gz) = 9e14c27a0e927a19bb3666fa73755652
diff --git a/graphics/openproducer/files/patch-Make::makedefs b/graphics/openproducer/files/patch-Make::makedefs
index e76b9699959..24d9b884998 100644
--- a/graphics/openproducer/files/patch-Make::makedefs
+++ b/graphics/openproducer/files/patch-Make::makedefs
@@ -1,6 +1,6 @@
---- Make/makedefs.orig	Sat Apr 19 01:07:23 2003
-+++ Make/makedefs	Tue Jul 29 19:22:15 2003
-@@ -232,15 +232,22 @@
+--- Make/makedefs.orig	Fri Oct  3 00:01:31 2003
++++ Make/makedefs	Fri Oct 17 18:26:27 2003
+@@ -281,19 +281,25 @@
        CXX               = g++
      endif
    DEPARG            = -MM
@@ -13,8 +13,9 @@
    SHARED            = -shared
    ARCH              = 32
    ARCHARGS          = 
--  INST_SYS_PREFIX   = /opt/X11R6
--  INST_SHARE_PREFIX = /usr/share/Producer
+-  INST_LOCATION   = /opt/X11R6
+-  INST_SHARE = /usr/share/Producer
+-
 +  INST_SYS_PREFIX   = $(PREFIX)
 +  INST_SHARE_PREFIX = $(DATADIR)
 +  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib
@@ -24,6 +25,10 @@
 +  INST_SRC          = $(EXAMPLESDIR)/src
 +  INST_DOC          = $(DOCSDIR)
 +  INST_DATA         = $(DATADIR)
+   GL_LIBS           = -lGL
+   X_LIBS            = -lXmu -lX11
+-  OPEN_THREAD_LIB   = -lOpenThreads -lpthread
++  OPEN_THREAD_LIB   = -lOpenThreads ${PTHREAD_LIBS}
+ 
  endif
  
- #### MacOS X specific definitions
diff --git a/graphics/openproducer/files/patch-Make::makerules b/graphics/openproducer/files/patch-Make::makerules
index 1c632629078..f6c0d3678cd 100644
--- a/graphics/openproducer/files/patch-Make::makerules
+++ b/graphics/openproducer/files/patch-Make::makerules
@@ -1,15 +1,15 @@
---- Make/makerules.orig	Tue Jul 29 19:02:29 2003
-+++ Make/makerules	Tue Jul 29 19:02:51 2003
-@@ -90,7 +90,7 @@
+--- Make/makerules.orig	Fri Oct 17 18:30:48 2003
++++ Make/makerules	Fri Oct 17 18:31:13 2003
+@@ -89,7 +89,7 @@
  $(EXEC:=.opt) :
  	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
  	@cd $(OPTDIR); \
--      $(MAKE) -f ../GNUmakefile DOF=$(OPTF)  TOPDIR=../${TOPDIR} \
-+      $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)"  TOPDIR=../${TOPDIR} \
-           THISDIR=../$(THISDIR)\
-           MAKEDEPEND=Makedepend $(EXEC)
+-	  $(MAKE) -f ../GNUmakefile DOF=$(OPTF)  TOPDIR=../${TOPDIR} \
++	  $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)"  TOPDIR=../${TOPDIR} \
+ 	      THISDIR=../$(THISDIR)\
+ 	      MAKEDEPEND=Makedepend $(EXEC)
  	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
-@@ -99,7 +99,7 @@
+@@ -98,7 +98,7 @@
  $(LIB:=.opt) : 
  	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
  	@cd $(OPTDIR);\
@@ -17,4 +17,4 @@
 +	  $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
  	        THISDIR=../$(THISDIR)\
  	        MAKEDEPEND=Makedepend $(LIB)
- 	$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(LIB).$(OS)$(ARCH).$(LIB_EXT) __link
+ 	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(LIB).$(LIB_EXT) __link
diff --git a/graphics/openproducer/files/patch-src::GNUmakefile b/graphics/openproducer/files/patch-src::GNUmakefile
deleted file mode 100644
index 712455acd04..00000000000
--- a/graphics/openproducer/files/patch-src::GNUmakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/GNUmakefile.orig	Thu Apr 10 04:16:47 2003
-+++ src/GNUmakefile	Mon Jul 21 14:03:29 2003
-@@ -27,7 +27,7 @@
- ## LIBS  =   -lGL -lXmu -lXmu -lX11 -lpthread -ll
- 
- INC  += -I$(TOPDIR)/include -I$(THISDIR)
--LIBS  =   -lGL -lXmu -lXmu -lX11 -lpthread
-+LIBS  =   -lGL -lXmu -lXmu -lX11 $(PTHREAD_LIBS)
- LIB   = libProducer
- 
- include $(TOPDIR)/Make/makerules
diff --git a/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp b/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp
new file mode 100644
index 00000000000..befa440fea3
--- /dev/null
+++ b/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp
@@ -0,0 +1,11 @@
+--- src/RenderSurface_X11.cpp.orig	Fri Oct 17 19:14:39 2003
++++ src/RenderSurface_X11.cpp	Fri Oct 17 19:14:59 2003
+@@ -16,7 +16,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 ) || defined(__FreeBSD__)
+ #include <dlfcn.h>
+ void (*glXGetProcAddressARB(const GLubyte *procName))(void)
+ {
diff --git a/graphics/openproducer/pkg-plist b/graphics/openproducer/pkg-plist
index 2cd1c5e6f8d..91e8015eb70 100644
--- a/graphics/openproducer/pkg-plist
+++ b/graphics/openproducer/pkg-plist
@@ -10,20 +10,16 @@ include/Producer/InputArea
 include/Producer/Keyboard
 include/Producer/KeyboardMouse
 include/Producer/Math
-include/Producer/Mutex
+include/Producer/RefOpenThreads
 include/Producer/Referenced
 include/Producer/RenderSurface
-include/Producer/Thread
 include/Producer/Timer
 include/Producer/Trackball
 include/Producer/Types
 include/Producer/Version
 include/Producer/VisualChooser
 include/Producer/Window3D
-include/Producer/osgCameraGroup
-include/Producer/osgSceneHandler
 lib/libProducer.so
-lib/libProducer.so.0
 @dirrm include/Producer
 %%PORTDOCS%%%%DOCSDIR%%/CameraConfig.bnf
 %%PORTDOCS%%%%DOCSDIR%%/CameraConfig.example