Date: Tue, 15 Jun 2004 15:42:09 +0400 (MSD) From: Igor Pokrovsky <ip@doom.homeunix.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67969: Update port: graphics/ayam bento fix Message-ID: <200406151142.i5FBg9fB006814@doom.homeunix.org> Resent-Message-ID: <200406151200.i5FC0pgG079851@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67969
>Category: ports
>Synopsis: Update port: graphics/ayam bento fix
>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: Tue Jun 15 12:00:51 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: Mon Jun 14 18:17:11 MSD 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386
>Description:
Fixed broken makefile.shared
>How-To-Repeat:
>Fix:
--- ayam.diff begins here ---
diff -ru /usr/ports/graphics/ayam/files/patch-Makefile.shared ayam/files/patch-Makefile.shared
--- /usr/ports/graphics/ayam/files/patch-Makefile.shared Mon May 17 09:11:25 2004
+++ ayam/files/patch-Makefile.shared Tue Jun 15 15:39:20 2004
@@ -1,5 +1,5 @@
--- Makefile.shared.orig Sat Mar 27 03:17:07 2004
-+++ Makefile.shared Fri May 14 06:48:16 2004
++++ Makefile.shared Tue Jun 15 15:38:05 2004
@@ -4,7 +4,7 @@
# Makefile for Ayam (shared version)
@@ -96,17 +96,15 @@
# Aqsis
-AQSISDIR = /usr/local/aqsis
--AQSISINCDIR = $(AQSISDIR)/include
--AQSISLIBDIR = $(AQSISDIR)/lib
+AQSISDIR = ${LOCALBASE}
-+AQSISINCDIR = $(AQSISDIR)/include/aqsis
-+AQSISLIBDIR = $(AQSISDIR)/lib/aqsis
+ AQSISINCDIR = $(AQSISDIR)/include
+ 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 = -L${AQSISLIBDIR} $(AQSISDIR)/lib/libaqsis.so $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -llog4cpp
++AQSISOBJS = $(AQSISLIBDIR)/libaqsis.so $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -llog4cpp
# if you do not use Aqsis libri2rib as BMRT libribout replacement:
#AQSISRI2RIB =
@@ -159,7 +157,7 @@
+all: ayamsh csphere.so mfio.so metaobj.so ayslx.so
-ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS)
-+ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AQSISOBJS)
++ayamsh: $(AYAMOBJS) $(TOGLOBJECT)
$(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL)
csphere.so: $(CSPHEREOBJS)
--- ayam.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406151142.i5FBg9fB006814>