Attachment 36224 Details for Bug 58162 – file.diff

[patch] file.diff

file.diff (text/plain), 6.60 KB, created by Ying-Chieh Chen on 2003-10-17 12:50:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ying-Chieh Chen

Created: 2003-10-17 12:50:14 UTC

Size: 6.60 KB

patch

obsolete

>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 <dlfcn.h>
>+ 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

Actions: View | Diff

Attachments on bug 58162: 36224