diff options
| author | John Marino <marino@FreeBSD.org> | 2015-10-10 14:49:28 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-10-10 14:49:28 +0000 |
| commit | 818a717d936e3576105df8544a87d8ead64a4af7 (patch) | |
| tree | c2c1d26736e72cf453578762fd95872141fd4eee /graphics/ayam | |
| parent | 9bb5b832603d972bfd6f4750eb23066a272fb23c (diff) | |
| download | ports-818a717d936e3576105df8544a87d8ead64a4af7.tar.gz ports-818a717d936e3576105df8544a87d8ead64a4af7.zip | |
graphics/ayam: upgrade version 1.20 => 1.22
I reverted most of the changes from 1-step to compound installation
commands.
PR: 199232
Submitted by: ports fury
Notes
Notes:
svn path=/head/; revision=399001
Diffstat (limited to 'graphics/ayam')
23 files changed, 305 insertions, 322 deletions
diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile index 2fb6364d0b49..c1c9ee074f03 100644 --- a/graphics/ayam/Makefile +++ b/graphics/ayam/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ayam -PORTVERSION= 1.20 -PORTREVISION= 3 +PORTVERSION= 1.22 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Ayam/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION}.src @@ -18,87 +17,95 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libaqsis_util.so:${PORTSDIR}/graphics/aqsis \ libtiff.so:${PORTSDIR}/graphics/tiff -BUILD_DEPENDS= aqsl:${PORTSDIR}/graphics/aqsis +RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils -OPTIONS_DEFINE= DOCS - -USE_XORG= xmu xext x11 -USE_GL= yes -USE_LDCONFIG= ${PREFIX}/lib/ayam -USES= gmake tk:84 WRKSRC= ${WRKDIR}/${PORTNAME}/src + +USES= gmake tk +USE_XORG= x11 xext xmu +USE_GL= glu +MAKE_ENV= TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \ + TCL_SHLIB_VER="${TCL_SHLIB_VER}" \ + TK_INCLUDEDIR="${TK_INCLUDEDIR}" \ + TK_SHLIB_VER="${TK_SHLIB_VER}" MAKEFILE= Makefile.shared +USE_LDCONFIG= ${PREFIX}/lib/ayam MAKE_JOBS_UNSAFE= yes -AYAM_PLUGINS= csphere mfio -PLUGINS_DIR= ${PREFIX}/lib/${PORTNAME} +DESKTOP_ENTRIES="Ayam" "" "" "ayam" "" "" + +OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/tcl/ayam.tcl - @${REINPLACE_CMD} -e 's|^MF3DCFLAGS =|MF3DCFLAGS = -fPIC|g' \ + @${REINPLACE_CMD} -e \ + '/^MF3DCFLAGS/s|=.*|= -fPIC|' \ ${WRKSRC}/MF3D/Makefile.mf3d @${REINPLACE_CMD} -e \ - 's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g; s|make|$$(MAKE)|g; \ - s|%%TCL_LIBDIR%%|${LOCALBASE}/lib|g; s|%%TCL_SHLIB_VER%%|${TCL_SHLIB_VER}|g; \ - s|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|g; \ - s|%%TK_LIBDIR%%|${LOCALBASE}/lib|g; s|%%TK_SHLIB_VER%%|${TK_SHLIB_VER}|g' \ - ${WRKSRC}/Makefile.shared - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/../scn/shaders/Makefile + 's|interp->errorLine;|Tcl_GetErrorLine(interp);|' \ + ${WRKSRC}/objects/script.c + @${REINPLACE_CMD} -e \ + 's|".*\(ayam-splash.gif\)"|"${DATADIR}/\1"|' \ + ${WRKSRC}/tcl/ayam.tcl + @${REINPLACE_CMD} -e \ + 's| firefox | xdg-open |' \ + ${WRKSRC}/tcl/browser.tcl + @${REINPLACE_CMD} -e \ + '/^AQSL/s|=.*|= ${LOCALBASE}/bin/aqsl|' \ + ${WRKSRC}/../scn/shaders/Makefile post-build: cd ${WRKSRC}/../scn/shaders && ${MAKE_CMD} slx + @${ECHO_CMD} -n > ${WRKSRC}/../bin/ayam + @${ECHO_CMD} "#!${SH}" >> ${WRKSRC}/../bin/ayam + @${ECHO_CMD} "${PREFIX}/bin/ayamsh ${PREFIX}/lib/ayam/tcl/ayam.tcl \$$@" \ + >> ${WRKSRC}/../bin/ayam do-install: # binary and wrapper - ${INSTALL_PROGRAM} ${WRKSRC}/ayamsh ${STAGEDIR}${PREFIX}/bin - @(${ECHO_CMD} "#!${SH}"; \ - ${ECHO_CMD} "${PREFIX}/bin/ayamsh ${PLUGINS_DIR}/tcl/ayam.tcl \$$@" \ - ) > ${STAGEDIR}${PREFIX}/bin/ayam - @${CHMOD} ugo+x ${STAGEDIR}${PREFIX}/bin/ayam - + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ayamsh ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}/../bin && ${INSTALL_SCRIPT} ayam ${STAGEDIR}${PREFIX}/bin) # shaders @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/shaders - ${INSTALL_DATA} ${WRKSRC}/../scn/shaders/*.slx ${STAGEDIR}${PREFIX}/lib/ayam/shaders - + (cd ${WRKSRC}/../scn/shaders && ${INSTALL_DATA} *.slx \ + ${STAGEDIR}${PREFIX}/lib/ayam/shaders) # plugins - @${MKDIR} ${STAGEDIR}${PLUGINS_DIR} -.for i in ${AYAM_PLUGINS} - ${INSTALL_DATA} ${WRKSRC}/plugins/${i}.tcl ${STAGEDIR}${PLUGINS_DIR} - ${INSTALL_PROGRAM} ${WRKSRC}/plugins/${i}.so ${STAGEDIR}${PLUGINS_DIR} -.endfor - ${INSTALL_PROGRAM} ${WRKSRC}/plugins/ayslx.so ${STAGEDIR}${PLUGINS_DIR} - ${INSTALL_DATA} ${WRKSRC}/plugins/loadayslx.tcl ${STAGEDIR}${PLUGINS_DIR} - - ${INSTALL_DATA} ${WRKSRC}/contrib/meta/*.tcl ${STAGEDIR}${PLUGINS_DIR} - ${INSTALL_PROGRAM} ${WRKSRC}/contrib/meta/metaobj.so ${STAGEDIR}${PLUGINS_DIR} - + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam + (cd ${WRKSRC}/plugins && ${INSTALL_LIB} \ + ayslx.so csphere.so mfio.so \ + ${STAGEDIR}${PREFIX}/lib/ayam) + (cd ${WRKSRC}/plugins && ${INSTALL_DATA} \ + csphere.tcl loadayslx.tcl mfio.tcl \ + ${STAGEDIR}${PREFIX}/lib/ayam) + (cd ${WRKSRC}/contrib/meta && ${INSTALL_LIB} *.so \ + ${STAGEDIR}${PREFIX}/lib/ayam) + (cd ${WRKSRC}/contrib/meta && ${INSTALL_DATA} *.tcl \ + ${STAGEDIR}${PREFIX}/lib/ayam) # tcl libs - @${MKDIR} ${STAGEDIR}${PLUGINS_DIR}/tcl - ${INSTALL_DATA} ${WRKSRC}/tcl/*.tcl ${STAGEDIR}${PLUGINS_DIR}/tcl - @${MKDIR} ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1 + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl \ + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1 \ + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/images \ + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/lang + ${INSTALL_DATA} ${WRKSRC}/tcl/*.tcl \ + ${STAGEDIR}${PREFIX}/lib/ayam/tcl ${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/*.tcl \ - ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1 - @${MKDIR} ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/images + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1 ${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/images/* \ - ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/images - @${MKDIR} ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/lang + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/images ${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/lang/* \ - ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/lang - + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/lang # data @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/lib/ayam-splash.gif ${STAGEDIR}${DATADIR} - + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/lib/ayam-splash.gif \ + ${STAGEDIR}${DATADIR} # docs -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} \ + ${STAGEDIR}${DOCSDIR}/html \ + ${STAGEDIR}${DOCSDIR}/html/pics ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Setup.txt ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/ayam.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/refcard.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/refcard.tcl ${STAGEDIR}${DOCSDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/*.html ${STAGEDIR}${DOCSDIR}/html - @${MKDIR} ${STAGEDIR}${DOCSDIR}/html/pics + (cd ${WRKDIR}/${PORTNAME}/doc && ${INSTALL_DATA} \ + ayam.pdf refcard.pdf refcard.tcl ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/*.html \ + ${STAGEDIR}${DOCSDIR}/html ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/pics/* \ ${STAGEDIR}${DOCSDIR}/html/pics diff --git a/graphics/ayam/distinfo b/graphics/ayam/distinfo index e5e5d431f00e..9017c9b7a000 100644 --- a/graphics/ayam/distinfo +++ b/graphics/ayam/distinfo @@ -1,2 +1,2 @@ -SHA256 (ayam1.20.src.tar.gz) = 4cf5fc46b0722ee12d5b5d0b2baadbf3c5f2a9cbf38e23fc837d6ce91139dad9 -SIZE (ayam1.20.src.tar.gz) = 4593617 +SHA256 (ayam1.22.src.tar.gz) = b583bfad827d70c31225fcd5158c595727806252eaf4f48bdb95dd453ef2b209 +SIZE (ayam1.22.src.tar.gz) = 5070423 diff --git a/graphics/ayam/files/patch-MF3D_mffile.c b/graphics/ayam/files/patch-MF3D_mffile.c index e23343382e4f..f35a55169477 100644 --- a/graphics/ayam/files/patch-MF3D_mffile.c +++ b/graphics/ayam/files/patch-MF3D_mffile.c @@ -1,6 +1,6 @@ ---- MF3D/mffile.c.orig 2007-12-17 19:24:47.000000000 +0100 -+++ MF3D/mffile.c 2007-12-17 19:25:03.000000000 +0100 -@@ -102,7 +102,7 @@ +--- MF3D/mffile.c.orig 2015-06-23 18:03:50 UTC ++++ MF3D/mffile.c +@@ -102,7 +102,7 @@ MF3D_TypeObjWrite ( /* Add this type to the table */ ++inMetafilePtr->typeTable.nTypes; numTypes = inMetafilePtr->typeTable.nTypes; diff --git a/graphics/ayam/files/patch-MF3D_mfobject.c b/graphics/ayam/files/patch-MF3D_mfobject.c index 5ac878640058..c48202fd7ea6 100644 --- a/graphics/ayam/files/patch-MF3D_mfobject.c +++ b/graphics/ayam/files/patch-MF3D_mfobject.c @@ -1,6 +1,6 @@ ---- MF3D/mfobject.c.orig 2007-09-21 13:30:36.000000000 +0200 -+++ MF3D/mfobject.c 2007-12-17 19:48:57.000000000 +0100 -@@ -930,7 +930,7 @@ +--- MF3D/mfobject.c.orig 2015-06-23 18:03:50 UTC ++++ MF3D/mfobject.c +@@ -930,7 +930,7 @@ MF3D_ObjTypeReader ( ++inMetafilePtr->typeTable.nTypes; numTypes = inMetafilePtr->typeTable.nTypes; diff --git a/graphics/ayam/files/patch-MF3D_mfprimtv.c b/graphics/ayam/files/patch-MF3D_mfprimtv.c index 1bad37d375f2..0f4ae0bafa41 100644 --- a/graphics/ayam/files/patch-MF3D_mfprimtv.c +++ b/graphics/ayam/files/patch-MF3D_mfprimtv.c @@ -1,6 +1,6 @@ ---- MF3D/mfprimtv.c.orig 2007-12-17 19:30:09.000000000 +0100 -+++ MF3D/mfprimtv.c 2007-12-17 19:30:24.000000000 +0100 -@@ -1000,7 +1000,7 @@ +--- MF3D/mfprimtv.c.orig 2015-06-23 18:03:50 UTC ++++ MF3D/mfprimtv.c +@@ -1000,7 +1000,7 @@ MF3D_LabelWrite ( if (result == kMF3DNoErr) { ++metafile->tocStuff.numReferences; diff --git a/graphics/ayam/files/patch-MF3D_mftextrd.c b/graphics/ayam/files/patch-MF3D_mftextrd.c index 1575f4d61679..2a5fe13715cc 100644 --- a/graphics/ayam/files/patch-MF3D_mftextrd.c +++ b/graphics/ayam/files/patch-MF3D_mftextrd.c @@ -1,6 +1,6 @@ ---- MF3D/mftextrd.c.orig 2007-12-17 19:30:49.000000000 +0100 -+++ MF3D/mftextrd.c 2007-12-17 19:32:02.000000000 +0100 -@@ -178,7 +178,7 @@ +--- MF3D/mftextrd.c.orig 2015-06-23 18:03:50 UTC ++++ MF3D/mftextrd.c +@@ -178,7 +178,7 @@ MF3D_GetTOCLabels( MFASSERT(numNewLabels >= 0); if (numNewLabels > 0) @@ -9,7 +9,7 @@ (numLabels + numNewLabels) * sizeof(*tocLabelNames)); } -@@ -250,7 +250,7 @@ +@@ -250,7 +250,7 @@ MF3D_ConvertTableLabels( if (result != kMF3DNoErr) break; @@ -18,7 +18,7 @@ if (result != kMF3DNoErr) break; -@@ -381,7 +381,7 @@ +@@ -381,7 +381,7 @@ MF3D_PreprocessTextFile( char objName[kMF3D_MaxObjNameLength + 1]; if (numObjects % kMF3D_ObjTableChunk == 0) @@ -27,7 +27,7 @@ (numObjects + kMF3D_ObjTableChunk) * sizeof(*objTable)); if (result != kMF3DNoErr) goto PreprocessTextFileAbort; -@@ -419,7 +419,7 @@ +@@ -419,7 +419,7 @@ MF3D_PreprocessTextFile( { /* We found a TOC object. We will want to find * this later; so save the index. */ @@ -36,7 +36,7 @@ (numTocs + 1) * sizeof(*tocLocations)); if (result != kMF3DNoErr) goto PreprocessTextFileAbort; -@@ -499,7 +499,7 @@ +@@ -499,7 +499,7 @@ MF3D_PreprocessTextFile( /* Readjust the object table from its chunky size */ if (result == kMF3DNoErr) @@ -45,7 +45,7 @@ if (result == kMF3DNoErr) { /* Store the file length here */ AssignInt64(objTable[numObjects].objLocation, location); -@@ -1027,7 +1027,7 @@ +@@ -1027,7 +1027,7 @@ MF3D_BuildString_AddChar( result = kMF3DNoErr; if ((ioStringPtr->pos % kMF3D_StringBufferChunk) == 0) diff --git a/graphics/ayam/files/patch-Makefile.shared b/graphics/ayam/files/patch-Makefile.shared index 443d1d0f2a9b..97be4c3b5bc7 100644 --- a/graphics/ayam/files/patch-Makefile.shared +++ b/graphics/ayam/files/patch-Makefile.shared @@ -1,15 +1,15 @@ ---- Makefile.shared.orig 2010-12-23 21:04:42.000000000 +0100 -+++ Makefile.shared 2011-01-05 10:49:15.000000000 +0100 -@@ -4,7 +4,7 @@ - # Makefile for Ayam (shared version) +--- Makefile.shared.orig 2015-06-23 18:03:50 UTC ++++ Makefile.shared +@@ -7,7 +7,7 @@ + # You can also use "wish ayamConf.tcl" to create a Makefile. # 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 -@@ -31,14 +31,14 @@ + #PREFIX = /home/user/ayam + +@@ -25,14 +25,14 @@ SCNDIR = $(PREFIX)/scn INSTALL = ./ninstall #INSTALL = install @@ -23,11 +23,11 @@ # the C++ compiler (just in use for the AyCSG and onio plugin) -#CXX = CC -+CXX = ${CC} ++CXX ?= c++ #CXX = g++ # the linker -@@ -82,7 +82,10 @@ +@@ -77,7 +77,10 @@ LD = $(CXX) # the default configuration is to build with Affine as RIB writer without # any shader parsing library (i.e. you will have to build and load a # plugin for shader parsing) @@ -35,20 +35,11 @@ +#CFLAGS = -O -DAYUSEAFFINE + +# make amd64 happy with fPIC -+CFLAGS += -O -fPIC -DAYUSESLXARGS -DAYUSEAQSISRIB -DAYENABLEWAIT ++CFLAGS += -fPIC -DAYUSESLXARGS -DAYUSEAQSISRIB -DAYENABLEWAIT # simple configuration using BMRT #CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT -@@ -96,7 +99,7 @@ - # MacOSX with Aqua: - #CFLAGS = -O -DAYWITHAQUA -DAYUSEAFFINE -DAYENABLEFEXIT -DUSE_NON_CONST - # MacOSX with Aqua (universal binary, support for older MacOSX): --CFLAGS = -O -DAYWITHAQUA -DAYUSEAFFINE -DAYENABLEFEXIT -DUSE_NON_CONST -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.2 -+#CFLAGS = -O -DAYWITHAQUA -DAYUSEAFFINE -DAYENABLEFEXIT -DUSE_NON_CONST -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.2 - # MacOSX with X11: - #CFLAGS = -O -DAYUSEAFFINE -DAYENABLEFEXIT - -@@ -121,9 +124,9 @@ +@@ -114,9 +117,9 @@ LDSWDYNAMIC = -dynamic # extra ld flags needed to compile Ayam # (gcc needs -rdynamic to allow shared objects access to global symbols) # IRIX: @@ -56,11 +47,11 @@ +#EXLDFLAGS = # Linux: -#EXLDFLAGS = -rdynamic -+EXLDFLAGS = -rdynamic ++EXLDFLAGS = -Wl,-export-dynamic # MacOSX (X11): #EXLDFLAGS = -flat_namespace -undefined suppress # MacOSX (Aqua): -@@ -140,7 +143,7 @@ +@@ -133,7 +136,7 @@ TOGLOBJECT = togl/togl.o # OpenGL # OpenGL includes @@ -69,7 +60,7 @@ # MacOSX (Aqua): #GLINC = # link options for linking with OpenGL libraries -@@ -150,24 +153,26 @@ +@@ -143,24 +146,26 @@ GLLIBS = -lGLU -lGL # TIFF # TIFF includes @@ -80,47 +71,51 @@ # Tcl/Tk # Tcl directory --TCLDIR = ../../tcl8.2.2 -+#TCLDIR = ../../tcl9.2.2 +-TCLDIR = ../../tcl8.4.19 ++#TCLDIR = ../../tcl8.4.19 #TCLDIR = ../../tcl8.0 # Tcl includes -TCLINC = -I$(TCLDIR)/generic +#TCLINC = -I$(TCLDIR)/generic -+TCLINC = -I%%TCL_INCLUDEDIR%% ++TCLINC = -I${TCL_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR} # MacOSX (Aqua): #TCLINC = # Tcl library # link options for linking with Tcl library --TCLLIB = -L$(TCLDIR)/unix -ltcl8.2 -+#TCLLIB = -L$(TCLDIR)/unix -ltcl9.2 +-TCLLIB = -L$(TCLDIR)/unix -ltcl8.4 ++#TCLLIB = -L$(TCLDIR)/unix -ltcl8.4 #TCLLIB = -L$(TCLDIR)/unix -ltcl8.0 -+TCLLIB = -L%%TCL_LIBDIR%% -ltcl%%TCL_SHLIB_VER%% ++TCLLIB = -L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER} # if you have an installed Tcl/Tk, you probably just want: #TCLLIB = -ltcl # MacOSX (Aqua): -@@ -175,7 +180,7 @@ +@@ -168,18 +173,20 @@ TCLLIB = -L$(TCLDIR)/unix -ltcl8.4 # Tk sources directory # Note: You really need the Tk _sources_ in order to compile Ayam! --TKDIR = ../../tk8.2.2 -+TKDIR = %%TK_INCLUDEDIR%% +-TKDIR = ../../tk8.4.19 ++#TKDIR = ../../tk8.4.19 #TKDIR = ../../tk8.0 # Tk includes -@@ -185,8 +190,9 @@ +-TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix ++#TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix ++TKINC = -I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR} + # MacOSX (Aqua): + #TKINC = -I$(TKDIR)/generic -I$(TKDIR)/macosx -I$(TKDIR)/xlib # 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.4 ++#TKLIB = -L$(TKDIR)/unix -ltk8.4 #TKLIB = -L$(TKDIR)/unix -ltk8.0 -+TKLIB = -L%%TK_LIBDIR%% -ltk%%TK_SHLIB_VER%% ++TKLIB = -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER} # if you have an installed Tcl/Tk, you probably just want: #TKLIB = -ltk # MacOSX (Aqua): -@@ -194,11 +200,11 @@ +@@ -187,11 +194,11 @@ TKLIB = -L$(TKDIR)/unix -ltk8.4 # X11 # X11 includes @@ -134,7 +129,7 @@ #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 # MacOSX (Aqua): #X11LIBS = -@@ -209,23 +215,25 @@ +@@ -202,23 +209,25 @@ X11LIBS = -L/usr/X11R6/lib -lXmu -lXext AFFINEINC = -Iaffine/include # if you use Affine as BMRT libribout replacement # (also add -DAYUSEAFFINE to CFLAGS!): @@ -155,7 +150,7 @@ +#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 = $(AQSISDIR)/lib/libaqsis_core.so $(AQSISLIBDIR)/libaqsis_shadervm.so $(AQSISLIBDIR)/libaqsis_slxargs.so -L${AQSISLIBDIR} -lstdc++ ++AQSISOBJS = $(AQSISDIR)/lib/libaqsis_core.so $(AQSISLIBDIR)/libaqsis_shadervm.so $(AQSISLIBDIR)/libaqsis_slxargs.so -L${AQSISLIBDIR} + # if you do not use Aqsis libri2rib as BMRT libribout replacement: @@ -163,11 +158,11 @@ +#AQSISRI2RIB = # if you use Aqsis libri2rib (add -DAYUSEAQSISRIB to CFLAGS above!): -#AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L /usr/local/lib -llog4cpp -+AQSISRI2RIB = $(AQSISLIBDIR)/libaqsis_ri2rib.so -L${AQSISLIBDIR} -lstdc++ -lpthread ++AQSISRI2RIB = $(AQSISLIBDIR)/libaqsis_ri2rib.so -L${AQSISLIBDIR} -pthread # BMRT -@@ -253,9 +261,9 @@ +@@ -246,9 +255,9 @@ SLCARGSLIB = # IRIX, Solaris, (MacOSX<10.4: get libdl from Fink!): #DL = -ldl # Linux: @@ -179,7 +174,7 @@ # linker flags to produce shared modules: -@@ -274,8 +282,9 @@ +@@ -267,8 +276,9 @@ AFFINEDIR = ../../affine0008 RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm # Ayslx Plugin (Aqsis) @@ -191,15 +186,42 @@ # Ayslc Plugin (BMRT) AYSLCINCDIR = $(BMRTDIR)/include -@@ -520,9 +529,9 @@ +@@ -536,9 +546,9 @@ RRIBOBJS = plugins/rrib.o .cpp.o: - $(CXX) -c $(CFLAGS) $*.cpp -o $@ $(AYINC) $(OPENCSGINC) -Iplugins + $(CXX) -c $(CFLAGS) $*.cpp -o $@ $(OPENCSGINC) $(AYINC) -Iplugins -all: ayamsh +all: ayamsh plugins --plugins: csphere.so mfio.so metaobj.so mopsi.so -+plugins: csphere.so mfio.so metaobj.so mopsi.so ayslx.so +-plugins: csphere.so sfcurve.so mfio.so metaobj.so mopsi.so ++plugins: ayslx.so csphere.so sfcurve.so mfio.so metaobj.so mopsi.so ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS) $(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL) +@@ -591,7 +601,7 @@ idr.so: $(IDROBJS) + $(CC) $(SHLFLAGS) $(IDROBJS) -o plugins/idr.so $(TIFFLIB) + + mf3d: +- cd MF3D; make -f Makefile.mf3d ++ cd MF3D; $(MAKE) -f Makefile.mf3d + + mfio.so: plugins/mfio.o mf3d + $(CC) $(SHLFLAGS) $(MF3DOBJS) plugins/mfio.o -o plugins/mfio.so +@@ -657,7 +667,7 @@ sdnpatch.so: + $(CXX) $(SHLFLAGS) plugins/sdnpatch.o -o plugins/sdnpatch.so $(SDNPATCHLIB) + + libsub: +- cd plugins/subdivide/src;make -f $(SUBDIVMK) ++ cd plugins/subdivide/src;$(MAKE) -f $(SUBDIVMK) + + subdiv.so: libsub + $(CXX) -c $(CFLAGS) plugins/subdiv.cpp -o plugins/subdiv.o $(AYINC) $(SUBDIVINC) +@@ -695,7 +705,7 @@ mostlyclean: + + clean: mostlyclean + -rm -f $(AFFINEOBJS) +- -cd MF3D; make -f Makefile.mf3d clean ++ -cd MF3D; $(MAKE) -f Makefile.mf3d clean + + DOCFILES = ../Setup.txt ../Changes.txt ../License.txt ../doc/refcard.tcl\ + ../doc/refcard.pdf ../doc/ayam.pdf diff --git a/graphics/ayam/files/patch-ayam.tcl b/graphics/ayam/files/patch-ayam.tcl deleted file mode 100644 index 3c56331090de..000000000000 --- a/graphics/ayam/files/patch-ayam.tcl +++ /dev/null @@ -1,11 +0,0 @@ ---- tcl/ayam.tcl.orig 2011-01-04 13:54:09.000000000 +0100 -+++ tcl/ayam.tcl 2011-01-04 13:54:31.000000000 +0100 -@@ -555,7 +555,7 @@ - pady 3 - failsafe 0 - showsplash 1 -- aysplash "../lib/ayam-splash.gif" -+ aysplash "%%DATADIR%%/ayam-splash.gif" - filename "" - tmpfiles "" - ayamrc "~/.ayamrc" diff --git a/graphics/ayam/files/patch-contrib-meta_metaobj.c b/graphics/ayam/files/patch-contrib-meta_metaobj.c index 4f3fee5fc8be..654a2dfd3919 100644 --- a/graphics/ayam/files/patch-contrib-meta_metaobj.c +++ b/graphics/ayam/files/patch-contrib-meta_metaobj.c @@ -1,6 +1,6 @@ ---- contrib/meta/metaobj.c.orig 2007-12-17 19:32:36.000000000 +0100 -+++ contrib/meta/metaobj.c 2007-12-17 19:33:01.000000000 +0100 -@@ -851,7 +851,7 @@ +--- contrib/meta/metaobj.c.orig 2015-06-23 18:03:50 UTC ++++ contrib/meta/metaobj.c +@@ -859,7 +859,7 @@ metaobj_notifycb (ay_object *o) meta_world *w; meta_blob *b; ay_object *down; diff --git a/graphics/ayam/files/patch-contrib_ai.c b/graphics/ayam/files/patch-contrib_ai.c deleted file mode 100644 index b55e72cd08b6..000000000000 --- a/graphics/ayam/files/patch-contrib_ai.c +++ /dev/null @@ -1,18 +0,0 @@ ---- contrib/ai.c.orig 2007-09-21 13:30:37.000000000 +0200 -+++ contrib/ai.c 2007-12-17 19:00:20.000000000 +0100 -@@ -530,11 +530,11 @@ - /* char fname[] = "Ai_Init";*/ - - /* Create Tcl commands */ -- Tcl_CreateCommand(interp, "ai_makeInstances", ay_ai_makeinstancestcmd, -- (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); -+ Tcl_CreateCommand(interp, "ai_makeInstances", (Tcl_CmdProc *) ay_ai_makeinstancestcmd, -+ NULL, NULL); - -- Tcl_CreateCommand(interp, "ai_resolveInstances", ay_ai_resolveinstancestcmd, -- (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); -+ Tcl_CreateCommand(interp, "ai_resolveInstances", (Tcl_CmdProc *) ay_ai_resolveinstancestcmd, -+ NULL, NULL); - /* - Tcl_CreateCommand(interp, "ai_getInstancesList", ay_ai_getinstanceslisttcmd, - (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); diff --git a/graphics/ayam/files/patch-contrib_sm.c b/graphics/ayam/files/patch-contrib_sm.c index d9472771a530..8d7f8d556d57 100644 --- a/graphics/ayam/files/patch-contrib_sm.c +++ b/graphics/ayam/files/patch-contrib_sm.c @@ -1,6 +1,6 @@ ---- contrib/sm.c.orig 2007-09-21 13:30:37.000000000 +0200 -+++ contrib/sm.c 2007-12-17 19:01:46.000000000 +0100 -@@ -473,7 +473,7 @@ +--- contrib/sm.c.orig 2015-06-23 18:03:50 UTC ++++ contrib/sm.c +@@ -474,7 +474,7 @@ ay_sm_wriballsm(char *file, char *objfil static int countsm = 0; char arrname[] = "ayprefs"; char ffvarname[] = "SMFileFormat", ftvarname[] = "SMFileType"; @@ -9,7 +9,7 @@ if(!o) return; -@@ -498,10 +498,10 @@ +@@ -499,10 +499,10 @@ ay_sm_wriballsm(char *file, char *objfil return; } diff --git a/graphics/ayam/files/patch-contrib_tree.c b/graphics/ayam/files/patch-contrib_tree.c deleted file mode 100644 index d2e012fe5c3a..000000000000 --- a/graphics/ayam/files/patch-contrib_tree.c +++ /dev/null @@ -1,28 +0,0 @@ ---- contrib/tree.c.orig 2007-09-21 13:30:37.000000000 +0200 -+++ contrib/tree.c 2007-12-17 19:03:54.000000000 +0100 -@@ -898,19 +898,19 @@ - */ - - /* create new Tcl commands */ -- Tcl_CreateCommand(interp, "treeGetString", ay_tree_gettreetcmd, -- (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); -+ Tcl_CreateCommand(interp, "treeGetString", (Tcl_CmdProc *)ay_tree_gettreetcmd, -+ NULL, NULL); - -- Tcl_CreateCommand(interp, "treeSelect", ay_tree_selecttcmd, -- (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); -+ Tcl_CreateCommand(interp, "treeSelect", (Tcl_CmdProc *)ay_tree_selecttcmd, -+ NULL, NULL); - - /* - Tcl_CreateCommand(interp, "CreateDndObject", aytree_CreateDndObject_tcmd, - (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); - */ - -- Tcl_CreateCommand(interp, "treeDnd", ay_tree_dndtcmd, -- (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); -+ Tcl_CreateCommand(interp, "treeDnd", (Tcl_CmdProc *)ay_tree_dndtcmd, -+ NULL, NULL); - - - diff --git a/graphics/ayam/files/patch-objects_ncurve.c b/graphics/ayam/files/patch-objects_ncurve.c deleted file mode 100644 index 614d762a5959..000000000000 --- a/graphics/ayam/files/patch-objects_ncurve.c +++ /dev/null @@ -1,11 +0,0 @@ ---- objects/ncurve.c.orig 2007-12-17 18:38:58.000000000 +0100 -+++ objects/ncurve.c 2007-12-17 18:39:11.000000000 +0100 -@@ -731,7 +731,7 @@ - ay_error(AY_EOUTPUT, fname, "Checking new knots..."); - Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "Knots", - TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY), -- &knotc, &knotv); -+ &knotc, (const char ***)&knotv); - - if(!(nknotv = calloc(knotc, sizeof(double)))) - { diff --git a/graphics/ayam/files/patch-objects_npatch.c b/graphics/ayam/files/patch-objects_npatch.c index 7738904aaa5f..fccb77ed884c 100644 --- a/graphics/ayam/files/patch-objects_npatch.c +++ b/graphics/ayam/files/patch-objects_npatch.c @@ -1,20 +1,20 @@ ---- objects/npatch.c.orig 2007-12-17 18:39:37.000000000 +0100 -+++ objects/npatch.c 2007-12-17 18:40:02.000000000 +0100 -@@ -1260,7 +1260,7 @@ - ay_error(AY_EOUTPUT, fname, "Checking new knots for U..."); +--- objects/npatch.c.orig 2015-06-23 18:03:50 UTC ++++ objects/npatch.c +@@ -1934,7 +1934,7 @@ ay_npatch_setpropcb(Tcl_Interp *interp, + { Tcl_SplitList(interp, Tcl_GetVar2(interp, n1, "Knots_U", TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY), - &knotc, &knotv); + &knotc, (const char ***)&knotv); - if(!(nknotv = calloc(knotc, sizeof(double)))) + if(!(nknotv = malloc(knotc * sizeof(double)))) { -@@ -1324,7 +1324,7 @@ - ay_error(AY_EOUTPUT, fname, "Checking new knots for V..."); - Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "Knots_V", +@@ -1988,7 +1988,7 @@ ay_npatch_setpropcb(Tcl_Interp *interp, + { + Tcl_SplitList(interp, Tcl_GetVar2(interp, n1, "Knots_V", TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY), - &knotc, &knotv); + &knotc, (const char ***)&knotv); - if(!(nknotv = calloc(knotc, sizeof(double)))) + if(!(nknotv = malloc(knotc * sizeof(double)))) { diff --git a/graphics/ayam/files/patch-objects_riinc.c b/graphics/ayam/files/patch-objects_riinc.c index 74b65275165f..72ecf8f2a229 100644 --- a/graphics/ayam/files/patch-objects_riinc.c +++ b/graphics/ayam/files/patch-objects_riinc.c @@ -1,11 +1,11 @@ ---- objects/riinc.c.orig 2007-12-17 18:40:30.000000000 +0100 -+++ objects/riinc.c 2007-12-17 18:40:55.000000000 +0100 -@@ -165,7 +165,7 @@ +--- objects/riinc.c.orig 2015-06-23 18:03:50 UTC ++++ objects/riinc.c +@@ -184,7 +184,7 @@ ay_riinc_setpropcb(Tcl_Interp *interp, i char *n1 = "RiIncAttrData"; Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL; ay_riinc_object *riinc = NULL; - char *result = NULL; + const char *result; - if(!o) + if(!interp || !o) return AY_ENULL; diff --git a/graphics/ayam/files/patch-objects_riproc.c b/graphics/ayam/files/patch-objects_riproc.c index 007d15fc3e6b..de06971ce900 100644 --- a/graphics/ayam/files/patch-objects_riproc.c +++ b/graphics/ayam/files/patch-objects_riproc.c @@ -1,11 +1,11 @@ ---- objects/riproc.c.orig 2007-12-17 18:41:21.000000000 +0100 -+++ objects/riproc.c 2007-12-17 18:41:58.000000000 +0100 -@@ -197,7 +197,7 @@ +--- objects/riproc.c.orig 2015-06-23 18:03:50 UTC ++++ objects/riproc.c +@@ -197,7 +197,7 @@ ay_riproc_setpropcb(Tcl_Interp *interp, char *n1 = "RiProcAttrData"; Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL; ay_riproc_object *riproc = NULL; - char *result = NULL; + const char *result; - if(!o) + if(!interp || !o) return AY_ENULL; diff --git a/graphics/ayam/files/patch-objects_root.c b/graphics/ayam/files/patch-objects_root.c index 0a7868912c3e..4bf3f43e8c77 100644 --- a/graphics/ayam/files/patch-objects_root.c +++ b/graphics/ayam/files/patch-objects_root.c @@ -1,11 +1,11 @@ ---- objects/root.c.orig 2007-12-17 18:43:32.000000000 +0100 -+++ objects/root.c 2007-12-17 18:44:08.000000000 +0100 -@@ -186,7 +186,7 @@ +--- objects/root.c.orig 2015-06-23 18:03:50 UTC ++++ objects/root.c +@@ -215,7 +215,7 @@ ay_root_setpropcb(Tcl_Interp *interp, in ay_riopt *riopt = NULL; double dtemp = 0.0; int itemp = 0; - char *result; + const char *result; - if(!o) + if(!interp || !o) return AY_ENULL; diff --git a/graphics/ayam/files/patch-objects_text.c b/graphics/ayam/files/patch-objects_text.c index e0a96ef6097b..e392c305f343 100644 --- a/graphics/ayam/files/patch-objects_text.c +++ b/graphics/ayam/files/patch-objects_text.c @@ -1,7 +1,7 @@ ---- objects/text.c.orig 2007-12-17 18:46:17.000000000 +0100 -+++ objects/text.c 2007-12-17 18:46:39.000000000 +0100 -@@ -164,7 +164,7 @@ - int ay_status = AY_OK; +--- objects/text.c.orig 2015-06-23 18:03:50 UTC ++++ objects/text.c +@@ -274,7 +274,7 @@ ay_text_setpropcb(Tcl_Interp *interp, in + /*int ay_status = AY_OK;*/ char fname[] = "setProp"; char *n1 = "TextAttrData"; - char *result; diff --git a/graphics/ayam/files/patch-plugins_ayslx.c b/graphics/ayam/files/patch-plugins_ayslx.c index b4bc55795e37..250dfb82377a 100644 --- a/graphics/ayam/files/patch-plugins_ayslx.c +++ b/graphics/ayam/files/patch-plugins_ayslx.c @@ -1,5 +1,5 @@ ---- plugins/ayslx.c.orig 2007-09-21 13:30:37.000000000 +0200 -+++ plugins/ayslx.c 2007-12-17 19:50:54.000000000 +0100 +--- plugins/ayslx.c.orig 2015-06-23 18:03:50 UTC ++++ plugins/ayslx.c @@ -17,7 +17,7 @@ #include <string.h> #include "tcl.h" @@ -9,7 +9,7 @@ /* prototypes: */ -@@ -311,8 +311,8 @@ +@@ -319,8 +319,8 @@ Ayslx_Init(Tcl_Interp *interp) Tcl_SetVar(interp, vname, vval, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY); @@ -19,4 +19,4 @@ + NULL, NULL); ay_error(AY_EOUTPUT, fname, - "Plug-In 'ayslx' loaded."); + "Plugin 'ayslx' successfully loaded."); diff --git a/graphics/ayam/files/patch-scn-shaders_Makefile b/graphics/ayam/files/patch-scn-shaders_Makefile deleted file mode 100644 index 73cd5d0c653f..000000000000 --- a/graphics/ayam/files/patch-scn-shaders_Makefile +++ /dev/null @@ -1,18 +0,0 @@ ---- ../scn/shaders/Makefile.orig 2013-10-31 15:39:27.000000000 +0100 -+++ ../scn/shaders/Makefile 2013-10-31 15:39:41.000000000 +0100 -@@ -18,7 +18,7 @@ - - # AQSIS - AQSHADERS := $(SOURCES:%.sl=%.slx) --AQSL = aqsl -+AQSL = %%LOCALBASE%%/bin/aqsl - AQSLFLAGS = - - # 3Delight -@@ -136,4 +136,4 @@ - rm -f $*.slpp - - .sl.sdr: -- $(SDRC) $(SDRCFLAGS) $*.sl -\ No newline at end of file -+ $(SDRC) $(SDRCFLAGS) $*.sl diff --git a/graphics/ayam/files/patch-tcl_shader.tcl b/graphics/ayam/files/patch-tcl_shader.tcl new file mode 100644 index 000000000000..de1d848d8098 --- /dev/null +++ b/graphics/ayam/files/patch-tcl_shader.tcl @@ -0,0 +1,21 @@ +--- tcl/shader.tcl.orig 2015-06-23 18:03:50 UTC ++++ tcl/shader.tcl +@@ -76,14 +76,14 @@ + + foreach p $spathstr { + set files [glob -nocomplain "${p}/*${sext}"] +- append allfiles "$files " ++ append temp "$files " + } + + set allshaders "" +- foreach f $allfiles { ++ foreach s $temp { + # silently omit unreadable shader files +- if {[file readable $f]} { +- lappend allshaders $f ++ if {[file readable $s]} { ++ lappend allshaders $s + } + } + # foreach diff --git a/graphics/ayam/files/patch-togl_togl.c b/graphics/ayam/files/patch-togl_togl.c index 816b1dad4abc..b55e997a263f 100644 --- a/graphics/ayam/files/patch-togl_togl.c +++ b/graphics/ayam/files/patch-togl_togl.c @@ -1,6 +1,6 @@ ---- togl/togl.c.orig 2007-12-17 19:12:44.000000000 +0100 -+++ togl/togl.c 2007-12-17 19:14:18.000000000 +0100 -@@ -709,7 +709,7 @@ +--- togl/togl.c.orig 2015-06-23 18:03:50 UTC ++++ togl/togl.c +@@ -709,7 +709,7 @@ int Togl_Init(Tcl_Interp *interp) } #endif @@ -9,7 +9,7 @@ (ClientData) Tk_MainWindow(interp), NULL); Tcl_InitHashTable(&CommandTable, TCL_STRING_KEYS); -@@ -941,7 +941,7 @@ +@@ -941,7 +941,7 @@ int Togl_Configure(Tcl_Interp *interp, s int oldAuxNumber = togl->AuxNumber; if (Tk_ConfigureWidget(interp, togl->TkWin, configSpecs, @@ -18,7 +18,7 @@ return(TCL_ERROR); } /*fprintf(stderr,"hier %d %d %d\n", togl->TkWin, togl->Width, togl->Height);*/ -@@ -1154,7 +1154,7 @@ +@@ -1154,7 +1154,7 @@ static int Togl_Cmd(ClientData clientDat /* Create command event handler */ togl->widgetCmd = Tcl_CreateCommand(interp, Tk_PathName(tkwin), diff --git a/graphics/ayam/pkg-plist b/graphics/ayam/pkg-plist index 1747da82530e..0d7ae1ac11f3 100644 --- a/graphics/ayam/pkg-plist +++ b/graphics/ayam/pkg-plist @@ -1,19 +1,88 @@ bin/ayam bin/ayamsh lib/ayam/ayslx.so -lib/ayam/loadayslx.tcl -lib/ayam/csphere.tcl lib/ayam/csphere.so -lib/ayam/metaobj.so +lib/ayam/csphere.tcl +lib/ayam/loadayslx.tcl lib/ayam/metacomp.tcl +lib/ayam/metaobj.so lib/ayam/metaobj.tcl -lib/ayam/mfio.tcl lib/ayam/mfio.so +lib/ayam/mfio.tcl lib/ayam/shaders/DSnoisedsp.slx lib/ayam/shaders/MFicydsp.slx lib/ayam/shaders/MFicysrf.slx lib/ayam/shaders/RCClouds.slx lib/ayam/shaders/RSstripessrf.slx +lib/ayam/tcl/BWidget-1.2.1/arrow.tcl +lib/ayam/tcl/BWidget-1.2.1/bitmap.tcl +lib/ayam/tcl/BWidget-1.2.1/button.tcl +lib/ayam/tcl/BWidget-1.2.1/buttonbox.tcl +lib/ayam/tcl/BWidget-1.2.1/color.tcl +lib/ayam/tcl/BWidget-1.2.1/combobox.tcl +lib/ayam/tcl/BWidget-1.2.1/dialog.tcl +lib/ayam/tcl/BWidget-1.2.1/dragsite.tcl +lib/ayam/tcl/BWidget-1.2.1/dropsite.tcl +lib/ayam/tcl/BWidget-1.2.1/dynhelp.tcl +lib/ayam/tcl/BWidget-1.2.1/entry.tcl +lib/ayam/tcl/BWidget-1.2.1/font.tcl +lib/ayam/tcl/BWidget-1.2.1/images/bold.gif +lib/ayam/tcl/BWidget-1.2.1/images/copy.gif +lib/ayam/tcl/BWidget-1.2.1/images/cut.gif +lib/ayam/tcl/BWidget-1.2.1/images/dragfile.gif +lib/ayam/tcl/BWidget-1.2.1/images/dragicon.gif +lib/ayam/tcl/BWidget-1.2.1/images/error.gif +lib/ayam/tcl/BWidget-1.2.1/images/file.gif +lib/ayam/tcl/BWidget-1.2.1/images/folder.gif +lib/ayam/tcl/BWidget-1.2.1/images/hourglass.gif +lib/ayam/tcl/BWidget-1.2.1/images/info.gif +lib/ayam/tcl/BWidget-1.2.1/images/italic.gif +lib/ayam/tcl/BWidget-1.2.1/images/minus.xbm +lib/ayam/tcl/BWidget-1.2.1/images/new.gif +lib/ayam/tcl/BWidget-1.2.1/images/opcopy.xbm +lib/ayam/tcl/BWidget-1.2.1/images/open.gif +lib/ayam/tcl/BWidget-1.2.1/images/openfold.gif +lib/ayam/tcl/BWidget-1.2.1/images/oplink.xbm +lib/ayam/tcl/BWidget-1.2.1/images/opmove.xbm +lib/ayam/tcl/BWidget-1.2.1/images/overstrike.gif +lib/ayam/tcl/BWidget-1.2.1/images/palette.gif +lib/ayam/tcl/BWidget-1.2.1/images/passwd.gif +lib/ayam/tcl/BWidget-1.2.1/images/paste.gif +lib/ayam/tcl/BWidget-1.2.1/images/plus.xbm +lib/ayam/tcl/BWidget-1.2.1/images/print.gif +lib/ayam/tcl/BWidget-1.2.1/images/question.gif +lib/ayam/tcl/BWidget-1.2.1/images/save.gif +lib/ayam/tcl/BWidget-1.2.1/images/underline.gif +lib/ayam/tcl/BWidget-1.2.1/images/undo.gif +lib/ayam/tcl/BWidget-1.2.1/images/warning.gif +lib/ayam/tcl/BWidget-1.2.1/init.tcl +lib/ayam/tcl/BWidget-1.2.1/label.tcl +lib/ayam/tcl/BWidget-1.2.1/labelentry.tcl +lib/ayam/tcl/BWidget-1.2.1/labelframe.tcl +lib/ayam/tcl/BWidget-1.2.1/lang/de.rc +lib/ayam/tcl/BWidget-1.2.1/lang/en.rc +lib/ayam/tcl/BWidget-1.2.1/lang/es.rc +lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc +lib/ayam/tcl/BWidget-1.2.1/listbox.tcl +lib/ayam/tcl/BWidget-1.2.1/mainframe.tcl +lib/ayam/tcl/BWidget-1.2.1/messagedlg.tcl +lib/ayam/tcl/BWidget-1.2.1/notebook.tcl +lib/ayam/tcl/BWidget-1.2.1/pagesmgr.tcl +lib/ayam/tcl/BWidget-1.2.1/panedw.tcl +lib/ayam/tcl/BWidget-1.2.1/passwddlg.tcl +lib/ayam/tcl/BWidget-1.2.1/pkgIndex.tcl +lib/ayam/tcl/BWidget-1.2.1/progressbar.tcl +lib/ayam/tcl/BWidget-1.2.1/progressdlg.tcl +lib/ayam/tcl/BWidget-1.2.1/scrollframe.tcl +lib/ayam/tcl/BWidget-1.2.1/scrollview.tcl +lib/ayam/tcl/BWidget-1.2.1/scrollw.tcl +lib/ayam/tcl/BWidget-1.2.1/separator.tcl +lib/ayam/tcl/BWidget-1.2.1/spinbox.tcl +lib/ayam/tcl/BWidget-1.2.1/titleframe.tcl +lib/ayam/tcl/BWidget-1.2.1/tree.tcl +lib/ayam/tcl/BWidget-1.2.1/utils.tcl +lib/ayam/tcl/BWidget-1.2.1/widget.tcl +lib/ayam/tcl/BWidget-1.2.1/xpm2image.tcl lib/ayam/tcl/about.tcl lib/ayam/tcl/action.tcl lib/ayam/tcl/acurve.tcl @@ -103,75 +172,6 @@ lib/ayam/tcl/vmenu.tcl lib/ayam/tcl/widget.tcl lib/ayam/tcl/win.tcl lib/ayam/tcl/zap.tcl -lib/ayam/tcl/BWidget-1.2.1/arrow.tcl -lib/ayam/tcl/BWidget-1.2.1/bitmap.tcl -lib/ayam/tcl/BWidget-1.2.1/button.tcl -lib/ayam/tcl/BWidget-1.2.1/buttonbox.tcl -lib/ayam/tcl/BWidget-1.2.1/color.tcl -lib/ayam/tcl/BWidget-1.2.1/combobox.tcl -lib/ayam/tcl/BWidget-1.2.1/dialog.tcl -lib/ayam/tcl/BWidget-1.2.1/dragsite.tcl -lib/ayam/tcl/BWidget-1.2.1/dropsite.tcl -lib/ayam/tcl/BWidget-1.2.1/dynhelp.tcl -lib/ayam/tcl/BWidget-1.2.1/entry.tcl -lib/ayam/tcl/BWidget-1.2.1/font.tcl -lib/ayam/tcl/BWidget-1.2.1/init.tcl -lib/ayam/tcl/BWidget-1.2.1/label.tcl -lib/ayam/tcl/BWidget-1.2.1/labelentry.tcl -lib/ayam/tcl/BWidget-1.2.1/labelframe.tcl -lib/ayam/tcl/BWidget-1.2.1/listbox.tcl -lib/ayam/tcl/BWidget-1.2.1/mainframe.tcl -lib/ayam/tcl/BWidget-1.2.1/messagedlg.tcl -lib/ayam/tcl/BWidget-1.2.1/notebook.tcl -lib/ayam/tcl/BWidget-1.2.1/pagesmgr.tcl -lib/ayam/tcl/BWidget-1.2.1/panedw.tcl -lib/ayam/tcl/BWidget-1.2.1/passwddlg.tcl -lib/ayam/tcl/BWidget-1.2.1/pkgIndex.tcl -lib/ayam/tcl/BWidget-1.2.1/progressbar.tcl -lib/ayam/tcl/BWidget-1.2.1/progressdlg.tcl -lib/ayam/tcl/BWidget-1.2.1/scrollframe.tcl -lib/ayam/tcl/BWidget-1.2.1/scrollview.tcl -lib/ayam/tcl/BWidget-1.2.1/scrollw.tcl -lib/ayam/tcl/BWidget-1.2.1/separator.tcl -lib/ayam/tcl/BWidget-1.2.1/spinbox.tcl -lib/ayam/tcl/BWidget-1.2.1/titleframe.tcl -lib/ayam/tcl/BWidget-1.2.1/tree.tcl -lib/ayam/tcl/BWidget-1.2.1/utils.tcl -lib/ayam/tcl/BWidget-1.2.1/widget.tcl -lib/ayam/tcl/BWidget-1.2.1/xpm2image.tcl -lib/ayam/tcl/BWidget-1.2.1/images/bold.gif -lib/ayam/tcl/BWidget-1.2.1/images/copy.gif -lib/ayam/tcl/BWidget-1.2.1/images/cut.gif -lib/ayam/tcl/BWidget-1.2.1/images/dragfile.gif -lib/ayam/tcl/BWidget-1.2.1/images/dragicon.gif -lib/ayam/tcl/BWidget-1.2.1/images/error.gif -lib/ayam/tcl/BWidget-1.2.1/images/file.gif -lib/ayam/tcl/BWidget-1.2.1/images/folder.gif -lib/ayam/tcl/BWidget-1.2.1/images/hourglass.gif -lib/ayam/tcl/BWidget-1.2.1/images/info.gif -lib/ayam/tcl/BWidget-1.2.1/images/italic.gif -lib/ayam/tcl/BWidget-1.2.1/images/minus.xbm -lib/ayam/tcl/BWidget-1.2.1/images/new.gif -lib/ayam/tcl/BWidget-1.2.1/images/opcopy.xbm -lib/ayam/tcl/BWidget-1.2.1/images/open.gif -lib/ayam/tcl/BWidget-1.2.1/images/openfold.gif -lib/ayam/tcl/BWidget-1.2.1/images/oplink.xbm -lib/ayam/tcl/BWidget-1.2.1/images/opmove.xbm -lib/ayam/tcl/BWidget-1.2.1/images/overstrike.gif -lib/ayam/tcl/BWidget-1.2.1/images/palette.gif -lib/ayam/tcl/BWidget-1.2.1/images/passwd.gif -lib/ayam/tcl/BWidget-1.2.1/images/paste.gif -lib/ayam/tcl/BWidget-1.2.1/images/plus.xbm -lib/ayam/tcl/BWidget-1.2.1/images/print.gif -lib/ayam/tcl/BWidget-1.2.1/images/question.gif -lib/ayam/tcl/BWidget-1.2.1/images/save.gif -lib/ayam/tcl/BWidget-1.2.1/images/underline.gif -lib/ayam/tcl/BWidget-1.2.1/images/undo.gif -lib/ayam/tcl/BWidget-1.2.1/images/warning.gif -lib/ayam/tcl/BWidget-1.2.1/lang/de.rc -lib/ayam/tcl/BWidget-1.2.1/lang/en.rc -lib/ayam/tcl/BWidget-1.2.1/lang/es.rc -lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%DATADIR%%/ayam-splash.gif %%PORTDOCS%%%%DOCSDIR%%/Setup.txt %%PORTDOCS%%%%DOCSDIR%%/ayam.pdf @@ -187,6 +187,7 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/ayam.html %%PORTDOCS%%%%DOCSDIR%%/html/pics/acurve-sym.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/acurves.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/addmodtag.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/ampick.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/aycsgic.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/bbxvscog.gif @@ -210,12 +211,19 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/pics/console.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/csgex.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/deleteac.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmdraw.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmdrawshade.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmhiddenwire.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmhiddenwirenosil.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/dmmenu.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmshade.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/editac.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/editdac.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/editwac.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/edmult.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/elevate.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/euchom.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/extendnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif @@ -253,6 +261,7 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/pics/ncurve.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/npatch.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/numpnted.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/objsearch.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/offnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/offnp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/pamesh.gif @@ -261,12 +270,15 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/pics/prefs.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/primitives.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/propgui.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/rect.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/refine.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/refinecv.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/refinenp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/refinepe.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/refinesel.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/remkn.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/remknnp.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/resetwac.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/revolve.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/rotateaac.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/rotateac.gif @@ -287,6 +299,8 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/pics/sdmesh.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/sdnpatch.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/selpnts.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/sfcurve.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/sfcurvetmax.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/sgordon.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/shiftclsbsp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/skin.gif @@ -303,13 +317,18 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc %%PORTDOCS%%%%DOCSDIR%%/html/pics/swing.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/tagac.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/tce.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/tcone.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/text-ayam.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/tgui.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/tnpatch.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/tools.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/toxy.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/trect.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/treeview.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/trimnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/trpnt.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/unclampnc.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/unclampnp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/view.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/zoomvac.gif %%PORTDOCS%%%%DOCSDIR%%/refcard.pdf |