Update to 1.0.1.

PR:		ports/98426
Submitted by:	Matthew May <rrghphar@bigpond.net.au>

4 files changed, 62 insertions, 56 deletions

diff --git a/graphics/openproducer/Makefile b/graphics/openproducer/Makefile
index 2a62862e87c9..b63bb03760eb 100644
--- a/graphics/openproducer/Makefile
+++ b/graphics/openproducer/Makefile
@@ -6,38 +6,34 @@
 #
 
 PORTNAME=	openproducer
-PORTVERSION=	0.8.5
+PORTVERSION=	1.0.1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.andesengineering.com/Producer/Download/
-DISTNAME=	Producer-${PORTVERSION}-3
+MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/
+#
+# the following master distribution contains the version of OpenProducer
+# as described above by PORTVERSION and PORTREVISION.
+DISTNAME=	OSG_OP_OT-1.0
 
 MAINTAINER=	lawrance@FreeBSD.org
 COMMENT=	A cross-platform C++/OpenGL library focused on camera control
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads
 
+USE_ZIP=	yes
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
-MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
-ONLY_FOR_ARCHS=	i386
-PORTDOCS=	*
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/Producer
+WRKSRC=		${WRKDIR}/${DISTNAME}/Producer
 MAKEFILE=	GNUmakefile
+MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
-# opt = optimized ($OPTF added); debug = debug ($DBGF added); opt is default
+# Optimisation/Debug flags:
+#   opt = optimized ($OPTF added)
+#   debug = debug ($DBGF added)
+# opt is default
+#
 ALL_TARGET=	opt
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,%%CXXFLAGS%%,${CXXFLAGS},g' \
-	${WRKSRC}/Make/makedefs
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${CP} -r ${WRKSRC}/doc/ ${DOCSDIR}
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/openproducer/distinfo b/graphics/openproducer/distinfo
index acb2c3680a90..76e06764f857 100644
--- a/graphics/openproducer/distinfo
+++ b/graphics/openproducer/distinfo
@@ -1,3 +1,3 @@
-MD5 (Producer-0.8.5-3.tar.gz) = 889c99c47a3af7d8df03fb5584919cbe
-SHA256 (Producer-0.8.5-3.tar.gz) = dfc71cd54ab08408c2470d560a1d2fde4c4ffeda2feace15ced8f89c8d2efb7b
-SIZE (Producer-0.8.5-3.tar.gz) = 502051
+MD5 (OSG_OP_OT-1.0.zip) = dfb3eca46b32625602dabe9aa46c6b6f
+SHA256 (OSG_OP_OT-1.0.zip) = c39572c72d9ed7b7a34a36779bcf56180ba2917926f6f658b5af1824eeb3b6a6
+SIZE (OSG_OP_OT-1.0.zip) = 5036053
diff --git a/graphics/openproducer/files/patch-Make::makedefs b/graphics/openproducer/files/patch-Make::makedefs
index 7b0ee2d99e82..4a35027a2f9d 100644
--- a/graphics/openproducer/files/patch-Make::makedefs
+++ b/graphics/openproducer/files/patch-Make::makedefs
@@ -1,35 +1,47 @@
-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
--  INC               +=  -I/usr/local/include -I/usr/X11R6/include
-+  INC               +=  -I${LOCALBASE}/include -I${X11BASE}/include
-   DEF               += -W -Wall
--  OPTF              = -O2 
-+  OPTF              = %%CXXFLAGS%%
-   DBGF              = -g 
-   SHARED            = -shared
-   ARCH              = 32
-   ARCHARGS          = 
--  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
-+  INST_LOCATION     = $(INST_SYS_PREFIX)
-+  INST_SHARE        = $(INST_SHARE_PREFIX)
-+  INST_DEMOS        = $(EXAMPLESDIR)/bin
-+  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}
+--- Make/makedefs.orig	Sat Dec 10 09:51:33 2005
++++ Make/makedefs	Wed Nov  1 18:19:31 2006
+@@ -55,7 +55,7 @@
+ DEF        = -DPRODUCER_VERSION=\"$(VERSION)\"\
+              -DPRODUCER_VERSION_REVISION="$(VERSION_REVISION)"
  
+-INC        = -I$(TOPDIR)/include 
++INC	   +=  -I${LOCALBASE}/include -I${X11BASE}/include
+ 
+ CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
+ LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
+@@ -64,20 +64,20 @@
+ 	     	 $(YACCFILES:.y=.o)\
+ 	     	 $(LEXFILES:.l=.o)	    
+ 
+-DOF        = $(OPTF)
++OPTF	   = ${CXXFLAGS}
+ DEBUGDIR   = $(OS)$(ARCH).Debug
+ OPTDIR     = $(OS)$(ARCH).Opt
+ BININST    = bin
+ LIBINST    = lib
+ 
+-INST_LOCATION      ?= /usr/local
++INST_LOCATION      = $(PREFIX)
+ INST_LIBS          = $(INST_LOCATION)/lib$(ARCH_EXT)
+ INST_INCLUDE       = $(INST_LOCATION)/include
+ INST_SHARE         = $(INST_LOCATION)/share/Producer
+-INST_DEMOS         = $(INST_SHARE)/bin
+-INST_SRC           = $(INST_SHARE)/src
+-INST_DOC           = $(INST_SHARE)/doc
+-INST_DATA          = $(INST_SHARE)/data
++INST_DEMOS         = $(EXAMPLESDIR)/bin
++INST_SRC           = $(EXAMPLESDIR)/src
++INST_DOC           = $(DOCSDIR)
++INST_DATA          = $(DATADIR)
+ INST_DEMO_SRC      = $(INST_SRC)/demos
+ 
+ LINK               = ln -sf
+@@ -124,7 +124,7 @@
+ LDFLAGS += -L$(OPENTHREADS_LIB_DIR)
  endif
  
+-OPEN_THREAD_LIB = -lOpenThreads
++OPEN_THREAD_LIB = -lOpenThreads ${PTHREAD_LIBS}
+ PTHREAD_LIB = -lpthread
+ 
+ STATICLIB_EXT = a
diff --git a/graphics/openproducer/pkg-plist b/graphics/openproducer/pkg-plist
index 0839f7d912d5..499debf83507 100644
--- a/graphics/openproducer/pkg-plist
+++ b/graphics/openproducer/pkg-plist
@@ -1,4 +1,3 @@
-include/Producer/Barrier
 include/Producer/Block
 include/Producer/BlockingQueue
 include/Producer/Camera
@@ -13,7 +12,6 @@ include/Producer/Math
 include/Producer/RefOpenThreads
 include/Producer/Referenced
 include/Producer/RenderSurface
-include/Producer/Thread
 include/Producer/Timer
 include/Producer/Trackball
 include/Producer/Types