ports/55161: [Maintainer Update] fix build of graphics/openproducer

[Ying-Chieh Chen]

>Number:         55161
>Category:       ports
>Synopsis:       [Maintainer Update] fix build of graphics/openproducer
>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 Aug 01 11:00:30 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ying-Chieh Chen
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
yinjieh vmware lab
>Environment:
System: FreeBSD stable.yinjieh.com 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Thu Apr 3 10:53:38 GMT 2003 root at freebsd-stable.sentex.ca:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:

	Fix build of graphics/openproducer.
	Changes are as follows:

	o MODIFY files/patch-Make::makedefs to fix install location hierarchy.
	o ADD files/patch-Make::makerules to fix makefile quotation problem.

	Please commit it, thanks!

>How-To-Repeat:

	patch and cd ${PORTSDIR}/graphics/openproducer && make

>Fix:

	

--- openproducer.patch begins here ---
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
--- openproducer.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: