diff -urN /usr/ports/graphics/ayam/Makefile graphics/ayam/Makefile --- /usr/ports/graphics/ayam/Makefile 2015-03-26 06:26:39.543073000 +0900 +++ graphics/ayam/Makefile 2015-04-07 00:00:00.000000000 +0900 @@ -2,8 +2,7 @@ # $FreeBSD: head/graphics/ayam/Makefile 382266 2015-03-25 20:09:42Z marino $ PORTNAME= ayam -PORTVERSION= 1.20 -PORTREVISION= 3 +PORTVERSION= 1.21 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Ayam/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION}.src @@ -18,91 +17,95 @@ 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" "" "" -.include +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 - ${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 - ${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 - ${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/lang/* \ - ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/lang - + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl + (cd ${WRKSRC}/tcl && ${INSTALL_DATA} *.tcl \ + ${STAGEDIR}${PREFIX}/lib/ayam/tcl) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1 + (cd ${WRKSRC}/tcl/BWidget-1.2.1 && ${INSTALL_DATA} *.tcl \ + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/images + (cd ${WRKSRC}/tcl/BWidget-1.2.1/images && ${INSTALL_DATA} * \ + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/images) + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/lang + (cd ${WRKSRC}/tcl/BWidget-1.2.1/lang && ${INSTALL_DATA} * \ + ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/lang) # data @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/lib/ayam-splash.gif ${STAGEDIR}${DATADIR} - + (cd ${WRKDIR}/${PORTNAME}/lib && ${INSTALL_DATA} ayam-splash.gif \ + ${STAGEDIR}${DATADIR}) # docs -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${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} + (cd ${WRKDIR}/${PORTNAME} && ${INSTALL_DATA} Setup.txt \ + ${STAGEDIR}${DOCSDIR}) + (cd ${WRKDIR}/${PORTNAME}/doc && ${INSTALL_DATA} \ + ayam.pdf refcard.pdf refcard.tcl ${STAGEDIR}${DOCSDIR}) @${MKDIR} ${STAGEDIR}${DOCSDIR}/html - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/*.html ${STAGEDIR}${DOCSDIR}/html + (cd ${WRKDIR}/${PORTNAME}/doc/html && ${INSTALL_DATA} *.html \ + ${STAGEDIR}${DOCSDIR}/html) @${MKDIR} ${STAGEDIR}${DOCSDIR}/html/pics - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/pics/* \ - ${STAGEDIR}${DOCSDIR}/html/pics -.endif + (cd ${WRKDIR}/${PORTNAME}/doc/html/pics && ${INSTALL_DATA} * \ + ${STAGEDIR}${DOCSDIR}/html/pics) .include diff -urN /usr/ports/graphics/ayam/distinfo graphics/ayam/distinfo --- /usr/ports/graphics/ayam/distinfo 2014-06-21 17:44:43.000000000 +0900 +++ graphics/ayam/distinfo 2015-04-07 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (ayam1.20.src.tar.gz) = 4cf5fc46b0722ee12d5b5d0b2baadbf3c5f2a9cbf38e23fc837d6ce91139dad9 -SIZE (ayam1.20.src.tar.gz) = 4593617 +SHA256 (ayam1.21.src.tar.gz) = fcb9decb6727f5dd20409a1b053755e0fda3ecd4b54bf5c0c729d3517474329d +SIZE (ayam1.21.src.tar.gz) = 4989474 diff -urN /usr/ports/graphics/ayam/files/patch-Makefile.shared graphics/ayam/files/patch-Makefile.shared --- /usr/ports/graphics/ayam/files/patch-Makefile.shared 2015-03-26 06:26:39.507600000 +0900 +++ graphics/ayam/files/patch-Makefile.shared 2015-04-07 00:00:00.000000000 +0900 @@ -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) +@@ -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 @@ 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 @@ # 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 @@ # 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 @@ # 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 @@ # 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 @@ # 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 @@ # 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 @@ 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 @@ # 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 @@ 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 @@ .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 @@ + $(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 @@ + $(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 @@ + + 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 -urN /usr/ports/graphics/ayam/files/patch-ayam.tcl graphics/ayam/files/patch-ayam.tcl --- /usr/ports/graphics/ayam/files/patch-ayam.tcl 2014-06-21 17:44:43.000000000 +0900 +++ graphics/ayam/files/patch-ayam.tcl 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/graphics/ayam/files/patch-contrib_ai.c graphics/ayam/files/patch-contrib_ai.c --- /usr/ports/graphics/ayam/files/patch-contrib_ai.c 2014-06-21 17:44:43.000000000 +0900 +++ graphics/ayam/files/patch-contrib_ai.c 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/graphics/ayam/files/patch-contrib_tree.c graphics/ayam/files/patch-contrib_tree.c --- /usr/ports/graphics/ayam/files/patch-contrib_tree.c 2014-06-21 17:44:43.000000000 +0900 +++ graphics/ayam/files/patch-contrib_tree.c 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/graphics/ayam/files/patch-objects_ncurve.c graphics/ayam/files/patch-objects_ncurve.c --- /usr/ports/graphics/ayam/files/patch-objects_ncurve.c 2014-06-21 17:44:43.000000000 +0900 +++ graphics/ayam/files/patch-objects_ncurve.c 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/graphics/ayam/files/patch-scn-shaders_Makefile graphics/ayam/files/patch-scn-shaders_Makefile --- /usr/ports/graphics/ayam/files/patch-scn-shaders_Makefile 2014-06-21 17:44:43.000000000 +0900 +++ graphics/ayam/files/patch-scn-shaders_Makefile 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/graphics/ayam/pkg-plist graphics/ayam/pkg-plist --- /usr/ports/graphics/ayam/pkg-plist 2014-10-21 02:13:21.000000000 +0900 +++ graphics/ayam/pkg-plist 2015-04-07 00:00:00.000000000 +0900 @@ -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/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 @@ %%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,18 @@ %%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/extendnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnc.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnp.gif %%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif @@ -253,6 +260,7 @@ %%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 @@ -265,8 +273,10 @@ %%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 +297,8 @@ %%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 @@ -310,6 +322,8 @@ %%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