8 files changed, 22 insertions, 88 deletions

diff --git a/graphics/ayam/Makefile b/graphics/ayam/Makefile
index 721c59e26e16..5f0692417ae4 100644
--- a/graphics/ayam/Makefile
+++ b/graphics/ayam/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ayam
-PORTVERSION=	1.15.1
-PORTREVISION=	3
+PORTVERSION=	1.17
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Ayam/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}.src
@@ -82,7 +81,7 @@ do-install:
 	@${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.pdf ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/refcard.tcl ${DOCSDIR}
 	@${MKDIR} ${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/*.html ${DOCSDIR}/html
diff --git a/graphics/ayam/distinfo b/graphics/ayam/distinfo
index bdc126e503f0..f4475259c21f 100644
--- a/graphics/ayam/distinfo
+++ b/graphics/ayam/distinfo
@@ -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.17.src.tar.gz) = 12d2a09b3422816bcc8db6773457dc27
+SHA256 (ayam1.17.src.tar.gz) = 14b8234e12a771757b4a6cc7aab00b5dc7f381e48c68cb29a18ea2cfe546f5fd
+SIZE (ayam1.17.src.tar.gz) = 4235092
diff --git a/graphics/ayam/files/patch-MF3D_mfbinrd.c b/graphics/ayam/files/patch-MF3D_mfbinrd.c
deleted file mode 100644
index c2a5ac15804b..000000000000
--- a/graphics/ayam/files/patch-MF3D_mfbinrd.c
+++ /dev/null
@@ -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)
diff --git a/graphics/ayam/files/patch-aycore_shader.c b/graphics/ayam/files/patch-aycore_shader.c
deleted file mode 100644
index 477bf7e5e11d..000000000000
--- a/graphics/ayam/files/patch-aycore_shader.c
+++ /dev/null
@@ -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);
diff --git a/graphics/ayam/files/patch-aycore_tgui.c b/graphics/ayam/files/patch-aycore_tgui.c
deleted file mode 100644
index 9c32de40ab0c..000000000000
--- a/graphics/ayam/files/patch-aycore_tgui.c
+++ /dev/null
@@ -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 */
diff --git a/graphics/ayam/files/patch-aycore_wrib.c b/graphics/ayam/files/patch-aycore_wrib.c
deleted file mode 100644
index 3197a1aa2e77..000000000000
--- a/graphics/ayam/files/patch-aycore_wrib.c
+++ /dev/null
@@ -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)
diff --git a/graphics/ayam/files/patch-objects_view.c b/graphics/ayam/files/patch-objects_view.c
deleted file mode 100644
index a7b59bb32ec5..000000000000
--- a/graphics/ayam/files/patch-objects_view.c
+++ /dev/null
@@ -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)
diff --git a/graphics/ayam/pkg-plist b/graphics/ayam/pkg-plist
index 714846f73d7f..ecaeefed1c89 100644
--- a/graphics/ayam/pkg-plist
+++ b/graphics/ayam/pkg-plist
@@ -26,6 +26,7 @@ lib/ayam/tcl/camera.tcl
 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
@@ -51,6 +52,7 @@ lib/ayam/tcl/npatch.tcl
 lib/ayam/tcl/objbar.tcl
 lib/ayam/tcl/objsel.tcl
 lib/ayam/tcl/offnc.tcl
+lib/ayam/tcl/offnp.tcl
 lib/ayam/tcl/olb.tcl
 lib/ayam/tcl/pamesh.tcl
 lib/ayam/tcl/pane.tcl
@@ -69,6 +71,7 @@ lib/ayam/tcl/riopt.tcl
 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,6 +89,7 @@ lib/ayam/tcl/tmp.tcl
 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
@@ -170,7 +174,7 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
 @dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/Setup.txt
 %%PORTDOCS%%%%DOCSDIR%%/ayam.pdf
-%%PORTDOCS%%%%DOCSDIR%%/refcard.ps
+%%PORTDOCS%%%%DOCSDIR%%/refcard.pdf
 %%PORTDOCS%%%%DOCSDIR%%/refcard.tcl
 %%PORTDOCS%%%%DOCSDIR%%/html/ayam-1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ayam-2.html
@@ -191,16 +195,21 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
 %%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/extrnc.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnp.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 +220,8 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/multicolcsg.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/multip.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/pics/ncircle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pics/ncircles.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 +232,14 @@ lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
 %%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