Date: Mon, 2 Feb 2004 07:27:16 +0300 (MSK) From: Igor Pokrovsky <tiamat@comset.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62246: Update port: graphics/ayam bento fix Message-ID: <200402020427.i124RGoU003670@doom.homeunix.org> Resent-Message-ID: <200402020430.i124UMrx048111@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62246
>Category: ports
>Synopsis: Update port: graphics/ayam bento fix
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 01 20:30:21 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Igor Pokrovsky
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Jan 26 19:02:19 MSK 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386
>Description:
1. Added -fPIC to make amd64 happy (bento fix).
2. Added support for graphics/aqsis as a renderer and shader.
3. Minor style and installation fixes.
4. Bumped port revision.
>How-To-Repeat:
>Fix:
--- ayam.diff begins here ---
diff -ru /usr/ports/graphics/ayam/Makefile ayam/Makefile
--- /usr/ports/graphics/ayam/Makefile Sun Jan 25 08:11:08 2004
+++ ayam/Makefile Mon Feb 2 07:14:07 2004
@@ -7,6 +7,7 @@
PORTNAME= ayam
PORTVERSION= 1.6
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,7 +17,8 @@
MAINTAINER= tiamat@comset.net
COMMENT= 3D modeling environment for the RenderMan interface
-LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
+LIB_DEPENDS= aqsis.0:${PORTSDIR}/graphics/aqsis \
+ tcl82.1:${PORTSDIR}/lang/tcl82 \
tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
tiff.4:${PORTSDIR}/graphics/tiff
@@ -26,8 +28,10 @@
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}/src
MAKEFILE= Makefile.shared
+MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
AYAM_PLUGINS= csphere mfio
+PLUGINS_DIR= ${PREFIX}/lib/${PORTNAME}
post-patch:
@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/tcl/ayam.tcl
@@ -36,34 +40,34 @@
# binary and wrapper
${INSTALL_PROGRAM} ${WRKSRC}/ayamsh ${PREFIX}/bin
@(${ECHO_CMD} "#!${SH}"; \
- ${ECHO_CMD} "${PREFIX}/bin/ayamsh ${PREFIX}/lib/ayam/tcl/ayam.tcl \$$@" \
+ ${ECHO_CMD} "${PREFIX}/bin/ayamsh ${PLUGINS_DIR}/tcl/ayam.tcl \$$@" \
) >${PREFIX}/bin/ayam
@${CHMOD} ugo+x ${PREFIX}/bin/ayam
# plugins
- @${MKDIR} ${PREFIX}/lib/${PORTNAME}
+ @${MKDIR} ${PLUGINS_DIR}
.for i in ${AYAM_PLUGINS}
- ${INSTALL_DATA} ${WRKSRC}/plugins/${i}.tcl \
- ${PREFIX}/lib/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/plugins/${i}.so \
- ${PREFIX}/lib/${PORTNAME}
+ ${INSTALL_DATA} ${WRKSRC}/plugins/${i}.tcl ${PLUGINS_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/plugins/${i}.so ${PLUGINS_DIR}
.endfor
- ${INSTALL_DATA} ${WRKSRC}/contrib/meta/*.tcl ${PREFIX}/lib/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/contrib/meta/metaobj.so ${PREFIX}/lib/${PORTNAME}
+ ${INSTALL_PROGRAM} ${WRKSRC}/plugins/ayslx.so ${PLUGINS_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/plugins/loadayslx.tcl ${PLUGINS_DIR}
+
+ ${INSTALL_DATA} ${WRKSRC}/contrib/meta/*.tcl ${PLUGINS_DIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/contrib/meta/metaobj.so ${PLUGINS_DIR}
# tcl libs
- @${MKDIR} ${PREFIX}/lib/${PORTNAME}
- @${MKDIR} ${PREFIX}/lib/${PORTNAME}/tcl
- ${INSTALL_DATA} ${WRKSRC}/tcl/*.tcl ${PREFIX}/lib/${PORTNAME}/tcl
- @${MKDIR} ${PREFIX}/lib/${PORTNAME}/tcl/BWidget-1.2.1
+ @${MKDIR} ${PLUGINS_DIR}/tcl
+ ${INSTALL_DATA} ${WRKSRC}/tcl/*.tcl ${PLUGINS_DIR}/tcl
+ @${MKDIR} ${PLUGINS_DIR}/tcl/BWidget-1.2.1
${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/*.tcl \
- ${PREFIX}/lib/${PORTNAME}/tcl/BWidget-1.2.1
- @${MKDIR} ${PREFIX}/lib/${PORTNAME}/tcl/BWidget-1.2.1/images
+ ${PLUGINS_DIR}/tcl/BWidget-1.2.1
+ @${MKDIR} ${PLUGINS_DIR}/tcl/BWidget-1.2.1/images
${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/images/* \
- ${PREFIX}/lib/${PORTNAME}/tcl/BWidget-1.2.1/images
- @${MKDIR} ${PREFIX}/lib/${PORTNAME}/tcl/BWidget-1.2.1/lang
+ ${PLUGINS_DIR}/tcl/BWidget-1.2.1/images
+ @${MKDIR} ${PLUGINS_DIR}/tcl/BWidget-1.2.1/lang
${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/lang/* \
- ${PREFIX}/lib/${PORTNAME}/tcl/BWidget-1.2.1/lang
+ ${PLUGINS_DIR}/tcl/BWidget-1.2.1/lang
# data
@${MKDIR} ${DATADIR}
@@ -73,7 +77,9 @@
.ifndef (NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/*.txt ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/ayam.pdf ${DOCSDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/refcard.ps ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/refcard.tcl ${DOCSDIR}
@${MKDIR} ${DOCSDIR}/html
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/*.html ${DOCSDIR}/html
@${MKDIR} ${DOCSDIR}/html/pics
diff -ru /usr/ports/graphics/ayam/files/patch-Makefile.shared ayam/files/patch-Makefile.shared
--- /usr/ports/graphics/ayam/files/patch-Makefile.shared Wed Jan 14 05:29:01 2004
+++ ayam/files/patch-Makefile.shared Mon Feb 2 07:18:41 2004
@@ -1,6 +1,6 @@
--- Makefile.shared.orig Fri Sep 26 17:17:52 2003
-+++ Makefile.shared Mon Jan 12 14:28:28 2004
-@@ -34,14 +34,14 @@
++++ Makefile.shared Mon Feb 2 07:17:36 2004
+@@ -34,7 +34,7 @@
MKDIR = mkdir -p
# the compiler
@@ -9,24 +9,17 @@
#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++
-
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,8 @@
# switched off and rotating views via keyboard will fill up the undo buffer
# o add -DAYOLDSLX if you compile with an Aqsis libslxargs prior to 0.7.19
-CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
-+CFLAGS += -O -DAYUSEAFFINE -DAYENABLEWAIT
++# make amd64 happy with fPIC
++CFLAGS += -O -fPIC -DAYUSESLXARGS -DAYUSEAQSISRIB -DAYENABLEWAIT
# IRIX (-DAYIRIXBUG is needed by ncurve.c to work around a bug in libGLU)::
#CFLAGS = -O -fullwarn -DAYIRIXBUG -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
# Linux:
-@@ -107,50 +107,36 @@
+@@ -107,49 +108,53 @@
TOGLOBJECT = togl/togl.o
# OpenGL
@@ -43,48 +36,88 @@
# Tcl/Tk
# Tcl directory
--#TCLDIR = ../../tcl8.2.2
+ #TCLDIR = ../../tcl8.2.2
-TCLDIR = ../../tcl8.0
++#TCLDIR = ../../tcl8.0
# Tcl includes
-TCLINC = -I$(TCLDIR)/generic
++#TCLINC = -I$(TCLDIR)/generic
+TCLINC = -I${LOCALBASE}/include/tcl8.2/generic
# Tcl library
# link options for linking with Tcl library
--#TCLLIB = -L$(TCLDIR)/unix -ltcl8.2
+ #TCLLIB = -L$(TCLDIR)/unix -ltcl8.2
-TCLLIB = -L$(TCLDIR)/unix -ltcl8.0
--# if you have an installed Tcl/Tk, you probably just want:
--#TCLLIB = -ltcl
--
--# Tk sources directory
--# Note: You really need the Tk _sources_ in order to compile Ayam!
--#TKDIR = ../../tk8.2.2
--TKDIR = ../../tk8.0
++#TCLLIB = -L$(TCLDIR)/unix -ltcl8.0
+TCLLIB = -L${LOCALBASE}/lib -ltcl82
+ # if you have an installed Tcl/Tk, you probably just want:
+ #TCLLIB = -ltcl
+
+ # Tk sources directory
+ # Note: You really need the Tk _sources_ in order to compile Ayam!
+ #TKDIR = ../../tk8.2.2
+-TKDIR = ../../tk8.0
++#TKDIR = ../../tk8.0
# Tk includes
-TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix
++#TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix
+TKINC = -I${LOCALBASE}/include/tk8.2/generic -I${LOCALBASE}/include/tk8.2/unix
# Tk library
# link options for linking with Tk library
--#TKLIB = -L$(TKDIR)/unix -ltk8.2
+ #TKLIB = -L$(TKDIR)/unix -ltk8.2
-TKLIB = -L$(TKDIR)/unix -ltk8.0
--# if you have an installed Tcl/Tk, you probably just want:
--#TKLIB = -ltk
++#TKLIB = -L$(TKDIR)/unix -ltk8.0
+TKLIB = -L${LOCALBASE}/lib -ltk82
+ # if you have an installed Tcl/Tk, you probably just want:
+ #TKLIB = -ltk
# X11-libs
# link options for linking with X11
-X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
--#X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
+X11LIBS = -L${X11BASE}/lib -lXmu -lXext -lX11
+ #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
+
+
+@@ -163,18 +168,18 @@
- # Affine Toolkit
-@@ -198,9 +184,9 @@
+ # Aqsis
+-AQSISDIR = /usr/local/aqsis
++AQSISDIR = ${LOCALBASE}
+ AQSISINCDIR = $(AQSISDIR)/include
+ AQSISLIBDIR = $(AQSISDIR)/lib
+ # if you do not use Aqsis libslxargs:
+-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
+
+ # if you do not use Aqsis libri2rib as 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${LOCALBASE}/lib -llog4cpp ${PTHREAD_LIBS}
+
+
+
+@@ -186,9 +191,9 @@
+ BMRTINCDIR = $(BMRTDIR)/include
+ BMRTLIBDIR = $(BMRTDIR)/lib
+ # if you use BMRT libribout and not Affine:
+-RIBOUTLIB = -L$(BMRTLIBDIR) -lribout
++#RIBOUTLIB = -L$(BMRTLIBDIR) -lribout
+ # if you use Affine or Aqsis libri2rib as libribout replacement:
+-#RIBOUTLIB =
++RIBOUTLIB =
+ # if you do not use libslcargs from BMRT:
+ SLCARGSLIB =
+ # if you use Affine as libribout replacement and libslcargs from BMRT:
+@@ -198,16 +203,16 @@
# Dynamic Loading
# Library for dynamic loading (contains dlopen())
# Linux, IRIX, Solaris:
@@ -96,21 +129,23 @@
# RRIB Plugin Required Libraries
RRIBLIBS = -L /home/randi/sdk/affine0008/lib -lribrdr -lribhash -lribnop -lm
-@@ -347,14 +333,15 @@
-
- RRIBOBJS = plugins/rrib.o
-
-+AFFINEOBJS = affine/src/constant.o affine/src/write.o
+ # Ayslx Plugin (Aqsis)
+ AYSLXINCDIR = $(AQSISDIR)/include
+-AYSLXLIBS = $(AQSISDIR)/lib/rcdummy.o $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L /usr/local/lib -llog4cpp
++AYSLXLIBS = $(AQSISDIR)/lib/libaqsis.so $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L${LOCALBASE}/lib -llog4cpp
+
+ # Ayso Plugin (RenderDotC, RDC)
+ RDCDIR = /usr/local/rdc
+@@ -351,9 +356,9 @@
.c.o:
-- $(CC) -c $(CFLAGS) $*.c -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(BMRTINCDIR) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(TIFFINCDIR)
-+ $(CC) -c $(CFLAGS) $*.c -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(TIFFINCDIR)
+ $(CC) -c $(CFLAGS) $*.c -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(BMRTINCDIR) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(TIFFINCDIR)
- all: ayamsh csphere.so mfio.so metaobj.so
+-all: ayamsh csphere.so mfio.so metaobj.so
++all: ayamsh csphere.so mfio.so metaobj.so ayslx.so
- ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS)
-- $(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL)
-+ $(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(SLCARGSLIB) $(AFFINEOBJS) $(TIFFLIB) -lm
+-ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS)
++ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AQSISOBJS)
+ $(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL)
csphere.so: $(CSPHEREOBJS)
- $(CC) -shared $(CSPHEREOBJS) -o plugins/csphere.so
diff -ru /usr/ports/graphics/ayam/pkg-plist ayam/pkg-plist
--- /usr/ports/graphics/ayam/pkg-plist Wed Jan 14 05:29:01 2004
+++ ayam/pkg-plist Mon Feb 2 07:14:07 2004
@@ -1,5 +1,7 @@
bin/ayam
bin/ayamsh
+lib/ayam/ayslx.so
+lib/ayam/loadayslx.tcl
lib/ayam/csphere.tcl
lib/ayam/csphere.so
lib/ayam/metaobj.so
@@ -155,7 +157,9 @@
%%PORTDOCS%%%%DOCSDIR%%/License.txt
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/Setup.txt
+%%PORTDOCS%%%%DOCSDIR%%/ayam.pdf
%%PORTDOCS%%%%DOCSDIR%%/refcard.ps
+%%PORTDOCS%%%%DOCSDIR%%/refcard.tcl
%%PORTDOCS%%%%DOCSDIR%%/html/ayam-1.html
%%PORTDOCS%%%%DOCSDIR%%/html/ayam-2.html
%%PORTDOCS%%%%DOCSDIR%%/html/ayam-3.html
--- 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?200402020427.i124RGoU003670>