diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-01 12:21:01 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2004-04-01 12:21:01 +0000 |
commit | 9b9ab9b5fa5162b796aeba6c0c827f7c2f2d5391 (patch) | |
tree | 3ace770dfe56dc612134742a59ba1b74aa061a4e /graphics/ayam | |
parent | - Update to version 1.2.1 (diff) |
- Update to version 1.7
PR: ports/65036
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=105867
Diffstat (limited to 'graphics/ayam')
-rw-r--r-- | graphics/ayam/Makefile | 9 | ||||
-rw-r--r-- | graphics/ayam/distinfo | 4 | ||||
-rw-r--r-- | graphics/ayam/files/patch-Makefile.shared | 50 | ||||
-rw-r--r-- | graphics/ayam/pkg-descr | 5 | ||||
-rw-r--r-- | graphics/ayam/pkg-plist | 7 |
5 files changed, 41 insertions, 34 deletions
diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile index db5f7a602e66..ac516271eb2b 100644 --- a/graphics/ayam/Makefile +++ b/graphics/ayam/Makefile @@ -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 @@ LIB_DEPENDS= aqsis.0:${PORTSDIR}/graphics/aqsis \ 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 @@ do-install: # 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 --git a/graphics/ayam/distinfo b/graphics/ayam/distinfo index db8d1d8e1774..4bb1cae29a25 100644 --- a/graphics/ayam/distinfo +++ b/graphics/ayam/distinfo @@ -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 --git a/graphics/ayam/files/patch-Makefile.shared b/graphics/ayam/files/patch-Makefile.shared index 7b3e735e3f78..e797dc22c102 100644 --- a/graphics/ayam/files/patch-Makefile.shared +++ b/graphics/ayam/files/patch-Makefile.shared @@ -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 --git a/graphics/ayam/pkg-descr b/graphics/ayam/pkg-descr index e8368734bf3e..7e44f5fbc9db 100644 --- a/graphics/ayam/pkg-descr +++ b/graphics/ayam/pkg-descr @@ -2,9 +2,8 @@ Ayam is a free 3D modeling environment for the RenderMan Interface (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 --git a/graphics/ayam/pkg-plist b/graphics/ayam/pkg-plist index 492a44df754b..5f3145e02f4d 100644 --- a/graphics/ayam/pkg-plist +++ b/graphics/ayam/pkg-plist @@ -28,6 +28,7 @@ lib/ayam/tcl/control.tcl 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 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc @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 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%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 |