Attachment 33795 Details for Bug 55161 – openproducer.patch

[patch] openproducer.patch

openproducer.patch (text/plain), 3.42 KB, created by Ying-Chieh Chen on 2003-08-01 19:00:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ying-Chieh Chen

Created: 2003-08-01 19:00:30 UTC

Size: 3.42 KB

patch

obsolete

>diff -ruN /usr/ports/graphics/openproducer/files/patch-Make::makedefs openproducer/files/patch-Make::makedefs
>--- /usr/ports/graphics/openproducer/files/patch-Make::makedefs	Sat Jul 26 12:32:20 2003
>+++ openproducer/files/patch-Make::makedefs	Tue Jul 29 19:22:52 2003
>@@ -1,27 +1,14 @@
>---- Make/makedefs.orig	Sat Apr 19 02:07:23 2003
>-+++ Make/makedefs	Sat Jul 26 10:06:16 2003
>-@@ -57,7 +57,7 @@
>- 			 -DGLX_GLXEXT_PROTOTYPES
>- INC        = -I$(TOPDIR)/include 
>- 
>--CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
>-+CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC) %%CXXFLAGS%%
>- LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib 
>- OBJS       = $(CXXFILES:.cpp=.o) \
>- 	     	 $(CFILES:.c=.o) \
>-@@ -228,19 +228,23 @@
>- 
>- #### FreeBSD specific definitions
>- ifeq ($(OS),FreeBSD)
>--    ifeq (x$(CXX),x)
>--      CXX               = g++
>--    endif
>+--- Make/makedefs.orig	Sat Apr 19 01:07:23 2003
>++++ Make/makedefs	Tue Jul 29 19:22:15 2003
>+@@ -232,15 +232,22 @@
>+       CXX               = g++
>+     endif
>    DEPARG            = -MM
> -  INC               +=  -I/usr/local/include -I/usr/X11R6/include
>-+  INC               += -I${LOCALBASE}/include -I${X11BASE}/include
>++  INC               +=  -I${LOCALBASE}/include -I${X11BASE}/include
>    DEF               += -W -Wall
> -  OPTF              = -O2 
>-+  OPTF              =
>++  OPTF              = %%CXXFLAGS%%
>    DBGF              = -g 
>    SHARED            = -shared
>    ARCH              = 32
>@@ -29,14 +16,14 @@
> -  INST_SYS_PREFIX   = /opt/X11R6
> -  INST_SHARE_PREFIX = /usr/share/Producer
> +  INST_SYS_PREFIX   = $(PREFIX)
>-+  INST_SHARE_PREFIX = $(INST_SYS_PREFIX)/share/openproducer
>++  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        = $(INST_LOCATION)/openproducer/bin
>-+  INST_SRC          = $(INST_LOCATION)/openproducer/src
>-+  INST_DOC          = $(INST_LOCATION)/openproducer/doc
>-+  INST_DATA         = $(INST_SHARE)/openproducer/data
>++  INST_DEMOS        = $(EXAMPLESDIR)/bin
>++  INST_SRC          = $(EXAMPLESDIR)/src
>++  INST_DOC          = $(DOCSDIR)
>++  INST_DATA         = $(DATADIR)
>  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	Thu Jan  1 08:00:00 1970
>+++ openproducer/files/patch-Make::makerules	Tue Jul 29 19:03:51 2003
>@@ -0,0 +1,20 @@
>+--- Make/makerules.orig	Tue Jul 29 19:02:29 2003
>++++ Make/makerules	Tue Jul 29 19:02:51 2003
>+@@ -90,7 +90,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) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
>+@@ -99,7 +99,7 @@
>+ $(LIB:=.opt) : 
>+ 	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
>+ 	@cd $(OPTDIR);\
>+-	  $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \
>++	  $(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

Actions: View | Diff

Attachments on bug 55161: 33795