ports/73247: Update port: graphics/ayam fix build

[Igor Pokrovsky]

>Number:         73247
>Category:       ports
>Synopsis:       Update port: graphics/ayam fix build
>Confidential:   no
>Severity:       critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 28 16:50:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Igor Pokrovsky
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Wed Oct 13 20:27:55 MSD 2004 root at doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386


	
>Description:
Fixes build on both 4.x and 5.x.
Bumped port revision.
	
>How-To-Repeat:
	
>Fix:

	

--- ayam.diff begins here ---
diff -ruN /usr/ports/graphics/ayam/Makefile ayam/Makefile
--- /usr/ports/graphics/ayam/Makefile	Sun Sep 19 09:53:08 2004
+++ ayam/Makefile	Tue Oct 12 20:37:27 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	ayam
 PORTVERSION=	1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,8 +19,10 @@
 LIB_DEPENDS=	aqsis.0:${PORTSDIR}/graphics/aqsis \
 		tcl82.1:${PORTSDIR}/lang/tcl82 \
 		tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		log4cpp.4:${PORTSDIR}/devel/log4cpp
 
+USE_GCC=	3.4
 USE_GL=		yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
@@ -31,12 +33,6 @@
 AYAM_PLUGINS=	csphere mfio
 PLUGINS_DIR=	${PREFIX}/lib/${PORTNAME}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not build on FreeBSD >= 5.x"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/tcl/ayam.tcl
 	@${REINPLACE_CMD} -e 's|^MF3DCFLAGS =|MF3DCFLAGS = -fPIC|g' \
@@ -93,4 +89,4 @@
 		${DOCSDIR}/html/pics
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/graphics/ayam/files/patch-Makefile.shared ayam/files/patch-Makefile.shared
--- /usr/ports/graphics/ayam/files/patch-Makefile.shared	Fri Jul 16 10:08:31 2004
+++ ayam/files/patch-Makefile.shared	Wed Oct 27 17:09:28 2004
@@ -1,5 +1,5 @@
 --- Makefile.shared.orig	Sat Mar 27 03:17:07 2004
-+++ Makefile.shared	Wed Jul  7 10:55:22 2004
++++ Makefile.shared	Tue Oct  5 21:43:30 2004
 @@ -4,7 +4,7 @@
  # Makefile for Ayam (shared version)
  
@@ -9,7 +9,7 @@
  #PREFIX = /opt/ayam
  # if you use one of the following, be sure to change LIBDIR
  # and DOCDIR to a more suitable (Ayam specific) path
-@@ -34,7 +34,7 @@
+@@ -34,14 +34,14 @@
  MKDIR = mkdir -p
  
  # the compiler
@@ -18,6 +18,14 @@
  #CC = gcc
  
  # the linker
+ # Starting with BMRT2.5, libribout and libslcargs are in C++,
+ # which forces us to use "CC" or "g++" to link the right libraries
+ # automatically
+-LD = CC
++LD = ${CC}
+ # for Linux, use
+ #LD = g++
+ # MacOSX
 @@ -68,7 +68,8 @@
  # o add -DAYOLDSLX if you compile with an Aqsis libslxargs prior to 0.7.19
  # o add -DUSE_NON_CONST if you compile with Tcl/Tk 8.4.x
@@ -97,22 +105,21 @@
  # Aqsis
 -AQSISDIR = /usr/local/aqsis
 -AQSISINCDIR = $(AQSISDIR)/include
--AQSISLIBDIR = $(AQSISDIR)/lib
 +AQSISDIR = ${LOCALBASE}
 +AQSISINCDIR = $(AQSISDIR)/include/aqsis
-+AQSISLIBDIR = $(AQSISDIR)/lib
+ AQSISLIBDIR = $(AQSISDIR)/lib
  # if you do not use Aqsis libslxargs as libslcargs replacement:
 -AQSISOBJS = 
 +#AQSISOBJS = 
  # if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!):
 -#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp
-+AQSISOBJS = $(AQSISLIBDIR)/libaqsis.so $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -llog4cpp
++AQSISOBJS = $(AQSISLIBDIR)/libaqsis.a $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L${LOCALBASE}/lib $(AQSISLIBDIR)/libraytrace.so -llog4cpp -lstdc++
  
  # if you do not use Aqsis libri2rib as BMRT libribout replacement:
  #AQSISRI2RIB =
  # if you use Aqsis libri2rib (add -DAYUSEAQSISRIB to CFLAGS above!):
 -AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L /usr/local/lib -llog4cpp
-+AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L${AQSISLIBDIR} -llog4cpp ${PTHREAD_LIBS}
++AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L${AQSISLIBDIR} -llog4cpp -lstdc++ ${PTHREAD_LIBS}
  
  
  # BMRT
--- ayam.diff ends here ---


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