From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 17 04:50:24 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C8A8016A4BF for ; Fri, 17 Oct 2003 04:50:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4746C43FD7 for ; Fri, 17 Oct 2003 04:50:21 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9HBoLFY008018 for ; Fri, 17 Oct 2003 04:50:21 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9HBoLLp008016; Fri, 17 Oct 2003 04:50:21 -0700 (PDT) (envelope-from gnats) Resent-Date: Fri, 17 Oct 2003 04:50:21 -0700 (PDT) Resent-Message-Id: <200310171150.h9HBoLLp008016@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Ying-Chieh Chen" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1307916A4B3 for ; Fri, 17 Oct 2003 04:40:04 -0700 (PDT) Received: from net04.cs.ccu.edu.tw (net04.cs.ccu.edu.tw [140.123.105.104]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D3D343F85 for ; Fri, 17 Oct 2003 04:40:02 -0700 (PDT) (envelope-from yinjieh@net04.cs.ccu.edu.tw) Received: from net04.cs.ccu.edu.tw (localhost [127.0.0.1]) by net04.cs.ccu.edu.tw (8.12.8p2/8.12.8) with ESMTP id h9HBdoX8000765 for ; Fri, 17 Oct 2003 19:39:50 +0800 (CST) (envelope-from yinjieh@net04.cs.ccu.edu.tw) Received: (from root@localhost) by net04.cs.ccu.edu.tw (8.12.8p2/8.12.8/Submit) id h9HBdniT000764; Fri, 17 Oct 2003 19:39:49 +0800 (CST) Message-Id: <200310171139.h9HBdniT000764@net04.cs.ccu.edu.tw> Date: Fri, 17 Oct 2003 19:39:49 +0800 (CST) From: "Ying-Chieh Chen" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/58162: [maintainer-update] Update ports/graphics/openproducer to 0.8.4.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Ying-Chieh Chen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Oct 2003 11:50:24 -0000 >Number: 58162 >Category: ports >Synopsis: [maintainer-update] Update ports/graphics/openproducer to 0.8.4.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Oct 17 04:50:14 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Ying-Chieh Chen >Release: FreeBSD 4.8-RELEASE-p13 i386 >Organization: MANA lab in CS/CCU >Environment: System: FreeBSD net04.cs.ccu.edu.tw 4.8-RELEASE-p13 FreeBSD 4.8-RELEASE-p13 #0: Mon Oct 6 23:47:41 CST 2003 root@net04.cs.ccu.edu.tw:/usr/obj/usr/src/sys/KERNEL i386 >Description: Update ports/graphics/openproducer to 0.8.4.2 Update files: Makefile distinfo files/patch-Make::makedefs files/patch-Make::makerules files/patch-src::RenderSurface_X11.cpp pkg-plist Please commit it, thanks! >How-To-Repeat: N/A >Fix: diff -ruN /usr/ports/graphics/openproducer/Makefile openproducer/Makefile --- /usr/ports/graphics/openproducer/Makefile Tue Jul 29 09:17:23 2003 +++ openproducer/Makefile Fri Oct 17 19:34:45 2003 @@ -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 @@ 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 @@ ${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 -ruN /usr/ports/graphics/openproducer/distinfo openproducer/distinfo --- /usr/ports/graphics/openproducer/distinfo Sat Jul 26 07:35:07 2003 +++ openproducer/distinfo Fri Oct 17 17:47:33 2003 @@ -1 +1 @@ -MD5 (Producer-0.8.2-2.tar.gz) = 070fd2108c196506ebc3103628d28547 +MD5 (Producer-0.8.4-2.tar.gz) = 9e14c27a0e927a19bb3666fa73755652 diff -ruN /usr/ports/graphics/openproducer/files/patch-Make::makedefs openproducer/files/patch-Make::makedefs --- /usr/ports/graphics/openproducer/files/patch-Make::makedefs Sat Aug 2 03:05:26 2003 +++ openproducer/files/patch-Make::makedefs Fri Oct 17 18:32:18 2003 @@ -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 -ruN /usr/ports/graphics/openproducer/files/patch-Make::makerules openproducer/files/patch-Make::makerules --- /usr/ports/graphics/openproducer/files/patch-Make::makerules Sat Aug 2 03:05:26 2003 +++ openproducer/files/patch-Make::makerules Fri Oct 17 18:32:43 2003 @@ -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 -ruN /usr/ports/graphics/openproducer/files/patch-src::GNUmakefile openproducer/files/patch-src::GNUmakefile --- /usr/ports/graphics/openproducer/files/patch-src::GNUmakefile Sat Jul 26 07:35:08 2003 +++ openproducer/files/patch-src::GNUmakefile Thu Jan 1 08:00:00 1970 @@ -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 -ruN /usr/ports/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp openproducer/files/patch-src::RenderSurface_X11.cpp --- /usr/ports/graphics/openproducer/files/patch-src::RenderSurface_X11.cpp Thu Jan 1 08:00:00 1970 +++ openproducer/files/patch-src::RenderSurface_X11.cpp Fri Oct 17 19:16:53 2003 @@ -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 + void (*glXGetProcAddressARB(const GLubyte *procName))(void) + { diff -ruN /usr/ports/graphics/openproducer/pkg-plist openproducer/pkg-plist --- /usr/ports/graphics/openproducer/pkg-plist Sat Jul 26 07:35:07 2003 +++ openproducer/pkg-plist Fri Oct 17 19:31:23 2003 @@ -10,20 +10,16 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: