- Fix stuff after pav's premature commit of graphics/osg update

  - Remove graphics/openproducer, graphics/openthreads - those are now included in osg
  - Remove obsolete bsd.osg.mk from graphics/osg
  - Mark graphics/demeter BROKEN if it's being build WITH_OSG, as it won't compile now

9 files changed, 1 insertions, 152 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 8f8e64f33bfe..8b576a2bd3c7 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -488,7 +488,6 @@
     SUBDIR += openexr_ctl
     SUBDIR += opengl-man
     SUBDIR += openjpeg
-    SUBDIR += openproducer
     SUBDIR += openrm
     SUBDIR += ophoto
     SUBDIR += optipng
diff --git a/graphics/demeter/Makefile b/graphics/demeter/Makefile
index 19f8410d97b4..959c3aa2fe87 100644
--- a/graphics/demeter/Makefile
+++ b/graphics/demeter/Makefile
@@ -61,6 +61,7 @@ USE_GNOME=	libxml2
 .ifdef (WITH_OSG)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libosg.so:${PORTSDIR}/graphics/osg
 RUN_DEPENDS+=	${LOCALBASE}/lib/libosg.so:${PORTSDIR}/graphics/osg
+BROKEN=		Does not compile with osg
 .endif
 
 .ifdef (WITH_GDAL)
diff --git a/graphics/openproducer/Makefile b/graphics/openproducer/Makefile
deleted file mode 100644
index 087aee5202c3..000000000000
--- a/graphics/openproducer/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# New ports collection makefile for:	openproducer
-# Date created:		22 July 2003
-# Whom:			Ying-Chieh Chen <yinjieh@csie.nctu.edu.tw>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openproducer
-PORTVERSION=	1.1
-PORTREVISION=	1
-CATEGORIES=	graphics
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A cross-platform C++/OpenGL library focused on camera control
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads
-RUN_DEPENDS=	${LOCALBASE}/lib/libOpenThreads.so:${PORTSDIR}/devel/openthreads
-
-USE_GL=		yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/Producer
-
-.include "${.CURDIR}/../../graphics/osg/bsd.osg.mk"
-.include <bsd.port.mk>
diff --git a/graphics/openproducer/files/patch-src::ConfigParser.cpp b/graphics/openproducer/files/patch-src::ConfigParser.cpp
deleted file mode 100644
index 8fb569ce3f3d..000000000000
--- a/graphics/openproducer/files/patch-src::ConfigParser.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index a8ae7a66740a..000000000000
--- a/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-descr b/graphics/openproducer/pkg-descr
deleted file mode 100644
index ff42415d7190..000000000000
--- a/graphics/openproducer/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-From the 'overview' section of the official site:
-
-Open Producer (or simply Producer) is a cross-platform C++/OpenGL library
-that is focused on Camera control. Producer's Camera provides projection 1,
-field of view, viewpoint control, and frame control. Further, Producer can
-be used in a multi-tasking environment to allow multiple Camera's to run in
-parallel supporting hardware configurations with multiple display subsystems.
-Threading, Camera synchronization and frame rate control are simplified in
-the Producer programming interface. 
-
-Producer provides a simple, yet powerfully scalable approach for real-time 3D
-applications wishing to run within a single window to large, multidisplay
-systems. 
-
-WWW: http://www.andesengineering.com/Producer/
diff --git a/graphics/openproducer/pkg-plist b/graphics/openproducer/pkg-plist
deleted file mode 100644
index b42abb0e1b10..000000000000
--- a/graphics/openproducer/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-include/Producer/Block
-include/Producer/BlockingQueue
-include/Producer/Camera
-include/Producer/CameraConfig
-include/Producer/CameraGroup
-include/Producer/Events
-include/Producer/Export
-include/Producer/InputArea
-include/Producer/Keyboard
-include/Producer/KeyboardMouse
-include/Producer/Math
-include/Producer/PipeTimer
-include/Producer/RefOpenThreads
-include/Producer/Referenced
-include/Producer/RenderSurface
-include/Producer/System
-include/Producer/Timer
-include/Producer/Trackball
-include/Producer/Types
-include/Producer/Utils
-include/Producer/Version
-include/Producer/VisualChooser
-include/Producer/Window3D
-lib/libProducer.so
-@dirrm include/Producer
diff --git a/graphics/osg-devel/bsd.osg.mk b/graphics/osg-devel/bsd.osg.mk
deleted file mode 100644
index aa07f82c1c62..000000000000
--- a/graphics/osg-devel/bsd.osg.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-
-MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/
-DISTNAME=	OSG_OP_OT-1.2
-
-MD5_FILE=	${.CURDIR}/../../graphics/osg/distinfo
-USE_ZIP=	yes
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-
-MAKEFILE=	GNUmakefile
-MAKE_ARGS=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CXX="${CXX}" \
-		INST_LOCATION="${PREFIX}" \
-		INST_EXAMPLES="${EXAMPLESDIR}/bin" \
-		INST_SRC="${EXAMPLESDIR}/src" \
-		INST_EXAMPLE_SRC="${EXAMPLESDIR}/src" \
-		INSTBINCMD="${INSTALL_PROGRAM}" \
-		INSTXCMD="${INSTALL_PROGRAM}" \
-		INSTDEVCMD="${INSTALL_DATA}" \
-		INSTRCMD="${INSTALL_DATA}"
-ALL_TARGET=	opt
-
-post-patch: osg-post-patch
-
-osg-post-patch:
-	@${REINPLACE_CMD} -Ee 's|-O2|${CXXFLAGS}|; \
-		s|(-I\|-L\|-rpath )/usr/local|\1${LOCALBASE}|; \
-		s|(-I\|-L\|-rpath )/usr/X11R6|\1${LOCALBASE}|' \
-		${WRKSRC}/Make/makedefs
-	@${REINPLACE_CMD} -e 's|DOF=$$(OPTF)|DOF="$$(OPTF)"|' \
-		${WRKSRC}/Make/makerules
diff --git a/graphics/osg/bsd.osg.mk b/graphics/osg/bsd.osg.mk
deleted file mode 100644
index aa07f82c1c62..000000000000
--- a/graphics/osg/bsd.osg.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-
-MASTER_SITES=	http://www.openscenegraph.org/downloads/snapshots/
-DISTNAME=	OSG_OP_OT-1.2
-
-MD5_FILE=	${.CURDIR}/../../graphics/osg/distinfo
-USE_ZIP=	yes
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-
-MAKEFILE=	GNUmakefile
-MAKE_ARGS=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CXX="${CXX}" \
-		INST_LOCATION="${PREFIX}" \
-		INST_EXAMPLES="${EXAMPLESDIR}/bin" \
-		INST_SRC="${EXAMPLESDIR}/src" \
-		INST_EXAMPLE_SRC="${EXAMPLESDIR}/src" \
-		INSTBINCMD="${INSTALL_PROGRAM}" \
-		INSTXCMD="${INSTALL_PROGRAM}" \
-		INSTDEVCMD="${INSTALL_DATA}" \
-		INSTRCMD="${INSTALL_DATA}"
-ALL_TARGET=	opt
-
-post-patch: osg-post-patch
-
-osg-post-patch:
-	@${REINPLACE_CMD} -Ee 's|-O2|${CXXFLAGS}|; \
-		s|(-I\|-L\|-rpath )/usr/local|\1${LOCALBASE}|; \
-		s|(-I\|-L\|-rpath )/usr/X11R6|\1${LOCALBASE}|' \
-		${WRKSRC}/Make/makedefs
-	@${REINPLACE_CMD} -e 's|DOF=$$(OPTF)|DOF="$$(OPTF)"|' \
-		${WRKSRC}/Make/makerules