Date: Thu, 1 Apr 2004 14:04:45 +0400 (MSD) From: Igor Pokrovsky <tiamat@comset.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65036: Update port: graphics/ayam 1.6 -> 1.7 Message-ID: <200404011004.i31A4jrZ004257@doom.homeunix.org> Resent-Message-ID: <200404011130.i31BUIBw037870@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65036
>Category: ports
>Synopsis: Update port: graphics/ayam 1.6 -> 1.7
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 01 03:30:18 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 Mar 29 21:09:31 MSD 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386
>Description:
Update to 1.7
>How-To-Repeat:
>Fix:
--- ayam.diff begins here ---
diff -ru /usr/ports/graphics/ayam/Makefile ayam/Makefile
--- /usr/ports/graphics/ayam/Makefile Sun Feb 8 01:43:46 2004
+++ ayam/Makefile Thu Apr 1 13:58:47 2004
@@ -6,13 +6,11 @@
#
PORTNAME= ayam
-PORTVERSION= 1.6
-PORTREVISION= 1
+PORTVERSION= 1.7
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX= .src.tar.gz
+DISTNAME= ${PORTNAME}${PORTVERSION}.src
MAINTAINER= tiamat@comset.net
COMMENT= 3D modeling environment for the RenderMan interface
@@ -23,7 +21,6 @@
tiff.4:${PORTSDIR}/graphics/tiff
USE_GL= yes
-USE_XLIB= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}/src
@@ -78,7 +75,7 @@
# docs
.ifndef (NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/*.txt ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Setup.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}
diff -ru /usr/ports/graphics/ayam/distinfo ayam/distinfo
--- /usr/ports/graphics/ayam/distinfo Thu Apr 1 09:28:06 2004
+++ ayam/distinfo Thu Apr 1 11:26:46 2004
@@ -1,2 +1,2 @@
-MD5 (ayam1.6.src.tar.gz) = 4b0c04179180b7f5b075c2e4d648ae73
-SIZE (ayam1.6.src.tar.gz) = 2168531
+MD5 (ayam1.7.src.tar.gz) = f4cd9c2f69304a0b4693a48d2d2b9fc5
+SIZE (ayam1.7.src.tar.gz) = 2135436
diff -ru /usr/ports/graphics/ayam/files/patch-Makefile.shared ayam/files/patch-Makefile.shared
--- /usr/ports/graphics/ayam/files/patch-Makefile.shared Mon Feb 2 11:55:42 2004
+++ ayam/files/patch-Makefile.shared Thu Apr 1 13:57:00 2004
@@ -1,5 +1,14 @@
---- Makefile.shared.orig Fri Sep 26 17:17:52 2003
-+++ Makefile.shared Mon Feb 2 07:17:36 2004
+--- Makefile.shared.orig Sat Mar 27 03:17:07 2004
++++ Makefile.shared Thu Apr 1 11:37:18 2004
+@@ -4,7 +4,7 @@
+ # Makefile for Ayam (shared version)
+
+ # Choose an installation prefix.
+-PREFIX = /usr/local/ayam
++#PREFIX = /usr/local/ayam
+ #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 @@
MKDIR = mkdir -p
@@ -9,9 +18,9 @@
#CC = gcc
# the linker
-@@ -65,7 +65,8 @@
- # switched off and rotating views via keyboard will fill up the undo buffer
+@@ -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
-CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
+# make amd64 happy with fPIC
@@ -19,7 +28,7 @@
# IRIX (-DAYIRIXBUG is needed by ncurve.c to work around a bug in libGLU)::
#CFLAGS = -O -fullwarn -DAYIRIXBUG -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
# Linux:
-@@ -107,49 +108,53 @@
+@@ -115,49 +116,53 @@
TOGLOBJECT = togl/togl.o
# OpenGL
@@ -82,7 +91,7 @@
#X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
-@@ -163,18 +168,18 @@
+@@ -172,18 +177,18 @@
# Aqsis
@@ -90,54 +99,55 @@
+AQSISDIR = ${LOCALBASE}
AQSISINCDIR = $(AQSISDIR)/include
AQSISLIBDIR = $(AQSISDIR)/lib
- # if you do not use Aqsis libslxargs:
+ # 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 = $(AQSISDIR)/lib/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:
+ # 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${LOCALBASE}/lib -llog4cpp ${PTHREAD_LIBS}
++AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L ${LOCALBASE}/lib -llog4cpp ${PTHREAD_LIBS}
-
-@@ -186,9 +191,9 @@
+ # BMRT
+@@ -194,9 +199,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:
+ # if you use Affine or Aqsis libri2rib as BMRT 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 @@
+ # if you use Affine as BMRT libribout replacement and libslcargs from BMRT:
+@@ -206,9 +211,9 @@
# Dynamic Loading
# Library for dynamic loading (contains dlopen())
- # Linux, IRIX, Solaris:
+ # Linux, IRIX, Solaris, (MacOSX: get libdl from Fink!):
-DL = -ldl
+#DL = -ldl
# NetBSD:
-#DL =
+DL =
- # RRIB Plugin Required Libraries
- RRIBLIBS = -L /home/randi/sdk/affine0008/lib -lribrdr -lribhash -lribnop -lm
+ # linker flags to produce shared modules:
+ # Linux, Solaris, IRIX:
+@@ -223,7 +228,7 @@
# 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/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 @@
+@@ -373,9 +378,9 @@
.c.o:
$(CC) -c $(CFLAGS) $*.c -o $@ -I. -IMF3D -I$(TOGLINCDIR) $(TCLINC) $(TKINC) -I$(BMRTINCDIR) -I$(GLINCDIR) -I$(AFFINEINCDIR) -I$(AQSISINCDIR) -I$(TIFFINCDIR)
diff -ru /usr/ports/graphics/ayam/pkg-descr ayam/pkg-descr
--- /usr/ports/graphics/ayam/pkg-descr Wed Jan 14 05:29:01 2004
+++ ayam/pkg-descr Thu Apr 1 14:01:21 2004
@@ -2,9 +2,8 @@
(formerly known as "The Mops"). Ayam is primarily aimed at the
platforms BMRT (Blue Moon Rendering Tools, a RenderMan compliant
renderer by Larry Gritz (Exluna) runs on. As BMRT are available
-in FreeBSD only as Linux binaries, Ayam will be compiled with code
-from the Affine Toolkit with limited functionality.
-No parsing of slc compiled shaders will be possible.
+in FreeBSD only as Linux binaries, Ayam will use graphics/aqsis as
+a primary renderer.
WWW: http://www.ayam3d.org/
diff -ru /usr/ports/graphics/ayam/pkg-plist ayam/pkg-plist
--- /usr/ports/graphics/ayam/pkg-plist Mon Feb 2 11:55:42 2004
+++ ayam/pkg-plist Thu Apr 1 13:54:21 2004
@@ -28,6 +28,7 @@
lib/ayam/tcl/cylinder.tcl
lib/ayam/tcl/disk.tcl
lib/ayam/tcl/extrude.tcl
+lib/ayam/tcl/gordon.tcl
lib/ayam/tcl/hyperb.tcl
lib/ayam/tcl/icons.tcl
lib/ayam/tcl/icurve.tcl
@@ -153,9 +154,6 @@
@dirrm lib/ayam
%%DATADIR%%/ayam-splash.gif
@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/Changes.txt
-%%PORTDOCS%%%%DOCSDIR%%/License.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/Setup.txt
%%PORTDOCS%%%%DOCSDIR%%/ayam.pdf
%%PORTDOCS%%%%DOCSDIR%%/refcard.ps
@@ -175,17 +173,20 @@
%%PORTDOCS%%%%DOCSDIR%%/html/pics/clone.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/concatnc.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pics/gordon-hood.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/icurves.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/inskn.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/listbox.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/main.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/meta.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/multip.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pics/plotcur.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/prefs.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/primitives.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/propgui.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refine.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/revolve.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pics/sgordon.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/skin.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/splitnc.gif
%%PORTDOCS%%%%DOCSDIR%%/html/pics/ssweep.gif
--- 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?200404011004.i31A4jrZ004257>