Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/ayam/Makefile,v retrieving revision 1.33 diff -u -u -r1.33 Makefile --- Makefile 19 Nov 2009 22:07:40 -0000 1.33 +++ Makefile 4 Jan 2010 22:10:39 -0000 @@ -6,8 +6,7 @@ # PORTNAME= ayam -PORTVERSION= 1.15.1 -PORTREVISION= 1 +PORTVERSION= 1.16 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Ayam/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION}.src @@ -15,12 +14,16 @@ MAINTAINER= gahr@FreeBSD.org COMMENT= 3D modeling environment for the RenderMan interface -LIB_DEPENDS= aqsis.1:${PORTSDIR}/graphics/aqsis \ - tk84.1:${PORTSDIR}/x11-toolkits/tk84 \ - tiff.4:${PORTSDIR}/graphics/tiff +BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/tk84:extract +LIB_DEPENDS= aqsis_core.1:${PORTSDIR}/graphics/aqsis \ + log4cpp.4:${PORTSDIR}/devel/log4cpp \ + tiff.4:${PORTSDIR}/graphics/tiff \ + GLEW.1:${PORTSDIR}/graphics/glew USE_XORG= xmu xext x11 -USE_GL= yes +USE_GL= gl glu +USE_TCL= 84 +USE_TK= 84 WRKSRC= ${WRKDIR}/${PORTNAME}/src MAKEFILE= Makefile.shared MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" @@ -29,66 +32,26 @@ AYAM_PLUGINS= csphere mfio PLUGINS_DIR= ${PREFIX}/lib/${PORTNAME} +NEW_PLUGINS= metaobj mfio mopsi objio idr \ + ayslb aycsg + .include .if ${ARCH} == "alpha" BROKEN= Does not build on alpha .endif -post-patch: - @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/tcl/ayam.tcl - @${REINPLACE_CMD} -e 's|^MF3DCFLAGS =|MF3DCFLAGS = -fPIC|g' \ - ${WRKSRC}/MF3D/Makefile.mf3d - -do-install: -# binary and wrapper - ${INSTALL_PROGRAM} ${WRKSRC}/ayamsh ${PREFIX}/bin - @(${ECHO_CMD} "#!${SH}"; \ - ${ECHO_CMD} "${PREFIX}/bin/ayamsh ${PLUGINS_DIR}/tcl/ayam.tcl \$$@" \ - ) >${PREFIX}/bin/ayam - @${CHMOD} ugo+x ${PREFIX}/bin/ayam - -# plugins - @${MKDIR} ${PLUGINS_DIR} -.for i in ${AYAM_PLUGINS} - ${INSTALL_DATA} ${WRKSRC}/plugins/${i}.tcl ${PLUGINS_DIR} - ${INSTALL_PROGRAM} ${WRKSRC}/plugins/${i}.so ${PLUGINS_DIR} +post-build: +.for plugin in ${NEW_PLUGINS} + cd ${WRKSRC} && ${GMAKE} -f ${MAKEFILE} ${plugin}.so .endfor - ${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} ${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 \ - ${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/* \ - ${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/* \ - ${PLUGINS_DIR}/tcl/BWidget-1.2.1/lang - -# data - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/lib/ayam-splash.gif ${DATADIR} - -# docs -.ifndef (NOPORTDOCS) - @${MKDIR} ${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} - @${MKDIR} ${DOCSDIR}/html - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/*.html ${DOCSDIR}/html - @${MKDIR} ${DOCSDIR}/html/pics - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/pics/* \ - ${DOCSDIR}/html/pics +post-patch: + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%LOCALBASE%%|${LOCALBASE}|g; \ + s|%%DOCSDIR%%|${DOCSDIR}|g; s|%%PORTSDIR%%|${PORTSDIR}|g; s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/Makefile.shared +.if defined(NOPORTDOCS) + ${REINPLACE_CMD} -e '709,714d' ${WRKSRC}/Makefile.shared .endif .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/ayam/distinfo,v retrieving revision 1.13 diff -u -u -r1.13 distinfo --- distinfo 10 Mar 2009 21:51:15 -0000 1.13 +++ distinfo 4 Jan 2010 22:10:39 -0000 @@ -1,3 +1,3 @@ -MD5 (ayam1.15.1.src.tar.gz) = 70cf4d40269060bf8daabe3201f6b495 -SHA256 (ayam1.15.1.src.tar.gz) = 1eb4a68ac130a6bb842ff7f33a269b2d8d254661a8c6cce9c00a1d2cf3ad09a8 -SIZE (ayam1.15.1.src.tar.gz) = 3901309 +MD5 (ayam1.16.src.tar.gz) = 010b065cc1a2ec7194a51510f32f8296 +SHA256 (ayam1.16.src.tar.gz) = ea8717921449fd2d35a936e8e2922a00a373f5326cd6e1cf653dd202ea93c2dd +SIZE (ayam1.16.src.tar.gz) = 4126714 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/ayam/pkg-plist,v retrieving revision 1.10 diff -u -u -r1.10 pkg-plist --- pkg-plist 10 Mar 2009 21:51:15 -0000 1.10 +++ pkg-plist 4 Jan 2010 22:10:39 -0000 @@ -1,18 +1,117 @@ bin/ayam bin/ayamsh -lib/ayam/ayslx.so +lib/ayam/aycsg.so +lib/ayam/aycsg.tcl +lib/ayam/aysdr.tcl +lib/ayam/ayslb.so +lib/ayam/dxfio.tcl +lib/ayam/idr.so +lib/ayam/idr.tcl +lib/ayam/loadaycsg.tcl +lib/ayam/loadaygso.tcl +lib/ayam/loadaysdr.tcl +lib/ayam/loadayslb.tcl +lib/ayam/loadayslo.tcl +lib/ayam/loadayslo3d.tcl lib/ayam/loadayslx.tcl -lib/ayam/csphere.tcl -lib/ayam/csphere.so -lib/ayam/metaobj.so +lib/ayam/loadayso.tcl +lib/ayam/loaddxfio.tcl +lib/ayam/loadidr.tcl +lib/ayam/loadmfio.tcl +lib/ayam/loadmopsi.tcl +lib/ayam/loadobjio.tcl +lib/ayam/loadonio.tcl +lib/ayam/loadrrib.tcl +lib/ayam/loadx3dio.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/mopsi.so +lib/ayam/mopsi.tcl +lib/ayam/objio.so +lib/ayam/objio.tcl +lib/ayam/onio.tcl +lib/ayam/rrib.tcl +lib/ayam/tcl/BWidget-1.2.1/CHANGES.txt +lib/ayam/tcl/BWidget-1.2.1/LGPL.txt +lib/ayam/tcl/BWidget-1.2.1/LICENSE.txt +lib/ayam/tcl/BWidget-1.2.1/README.txt +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 lib/ayam/tcl/ai.tcl +lib/ayam/tcl/ayam-splash.gif lib/ayam/tcl/ayam.tcl lib/ayam/tcl/balloon.tcl lib/ayam/tcl/bevel.tcl @@ -26,6 +125,7 @@ lib/ayam/tcl/cap.tcl lib/ayam/tcl/clone.tcl lib/ayam/tcl/concatnc.tcl +lib/ayam/tcl/concatnp.tcl lib/ayam/tcl/cone.tcl lib/ayam/tcl/console.tcl lib/ayam/tcl/control.tcl @@ -69,6 +169,7 @@ lib/ayam/tcl/riproc.tcl lib/ayam/tcl/root.tcl lib/ayam/tcl/run.tcl +lib/ayam/tcl/safe.tcl lib/ayam/tcl/script.tcl lib/ayam/tcl/sdmesh.tcl lib/ayam/tcl/select.tcl @@ -86,102 +187,20 @@ lib/ayam/tcl/toolbox.tcl lib/ayam/tcl/torus.tcl lib/ayam/tcl/tree.tcl +lib/ayam/tcl/trim.tcl lib/ayam/tcl/uie.tcl lib/ayam/tcl/view.tcl 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 -@dirrm lib/ayam/tcl/BWidget-1.2.1/lang -@dirrm lib/ayam/tcl/BWidget-1.2.1/images -@dirrm lib/ayam/tcl/BWidget-1.2.1 -@dirrm lib/ayam/tcl -@dirrm lib/ayam -%%DATADIR%%/ayam-splash.gif -@dirrm %%DATADIR%% +lib/ayam/x3dio.tcl %%PORTDOCS%%%%DOCSDIR%%/Setup.txt -%%PORTDOCS%%%%DOCSDIR%%/ayam.pdf -%%PORTDOCS%%%%DOCSDIR%%/refcard.ps +%%PORTDOCS%%%%DOCSDIR%%/Changes.txt +%%PORTDOCS%%%%DOCSDIR%%/License.txt %%PORTDOCS%%%%DOCSDIR%%/refcard.tcl -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-1.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-2.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-3.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-4.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-5.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-6.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-7.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-8.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam-9.html -%%PORTDOCS%%%%DOCSDIR%%/html/ayam.html +%%PORTDOCS%%%%DOCSDIR%%/refcard.pdf +%%PORTDOCS%%%%DOCSDIR%%/ayam.pdf %%PORTDOCS%%%%DOCSDIR%%/html/pics/acurve-sym.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/acurves.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/ampick.gif @@ -191,16 +210,19 @@ %%PORTDOCS%%%%DOCSDIR%%/html/pics/birail2.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/birail2vc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/cap.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/chordalex.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/clampnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/clampnp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/clone.gif -%%PORTDOCS%%%%DOCSDIR%%/html/pics/concatnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/coarsen.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/concatnc.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/concatnp.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/console.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/csgex.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/elevate.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif -%%PORTDOCS%%%%DOCSDIR%%/html/pics/gordoncap.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/gordon-hood.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/gordoncap.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/icurves.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/inskn.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/insknnp.gif @@ -211,6 +233,7 @@ %%PORTDOCS%%%%DOCSDIR%%/html/pics/multicolcsg.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/multip.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/ncircle.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/ncurve.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/offnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/plotcur.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/prefs.gif @@ -221,12 +244,14 @@ %%PORTDOCS%%%%DOCSDIR%%/html/pics/revolve.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/scriptex1.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/scriptex2.gif -%%PORTDOCS%%%%DOCSDIR%%/html/pics/shiftclsbsp.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/scriptex3.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/sgordon.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/shiftclsbsp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/skin.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/splitnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/ssweep.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/sweep.gif +%%PORTDOCS%%%%DOCSDIR%%/html/pics/sweepinterp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/swin.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/swing.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/tce.gif @@ -237,6 +262,21 @@ %%PORTDOCS%%%%DOCSDIR%%/html/pics/treeview.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/trimnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/view.gif +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-1.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-2.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-3.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-4.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-5.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-6.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-7.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-8.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam-9.html +%%PORTDOCS%%%%DOCSDIR%%/html/ayam.html %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/pics %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/ayam/tcl/BWidget-1.2.1/lang +@dirrm lib/ayam/tcl/BWidget-1.2.1/images +@dirrm lib/ayam/tcl/BWidget-1.2.1 +@dirrm lib/ayam/tcl +@dirrm lib/ayam Index: files/patch-MF3D_mfbinrd.c =================================================================== RCS file: files/patch-MF3D_mfbinrd.c diff -N files/patch-MF3D_mfbinrd.c --- files/patch-MF3D_mfbinrd.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- MF3D/mfbinrd.c.orig 2007-12-17 19:17:47.000000000 +0100 -+++ MF3D/mfbinrd.c 2007-12-17 19:23:12.000000000 +0100 -@@ -132,7 +132,7 @@ - MFASSERT (!MF3DIsTextFormat (tocPtr->nextTOC->format)); - AssignInt64 (nextTocLoc, tocPtr->nextTOC->location.binary); - numNewRefs = tocPtr->nEntries; -- result = MF3D_Reallocate (&inMetafilePtr->tocStuff.references, -+ result = MF3D_Reallocate ((void **) &inMetafilePtr->tocStuff.references, - ((numReferences + numNewRefs) * - sizeof (*inMetafilePtr->tocStuff.references))); - if (result != kMF3DNoErr) Index: files/patch-MF3D_mffile.c =================================================================== RCS file: files/patch-MF3D_mffile.c diff -N files/patch-MF3D_mffile.c --- files/patch-MF3D_mffile.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 @@ - /* Add this type to the table */ - ++inMetafilePtr->typeTable.nTypes; - numTypes = inMetafilePtr->typeTable.nTypes; -- result = MF3D_Reallocate (&inMetafilePtr->typeTable.types, -+ result = MF3D_Reallocate ((void **)&inMetafilePtr->typeTable.types, - numTypes * sizeof (*inMetafilePtr->typeTable.types)); - if (result == kMF3DNoErr) - { Index: files/patch-MF3D_mfobject.c =================================================================== RCS file: files/patch-MF3D_mfobject.c diff -N files/patch-MF3D_mfobject.c --- files/patch-MF3D_mfobject.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 @@ - ++inMetafilePtr->typeTable.nTypes; - numTypes = inMetafilePtr->typeTable.nTypes; - -- result = MF3D_Reallocate (&inMetafilePtr->typeTable.types, -+ result = MF3D_Reallocate ((void **)&inMetafilePtr->typeTable.types, - numTypes * sizeof (*inMetafilePtr->typeTable.types)); - - if (result == kMF3DNoErr) Index: files/patch-MF3D_mfprimtv.c =================================================================== RCS file: files/patch-MF3D_mfprimtv.c diff -N files/patch-MF3D_mfprimtv.c --- files/patch-MF3D_mfprimtv.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 @@ - if (result == kMF3DNoErr) - { - ++metafile->tocStuff.numReferences; -- result = MF3D_Reallocate (&metafile->tocStuff.references, -+ result = MF3D_Reallocate ((void **)&metafile->tocStuff.references, - (metafile->tocStuff.numReferences * - sizeof (*metafile->tocStuff.references))); - } Index: files/patch-MF3D_mftextrd.c =================================================================== RCS file: files/patch-MF3D_mftextrd.c diff -N files/patch-MF3D_mftextrd.c --- files/patch-MF3D_mftextrd.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,56 +0,0 @@ ---- 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 @@ - MFASSERT(numNewLabels >= 0); - - if (numNewLabels > 0) -- result = MF3D_Reallocate(&tocLabelNames, -+ result = MF3D_Reallocate((void **)&tocLabelNames, - (numLabels + numNewLabels) * sizeof(*tocLabelNames)); - } - -@@ -250,7 +250,7 @@ - if (result != kMF3DNoErr) - break; - -- result = MF3D_Reallocate(&objLabelName, labelLen); -+ result = MF3D_Reallocate((void **)&objLabelName, labelLen); - if (result != kMF3DNoErr) - break; - -@@ -381,7 +381,7 @@ - char objName[kMF3D_MaxObjNameLength + 1]; - - if (numObjects % kMF3D_ObjTableChunk == 0) -- { result = MF3D_Reallocate(&objTable, -+ { result = MF3D_Reallocate((void **)&objTable, - (numObjects + kMF3D_ObjTableChunk) * sizeof(*objTable)); - if (result != kMF3DNoErr) - goto PreprocessTextFileAbort; -@@ -419,7 +419,7 @@ - { /* We found a TOC object. We will want to find - * this later; so save the index. - */ -- result = MF3D_Reallocate(&tocLocations, -+ result = MF3D_Reallocate((void **)&tocLocations, - (numTocs + 1) * sizeof(*tocLocations)); - if (result != kMF3DNoErr) - goto PreprocessTextFileAbort; -@@ -499,7 +499,7 @@ - - /* Readjust the object table from its chunky size */ - if (result == kMF3DNoErr) -- { result = MF3D_Reallocate(&objTable, (numObjects + 1) * sizeof(*objTable)); -+ { result = MF3D_Reallocate((void **)&objTable, (numObjects + 1) * sizeof(*objTable)); - if (result == kMF3DNoErr) - { /* Store the file length here */ - AssignInt64(objTable[numObjects].objLocation, location); -@@ -1027,7 +1027,7 @@ - - result = kMF3DNoErr; - if ((ioStringPtr->pos % kMF3D_StringBufferChunk) == 0) -- result = MF3D_Reallocate(&ioStringPtr->str, -+ result = MF3D_Reallocate((void **)&ioStringPtr->str, - ioStringPtr->pos + kMF3D_StringBufferChunk); - - if (result == kMF3DNoErr) Index: files/patch-Makefile.shared =================================================================== RCS file: /home/pcvs/ports/graphics/ayam/files/patch-Makefile.shared,v retrieving revision 1.16 diff -u -u -r1.16 patch-Makefile.shared --- files/patch-Makefile.shared 19 Apr 2008 17:49:56 -0000 1.16 +++ files/patch-Makefile.shared 4 Jan 2010 22:08:57 -0000 @@ -1,45 +1,56 @@ ---- Makefile.shared.orig 2008-04-03 20:21:22.000000000 +0200 -+++ Makefile.shared 2008-04-07 12:09:04.000000000 +0200 +--- Makefile.shared.orig 2009-09-22 17:09:08.000000000 +0200 ++++ Makefile.shared 2010-01-04 22:45:47.000000000 +0100 @@ -4,7 +4,7 @@ # Makefile for Ayam (shared version) # Choose an installation prefix. -PREFIX = /usr/local/ayam -+#PREFIX = /usr/local/ayam ++PREFIX = %%PREFIX%% #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 @@ +@@ -12,24 +12,24 @@ + #PREFIX = /usr - INSTALL = ./ninstall - #INSTALL = install --MKDIR = mkdir -p -+#MKDIR = mkdir -p + # if PREFIX points to a generic directory (e.g. /usr) and not +-# to a directory specific to Ayam (e.g. /usr/local/ayam) you ++# to a directory specific to Ayam (e.g. %%LOCALBASE%%/ayam) you + # probably want to switch LN to echo (this way the installation + # will not create a softlink named "plugins" in PREFIX/bin) +-LN = ln -s +-#LN = echo ++#LN = ln -s ++LN = echo + + # Where shall the executable be installed? + BINDIR = $(PREFIX)/bin + + # Where shall the main tcl scripts, plugins, and custom objects be installed? +-LIBDIR = $(PREFIX)/lib +-#LIBDIR = $(PREFIX)/lib/ayam ++#LIBDIR = $(PREFIX)/lib ++LIBDIR = $(PREFIX)/lib/ayam + + # Where shall the documentation be installed? +-DOCDIR = $(PREFIX)/doc ++DOCDIR = %%DOCSDIR%% + #DOCDIR = $(PREFIX)/doc/ayam - # the C compiler --#CC = cc -+CC ?= cc - #CC = gcc - - # the C++ compiler (just in use for the AyCSG and onio plugin) --#CXX = CC -+CXX = ${CC} - #CXX = g++ +-INSTALL = ./ninstall ++INSTALL = install + #INSTALL = install + MKDIR = mkdir -p - # the linker -@@ -80,7 +80,10 @@ +@@ -82,7 +82,7 @@ # 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) -CFLAGS = -O -DAYUSEAFFINE -+#CFLAGS = -O -DAYUSEAFFINE -+ -+# make amd64 happy with fPIC -+CFLAGS += -O -fPIC -DAYUSESLXARGS -DAYUSEAQSISRIB -DAYENABLEWAIT ++CFLAGS = -O -DAYUSEAQSISRIB # simple configuration using BMRT #CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT -@@ -94,7 +97,7 @@ +@@ -96,7 +96,7 @@ # MacOSX with Aqua: #CFLAGS = -O -DAYWITHAQUA -DAYUSEAFFINE -DAYENABLEFEXIT -DUSE_NON_CONST # MacOSX with Aqua (universal binary, support for older MacOSX): @@ -48,146 +59,207 @@ # MacOSX with X11: #CFLAGS = -O -DAYUSEAFFINE -DAYENABLEFEXIT -@@ -138,7 +141,7 @@ +@@ -121,9 +121,9 @@ + # extra ld flags needed to compile Ayam + # (gcc needs -rdynamic to allow shared objects access to global symbols) + # IRIX: +-EXLDFLAGS = ++#EXLDFLAGS = + # Linux: +-#EXLDFLAGS = -rdynamic ++EXLDFLAGS = -rdynamic + # MacOSX (X11): + #EXLDFLAGS = -flat_namespace -undefined suppress + # MacOSX (Aqua): +@@ -140,7 +140,7 @@ # OpenGL # OpenGL includes -GLINC = -I/usr/X11R6/include/ -+GLINC = -I${LOCALBASE}/include/ ++GLINC = -I%%LOCALBASE%%/include # MacOSX (Aqua): #GLINC = # link options for linking with OpenGL libraries -@@ -148,24 +151,26 @@ +@@ -150,13 +150,13 @@ # TIFF # TIFF includes -TIFFINC = -I/usr/include/ -+TIFFINC = -I${LOCALBASE}/include/ ++TIFFINC = -I%%LOCALBASE%%/include # link options for linking with TIFF library - TIFFLIB = -ltiff +-TIFFLIB = -ltiff ++TIFFLIB = -ltiff -L%%LOCALBASE%%/lib # Tcl/Tk # Tcl directory -TCLDIR = ../../tcl8.2.2 -+#TCLDIR = ../../tcl9.2.2 ++TCLDIR = %%LOCALBASE%%/include/tcl8.4 #TCLDIR = ../../tcl8.0 # Tcl includes --TCLINC = -I$(TCLDIR)/generic -+#TCLINC = -I$(TCLDIR)/generic -+TCLINC = -I${LOCALBASE}/include/tcl8.4/generic - # MacOSX (Aqua): - #TCLINC = +@@ -166,7 +166,7 @@ # Tcl library # link options for linking with Tcl library -TCLLIB = -L$(TCLDIR)/unix -ltcl8.2 -+#TCLLIB = -L$(TCLDIR)/unix -ltcl9.2 ++TCLLIB = -L%%LOCALBASE%%/lib -ltcl84 #TCLLIB = -L$(TCLDIR)/unix -ltcl8.0 -+TCLLIB = -L${LOCALBASE}/lib -ltcl84 # if you have an installed Tcl/Tk, you probably just want: #TCLLIB = -ltcl - # MacOSX (Aqua): -@@ -173,7 +178,7 @@ +@@ -175,7 +175,7 @@ # Tk sources directory # Note: You really need the Tk _sources_ in order to compile Ayam! -TKDIR = ../../tk8.2.2 -+TKDIR = ${LOCALBASE}/include/tk8.4 ++TKDIR = %%PORTSDIR%%/x11-toolkits/tk84/work/tk8.4.19 #TKDIR = ../../tk8.0 # Tk includes -@@ -183,8 +188,9 @@ +@@ -185,7 +185,7 @@ # Tk library # link options for linking with Tk library -TKLIB = -L$(TKDIR)/unix -ltk8.2 -+#TKLIB = -L$(TKDIR)/unix -ltk8.2 ++TKLIB = -ltk84 #TKLIB = -L$(TKDIR)/unix -ltk8.0 -+TKLIB = -L${LOCALBASE}/lib -ltk84 # if you have an installed Tcl/Tk, you probably just want: #TKLIB = -ltk - # MacOSX (Aqua): -@@ -192,11 +198,11 @@ +@@ -194,12 +194,12 @@ # X11 # X11 includes -X11INC = -I/usr/X11R6/include -+X11INC = -I${LOCALBASE}/include ++X11INC = -I%%LOCALBASE%%/include # MacOSX (Aqua): #X11INC = # link options for linking with X11 -X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 -+X11LIBS = -L${LOCALBASE}/lib -lXmu -lXext -lX11 - #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 +-#X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11 ++X11LIBS = -L%%LOCALBASE%%/lib -lXmu -lXext -lX11 ++#X11LIBS = -L%%LOCALBASE%%/lib -lXmu -lXext -lX11 # MacOSX (Aqua): #X11LIBS = -@@ -207,23 +213,25 @@ - AFFINEINC = -Iaffine/include - # if you use Affine as BMRT libribout replacement - # (also add -DAYUSEAFFINE to CFLAGS!): --AFFINEOBJS = ./affine/src/write.o ./affine/src/constant.o -+#AFFINEOBJS = ./affine/src/write.o ./affine/src/constant.o - # if you do not use Affine as BMRT libribout replacement: --#AFFINEOBJS = -+AFFINEOBJS = + +@@ -214,18 +214,18 @@ + #AFFINEOBJS = # Aqsis -AQSISDIR = /usr/local/aqsis -AQSISINC = -I$(AQSISDIR)/include -+AQSISDIR = ${LOCALBASE} -+AQSISINC = -I$(AQSISDIR)/include/aqsis ++AQSISDIR = %%LOCALBASE%%/ ++AQSISINC = -I$(AQSISDIR)/include/aqsis -I$(AQSISDIR)/include/aqsis/ri AQSISLIBDIR = $(AQSISDIR)/lib # if you do not use Aqsis libslxargs as libslcargs replacement: --AQSISOBJS = -+#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)/libshadervm.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L${AQSISLIBDIR} -lstdc++ -DUYUSESLXARGS -+ +-#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp ++#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L %%LOCALBASE%%/lib -llog4cpp # if you do not use Aqsis libri2rib as BMRT libribout replacement: --AQSISRI2RIB = -+#AQSISRI2RIB = + 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${AQSISLIBDIR} -lstdc++ ${PTHREAD_LIBS} ++#AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L %%LOCALBASE%%/lib -llog4cpp # BMRT -@@ -251,9 +259,9 @@ +@@ -253,7 +253,7 @@ # IRIX, Solaris, (MacOSX<10.4: get libdl from Fink!): #DL = -ldl # Linux: -DL = -ldl -lpthread -+#DL = -ldl -lpthread ++DL = %%PTHREAD_LIBS%% # NetBSD/MacOSX (Aqua): --#DL = -+DL = + #DL = - - # linker flags to produce shared modules: -@@ -272,8 +280,9 @@ - RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm +@@ -275,45 +275,44 @@ # Ayslx Plugin (Aqsis) --AYSLXINCDIR = $(AQSISDIR)/include + 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 -+AYSLXINCDIR = ${AQSISDIR}/include/aqsis -+AYSLXLIBS = -L${AQSISLIBDIR} $(AQSISDIR)/lib/libaqsis.so $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L${LOCALBASE}/lib -+ ++AYSLXLIBS = $(AQSISDIR)/lib/rcdummy.o $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L%%LOCALBASE%%/lib -llog4cpp # Ayslc Plugin (BMRT) AYSLCINCDIR = $(BMRTDIR)/include -@@ -496,9 +505,9 @@ - .cpp.o: - $(CXX) -c $(CFLAGS) $*.cpp -o $@ $(AYINC) -I$(OPENCSGINCDIR) -I$(GLEWINCDIR) -Iplugins - --all: ayamsh -+all: ayamsh plugins + AYSLCLIBS = -L$(BMRTDIR)/lib -lslcargs --plugins: csphere.so mfio.so metaobj.so mopsi.so -+plugins: csphere.so mfio.so metaobj.so mopsi.so ayslx.so + # Ayso Plugin (RenderDotC, RDC) +-RDCDIR = /usr/local/rdc ++RDCDIR = %%LOCALBASE%%/rdc + AYSOINCDIR = $(RDCDIR)/include + AYSOLIBS = -L$(RDCDIR)/lib -lsoargs + + # Ayslo Plugin (PRman) +-PRMANDIR = /usr/local/prman +-AYSLOINCDIR = $(PRMANDIR)/include +-AYSLOLIBS = -L$(PRMANDIR)/lib -lsloargs -ltarget -lzip ++AYSLOINCDIR = ${AQSISINC} -I%%LOCALBASE%%/include ++AYSLOLIBS = ${AQSISLIB} + + # Ayslo3d Plugin (3Delight) + # (add AYOLDSLO3D to CFLAGS above, if you compile with a 3Delight + # older than 1.0.6) +-3DLDIR = /usr/local/3delight +-#3DLDIR = /usr/local/3delight-0.9.6/Linux-i686-libstdc++-3 ++3DLDIR = %%LOCALBASE%%/3delight ++#3DLDIR = %%LOCALBASE%%/3delight-0.9.6/Linux-i686-libstdc++-3 + AYSLO3DINCDIR = $(3DLDIR)/include + AYSLO3DLIBS = -L$(3DLDIR)/lib -l3delight + + # Aysdr Plugin (Pixie) +-SDRDIR = /usr/local ++SDRDIR = %%LOCALBASE%% + AYSDRINCDIR = $(SDRDIR)/include + PIXIESRC = /home/user/Pixie/src + AYSDRLIBS = $(PIXIESRC)/common/os.o $(PIXIESRC)/common/memoryman.o -L$(SDRDIR)/lib -lsdr + + # Aygso Plugin (Gelato) +-GELDIR = /usr/local/gelato ++GELDIR = %%LOCALBASE%%/gelato + AYGSOINCDIR = $(GELDIR)/include + AYGSOLIBS = -L$(GELDIR)/lib -lgsoargs -lgelato + + # Aycsg Plugin + # OpenCSG + OPENCSGDIR = ../../OpenCSG-1.0.1 +-OPENCSGINCDIR = $(OPENCSGDIR)/include ++OPENCSGINCDIR = %%LOCALBASE%%/include + OPENCSGOBJS = $(OPENCSGDIR)/src/area.o $(OPENCSGDIR)/src/batch.o\ + $(OPENCSGDIR)/src/openglHelper.o\ + $(OPENCSGDIR)/src/occlusionQuery.o\ +@@ -328,13 +327,13 @@ + $(OPENCSGDIR)/RenderTexture/RenderTexture.o + + +-GLEWDIR = ../../OpenCSG-1.0.1/glew ++GLEWDIR = %%LOCALBASE%% + GLEWINCDIR = $(GLEWDIR)/include + GLEWLIB = -L$(GLEWDIR)/lib -lGLEW + + AYCSGOBJS = plugins/aycsg.o\ + plugins/ayCSGPrimitive.o +-AYCSGLIBS = $(OPENCSGOBJS) $(GLEWLIB) ++AYCSGLIBS = $(GLEWLIB) -lopencsg + + # onio Plugin + OPENNURBSDIR = ../../opennurbs +@@ -551,8 +550,8 @@ + cp -R scripts /Volumes/ayam + -find /Volumes/ayam -name CVS -exec rm -rf "{}" ";" + +-aycsg.so: $(AYCSGOBJS) $(OPENCSGOBJS) +- $(LD) $(SHLFLAGS) $(AYCSGOBJS) -o plugins/aycsg.so $(AYCSGLIBS) ++aycsg.so: $(AYCSGOBJS) ++ $(LD) $(SHLFLAGS) -o plugins/aycsg.so $(AYCSGLIBS) + + csphere.so: $(CSPHEREOBJS) + $(CC) $(SHLFLAGS) $(CSPHEREOBJS) -o plugins/csphere.so +@@ -648,7 +647,7 @@ + -cd MF3D; make -f Makefile.mf3d clean + + DOCFILES = ../Setup.txt ../Changes.txt ../License.txt ../doc/refcard.tcl\ +-../doc/refcard.ps ../doc/ayam.pdf ++../doc/refcard.pdf ../doc/ayam.pdf - ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS) - $(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL) + install: + $(MKDIR) $(BINDIR) Index: files/patch-ayam.tcl =================================================================== RCS file: files/patch-ayam.tcl diff -N files/patch-ayam.tcl --- files/patch-ayam.tcl 14 Jan 2004 02:29:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- tcl/ayam.tcl.orig Mon Jan 12 16:05:21 2004 -+++ tcl/ayam.tcl Mon Jan 12 16:06:01 2004 -@@ -391,7 +391,7 @@ - pady 3 - failsafe 0 - showsplash 1 -- aysplash "../lib/ayam-splash.gif" -+ aysplash "%%DATADIR%%/ayam-splash.gif" - filename "" - tmpfiles "" - ayamrc "~/.ayamrc" Index: files/patch-aycore_shader.c =================================================================== RCS file: files/patch-aycore_shader.c diff -N files/patch-aycore_shader.c --- files/patch-aycore_shader.c 8 Apr 2008 11:06:33 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ ---- aycore/shader.c.orig 2007-09-21 13:30:37.000000000 +0200 -+++ aycore/shader.c 2007-12-17 18:29:44.000000000 +0100 -@@ -340,7 +340,7 @@ - } - - #ifndef WIN32 -- SLX_SetPath(Tcl_GetVar(ay_interp, vname, TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG)); -+ SLX_SetPath((char *)Tcl_GetVar(ay_interp, vname, TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG)); - #else - /* change all ; to : in shader search path */ - Tcl_DStringInit(&ds); -@@ -1094,7 +1094,8 @@ - ay_mat_object *material = NULL; - ay_shader *newshader = NULL, **shader = NULL; - ay_shader_arg *newarg = NULL, **argnext = NULL; -- char *result, *n1=NULL; -+ const char *result; -+ char *n1=NULL; - int sargnc = 0, sargtc = 0, i, j, shadertype = 0, argtype = 0; - double dtemp = 0.0; - char **sargnv, **sargtv; -@@ -1287,10 +1288,10 @@ - /* decompose argument-list */ - Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "ArgNames", - TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY), -- &sargnc, &sargnv); -+ &sargnc, (const char ***)&sargnv); - Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "ArgTypes", - TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY), -- &sargtc, &sargtv); -+ &sargtc, (const char ***)&sargtv); - - - argnext = &(newshader->arg); Index: files/patch-aycore_tgui.c =================================================================== RCS file: files/patch-aycore_tgui.c diff -N files/patch-aycore_tgui.c --- files/patch-aycore_tgui.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- aycore/tgui.c.orig 2007-12-17 18:30:39.000000000 +0100 -+++ aycore/tgui.c 2007-12-17 18:33:44.000000000 +0100 -@@ -439,7 +439,7 @@ - - /* register some C-functions as Tcl-Commands */ - Tcl_CreateCommand (interp, "tguiCmd", -- ay_tgui_tcmd, -+ (Tcl_CmdProc *)ay_tgui_tcmd, - (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); - - /* register TP tag type */ Index: files/patch-aycore_wrib.c =================================================================== RCS file: files/patch-aycore_wrib.c diff -N files/patch-aycore_wrib.c --- files/patch-aycore_wrib.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- aycore/wrib.c.orig 2007-12-17 18:35:09.000000000 +0100 -+++ aycore/wrib.c 2007-12-17 18:36:12.000000000 +0100 -@@ -1158,7 +1158,7 @@ - size_t filenlen = 0; - RtLightHandle light_handle; - char arrname[] = "ayprefs", ccvarname[] = "SMChangeShaders"; -- char *vstr = NULL; -+ const char *vstr; - int changeshaders = AY_TRUE; - - if(!o || !file) Index: files/patch-contrib-meta_metaobj.c =================================================================== RCS file: files/patch-contrib-meta_metaobj.c diff -N files/patch-contrib-meta_metaobj.c --- files/patch-contrib-meta_metaobj.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 @@ - meta_world *w; - meta_blob *b; - ay_object *down; -- char *adapt; -+ const char *adapt; - char vname[] = "ay"; - char vname1[] = "action"; - double euler[3] = {0}; Index: files/patch-contrib_ai.c =================================================================== RCS file: files/patch-contrib_ai.c diff -N files/patch-contrib_ai.c --- files/patch-contrib_ai.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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); Index: files/patch-contrib_sm.c =================================================================== RCS file: files/patch-contrib_sm.c diff -N files/patch-contrib_sm.c --- files/patch-contrib_sm.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ ---- 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 @@ - static int countsm = 0; - char arrname[] = "ayprefs"; - char ffvarname[] = "SMFileFormat", ftvarname[] = "SMFileType"; -- char *smfileformat = NULL, *smfiletype = NULL; -+ char *smfileformat, *smfiletype; - - if(!o) - return; -@@ -498,10 +498,10 @@ - return; - } - -- smfiletype = Tcl_GetVar2(ay_interp, arrname, ftvarname, -+ smfiletype = (char *)Tcl_GetVar2(ay_interp, arrname, ftvarname, - TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY); - -- smfileformat = Tcl_GetVar2(ay_interp, arrname, ffvarname, -+ smfileformat = (char *)Tcl_GetVar2(ay_interp, arrname, ffvarname, - TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY); - - newtrafo->next = trafo; Index: files/patch-contrib_tree.c =================================================================== RCS file: files/patch-contrib_tree.c diff -N files/patch-contrib_tree.c --- files/patch-contrib_tree.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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); - - - Index: files/patch-nurbs_nct.c =================================================================== RCS file: files/patch-nurbs_nct.c diff -N files/patch-nurbs_nct.c --- files/patch-nurbs_nct.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- nurbs/nct.c.orig 2007-12-17 18:37:00.000000000 +0100 -+++ nurbs/nct.c 2007-12-17 18:38:29.000000000 +0100 -@@ -817,7 +817,7 @@ - - if(argc > 1) - { -- Tcl_SplitList(interp, argv[1], &aknotc, &aknotv); -+ Tcl_SplitList(interp, argv[1], &aknotc, (const char ***)&aknotv); - - if(!(X = calloc(aknotc, sizeof(double)))) - { Index: files/patch-objects_ncurve.c =================================================================== RCS file: files/patch-objects_ncurve.c diff -N files/patch-objects_ncurve.c --- files/patch-objects_ncurve.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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)))) - { Index: files/patch-objects_npatch.c =================================================================== RCS file: files/patch-objects_npatch.c diff -N files/patch-objects_npatch.c --- files/patch-objects_npatch.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ ---- 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..."); - 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)))) - { -@@ -1324,7 +1324,7 @@ - ay_error(AY_EOUTPUT, fname, "Checking new knots for V..."); - 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)))) - { Index: files/patch-objects_riinc.c =================================================================== RCS file: files/patch-objects_riinc.c diff -N files/patch-objects_riinc.c --- files/patch-objects_riinc.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 @@ - char *n1 = "RiIncAttrData"; - Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL; - ay_riinc_object *riinc = NULL; -- char *result = NULL; -+ const char *result; - - if(!o) - return AY_ENULL; Index: files/patch-objects_riproc.c =================================================================== RCS file: files/patch-objects_riproc.c diff -N files/patch-objects_riproc.c --- files/patch-objects_riproc.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 @@ - char *n1 = "RiProcAttrData"; - Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL; - ay_riproc_object *riproc = NULL; -- char *result = NULL; -+ const char *result; - - if(!o) - return AY_ENULL; Index: files/patch-objects_root.c =================================================================== RCS file: files/patch-objects_root.c diff -N files/patch-objects_root.c --- files/patch-objects_root.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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 @@ - ay_riopt *riopt = NULL; - double dtemp = 0.0; - int itemp = 0; -- char *result; -+ const char *result; - - if(!o) - return AY_ENULL; Index: files/patch-objects_text.c =================================================================== RCS file: files/patch-objects_text.c diff -N files/patch-objects_text.c --- files/patch-objects_text.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- 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; - char fname[] = "setProp"; - char *n1 = "TextAttrData"; -- char *result; -+ const char *result; - Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL; - ay_text_object *text = NULL; - Tcl_UniChar *unistr = NULL; Index: files/patch-objects_view.c =================================================================== RCS file: files/patch-objects_view.c diff -N files/patch-objects_view.c --- files/patch-objects_view.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- objects/view.c.orig 2007-12-17 18:47:07.000000000 +0100 -+++ objects/view.c 2007-12-17 18:47:21.000000000 +0100 -@@ -167,7 +167,7 @@ - char *n1 = "CameraData", *n2 = "ViewAttribData"; - Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL; - int itemp = 0; -- char *result; -+ const char *result; - char fname[] = "view_setpropcb"; - - if(!o) Index: files/patch-plugins_ayslx.c =================================================================== RCS file: files/patch-plugins_ayslx.c diff -N files/patch-plugins_ayslx.c --- files/patch-plugins_ayslx.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ ---- plugins/ayslx.c.orig 2007-09-21 13:30:37.000000000 +0200 -+++ plugins/ayslx.c 2007-12-17 19:50:54.000000000 +0100 -@@ -17,7 +17,7 @@ - #include - #include "tcl.h" - #include "errcode.h" --#include "slx.h" -+#include - - - /* prototypes: */ -@@ -311,8 +311,8 @@ - - Tcl_SetVar(interp, vname, vval, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY); - -- Tcl_CreateCommand(interp, "shaderScan", ayslx_scanslxtcmd, -- (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); -+ Tcl_CreateCommand(interp, "shaderScan", (Tcl_CmdProc *)ayslx_scanslxtcmd, -+ NULL, NULL); - - ay_error(AY_EOUTPUT, fname, - "Plug-In 'ayslx' loaded."); Index: files/patch-togl_togl.c =================================================================== RCS file: files/patch-togl_togl.c diff -N files/patch-togl_togl.c --- files/patch-togl_togl.c 18 Dec 2007 00:19:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ ---- 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 @@ - } - #endif - -- Tcl_CreateCommand(interp, "togl", Togl_Cmd, -+ Tcl_CreateCommand(interp, "togl", (Tcl_CmdProc *)Togl_Cmd, - (ClientData) Tk_MainWindow(interp), NULL); - Tcl_InitHashTable(&CommandTable, TCL_STRING_KEYS); - -@@ -941,7 +941,7 @@ - int oldAuxNumber = togl->AuxNumber; - - if (Tk_ConfigureWidget(interp, togl->TkWin, configSpecs, -- argc, argv, (char *)togl, flags) == TCL_ERROR) { -+ argc, (const char **)argv, (char *)togl, flags) == TCL_ERROR) { - return(TCL_ERROR); - } - /*fprintf(stderr,"hier %d %d %d\n", togl->TkWin, togl->Width, togl->Height);*/ -@@ -1154,7 +1154,7 @@ - - /* Create command event handler */ - togl->widgetCmd = Tcl_CreateCommand(interp, Tk_PathName(tkwin), -- Togl_Widget, (ClientData)togl, -+ (Tcl_CmdProc *)Togl_Widget, (ClientData)togl, - (Tcl_CmdDeleteProc*) ToglCmdDeletedProc); - Tk_CreateEventHandler(tkwin, - ExposureMask | StructureNotifyMask,