View | Details | Raw Unified | Return to bug 118786
Collapse All | Expand All

(-)Makefile (-7 / +5 lines)
Lines 6-27 Link Here
6
#
6
#
7
7
8
PORTNAME=	ayam
8
PORTNAME=	ayam
9
PORTVERSION=	1.10
9
PORTVERSION=	1.13
10
PORTREVISION=	1
10
PORTREVISION=	1
11
CATEGORIES=	graphics
11
CATEGORIES=	graphics
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
14
DISTNAME=	${PORTNAME}${PORTVERSION}.src
14
DISTNAME=	${PORTNAME}${PORTVERSION}.src
15
15
16
MAINTAINER=	ports@FreeBSD.org
16
MAINTAINER=	gahr@gahr.ch
17
COMMENT=	3D modeling environment for the RenderMan interface
17
COMMENT=	3D modeling environment for the RenderMan interface
18
18
19
LIB_DEPENDS=	aqsis.0:${PORTSDIR}/graphics/aqsis \
19
LIB_DEPENDS=	aqsis.1:${PORTSDIR}/graphics/aqsis \
20
		tcl82.1:${PORTSDIR}/lang/tcl82 \
20
		tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
21
		tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
22
		tiff.4:${PORTSDIR}/graphics/tiff
21
		tiff.4:${PORTSDIR}/graphics/tiff
23
22
24
USE_GCC=	3.4
25
USE_GL=		yes
23
USE_GL=		yes
26
USE_X_PREFIX=	yes
24
USE_X_PREFIX=	yes
27
WRKSRC=		${WRKDIR}/${PORTNAME}/src
25
WRKSRC=		${WRKDIR}/${PORTNAME}/src
Lines 34-40 Link Here
34
.include <bsd.port.pre.mk>
32
.include <bsd.port.pre.mk>
35
33
36
.if ${ARCH} == "alpha"
34
.if ${ARCH} == "alpha"
37
BROKEN=		"Does not build on alpha"
35
BROKEN=		Does not build on alpha
38
.endif
36
.endif
39
37
40
post-patch:
38
post-patch:
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (ayam1.10.src.tar.gz) = b4d8b41aeb29efd175ffa62f10d0b464
1
MD5 (ayam1.13.src.tar.gz) = 64dcb78ebbdc53ff2394da3372f10435
2
SHA256 (ayam1.10.src.tar.gz) = 118b24bb8bc9ac8844dfafb12f5ccfd82975805a60c7e68a7dec08a4fdc12d17
2
SHA256 (ayam1.13.src.tar.gz) = 798fc893024fe0af46ce3ea9551c3e04f3f649e392e4707f6e879c10fe7b6236
3
SIZE (ayam1.10.src.tar.gz) = 3037620
3
SIZE (ayam1.13.src.tar.gz) = 3309549
(-)pkg-plist (+9 lines)
Lines 43-48 Link Here
43
lib/ayam/tcl/material.tcl
43
lib/ayam/tcl/material.tcl
44
lib/ayam/tcl/mmenu.tcl
44
lib/ayam/tcl/mmenu.tcl
45
lib/ayam/tcl/ms.tcl
45
lib/ayam/tcl/ms.tcl
46
lib/ayam/tcl/ncircle.tcl
46
lib/ayam/tcl/ncurve.tcl
47
lib/ayam/tcl/ncurve.tcl
47
lib/ayam/tcl/npatch.tcl
48
lib/ayam/tcl/npatch.tcl
48
lib/ayam/tcl/objbar.tcl
49
lib/ayam/tcl/objbar.tcl
Lines 184-199 Link Here
184
%%PORTDOCS%%%%DOCSDIR%%/html/pics/birail2vc.gif
185
%%PORTDOCS%%%%DOCSDIR%%/html/pics/birail2vc.gif
185
%%PORTDOCS%%%%DOCSDIR%%/html/pics/cap.gif
186
%%PORTDOCS%%%%DOCSDIR%%/html/pics/cap.gif
186
%%PORTDOCS%%%%DOCSDIR%%/html/pics/clampnc.gif
187
%%PORTDOCS%%%%DOCSDIR%%/html/pics/clampnc.gif
188
%%PORTDOCS%%%%DOCSDIR%%/html/pics/clampnp.gif
187
%%PORTDOCS%%%%DOCSDIR%%/html/pics/clone.gif
189
%%PORTDOCS%%%%DOCSDIR%%/html/pics/clone.gif
188
%%PORTDOCS%%%%DOCSDIR%%/html/pics/concatnc.gif
190
%%PORTDOCS%%%%DOCSDIR%%/html/pics/concatnc.gif
191
%%PORTDOCS%%%%DOCSDIR%%/html/pics/coarsen.gif
189
%%PORTDOCS%%%%DOCSDIR%%/html/pics/csgex.gif
192
%%PORTDOCS%%%%DOCSDIR%%/html/pics/csgex.gif
190
%%PORTDOCS%%%%DOCSDIR%%/html/pics/elevate.gif
193
%%PORTDOCS%%%%DOCSDIR%%/html/pics/elevate.gif
191
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif
194
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif
195
%%PORTDOCS%%%%DOCSDIR%%/html/pics/gordoncap.gif
192
%%PORTDOCS%%%%DOCSDIR%%/html/pics/gordon-hood.gif
196
%%PORTDOCS%%%%DOCSDIR%%/html/pics/gordon-hood.gif
193
%%PORTDOCS%%%%DOCSDIR%%/html/pics/icurves.gif
197
%%PORTDOCS%%%%DOCSDIR%%/html/pics/icurves.gif
194
%%PORTDOCS%%%%DOCSDIR%%/html/pics/inskn.gif
198
%%PORTDOCS%%%%DOCSDIR%%/html/pics/inskn.gif
199
%%PORTDOCS%%%%DOCSDIR%%/html/pics/insknnp.gif
195
%%PORTDOCS%%%%DOCSDIR%%/html/pics/listbox.gif
200
%%PORTDOCS%%%%DOCSDIR%%/html/pics/listbox.gif
196
%%PORTDOCS%%%%DOCSDIR%%/html/pics/main.gif
201
%%PORTDOCS%%%%DOCSDIR%%/html/pics/main.gif
202
%%PORTDOCS%%%%DOCSDIR%%/html/pics/makecomp.gif
197
%%PORTDOCS%%%%DOCSDIR%%/html/pics/meta.gif
203
%%PORTDOCS%%%%DOCSDIR%%/html/pics/meta.gif
198
%%PORTDOCS%%%%DOCSDIR%%/html/pics/multip.gif
204
%%PORTDOCS%%%%DOCSDIR%%/html/pics/multip.gif
199
%%PORTDOCS%%%%DOCSDIR%%/html/pics/ncircle.gif
205
%%PORTDOCS%%%%DOCSDIR%%/html/pics/ncircle.gif
Lines 202-207 Link Here
202
%%PORTDOCS%%%%DOCSDIR%%/html/pics/primitives.gif
208
%%PORTDOCS%%%%DOCSDIR%%/html/pics/primitives.gif
203
%%PORTDOCS%%%%DOCSDIR%%/html/pics/propgui.gif
209
%%PORTDOCS%%%%DOCSDIR%%/html/pics/propgui.gif
204
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refine.gif
210
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refine.gif
211
%%PORTDOCS%%%%DOCSDIR%%/html/pics/remkn.gif
205
%%PORTDOCS%%%%DOCSDIR%%/html/pics/revolve.gif
212
%%PORTDOCS%%%%DOCSDIR%%/html/pics/revolve.gif
206
%%PORTDOCS%%%%DOCSDIR%%/html/pics/shiftclsbsp.gif
213
%%PORTDOCS%%%%DOCSDIR%%/html/pics/shiftclsbsp.gif
207
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sgordon.gif
214
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sgordon.gif
Lines 213-219 Link Here
213
%%PORTDOCS%%%%DOCSDIR%%/html/pics/text-ayam.gif
220
%%PORTDOCS%%%%DOCSDIR%%/html/pics/text-ayam.gif
214
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tgui.gif
221
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tgui.gif
215
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tools.gif
222
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tools.gif
223
%%PORTDOCS%%%%DOCSDIR%%/html/pics/toxy.gif
216
%%PORTDOCS%%%%DOCSDIR%%/html/pics/treeview.gif
224
%%PORTDOCS%%%%DOCSDIR%%/html/pics/treeview.gif
225
%%PORTDOCS%%%%DOCSDIR%%/html/pics/trimnc.gif
217
%%PORTDOCS%%%%DOCSDIR%%/html/pics/view.gif
226
%%PORTDOCS%%%%DOCSDIR%%/html/pics/view.gif
218
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/pics
227
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/pics
219
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
228
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
(-)files/patch-MF3D_mfbinrd.c (+11 lines)
Added Link Here
1
--- MF3D/mfbinrd.c.orig	2007-12-17 19:17:47.000000000 +0100
2
+++ MF3D/mfbinrd.c	2007-12-17 19:23:12.000000000 +0100
3
@@ -132,7 +132,7 @@
4
 	  MFASSERT (!MF3DIsTextFormat (tocPtr->nextTOC->format));
5
 	  AssignInt64 (nextTocLoc, tocPtr->nextTOC->location.binary);
6
 	  numNewRefs = tocPtr->nEntries;
7
-	  result = MF3D_Reallocate (&inMetafilePtr->tocStuff.references,
8
+	  result = MF3D_Reallocate ((void **) &inMetafilePtr->tocStuff.references,
9
 				    ((numReferences + numNewRefs) *
10
 			     sizeof (*inMetafilePtr->tocStuff.references)));
11
 	  if (result != kMF3DNoErr)
(-)files/patch-MF3D_mffile.c (+11 lines)
Added Link Here
1
--- MF3D/mffile.c.orig	2007-12-17 19:24:47.000000000 +0100
2
+++ MF3D/mffile.c	2007-12-17 19:25:03.000000000 +0100
3
@@ -102,7 +102,7 @@
4
       /* Add this type to the table */
5
       ++inMetafilePtr->typeTable.nTypes;
6
       numTypes = inMetafilePtr->typeTable.nTypes;
7
-      result = MF3D_Reallocate (&inMetafilePtr->typeTable.types,
8
+      result = MF3D_Reallocate ((void **)&inMetafilePtr->typeTable.types,
9
 		       numTypes * sizeof (*inMetafilePtr->typeTable.types));
10
       if (result == kMF3DNoErr)
11
 	{
(-)files/patch-MF3D_mfobject.c (+11 lines)
Added Link Here
1
--- MF3D/mfobject.c.orig	2007-09-21 13:30:36.000000000 +0200
2
+++ MF3D/mfobject.c	2007-12-17 19:48:57.000000000 +0100
3
@@ -930,7 +930,7 @@
4
       ++inMetafilePtr->typeTable.nTypes;
5
       numTypes = inMetafilePtr->typeTable.nTypes;
6
 
7
-      result = MF3D_Reallocate (&inMetafilePtr->typeTable.types,
8
+      result = MF3D_Reallocate ((void **)&inMetafilePtr->typeTable.types,
9
 		       numTypes * sizeof (*inMetafilePtr->typeTable.types));
10
 
11
       if (result == kMF3DNoErr)
(-)files/patch-MF3D_mfprimtv.c (+11 lines)
Added Link Here
1
--- MF3D/mfprimtv.c.orig	2007-12-17 19:30:09.000000000 +0100
2
+++ MF3D/mfprimtv.c	2007-12-17 19:30:24.000000000 +0100
3
@@ -1000,7 +1000,7 @@
4
   if (result == kMF3DNoErr)
5
     {
6
       ++metafile->tocStuff.numReferences;
7
-      result = MF3D_Reallocate (&metafile->tocStuff.references,
8
+      result = MF3D_Reallocate ((void **)&metafile->tocStuff.references,
9
 				(metafile->tocStuff.numReferences *
10
 				 sizeof (*metafile->tocStuff.references)));
11
     }
(-)files/patch-MF3D_mftextrd.c (+56 lines)
Added Link Here
1
--- MF3D/mftextrd.c.orig	2007-12-17 19:30:49.000000000 +0100
2
+++ MF3D/mftextrd.c	2007-12-17 19:32:02.000000000 +0100
3
@@ -178,7 +178,7 @@
4
 			MFASSERT(numNewLabels >= 0);
5
 
6
 			if (numNewLabels > 0)
7
-				result = MF3D_Reallocate(&tocLabelNames,
8
+				result = MF3D_Reallocate((void **)&tocLabelNames,
9
 						(numLabels + numNewLabels) * sizeof(*tocLabelNames));
10
 		}
11
 
12
@@ -250,7 +250,7 @@
13
 			if (result != kMF3DNoErr)
14
 				break;
15
 
16
-			result = MF3D_Reallocate(&objLabelName, labelLen);
17
+			result = MF3D_Reallocate((void **)&objLabelName, labelLen);
18
 			if (result != kMF3DNoErr)
19
 				break;
20
 
21
@@ -381,7 +381,7 @@
22
 			char			objName[kMF3D_MaxObjNameLength + 1];
23
 
24
 			if (numObjects % kMF3D_ObjTableChunk == 0)
25
-			{	result = MF3D_Reallocate(&objTable,
26
+			{	result = MF3D_Reallocate((void **)&objTable,
27
 						(numObjects + kMF3D_ObjTableChunk) * sizeof(*objTable));
28
 				if (result != kMF3DNoErr)
29
 					goto PreprocessTextFileAbort;
30
@@ -419,7 +419,7 @@
31
 					{	/* We found a TOC object. We will want to find
32
 						 * this later; so save the index.
33
 						 */
34
-						result = MF3D_Reallocate(&tocLocations,
35
+						result = MF3D_Reallocate((void **)&tocLocations,
36
 								(numTocs + 1) * sizeof(*tocLocations));
37
 						if (result != kMF3DNoErr)
38
 							goto PreprocessTextFileAbort;
39
@@ -499,7 +499,7 @@
40
 
41
 	/* Readjust the object table from its chunky size */
42
 	if (result == kMF3DNoErr)
43
-	{	result = MF3D_Reallocate(&objTable, (numObjects + 1) * sizeof(*objTable));
44
+	{	result = MF3D_Reallocate((void **)&objTable, (numObjects + 1) * sizeof(*objTable));
45
 		if (result == kMF3DNoErr)
46
 		{	/* Store the file length here */
47
 			AssignInt64(objTable[numObjects].objLocation, location);
48
@@ -1027,7 +1027,7 @@
49
 
50
 	result = kMF3DNoErr;
51
 	if ((ioStringPtr->pos % kMF3D_StringBufferChunk) == 0)
52
-		result = MF3D_Reallocate(&ioStringPtr->str,
53
+		result = MF3D_Reallocate((void **)&ioStringPtr->str,
54
 				ioStringPtr->pos + kMF3D_StringBufferChunk);
55
 
56
 	if (result == kMF3DNoErr)
(-)files/patch-ayam.c (+648 lines)
Added Link Here
1
--- ayam.c.orig	2007-09-21 13:30:36.000000000 +0200
2
+++ ayam.c	2007-12-17 19:12:10.000000000 +0100
3
@@ -598,227 +598,227 @@
4
 
5
   /* aycsg.cpp */
6
 #ifdef AYCSGWRAPPED
7
-  Tcl_CreateCommand(interp, "aycsgInit", aycsg_inittcmd,
8
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
9
+  Tcl_CreateCommand(interp, "aycsgInit", (Tcl_CmdProc *)aycsg_inittcmd,
10
+		     NULL, NULL);
11
 #endif
12
 
13
   /* clear.c */
14
-  Tcl_CreateCommand(interp, "newScene", ay_clear_scenetcmd,
15
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
16
+  Tcl_CreateCommand(interp, "newScene", (Tcl_CmdProc *)ay_clear_scenetcmd,
17
+		     NULL, NULL);
18
 
19
   /* clevel.c */
20
-  Tcl_CreateCommand(interp, "goTop", ay_clevel_gotoptcmd,
21
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
22
+  Tcl_CreateCommand(interp, "goTop", (Tcl_CmdProc *)ay_clevel_gotoptcmd,
23
+		     NULL, NULL);
24
 
25
-  Tcl_CreateCommand(interp, "goUp", ay_clevel_gouptcmd,
26
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
27
+  Tcl_CreateCommand(interp, "goUp", (Tcl_CmdProc *)ay_clevel_gouptcmd,
28
+		     NULL, NULL);
29
 
30
-  Tcl_CreateCommand(interp, "goDown", ay_clevel_godowntcmd,
31
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
32
+  Tcl_CreateCommand(interp, "goDown", (Tcl_CmdProc *)ay_clevel_godowntcmd,
33
+		     NULL, NULL);
34
 
35
-  Tcl_CreateCommand(interp, "getLevel", ay_clevel_gettcmd,
36
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
37
+  Tcl_CreateCommand(interp, "getLevel", (Tcl_CmdProc *)ay_clevel_gettcmd,
38
+		     NULL, NULL);
39
 
40
   /* clipb.c */
41
-  Tcl_CreateCommand(interp, "copOb", ay_clipb_copytcmd,
42
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
43
+  Tcl_CreateCommand(interp, "copOb", (Tcl_CmdProc *)ay_clipb_copytcmd,
44
+		     NULL, NULL);
45
 
46
-  Tcl_CreateCommand(interp, "cutOb", ay_clipb_cuttcmd,
47
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
48
+  Tcl_CreateCommand(interp, "cutOb", (Tcl_CmdProc *)ay_clipb_cuttcmd,
49
+		     NULL, NULL);
50
 
51
-  Tcl_CreateCommand(interp, "pasOb", ay_clipb_pastetcmd,
52
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
53
+  Tcl_CreateCommand(interp, "pasOb", (Tcl_CmdProc *)ay_clipb_pastetcmd,
54
+		     NULL, NULL);
55
 
56
-  Tcl_CreateCommand(interp, "cmovOb", ay_clipb_movetcmd,
57
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
58
+  Tcl_CreateCommand(interp, "cmovOb", (Tcl_CmdProc *)ay_clipb_movetcmd,
59
+		     NULL, NULL);
60
 
61
-  Tcl_CreateCommand(interp, "repOb", ay_clipb_replacetcmd,
62
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
63
+  Tcl_CreateCommand(interp, "repOb", (Tcl_CmdProc *)ay_clipb_replacetcmd,
64
+		     NULL, NULL);
65
 
66
   /* conv.c */
67
-  Tcl_CreateCommand(interp, "convOb", ay_convert_forcetcmd,
68
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
69
+  Tcl_CreateCommand(interp, "convOb", (Tcl_CmdProc *)ay_convert_forcetcmd,
70
+		    NULL, NULL);
71
 
72
   /* draw.c */
73
 
74
   /* error.c */
75
-  Tcl_CreateCommand(interp, "ayError", ay_error_tcmd,
76
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
77
+  Tcl_CreateCommand(interp, "ayError", (Tcl_CmdProc *)ay_error_tcmd,
78
+		     NULL, NULL);
79
 
80
-  Tcl_CreateCommand(interp, "getGLErr", ay_error_getglerrortcmd,
81
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
82
+  Tcl_CreateCommand(interp, "getGLErr", (Tcl_CmdProc *)ay_error_getglerrortcmd,
83
+		    NULL, NULL);
84
 
85
   /* instt.c */
86
-  Tcl_CreateCommand(interp, "resolveIn", ay_instt_resolvetcmd,
87
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
88
+  Tcl_CreateCommand(interp, "resolveIn", (Tcl_CmdProc *)ay_instt_resolvetcmd,
89
+		     NULL, NULL);
90
 
91
-  Tcl_CreateCommand(interp, "getMaster", ay_instt_getmastertcmd,
92
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
93
+  Tcl_CreateCommand(interp, "getMaster", (Tcl_CmdProc *)ay_instt_getmastertcmd,
94
+		     NULL, NULL);
95
 
96
   /* notify.c */
97
-  Tcl_CreateCommand(interp, "forceNot", ay_notify_forcetcmd,
98
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
99
+  Tcl_CreateCommand(interp, "forceNot", (Tcl_CmdProc *)ay_notify_forcetcmd,
100
+		    NULL, NULL);
101
 
102
   /* object.c */
103
-  Tcl_CreateCommand(interp, "crtOb", ay_object_createtcmd,
104
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
105
+  Tcl_CreateCommand(interp, "crtOb", (Tcl_CmdProc *)ay_object_createtcmd,
106
+		    NULL, NULL);
107
 
108
-  Tcl_CreateCommand(interp, "delOb", ay_object_deletetcmd,
109
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
110
+  Tcl_CreateCommand(interp, "delOb", (Tcl_CmdProc *)ay_object_deletetcmd,
111
+		    NULL, NULL);
112
 
113
-  Tcl_CreateCommand(interp, "nameOb", ay_object_setnametcmd,
114
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
115
+  Tcl_CreateCommand(interp, "nameOb", (Tcl_CmdProc *)ay_object_setnametcmd,
116
+		    NULL, NULL);
117
 
118
-  Tcl_CreateCommand(interp, "hasChild", ay_object_haschildtcmd,
119
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
120
+  Tcl_CreateCommand(interp, "hasChild", (Tcl_CmdProc *)ay_object_haschildtcmd,
121
+		    NULL, NULL);
122
 
123
-  Tcl_CreateCommand(interp, "getType", ay_object_gettypetcmd,
124
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
125
+  Tcl_CreateCommand(interp, "getType", (Tcl_CmdProc *)ay_object_gettypetcmd,
126
+		    NULL, NULL);
127
 
128
-  Tcl_CreateCommand(interp, "getName", ay_object_getnametcmd,
129
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
130
+  Tcl_CreateCommand(interp, "getName", (Tcl_CmdProc *)ay_object_getnametcmd,
131
+		    NULL, NULL);
132
 
133
   /* pomesht.c */
134
-  Tcl_CreateCommand(interp, "mergePo", ay_pomesht_mergetcmd,
135
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
136
-  Tcl_CreateCommand(interp, "optiPo", ay_pomesht_optimizetcmd,
137
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
138
-  Tcl_CreateCommand(interp, "splitPo", ay_pomesht_splittcmd,
139
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
140
+  Tcl_CreateCommand(interp, "mergePo", (Tcl_CmdProc *)ay_pomesht_mergetcmd,
141
+		    NULL, NULL);
142
+  Tcl_CreateCommand(interp, "optiPo", (Tcl_CmdProc *)ay_pomesht_optimizetcmd,
143
+		    NULL, NULL);
144
+  Tcl_CreateCommand(interp, "splitPo", (Tcl_CmdProc *)ay_pomesht_splittcmd,
145
+		    NULL, NULL);
146
 
147
   /* prop.c */
148
-  Tcl_CreateCommand(interp, "setProp", ay_prop_settcmd,
149
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
150
+  Tcl_CreateCommand(interp, "setProp", (Tcl_CmdProc *)ay_prop_settcmd,
151
+		    NULL, NULL);
152
 
153
-  Tcl_CreateCommand(interp, "getProp", ay_prop_gettcmd,
154
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
155
+  Tcl_CreateCommand(interp, "getProp", (Tcl_CmdProc *)ay_prop_gettcmd,
156
+		    NULL, NULL);
157
 
158
-  Tcl_CreateCommand(interp, "setTrafo", ay_prop_settrafotcmd,
159
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
160
+  Tcl_CreateCommand(interp, "setTrafo", (Tcl_CmdProc *)ay_prop_settrafotcmd,
161
+		    NULL, NULL);
162
 
163
-  Tcl_CreateCommand(interp, "getTrafo", ay_prop_gettrafotcmd,
164
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
165
+  Tcl_CreateCommand(interp, "getTrafo", (Tcl_CmdProc *)ay_prop_gettrafotcmd,
166
+		    NULL, NULL);
167
 
168
-  Tcl_CreateCommand(interp, "setAttr", ay_prop_setattrtcmd,
169
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
170
+  Tcl_CreateCommand(interp, "setAttr", (Tcl_CmdProc *)ay_prop_setattrtcmd,
171
+		    NULL, NULL);
172
 
173
-  Tcl_CreateCommand(interp, "getAttr", ay_prop_getattrtcmd,
174
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
175
+  Tcl_CreateCommand(interp, "getAttr", (Tcl_CmdProc *)ay_prop_getattrtcmd,
176
+		    NULL, NULL);
177
 
178
-  Tcl_CreateCommand(interp, "setMat", ay_prop_setmattcmd,
179
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
180
+  Tcl_CreateCommand(interp, "setMat", (Tcl_CmdProc *)ay_prop_setmattcmd,
181
+		    NULL, NULL);
182
 
183
-  Tcl_CreateCommand(interp, "getMat", ay_prop_getmattcmd,
184
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
185
+  Tcl_CreateCommand(interp, "getMat", (Tcl_CmdProc *)ay_prop_getmattcmd,
186
+		    NULL, NULL);
187
 
188
   /* prefs.c */
189
-  Tcl_CreateCommand(interp, "setPrefs", ay_prefs_settcmd,
190
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
191
+  Tcl_CreateCommand(interp, "setPrefs", (Tcl_CmdProc *)ay_prefs_settcmd,
192
+		    NULL, NULL);
193
 
194
-  Tcl_CreateCommand(interp, "getPrefs", ay_prefs_gettcmd,
195
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
196
+  Tcl_CreateCommand(interp, "getPrefs", (Tcl_CmdProc *)ay_prefs_gettcmd,
197
+		    NULL, NULL);
198
 
199
   /* read.c */
200
-  Tcl_CreateCommand(interp, "replaceScene", ay_read_replacetcmd,
201
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
202
+  Tcl_CreateCommand(interp, "replaceScene", (Tcl_CmdProc *)ay_read_replacetcmd,
203
+		    NULL, NULL);
204
 
205
-  Tcl_CreateCommand(interp, "insertScene", ay_read_inserttcmd,
206
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
207
+  Tcl_CreateCommand(interp, "insertScene", (Tcl_CmdProc *)ay_read_inserttcmd,
208
+		    NULL, NULL);
209
 
210
 
211
   /* sel.c */
212
-  Tcl_CreateCommand(interp, "selOb", ay_sel_setfromlbtcmd,
213
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
214
+  Tcl_CreateCommand(interp, "selOb", (Tcl_CmdProc *)ay_sel_setfromlbtcmd,
215
+		    NULL, NULL);
216
 
217
-  Tcl_CreateCommand(interp, "getSel", ay_sel_getseltcmd,
218
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
219
+  Tcl_CreateCommand(interp, "getSel", (Tcl_CmdProc *)ay_sel_getseltcmd,
220
+		    NULL, NULL);
221
 
222
-  Tcl_CreateCommand(interp, "hSL", ay_sel_hsltcmd,
223
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
224
+  Tcl_CreateCommand(interp, "hSL", (Tcl_CmdProc *)ay_sel_hsltcmd,
225
+		    NULL, NULL);
226
 
227
 
228
   /* shader.c */
229
-  Tcl_CreateCommand(interp, "shaderScanSLC", ay_shader_scanslctcmd,
230
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
231
+  Tcl_CreateCommand(interp, "shaderScanSLC", (Tcl_CmdProc *)ay_shader_scanslctcmd,
232
+		    NULL, NULL);
233
 
234
-  Tcl_CreateCommand(interp, "shaderScanSLX", ay_shader_scanslxtcmd,
235
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
236
+  Tcl_CreateCommand(interp, "shaderScanSLX", (Tcl_CmdProc *)ay_shader_scanslxtcmd,
237
+		    NULL, NULL);
238
 
239
-  Tcl_CreateCommand(interp, "shaderSet", ay_shader_settcmd,
240
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
241
+  Tcl_CreateCommand(interp, "shaderSet", (Tcl_CmdProc *)ay_shader_settcmd,
242
+		    NULL, NULL);
243
 
244
-  Tcl_CreateCommand(interp, "shaderGet", ay_shader_gettcmd,
245
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
246
+  Tcl_CreateCommand(interp, "shaderGet", (Tcl_CmdProc *)ay_shader_gettcmd,
247
+		    NULL, NULL);
248
 
249
   /* tags.c */
250
-  Tcl_CreateCommand(interp, "tagIsTemp", ay_tags_istemptcmd,
251
-		      (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
252
-  Tcl_CreateCommand(interp, "setTags", ay_tags_settcmd,
253
-		      (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
254
-  Tcl_CreateCommand(interp, "addTag", ay_tags_addtcmd,
255
-		      (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
256
-  Tcl_CreateCommand(interp, "getTags", ay_tags_gettcmd,
257
-		      (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
258
-  Tcl_CreateCommand(interp, "delTags", ay_tags_deletetcmd,
259
-		      (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
260
+  Tcl_CreateCommand(interp, "tagIsTemp", (Tcl_CmdProc *)ay_tags_istemptcmd,
261
+		      NULL, NULL);
262
+  Tcl_CreateCommand(interp, "setTags", (Tcl_CmdProc *)ay_tags_settcmd,
263
+		      NULL, NULL);
264
+  Tcl_CreateCommand(interp, "addTag", (Tcl_CmdProc *)ay_tags_addtcmd,
265
+		      NULL, NULL);
266
+  Tcl_CreateCommand(interp, "getTags", (Tcl_CmdProc *)ay_tags_gettcmd,
267
+		      NULL, NULL);
268
+  Tcl_CreateCommand(interp, "delTags", (Tcl_CmdProc *)ay_tags_deletetcmd,
269
+		      NULL, NULL);
270
 
271
   /* tcmd.c */
272
-  Tcl_CreateCommand(interp, "revert", ay_tcmd_reverttcmd,
273
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
274
+  Tcl_CreateCommand(interp, "revert", (Tcl_CmdProc *)ay_tcmd_reverttcmd,
275
+		    NULL, NULL);
276
 
277
-  Tcl_CreateCommand(interp, "show", ay_tcmd_showtcmd,
278
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
279
+  Tcl_CreateCommand(interp, "show", (Tcl_CmdProc *)ay_tcmd_showtcmd,
280
+		    NULL, NULL);
281
 
282
-  Tcl_CreateCommand(interp, "hide", ay_tcmd_hidetcmd,
283
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
284
+  Tcl_CreateCommand(interp, "hide", (Tcl_CmdProc *)ay_tcmd_hidetcmd,
285
+		    NULL, NULL);
286
 
287
-  Tcl_CreateCommand(interp, "getVersion", ay_tcmd_getvertcmd,
288
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
289
+  Tcl_CreateCommand(interp, "getVersion", (Tcl_CmdProc *)ay_tcmd_getvertcmd,
290
+		    NULL, NULL);
291
 
292
-  Tcl_CreateCommand(interp, "getPnt", ay_tcmd_getpointtcmd,
293
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
294
+  Tcl_CreateCommand(interp, "getPnt", (Tcl_CmdProc *)ay_tcmd_getpointtcmd,
295
+		    NULL, NULL);
296
 
297
-  Tcl_CreateCommand(interp, "setPnt", ay_tcmd_setpointtcmd,
298
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
299
+  Tcl_CreateCommand(interp, "setPnt", (Tcl_CmdProc *)ay_tcmd_setpointtcmd,
300
+		    NULL, NULL);
301
 
302
 #ifdef AYENABLEWAIT
303
-  Tcl_CreateCommand(interp, "waitPid", ay_tcmd_waitpidtcmd,
304
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
305
+  Tcl_CreateCommand(interp, "waitPid", (Tcl_CmdProc *)ay_tcmd_waitpidtcmd,
306
+		    NULL, NULL);
307
 #endif /* AYENABLEWAIT */
308
 
309
 #ifdef AYENABLEFEXIT
310
-  Tcl_CreateCommand(interp, "fastExit", ay_tcmd_fastexittcmd,
311
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
312
+  Tcl_CreateCommand(interp, "fastExit", (Tcl_CmdProc *)ay_tcmd_fastexittcmd,
313
+		    NULL, NULL);
314
 #endif /* AYENABLEFEXIT */
315
 
316
-  Tcl_CreateCommand(interp, "withOb", ay_tcmd_withobtcmd,
317
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
318
+  Tcl_CreateCommand(interp, "withOb", (Tcl_CmdProc *)ay_tcmd_withobtcmd,
319
+		    NULL, NULL);
320
 
321
   /* tmp.c */
322
-  Tcl_CreateCommand(interp, "tmpGet", ay_tmp_gettcmd,
323
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
324
+  Tcl_CreateCommand(interp, "tmpGet", (Tcl_CmdProc *)ay_tmp_gettcmd,
325
+		    NULL, NULL);
326
 
327
   /* trafo.c */
328
-  Tcl_CreateCommand(interp, "delegTrafo", ay_trafo_delegatetcmd,
329
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
330
+  Tcl_CreateCommand(interp, "delegTrafo", (Tcl_CmdProc *)ay_trafo_delegatetcmd,
331
+		    NULL, NULL);
332
 
333
-  Tcl_CreateCommand(interp, "movOb", ay_trafo_movobtcmd,
334
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
335
+  Tcl_CreateCommand(interp, "movOb", (Tcl_CmdProc *)ay_trafo_movobtcmd,
336
+		    NULL, NULL);
337
 
338
-  Tcl_CreateCommand(interp, "movSel", ay_trafo_movseltcmd,
339
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
340
+  Tcl_CreateCommand(interp, "movSel", (Tcl_CmdProc *)ay_trafo_movseltcmd,
341
+		    NULL, NULL);
342
 
343
-  Tcl_CreateCommand(interp, "scalOb", ay_trafo_scalobtcmd,
344
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
345
+  Tcl_CreateCommand(interp, "scalOb", (Tcl_CmdProc *)ay_trafo_scalobtcmd,
346
+		    NULL, NULL);
347
 
348
-  Tcl_CreateCommand(interp, "scalSel", ay_trafo_scalseltcmd,
349
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
350
+  Tcl_CreateCommand(interp, "scalSel", (Tcl_CmdProc *)ay_trafo_scalseltcmd,
351
+		    NULL, NULL);
352
 
353
-  Tcl_CreateCommand(interp, "rotOb", ay_trafo_rotobtcmd,
354
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
355
+  Tcl_CreateCommand(interp, "rotOb", (Tcl_CmdProc *)ay_trafo_rotobtcmd,
356
+		    NULL, NULL);
357
 
358
-  Tcl_CreateCommand(interp, "rotSel", ay_trafo_rotseltcmd,
359
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
360
+  Tcl_CreateCommand(interp, "rotSel", (Tcl_CmdProc *)ay_trafo_rotseltcmd,
361
+		    NULL, NULL);
362
 
363
   /* oact.c */
364
   Togl_CreateCommand("moveoac", ay_oact_movetcb);
365
@@ -842,8 +842,8 @@
366
   /* objsel.c */
367
   Togl_CreateCommand("processObjSel", ay_objsel_processcb);
368
 
369
-  Tcl_CreateCommand(interp, "getNameFromNode", ay_objsel_getnmfrmndtcmd,
370
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
371
+  Tcl_CreateCommand(interp, "getNameFromNode", (Tcl_CmdProc *)ay_objsel_getnmfrmndtcmd,
372
+		    NULL, NULL);
373
 
374
   /* pact.c */
375
   Togl_CreateCommand("selpac", ay_pact_seltcb);
376
@@ -864,25 +864,25 @@
377
 
378
   Togl_CreateCommand("wrpac", ay_pact_wrtcb);
379
 
380
-  Tcl_CreateCommand(interp, "centerPnts", ay_pact_centertcmd,
381
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
382
+  Tcl_CreateCommand(interp, "centerPnts", (Tcl_CmdProc *)ay_pact_centertcmd,
383
+		    NULL, NULL);
384
 
385
   Togl_CreateCommand("snapac", ay_pact_snaptogridcb);
386
 
387
 
388
   /* selp.c */
389
-  Tcl_CreateCommand(interp, "selPoints", ay_selp_selalltcmd,
390
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
391
+  Tcl_CreateCommand(interp, "selPoints", (Tcl_CmdProc *)ay_selp_selalltcmd,
392
+		    NULL, NULL);
393
 
394
-  Tcl_CreateCommand(interp, "applyTrafo", ay_selp_applytrafotcmd,
395
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
396
+  Tcl_CreateCommand(interp, "applyTrafo", (Tcl_CmdProc *)ay_selp_applytrafotcmd,
397
+		    NULL, NULL);
398
 
399
-  Tcl_CreateCommand(interp, "invSelPoints", ay_selp_inverttcmd,
400
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
401
+  Tcl_CreateCommand(interp, "invSelPoints", (Tcl_CmdProc *)ay_selp_inverttcmd,
402
+		    NULL, NULL);
403
 
404
   /* undo.c */
405
-  Tcl_CreateCommand(interp, "undo", ay_undo_undotcmd,
406
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
407
+  Tcl_CreateCommand(interp, "undo", (Tcl_CmdProc *)ay_undo_undotcmd,
408
+		    NULL, NULL);
409
 
410
   /* vact.c */
411
   Togl_CreateCommand("movevac", ay_vact_movetcb);
412
@@ -913,150 +913,150 @@
413
   /* w32t.c */
414
 #ifdef WIN32
415
   Tcl_CreateCommand(interp, "w32kill", ay_w32t_w32killtcmd,
416
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
417
+		    NULL, NULL);
418
 #endif
419
 
420
   /* wrib.c */
421
   Togl_CreateCommand("wrib", ay_wrib_cb);
422
 
423
-  Tcl_CreateCommand(interp, "wrib", ay_wrib_tcmd,
424
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
425
+  Tcl_CreateCommand(interp, "wrib", (Tcl_CmdProc *)ay_wrib_tcmd,
426
+		    NULL, NULL);
427
 
428
   /* write.c */
429
-  Tcl_CreateCommand(interp, "saveScene", ay_write_scenetcmd,
430
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
431
+  Tcl_CreateCommand(interp, "saveScene", (Tcl_CmdProc *)ay_write_scenetcmd,
432
+		    NULL, NULL);
433
 
434
 
435
   /* contrib/tree.c */
436
   /*
437
   Tcl_CreateCommand(interp, "treeInit", ay_tree_inittcmd,
438
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
439
+		    NULL, NULL);
440
   */
441
   /* NURBS */
442
 
443
   /* nurbs/nct.c */
444
-  Tcl_CreateCommand(interp, "refineNC", ay_nct_refinetcmd,
445
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
446
+  Tcl_CreateCommand(interp, "refineNC", (Tcl_CmdProc *)ay_nct_refinetcmd,
447
+		    NULL, NULL);
448
 
449
-  Tcl_CreateCommand(interp, "coarsenNC", ay_nct_coarsentcmd,
450
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
451
+  Tcl_CreateCommand(interp, "coarsenNC", (Tcl_CmdProc *)ay_nct_coarsentcmd,
452
+		    NULL, NULL);
453
 
454
-  Tcl_CreateCommand(interp, "clampNC", ay_nct_clamptcmd,
455
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
456
+  Tcl_CreateCommand(interp, "clampNC", (Tcl_CmdProc *)ay_nct_clamptcmd,
457
+		    NULL, NULL);
458
 
459
-  Tcl_CreateCommand(interp, "elevateNC", ay_nct_elevatetcmd,
460
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
461
+  Tcl_CreateCommand(interp, "elevateNC", (Tcl_CmdProc *)ay_nct_elevatetcmd,
462
+		    NULL, NULL);
463
 
464
-  Tcl_CreateCommand(interp, "insknNC", ay_nct_insertkntcmd,
465
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
466
+  Tcl_CreateCommand(interp, "insknNC", (Tcl_CmdProc *)ay_nct_insertkntcmd,
467
+		    NULL, NULL);
468
 
469
-  Tcl_CreateCommand(interp, "remknNC", ay_nct_removekntcmd,
470
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
471
+  Tcl_CreateCommand(interp, "remknNC", (Tcl_CmdProc *)ay_nct_removekntcmd,
472
+		    NULL, NULL);
473
 
474
-  Tcl_CreateCommand(interp, "collMP", ay_nct_collapsetcmd,
475
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
476
+  Tcl_CreateCommand(interp, "collMP", (Tcl_CmdProc *)ay_nct_collapsetcmd,
477
+		    NULL, NULL);
478
 
479
-  Tcl_CreateCommand(interp, "explMP", ay_nct_explodetcmd,
480
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
481
+  Tcl_CreateCommand(interp, "explMP", (Tcl_CmdProc *)ay_nct_explodetcmd,
482
+		    NULL, NULL);
483
 
484
   Togl_CreateCommand("finduac", ay_nct_finducb);
485
 
486
-  Tcl_CreateCommand(interp, "splitNC", ay_nct_splittcmd,
487
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
488
+  Tcl_CreateCommand(interp, "splitNC", (Tcl_CmdProc *)ay_nct_splittcmd,
489
+		    NULL, NULL);
490
 
491
-  Tcl_CreateCommand(interp, "concatNC", ay_nct_concattcmd,
492
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
493
+  Tcl_CreateCommand(interp, "concatNC", (Tcl_CmdProc *)ay_nct_concattcmd,
494
+		    NULL, NULL);
495
 
496
-  Tcl_CreateCommand(interp, "crtNCircle", ay_nct_crtncircletcmd,
497
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
498
+  Tcl_CreateCommand(interp, "crtNCircle", (Tcl_CmdProc *)ay_nct_crtncircletcmd,
499
+		    NULL, NULL);
500
 
501
-  Tcl_CreateCommand(interp, "crtNRect", ay_nct_crtrecttcmd,
502
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
503
+  Tcl_CreateCommand(interp, "crtNRect", (Tcl_CmdProc *)ay_nct_crtrecttcmd,
504
+		    NULL, NULL);
505
 
506
-  Tcl_CreateCommand(interp, "crtClosedBS", ay_nct_crtclosedbsptcmd,
507
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
508
+  Tcl_CreateCommand(interp, "crtClosedBS", (Tcl_CmdProc *)ay_nct_crtclosedbsptcmd,
509
+		    NULL, NULL);
510
 
511
-  Tcl_CreateCommand(interp, "rescaleKnNC", ay_nct_rescaleknvnctcmd,
512
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
513
+  Tcl_CreateCommand(interp, "rescaleKnNC", (Tcl_CmdProc *)ay_nct_rescaleknvnctcmd,
514
+		    NULL, NULL);
515
 
516
-  Tcl_CreateCommand(interp, "curvPlot", ay_nct_curvplottcmd,
517
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
518
+  Tcl_CreateCommand(interp, "curvPlot", (Tcl_CmdProc *)ay_nct_curvplottcmd,
519
+		    NULL, NULL);
520
 
521
-  Tcl_CreateCommand(interp, "shiftClosedBS", ay_nct_shiftcbstcmd,
522
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
523
+  Tcl_CreateCommand(interp, "shiftClosedBS", (Tcl_CmdProc *)ay_nct_shiftcbstcmd,
524
+		    NULL, NULL);
525
 
526
-  Tcl_CreateCommand(interp, "toXYNC", ay_nct_toxytcmd,
527
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
528
+  Tcl_CreateCommand(interp, "toXYNC", (Tcl_CmdProc *)ay_nct_toxytcmd,
529
+		    NULL, NULL);
530
 
531
-  Tcl_CreateCommand(interp, "makeCompNC", ay_nct_makecomptcmd,
532
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
533
+  Tcl_CreateCommand(interp, "makeCompNC", (Tcl_CmdProc *)ay_nct_makecomptcmd,
534
+		    NULL, NULL);
535
 
536
-  Tcl_CreateCommand(interp, "centerNC", ay_nct_centertcmd,
537
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
538
+  Tcl_CreateCommand(interp, "centerNC", (Tcl_CmdProc *)ay_nct_centertcmd,
539
+		    NULL, NULL);
540
 
541
-  Tcl_CreateCommand(interp, "trimNC", ay_nct_trimtcmd,
542
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
543
+  Tcl_CreateCommand(interp, "trimNC", (Tcl_CmdProc *)ay_nct_trimtcmd,
544
+		    NULL, NULL);
545
 
546
   /* nurbs/npt.c */
547
-  Tcl_CreateCommand(interp, "crtNSphere", ay_npt_crtnspheretcmd,
548
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
549
+  Tcl_CreateCommand(interp, "crtNSphere", (Tcl_CmdProc *)ay_npt_crtnspheretcmd,
550
+		    NULL, NULL);
551
 
552
-  Tcl_CreateCommand(interp, "crtNSphere2", ay_npt_crtnsphere2tcmd,
553
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
554
+  Tcl_CreateCommand(interp, "crtNSphere2", (Tcl_CmdProc *)ay_npt_crtnsphere2tcmd,
555
+		    NULL, NULL);
556
 
557
-  Tcl_CreateCommand(interp, "splitNP", ay_npt_splittocurvestcmd,
558
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
559
+  Tcl_CreateCommand(interp, "splitNP", (Tcl_CmdProc *)ay_npt_splittocurvestcmd,
560
+		    NULL, NULL);
561
 
562
-  Tcl_CreateCommand(interp, "buildNP", ay_npt_buildfromcurvestcmd,
563
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
564
+  Tcl_CreateCommand(interp, "buildNP", (Tcl_CmdProc *)ay_npt_buildfromcurvestcmd,
565
+		    NULL, NULL);
566
 
567
-  Tcl_CreateCommand(interp, "topoly", ay_tess_npatchtcmd,
568
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
569
+  Tcl_CreateCommand(interp, "topoly", (Tcl_CmdProc *)ay_tess_npatchtcmd,
570
+		    NULL, NULL);
571
 
572
-  Tcl_CreateCommand(interp, "elevateNPU", ay_npt_elevateutcmd,
573
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
574
+  Tcl_CreateCommand(interp, "elevateNPU", (Tcl_CmdProc *)ay_npt_elevateutcmd,
575
+		    NULL, NULL);
576
 
577
-  Tcl_CreateCommand(interp, "elevateNPV", ay_npt_elevatevtcmd,
578
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
579
+  Tcl_CreateCommand(interp, "elevateNPV", (Tcl_CmdProc *)ay_npt_elevatevtcmd,
580
+		    NULL, NULL);
581
 
582
-  Tcl_CreateCommand(interp, "swapUV", ay_npt_swapuvtcmd,
583
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
584
+  Tcl_CreateCommand(interp, "swapUV", (Tcl_CmdProc *)ay_npt_swapuvtcmd,
585
+		    NULL, NULL);
586
 
587
-  Tcl_CreateCommand(interp, "revertU", ay_npt_revertutcmd,
588
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
589
+  Tcl_CreateCommand(interp, "revertU", (Tcl_CmdProc *)ay_npt_revertutcmd,
590
+		    NULL, NULL);
591
 
592
-  Tcl_CreateCommand(interp, "revertV", ay_npt_revertvtcmd,
593
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
594
+  Tcl_CreateCommand(interp, "revertV", (Tcl_CmdProc *)ay_npt_revertvtcmd,
595
+		    NULL, NULL);
596
 
597
-  Tcl_CreateCommand(interp, "closeNPU", ay_npt_closeutcmd,
598
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
599
+  Tcl_CreateCommand(interp, "closeNPU", (Tcl_CmdProc *)ay_npt_closeutcmd,
600
+		    NULL, NULL);
601
 
602
-  Tcl_CreateCommand(interp, "closeNPV", ay_npt_closevtcmd,
603
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
604
+  Tcl_CreateCommand(interp, "closeNPV", (Tcl_CmdProc *)ay_npt_closevtcmd,
605
+		    NULL, NULL);
606
 
607
-  Tcl_CreateCommand(interp, "clampNPU", ay_npt_clamputcmd,
608
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
609
+  Tcl_CreateCommand(interp, "clampNPU", (Tcl_CmdProc *)ay_npt_clamputcmd,
610
+		    NULL, NULL);
611
 
612
-  Tcl_CreateCommand(interp, "clampNPV", ay_npt_clampvtcmd,
613
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
614
+  Tcl_CreateCommand(interp, "clampNPV", (Tcl_CmdProc *)ay_npt_clampvtcmd,
615
+		    NULL, NULL);
616
 
617
-  Tcl_CreateCommand(interp, "rescaleKnNP", ay_npt_rescaleknvnptcmd,
618
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
619
+  Tcl_CreateCommand(interp, "rescaleKnNP", (Tcl_CmdProc *)ay_npt_rescaleknvnptcmd,
620
+		    NULL, NULL);
621
 
622
-  Tcl_CreateCommand(interp, "insknNPU", ay_npt_insertknutcmd,
623
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
624
+  Tcl_CreateCommand(interp, "insknNPU", (Tcl_CmdProc *)ay_npt_insertknutcmd,
625
+		    NULL, NULL);
626
 
627
-  Tcl_CreateCommand(interp, "insknNPV", ay_npt_insertknvtcmd,
628
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
629
+  Tcl_CreateCommand(interp, "insknNPV", (Tcl_CmdProc *)ay_npt_insertknvtcmd,
630
+		    NULL, NULL);
631
 
632
-  Tcl_CreateCommand(interp, "splitNPU", ay_npt_splitutcmd,
633
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
634
+  Tcl_CreateCommand(interp, "splitNPU", (Tcl_CmdProc *)ay_npt_splitutcmd,
635
+		    NULL, NULL);
636
 
637
-  Tcl_CreateCommand(interp, "splitNPV", ay_npt_splitvtcmd,
638
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
639
+  Tcl_CreateCommand(interp, "splitNPV", (Tcl_CmdProc *)ay_npt_splitvtcmd,
640
+		    NULL, NULL);
641
 
642
-  Tcl_CreateCommand(interp, "extrNP", ay_npt_extractnptcmd,
643
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
644
+  Tcl_CreateCommand(interp, "extrNP", (Tcl_CmdProc *)ay_npt_extractnptcmd,
645
+		    NULL, NULL);
646
 
647
 /* inform Tcl-context about compile time configuration: */
648
 
(-)files/patch-Makefile.shared (-33 / +37 lines)
Lines 1-8 Link Here
1
1
--- Makefile.shared.orig	2007-09-21 13:30:36.000000000 +0200
2
$FreeBSD: ports/graphics/ayam/files/patch-Makefile.shared,v 1.13 2006/06/01 00:37:21 clsung Exp $
2
+++ Makefile.shared	2007-12-17 18:17:51.000000000 +0100
3
4
--- Makefile.shared.orig
5
+++ Makefile.shared
6
@@ -4,7 +4,7 @@
3
@@ -4,7 +4,7 @@
7
 # Makefile for Ayam (shared version)
4
 # Makefile for Ayam (shared version)
8
 
5
 
Lines 42-48 Link Here
42
 
39
 
43
 # simple configuration using BMRT
40
 # simple configuration using BMRT
44
 #CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
41
 #CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
45
@@ -134,7 +137,7 @@
42
@@ -94,7 +97,7 @@
43
 # MacOSX with Aqua:
44
 #CFLAGS = -O -DAYWITHAQUA -DAYUSEAFFINE -DAYENABLEFEXIT -DUSE_NON_CONST
45
 # MacOSX with Aqua (universal binary, support for older MacOSX):
46
-CFLAGS = -O -DAYWITHAQUA -DAYUSEAFFINE -DAYENABLEFEXIT -DUSE_NON_CONST -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.2
47
+#CFLAGS = -O -DAYWITHAQUA -DAYUSEAFFINE -DAYENABLEFEXIT -DUSE_NON_CONST -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.2
48
 # MacOSX with X11:
49
 #CFLAGS = -O -DAYUSEAFFINE -DAYENABLEFEXIT
50
 
51
@@ -138,7 +141,7 @@
46
 
52
 
47
 # OpenGL
53
 # OpenGL
48
 # OpenGL includes
54
 # OpenGL includes
Lines 51-112 Link Here
51
 # MacOSX (Aqua):
57
 # MacOSX (Aqua):
52
 #GLINC =
58
 #GLINC =
53
 # link options for linking with OpenGL libraries
59
 # link options for linking with OpenGL libraries
54
@@ -144,24 +147,26 @@
60
@@ -148,24 +151,26 @@
55
 
61
 
56
 # TIFF
62
 # TIFF
57
 # TIFF includes
63
 # TIFF includes
58
-TIFFINC = -I/usr/include/
64
-TIFFINC = -I/usr/include/
59
+TIFFINC = -I${LOCALBASE}/include/
65
+TIFFINC = -I${X11BASE}/include/
60
 # link options for linking with TIFF library
66
 # link options for linking with TIFF library
61
 TIFFLIB = -ltiff
67
 TIFFLIB = -ltiff
62
 
68
 
63
 # Tcl/Tk
69
 # Tcl/Tk
64
 # Tcl directory
70
 # Tcl directory
65
-TCLDIR = ../../tcl8.2.2
71
-TCLDIR = ../../tcl8.2.2
66
+#TCLDIR = ../../tcl8.2.2
72
+#TCLDIR = ../../tcl9.2.2
67
 #TCLDIR = ../../tcl8.0
73
 #TCLDIR = ../../tcl8.0
68
 
74
 
69
 # Tcl includes
75
 # Tcl includes
70
-TCLINC = -I$(TCLDIR)/generic
76
-TCLINC = -I$(TCLDIR)/generic
71
+#TCLINC = -I$(TCLDIR)/generic
77
+#TCLINC = -I$(TCLDIR)/generic
72
+TCLINC = -I${LOCALBASE}/include/tcl8.2/generic
78
+TCLINC = -I${LOCALBASE}/include/tcl8.4/generic 
73
 # MacOSX (Aqua):
79
 # MacOSX (Aqua):
74
 #TCLINC =
80
 #TCLINC =
75
 
81
 
76
 # Tcl library
82
 # Tcl library
77
 # link options for linking with Tcl library
83
 # link options for linking with Tcl library
78
-TCLLIB = -L$(TCLDIR)/unix -ltcl8.2
84
-TCLLIB = -L$(TCLDIR)/unix -ltcl8.2
79
+#TCLLIB = -L$(TCLDIR)/unix -ltcl8.2
85
+#TCLLIB = -L$(TCLDIR)/unix -ltcl9.2
80
 #TCLLIB = -L$(TCLDIR)/unix -ltcl8.0
86
 #TCLLIB = -L$(TCLDIR)/unix -ltcl8.0
81
+TCLLIB = -L${LOCALBASE}/lib -ltcl82
87
+TCLLIB = -L${LOCALBASE}/lib -ltcl84
82
 # if you have an installed Tcl/Tk, you probably just want:
88
 # if you have an installed Tcl/Tk, you probably just want:
83
 #TCLLIB = -ltcl
89
 #TCLLIB = -ltcl
84
 # MacOSX (Aqua):
90
 # MacOSX (Aqua):
85
@@ -169,18 +174,20 @@
91
@@ -173,7 +178,7 @@
86
 
92
 
87
 # Tk sources directory
93
 # Tk sources directory
88
 # Note: You really need the Tk _sources_ in order to compile Ayam!
94
 # Note: You really need the Tk _sources_ in order to compile Ayam!
89
-TKDIR = ../../tk8.2.2
95
-TKDIR = ../../tk8.2.2
90
+#TKDIR = ../../tk8.2.2
96
+TKDIR = ${LOCALBASE}/include/tk8.4
91
 #TKDIR = ../../tk8.0
97
 #TKDIR = ../../tk8.0
92
 
98
 
93
 # Tk includes
99
 # Tk includes
94
-TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix
100
@@ -183,8 +188,9 @@
95
+#TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix
96
+TKINC = -I${LOCALBASE}/include/tk8.2/generic -I${LOCALBASE}/include/tk8.2/unix
97
 # MacOSX (Aqua):
98
 #TKINC = -I$(TKDIR)/generic -I$(TKDIR)/macosx -I$(TKDIR)/xlib
99
 
101
 
100
 # Tk library
102
 # Tk library
101
 # link options for linking with Tk library
103
 # link options for linking with Tk library
102
-TKLIB = -L$(TKDIR)/unix -ltk8.2
104
-TKLIB = -L$(TKDIR)/unix -ltk8.2
103
+#TKLIB = -L$(TKDIR)/unix -ltk8.2
105
+#TKLIB = -L$(TKDIR)/unix -ltk8.2
104
 #TKLIB = -L$(TKDIR)/unix -ltk8.0
106
 #TKLIB = -L$(TKDIR)/unix -ltk8.0
105
+TKLIB = -L${LOCALBASE}/lib -ltk82
107
+TKLIB = -L${LOCALBASE}/lib -ltk84
106
 # if you have an installed Tcl/Tk, you probably just want:
108
 # if you have an installed Tcl/Tk, you probably just want:
107
 #TKLIB = -ltk
109
 #TKLIB = -ltk
108
 # MacOSX (Aqua):
110
 # MacOSX (Aqua):
109
@@ -188,11 +195,11 @@
111
@@ -192,11 +198,11 @@
110
 
112
 
111
 # X11
113
 # X11
112
 # X11 includes
114
 # X11 includes
Lines 120-126 Link Here
120
 #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
122
 #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
121
 # MacOSX (Aqua):
123
 # MacOSX (Aqua):
122
 #X11LIBS =
124
 #X11LIBS =
123
@@ -203,23 +210,23 @@
125
@@ -207,23 +213,25 @@
124
 AFFINEINC = -Iaffine/include
126
 AFFINEINC = -Iaffine/include
125
 # if you use Affine as BMRT libribout replacement
127
 # if you use Affine as BMRT libribout replacement
126
 # (also add -DAYUSEAFFINE to CFLAGS!):
128
 # (also add -DAYUSEAFFINE to CFLAGS!):
Lines 140-147 Link Here
140
-AQSISOBJS =
142
-AQSISOBJS =
141
+#AQSISOBJS =
143
+#AQSISOBJS =
142
 # if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!):
144
 # if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!):
143
-#AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp
145
 #AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp
144
+AQSISOBJS = $(AQSISLIBDIR)/libaqsis.a $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L${AQSISLIBDIR} $(AQSISLIBDIR)/libraytrace.so -lstdc++
146
+AQSISOBJS = $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L${AQSISLIBDIR} -lstdc++ -DUYUSESLXARGS
147
+
145
 
148
 
146
 # if you do not use Aqsis libri2rib as BMRT libribout replacement:
149
 # if you do not use Aqsis libri2rib as BMRT libribout replacement:
147
-AQSISRI2RIB =
150
-AQSISRI2RIB =
Lines 152-158 Link Here
152
 
155
 
153
 
156
 
154
 # BMRT
157
 # BMRT
155
@@ -247,9 +254,9 @@
158
@@ -251,9 +259,9 @@
156
 # IRIX, Solaris, (MacOSX<10.4: get libdl from Fink!):
159
 # IRIX, Solaris, (MacOSX<10.4: get libdl from Fink!):
157
 #DL = -ldl
160
 #DL = -ldl
158
 # Linux:
161
 # Linux:
Lines 164-186 Link Here
164
 
167
 
165
 
168
 
166
 # linker flags to produce shared modules:
169
 # linker flags to produce shared modules:
167
@@ -266,8 +273,8 @@
170
@@ -272,8 +280,9 @@
168
 RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm
171
 RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm
169
 
172
 
170
 # Ayslx Plugin (Aqsis)
173
 # Ayslx Plugin (Aqsis)
171
-AYSLXINCDIR = $(AQSISDIR)/include
174
-AYSLXINCDIR = $(AQSISDIR)/include
172
-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
175
-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
173
+AYSLXINCDIR = ${AQSISINC}
176
+AYSLXINCDIR = ${AQSISDIR}/include/aqsis
174
+AYSLXLIBS = -L${AQSISLIBDIR} $(AQSISDIR)/lib/libaqsis.so $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libshaderexecenv.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L${LOCALBASE}/lib
177
+AYSLXLIBS = -L${AQSISLIBDIR} $(AQSISDIR)/lib/libaqsis.so $(AQSISDIR)/lib/libshadervm.so $(AQSISDIR)/lib/libslxargs.so $(AQSISDIR)/lib/libaqsistypes.so -L${LOCALBASE}/lib
178
+
175
 
179
 
176
 # Ayso Plugin (RenderDotC, RDC)
180
 # Ayslc Plugin (BMRT)
177
 RDCDIR = /usr/local/rdc
181
 AYSLCINCDIR = $(BMRTDIR)/include
178
@@ -464,7 +471,7 @@
182
@@ -489,7 +498,7 @@
179
 .cpp.o:
183
 .cpp.o:
180
 	$(CXX) -c $(CFLAGS) $*.cpp -o $@ -I. -IMF3D $(TOGLINC) $(TCLINC) $(TKINC) $(BMRTINC) $(GLINC) $(AFFINEINC) $(AQSISINC) -I$(OPENCSGINCDIR) -I$(GLEWINCDIR) -Iplugins
184
 	$(CXX) -c $(CFLAGS) $*.cpp -o $@ -I. -IMF3D $(TOGLINC) $(TCLINC) $(TKINC) $(BMRTINC) $(GLINC) $(AFFINEINC) $(AQSISINC) -I$(OPENCSGINCDIR) -I$(GLEWINCDIR) -Iplugins
181
 
185
 
182
-all: ayamsh csphere.so mfio.so metaobj.so
186
-all: ayamsh csphere.so mfio.so metaobj.so mopsi.so
183
+all: ayamsh csphere.so mfio.so metaobj.so ayslx.so
187
+all: ayamsh csphere.so mfio.so metaobj.so mopsi.so ayslx.so
184
 
188
 
185
 ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS)
189
 ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS)
186
 	$(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL)
190
 	$(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL)
(-)files/patch-aycore_shader.c (+34 lines)
Added Link Here
1
--- aycore/shader.c.orig	2007-09-21 13:30:37.000000000 +0200
2
+++ aycore/shader.c	2007-12-17 18:29:44.000000000 +0100
3
@@ -340,7 +340,7 @@
4
     }
5
 
6
 #ifndef WIN32
7
-  SLX_SetPath(Tcl_GetVar(ay_interp, vname, TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG));
8
+  SLX_SetPath((char *)Tcl_GetVar(ay_interp, vname, TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG));
9
 #else
10
   /* change all ; to : in shader search path */
11
   Tcl_DStringInit(&ds);
12
@@ -1094,7 +1094,8 @@
13
  ay_mat_object *material = NULL;
14
  ay_shader *newshader = NULL, **shader = NULL;
15
  ay_shader_arg *newarg = NULL, **argnext = NULL;
16
- char *result, *n1=NULL;
17
+ const char *result;
18
+ char *n1=NULL;
19
  int sargnc = 0, sargtc = 0, i, j, shadertype = 0, argtype = 0;
20
  double dtemp = 0.0;
21
  char **sargnv, **sargtv;
22
@@ -1287,10 +1288,10 @@
23
   /* decompose argument-list */
24
   Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "ArgNames",
25
 				   TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
26
-		&sargnc, &sargnv);
27
+		&sargnc, (const char ***)&sargnv);
28
   Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "ArgTypes",
29
 				   TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
30
-		&sargtc, &sargtv);
31
+		&sargtc, (const char ***)&sargtv);
32
 
33
 
34
   argnext = &(newshader->arg);
(-)files/patch-aycore_tgui.c (+11 lines)
Added Link Here
1
--- aycore/tgui.c.orig	2007-12-17 18:30:39.000000000 +0100
2
+++ aycore/tgui.c	2007-12-17 18:33:44.000000000 +0100
3
@@ -439,7 +439,7 @@
4
 
5
   /* register some C-functions as Tcl-Commands */
6
   Tcl_CreateCommand (interp, "tguiCmd",
7
-		     ay_tgui_tcmd,
8
+		     (Tcl_CmdProc *)ay_tgui_tcmd,
9
 		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
10
 
11
   /* register TP tag type */
(-)files/patch-aycore_wrib.c (+11 lines)
Added Link Here
1
--- aycore/wrib.c.orig	2007-12-17 18:35:09.000000000 +0100
2
+++ aycore/wrib.c	2007-12-17 18:36:12.000000000 +0100
3
@@ -1158,7 +1158,7 @@
4
  size_t filenlen = 0;
5
  RtLightHandle light_handle;
6
  char arrname[] = "ayprefs", ccvarname[] = "SMChangeShaders";
7
- char *vstr = NULL;
8
+ const char *vstr;
9
  int changeshaders = AY_TRUE;
10
 
11
   if(!o || !file)
(-)files/patch-contrib-meta_metaobj.c (+11 lines)
Added Link Here
1
--- contrib/meta/metaobj.c.orig	2007-12-17 19:32:36.000000000 +0100
2
+++ contrib/meta/metaobj.c	2007-12-17 19:33:01.000000000 +0100
3
@@ -851,7 +851,7 @@
4
  meta_world *w;
5
  meta_blob *b;
6
  ay_object *down;
7
- char *adapt;
8
+ const char *adapt;
9
  char vname[] = "ay";
10
  char vname1[] = "action";
11
  double euler[3] = {0};
(-)files/patch-contrib_ai.c (+18 lines)
Added Link Here
1
--- contrib/ai.c.orig	2007-09-21 13:30:37.000000000 +0200
2
+++ contrib/ai.c	2007-12-17 19:00:20.000000000 +0100
3
@@ -530,11 +530,11 @@
4
   /* char fname[] = "Ai_Init";*/
5
 
6
    /* Create Tcl commands */
7
-  Tcl_CreateCommand(interp, "ai_makeInstances", ay_ai_makeinstancestcmd,
8
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
9
+  Tcl_CreateCommand(interp, "ai_makeInstances", (Tcl_CmdProc *) ay_ai_makeinstancestcmd,
10
+		    NULL, NULL);
11
 
12
-  Tcl_CreateCommand(interp, "ai_resolveInstances", ay_ai_resolveinstancestcmd,
13
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
14
+  Tcl_CreateCommand(interp, "ai_resolveInstances", (Tcl_CmdProc *) ay_ai_resolveinstancestcmd,
15
+		    NULL, NULL);
16
   /*
17
   Tcl_CreateCommand(interp, "ai_getInstancesList", ay_ai_getinstanceslisttcmd,
18
 		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
(-)files/patch-contrib_sm.c (+24 lines)
Added Link Here
1
--- contrib/sm.c.orig	2007-09-21 13:30:37.000000000 +0200
2
+++ contrib/sm.c	2007-12-17 19:01:46.000000000 +0100
3
@@ -473,7 +473,7 @@
4
  static int countsm = 0;
5
  char arrname[] = "ayprefs";
6
  char ffvarname[] = "SMFileFormat", ftvarname[] = "SMFileType";
7
- char *smfileformat = NULL, *smfiletype = NULL;
8
+ char *smfileformat, *smfiletype;
9
 
10
   if(!o)
11
     return;
12
@@ -498,10 +498,10 @@
13
       return;
14
     }
15
 
16
-  smfiletype = Tcl_GetVar2(ay_interp, arrname, ftvarname,
17
+  smfiletype = (char *)Tcl_GetVar2(ay_interp, arrname, ftvarname,
18
 			   TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
19
 
20
-  smfileformat = Tcl_GetVar2(ay_interp, arrname, ffvarname,
21
+  smfileformat = (char *)Tcl_GetVar2(ay_interp, arrname, ffvarname,
22
 			     TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
23
 
24
   newtrafo->next = trafo;
(-)files/patch-contrib_tree.c (+28 lines)
Added Link Here
1
--- contrib/tree.c.orig	2007-09-21 13:30:37.000000000 +0200
2
+++ contrib/tree.c	2007-12-17 19:03:54.000000000 +0100
3
@@ -898,19 +898,19 @@
4
   */
5
 
6
   /* create new Tcl commands */
7
-  Tcl_CreateCommand(interp, "treeGetString", ay_tree_gettreetcmd,
8
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
9
+  Tcl_CreateCommand(interp, "treeGetString", (Tcl_CmdProc *)ay_tree_gettreetcmd,
10
+		    NULL, NULL);
11
 
12
-  Tcl_CreateCommand(interp, "treeSelect", ay_tree_selecttcmd,
13
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
14
+  Tcl_CreateCommand(interp, "treeSelect", (Tcl_CmdProc *)ay_tree_selecttcmd,
15
+		    NULL, NULL);
16
 
17
   /*
18
   Tcl_CreateCommand(interp, "CreateDndObject", aytree_CreateDndObject_tcmd,
19
 		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
20
   */
21
 
22
-  Tcl_CreateCommand(interp, "treeDnd", ay_tree_dndtcmd,
23
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
24
+  Tcl_CreateCommand(interp, "treeDnd", (Tcl_CmdProc *)ay_tree_dndtcmd,
25
+		    NULL, NULL);
26
 
27
 
28
 
(-)files/patch-nurbs_nct.c (+11 lines)
Added Link Here
1
--- nurbs/nct.c.orig	2007-12-17 18:37:00.000000000 +0100
2
+++ nurbs/nct.c	2007-12-17 18:38:29.000000000 +0100
3
@@ -817,7 +817,7 @@
4
 
5
   if(argc > 1)
6
     {
7
-      Tcl_SplitList(interp, argv[1], &aknotc, &aknotv);
8
+      Tcl_SplitList(interp, argv[1], &aknotc, (const char ***)&aknotv);
9
 
10
       if(!(X = calloc(aknotc, sizeof(double))))
11
 	{
(-)files/patch-objects_ncurve.c (+11 lines)
Added Link Here
1
--- objects/ncurve.c.orig	2007-12-17 18:38:58.000000000 +0100
2
+++ objects/ncurve.c	2007-12-17 18:39:11.000000000 +0100
3
@@ -731,7 +731,7 @@
4
       ay_error(AY_EOUTPUT, fname, "Checking new knots...");
5
       Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "Knots",
6
 				       TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
7
-		    &knotc, &knotv);
8
+		    &knotc, (const char ***)&knotv);
9
 
10
       if(!(nknotv = calloc(knotc, sizeof(double))))
11
 	{
(-)files/patch-objects_npatch.c (+20 lines)
Added Link Here
1
--- objects/npatch.c.orig	2007-12-17 18:39:37.000000000 +0100
2
+++ objects/npatch.c	2007-12-17 18:40:02.000000000 +0100
3
@@ -1260,7 +1260,7 @@
4
       ay_error(AY_EOUTPUT, fname, "Checking new knots for U...");
5
       Tcl_SplitList(interp, Tcl_GetVar2(interp, n1, "Knots_U",
6
 					TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
7
-		    &knotc, &knotv);
8
+		    &knotc, (const char ***)&knotv);
9
 
10
       if(!(nknotv = calloc(knotc, sizeof(double))))
11
 	{
12
@@ -1324,7 +1324,7 @@
13
       ay_error(AY_EOUTPUT, fname, "Checking new knots for V...");
14
       Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "Knots_V",
15
 				       TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
16
-		    &knotc, &knotv);
17
+		    &knotc, (const char ***)&knotv);
18
 
19
       if(!(nknotv = calloc(knotc, sizeof(double))))
20
 	{
(-)files/patch-objects_riinc.c (+11 lines)
Added Link Here
1
--- objects/riinc.c.orig	2007-12-17 18:40:30.000000000 +0100
2
+++ objects/riinc.c	2007-12-17 18:40:55.000000000 +0100
3
@@ -165,7 +165,7 @@
4
  char *n1 = "RiIncAttrData";
5
  Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL;
6
  ay_riinc_object *riinc = NULL;
7
- char *result = NULL;
8
+ const char *result;
9
 
10
   if(!o)
11
     return AY_ENULL;
(-)files/patch-objects_riproc.c (+11 lines)
Added Link Here
1
--- objects/riproc.c.orig	2007-12-17 18:41:21.000000000 +0100
2
+++ objects/riproc.c	2007-12-17 18:41:58.000000000 +0100
3
@@ -197,7 +197,7 @@
4
  char *n1 = "RiProcAttrData";
5
  Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL;
6
  ay_riproc_object *riproc = NULL;
7
- char *result = NULL;
8
+ const char *result;
9
 
10
   if(!o)
11
     return AY_ENULL;
(-)files/patch-objects_root.c (+11 lines)
Added Link Here
1
--- objects/root.c.orig	2007-12-17 18:43:32.000000000 +0100
2
+++ objects/root.c	2007-12-17 18:44:08.000000000 +0100
3
@@ -186,7 +186,7 @@
4
  ay_riopt *riopt = NULL;
5
  double dtemp = 0.0;
6
  int itemp = 0;
7
- char *result;
8
+ const char *result;
9
 
10
   if(!o)
11
     return AY_ENULL;
(-)files/patch-objects_script.c (+11 lines)
Added Link Here
1
--- objects/script.c.orig	2007-09-21 13:30:37.000000000 +0200
2
+++ objects/script.c	2007-12-17 19:00:06.000000000 +0100
3
@@ -442,7 +442,7 @@
4
 ay_script_writecb(FILE *fileptr, ay_object *o)
5
 {
6
  ay_script_object *sc = NULL;
7
- char *arrname = NULL, *membername = NULL, *memberval = NULL;
8
+ const char *arrname = NULL, *membername = NULL, *memberval = NULL;
9
  char *arrnameend = NULL;
10
  Tcl_Obj *arrmemberlist = NULL, *arrmember;
11
  int arrmembers = 0, i, slen;
(-)files/patch-objects_text.c (+11 lines)
Added Link Here
1
--- objects/text.c.orig	2007-12-17 18:46:17.000000000 +0100
2
+++ objects/text.c	2007-12-17 18:46:39.000000000 +0100
3
@@ -164,7 +164,7 @@
4
  int ay_status = AY_OK;
5
  char fname[] = "setProp";
6
  char *n1 = "TextAttrData";
7
- char *result;
8
+ const char *result;
9
  Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL;
10
  ay_text_object *text = NULL;
11
  Tcl_UniChar *unistr = NULL;
(-)files/patch-objects_view.c (+11 lines)
Added Link Here
1
--- objects/view.c.orig	2007-12-17 18:47:07.000000000 +0100
2
+++ objects/view.c	2007-12-17 18:47:21.000000000 +0100
3
@@ -167,7 +167,7 @@
4
  char *n1 = "CameraData", *n2 = "ViewAttribData";
5
  Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL;
6
  int itemp = 0;
7
- char *result;
8
+ const char *result;
9
  char fname[] = "view_setpropcb";
10
 
11
   if(!o)
(-)files/patch-plugins_ayslx.c (+22 lines)
Added Link Here
1
--- plugins/ayslx.c.orig	2007-09-21 13:30:37.000000000 +0200
2
+++ plugins/ayslx.c	2007-12-17 19:50:54.000000000 +0100
3
@@ -17,7 +17,7 @@
4
 #include <string.h>
5
 #include "tcl.h"
6
 #include "errcode.h"
7
-#include "slx.h"
8
+#include <slx.h>
9
 
10
 
11
 /* prototypes: */
12
@@ -311,8 +311,8 @@
13
 
14
   Tcl_SetVar(interp, vname, vval, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
15
 
16
-  Tcl_CreateCommand(interp, "shaderScan", ayslx_scanslxtcmd,
17
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
18
+  Tcl_CreateCommand(interp, "shaderScan", (Tcl_CmdProc *)ayslx_scanslxtcmd,
19
+		    NULL, NULL);
20
 
21
   ay_error(AY_EOUTPUT, fname,
22
 	   "Plug-In 'ayslx' loaded.");
(-)files/patch-plugins_mfio.c (+19 lines)
Added Link Here
1
--- plugins/mfio.c.orig	2007-12-17 19:15:06.000000000 +0100
2
+++ plugins/mfio.c	2007-12-17 19:17:03.000000000 +0100
3
@@ -3530,12 +3530,12 @@
4
 
5
   /* register some C-functions as Tcl-Commands */
6
   Tcl_CreateCommand (interp, "ay_mfio_import",
7
-		     ay_mfio_importscenetcmd,
8
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
9
+		     (Tcl_CmdProc *)ay_mfio_importscenetcmd,
10
+		     NULL, NULL);
11
 
12
   Tcl_CreateCommand (interp, "ay_mfio_export",
13
-		     ay_mfio_exportscenetcmd,
14
-		     (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
15
+		     (Tcl_CmdProc *)ay_mfio_exportscenetcmd,
16
+		     NULL, NULL);
17
 
18
   /* source mfio.tcl, it contains Tcl-code for menu entries */
19
   if((Tcl_EvalFile(interp, "mfio.tcl")) != TCL_OK)
(-)files/patch-plugins_mopsi.c (+13 lines)
Added Link Here
1
--- plugins/mopsi.c.orig	2007-09-21 13:30:38.000000000 +0200
2
+++ plugins/mopsi.c	2007-12-17 19:50:09.000000000 +0100
3
@@ -2130,8 +2130,8 @@
4
   entry = Tcl_CreateHashEntry(&mopsiht, "ICurve", &new_item);
5
   Tcl_SetHashValue(entry, &(mopsi_icurve));
6
 
7
-  Tcl_CreateCommand(interp, "importMops", mopsi_tcmd,
8
-		    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
9
+  Tcl_CreateCommand(interp, "importMops", (Tcl_CmdProc *)mopsi_tcmd,
10
+		    NULL, NULL);
11
 
12
   /* source mopsi.tcl, it contains vital Tcl-code */
13
   if((Tcl_EvalFile(interp, "mopsi.tcl")) != TCL_OK)
(-)files/patch-togl_togl.c (+29 lines)
Added Link Here
1
--- togl/togl.c.orig	2007-12-17 19:12:44.000000000 +0100
2
+++ togl/togl.c	2007-12-17 19:14:18.000000000 +0100
3
@@ -709,7 +709,7 @@
4
    }
5
 #endif
6
 
7
-   Tcl_CreateCommand(interp, "togl", Togl_Cmd,
8
+   Tcl_CreateCommand(interp, "togl", (Tcl_CmdProc *)Togl_Cmd,
9
                      (ClientData) Tk_MainWindow(interp), NULL);
10
    Tcl_InitHashTable(&CommandTable, TCL_STRING_KEYS);
11
 
12
@@ -941,7 +941,7 @@
13
    int oldAuxNumber   = togl->AuxNumber;
14
 
15
    if (Tk_ConfigureWidget(interp, togl->TkWin, configSpecs,
16
-                          argc, argv, (char *)togl, flags) == TCL_ERROR) {
17
+                          argc, (const char **)argv, (char *)togl, flags) == TCL_ERROR) {
18
       return(TCL_ERROR);
19
    }
20
    /*fprintf(stderr,"hier %d %d %d\n", togl->TkWin, togl->Width, togl->Height);*/
21
@@ -1154,7 +1154,7 @@
22
 
23
    /* Create command event handler */
24
    togl->widgetCmd = Tcl_CreateCommand(interp, Tk_PathName(tkwin),
25
-				       Togl_Widget, (ClientData)togl,
26
+				       (Tcl_CmdProc *)Togl_Widget, (ClientData)togl,
27
 				       (Tcl_CmdDeleteProc*) ToglCmdDeletedProc);
28
    Tk_CreateEventHandler(tkwin,
29
                          ExposureMask | StructureNotifyMask,

Return to bug 118786