View | Details | Raw Unified | Return to bug 199232 | Differences between
and this patch

Collapse All | Expand All

(-)graphics/ayam/Makefile (-62 / +65 lines)
Lines 2-9 Link Here
2
# $FreeBSD: head/graphics/ayam/Makefile 382266 2015-03-25 20:09:42Z marino $
2
# $FreeBSD: head/graphics/ayam/Makefile 382266 2015-03-25 20:09:42Z marino $
3
3
4
PORTNAME=	ayam
4
PORTNAME=	ayam
5
PORTVERSION=	1.20
5
PORTVERSION=	1.22
6
PORTREVISION=	3
7
CATEGORIES=	graphics
6
CATEGORIES=	graphics
8
MASTER_SITES=	SF/${PORTNAME}/Ayam/${PORTVERSION}
7
MASTER_SITES=	SF/${PORTNAME}/Ayam/${PORTVERSION}
9
DISTNAME=	${PORTNAME}${PORTVERSION}.src
8
DISTNAME=	${PORTNAME}${PORTVERSION}.src
Lines 18-108 Link Here
18
17
19
LIB_DEPENDS=	libaqsis_util.so:${PORTSDIR}/graphics/aqsis \
18
LIB_DEPENDS=	libaqsis_util.so:${PORTSDIR}/graphics/aqsis \
20
		libtiff.so:${PORTSDIR}/graphics/tiff
19
		libtiff.so:${PORTSDIR}/graphics/tiff
21
BUILD_DEPENDS=	aqsl:${PORTSDIR}/graphics/aqsis
20
RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
22
21
23
OPTIONS_DEFINE=	DOCS
24
25
USE_XORG=	xmu xext x11
26
USE_GL=		yes
27
USE_LDCONFIG=	${PREFIX}/lib/ayam
28
USES=		gmake tk:84
29
WRKSRC=		${WRKDIR}/${PORTNAME}/src
22
WRKSRC=		${WRKDIR}/${PORTNAME}/src
23
24
USES=		gmake tk
25
USE_XORG=	x11 xext xmu
26
USE_GL=		glu
27
MAKE_ENV=	TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \
28
		TCL_SHLIB_VER="${TCL_SHLIB_VER}" \
29
		TK_INCLUDEDIR="${TK_INCLUDEDIR}" \
30
		TK_SHLIB_VER="${TK_SHLIB_VER}"
30
MAKEFILE=	Makefile.shared
31
MAKEFILE=	Makefile.shared
32
USE_LDCONFIG=	${PREFIX}/lib/ayam
31
MAKE_JOBS_UNSAFE=	yes
33
MAKE_JOBS_UNSAFE=	yes
32
34
33
AYAM_PLUGINS=	csphere mfio
35
DESKTOP_ENTRIES="Ayam" "" "" "ayam" "" ""
34
PLUGINS_DIR=	${PREFIX}/lib/${PORTNAME}
35
36
36
.include <bsd.port.options.mk>
37
OPTIONS_DEFINE=	DOCS
37
38
38
post-patch:
39
post-patch:
39
	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/tcl/ayam.tcl
40
	@${REINPLACE_CMD} -e \
40
	@${REINPLACE_CMD} -e 's|^MF3DCFLAGS =|MF3DCFLAGS = -fPIC|g' \
41
		'/^MF3DCFLAGS/s|=.*|= -fPIC|' \
41
		${WRKSRC}/MF3D/Makefile.mf3d
42
		${WRKSRC}/MF3D/Makefile.mf3d
42
	@${REINPLACE_CMD} -e \
43
	@${REINPLACE_CMD} -e \
43
	   's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g; s|make|$$(MAKE)|g; \
44
		's|interp->errorLine;|Tcl_GetErrorLine(interp);|' \
44
	    s|%%TCL_LIBDIR%%|${LOCALBASE}/lib|g; s|%%TCL_SHLIB_VER%%|${TCL_SHLIB_VER}|g; \
45
		${WRKSRC}/objects/script.c
45
	    s|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|g; \
46
	@${REINPLACE_CMD} -e \
46
	    s|%%TK_LIBDIR%%|${LOCALBASE}/lib|g; s|%%TK_SHLIB_VER%%|${TK_SHLIB_VER}|g' \
47
		's|".*\(ayam-splash.gif\)"|"${DATADIR}/\1"|' \
47
	    ${WRKSRC}/Makefile.shared
48
		${WRKSRC}/tcl/ayam.tcl
48
	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/../scn/shaders/Makefile
49
	@${REINPLACE_CMD} -e \
50
		's| firefox | xdg-open |' \
51
		${WRKSRC}/tcl/browser.tcl
52
	@${REINPLACE_CMD} -e \
53
		'/^AQSL/s|=.*|= ${LOCALBASE}/bin/aqsl|' \
54
		${WRKSRC}/../scn/shaders/Makefile
49
55
50
post-build:
56
post-build:
51
	cd ${WRKSRC}/../scn/shaders && ${MAKE_CMD} slx
57
	cd ${WRKSRC}/../scn/shaders && ${MAKE_CMD} slx
58
	@${ECHO_CMD} -n > ${WRKSRC}/../bin/ayam
59
	@${ECHO_CMD} "#!${SH}" >> ${WRKSRC}/../bin/ayam
60
	@${ECHO_CMD} "${PREFIX}/bin/ayamsh ${PREFIX}/lib/ayam/tcl/ayam.tcl \$$@" \
61
		>> ${WRKSRC}/../bin/ayam
52
62
53
do-install:
63
do-install:
54
# binary and wrapper
64
# binary and wrapper
55
	${INSTALL_PROGRAM} ${WRKSRC}/ayamsh ${STAGEDIR}${PREFIX}/bin
65
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ayamsh ${STAGEDIR}${PREFIX}/bin)
56
	@(${ECHO_CMD} "#!${SH}"; \
66
	(cd ${WRKSRC}/../bin && ${INSTALL_SCRIPT} ayam ${STAGEDIR}${PREFIX}/bin)
57
	  ${ECHO_CMD} "${PREFIX}/bin/ayamsh ${PLUGINS_DIR}/tcl/ayam.tcl \$$@" \
58
	) > ${STAGEDIR}${PREFIX}/bin/ayam
59
	@${CHMOD} ugo+x ${STAGEDIR}${PREFIX}/bin/ayam
60
61
# shaders
67
# shaders
62
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/shaders
68
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/shaders
63
	${INSTALL_DATA} ${WRKSRC}/../scn/shaders/*.slx ${STAGEDIR}${PREFIX}/lib/ayam/shaders
69
	(cd ${WRKSRC}/../scn/shaders && ${INSTALL_DATA} *.slx \
64
70
		${STAGEDIR}${PREFIX}/lib/ayam/shaders)
65
# plugins
71
# plugins
66
	@${MKDIR} ${STAGEDIR}${PLUGINS_DIR}
72
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam
67
.for i in ${AYAM_PLUGINS}
73
	(cd ${WRKSRC}/plugins && ${INSTALL_LIB}  \
68
	${INSTALL_DATA} ${WRKSRC}/plugins/${i}.tcl ${STAGEDIR}${PLUGINS_DIR}
74
		ayslx.so csphere.so mfio.so ${STAGEDIR}${PREFIX}/lib/ayam)
69
	${INSTALL_PROGRAM} ${WRKSRC}/plugins/${i}.so ${STAGEDIR}${PLUGINS_DIR}
75
	(cd ${WRKSRC}/plugins && ${INSTALL_DATA} \
70
.endfor
76
		csphere.tcl loadayslx.tcl mfio.tcl ${STAGEDIR}${PREFIX}/lib/ayam)
71
	${INSTALL_PROGRAM} ${WRKSRC}/plugins/ayslx.so ${STAGEDIR}${PLUGINS_DIR}
77
	(cd ${WRKSRC}/contrib/meta && ${INSTALL_LIB} *.so \
72
	${INSTALL_DATA} ${WRKSRC}/plugins/loadayslx.tcl ${STAGEDIR}${PLUGINS_DIR}
78
		${STAGEDIR}${PREFIX}/lib/ayam)
73
79
	(cd ${WRKSRC}/contrib/meta && ${INSTALL_DATA} *.tcl \
74
	${INSTALL_DATA} ${WRKSRC}/contrib/meta/*.tcl ${STAGEDIR}${PLUGINS_DIR}
80
		${STAGEDIR}${PREFIX}/lib/ayam)
75
	${INSTALL_PROGRAM} ${WRKSRC}/contrib/meta/metaobj.so ${STAGEDIR}${PLUGINS_DIR}
76
77
# tcl libs
81
# tcl libs
78
	@${MKDIR} ${STAGEDIR}${PLUGINS_DIR}/tcl
82
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl
79
	${INSTALL_DATA} ${WRKSRC}/tcl/*.tcl ${STAGEDIR}${PLUGINS_DIR}/tcl
83
	(cd ${WRKSRC}/tcl && ${INSTALL_DATA} *.tcl \
80
	@${MKDIR} ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1
84
		${STAGEDIR}${PREFIX}/lib/ayam/tcl)
81
	${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/*.tcl \
85
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1
82
		${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1
86
	(cd ${WRKSRC}/tcl/BWidget-1.2.1 && ${INSTALL_DATA} *.tcl \
83
	@${MKDIR} ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/images
87
		${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1)
84
	${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/images/* \
88
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/images
85
		${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/images
89
	(cd ${WRKSRC}/tcl/BWidget-1.2.1/images && ${INSTALL_DATA} * \
86
	@${MKDIR} ${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/lang
90
		${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/images)
87
	${INSTALL_DATA} ${WRKSRC}/tcl/BWidget-1.2.1/lang/* \
91
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/lang
88
		${STAGEDIR}${PLUGINS_DIR}/tcl/BWidget-1.2.1/lang
92
	(cd ${WRKSRC}/tcl/BWidget-1.2.1/lang && ${INSTALL_DATA} * \
89
93
		${STAGEDIR}${PREFIX}/lib/ayam/tcl/BWidget-1.2.1/lang)
90
# data
94
# data
91
	@${MKDIR} ${STAGEDIR}${DATADIR}
95
	@${MKDIR} ${STAGEDIR}${DATADIR}
92
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/lib/ayam-splash.gif ${STAGEDIR}${DATADIR}
96
	(cd ${WRKDIR}/${PORTNAME}/lib && ${INSTALL_DATA} ayam-splash.gif \
93
97
		${STAGEDIR}${DATADIR})
94
# docs
98
# docs
95
.if ${PORT_OPTIONS:MDOCS}
96
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
99
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
97
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Setup.txt ${STAGEDIR}${DOCSDIR}
100
	(cd ${WRKDIR}/${PORTNAME} && ${INSTALL_DATA} Setup.txt \
98
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/ayam.pdf ${STAGEDIR}${DOCSDIR}
101
		${STAGEDIR}${DOCSDIR})
99
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/refcard.pdf ${STAGEDIR}${DOCSDIR}
102
	(cd ${WRKDIR}/${PORTNAME}/doc && ${INSTALL_DATA} \
100
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/refcard.tcl ${STAGEDIR}${DOCSDIR}
103
		ayam.pdf refcard.pdf refcard.tcl ${STAGEDIR}${DOCSDIR})
101
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
104
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
102
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/*.html ${STAGEDIR}${DOCSDIR}/html
105
	(cd ${WRKDIR}/${PORTNAME}/doc/html && ${INSTALL_DATA} *.html \
106
		${STAGEDIR}${DOCSDIR}/html)
103
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/pics
107
	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/pics
104
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/html/pics/* \
108
	(cd ${WRKDIR}/${PORTNAME}/doc/html/pics && ${INSTALL_DATA} * \
105
		${STAGEDIR}${DOCSDIR}/html/pics
109
		${STAGEDIR}${DOCSDIR}/html/pics)
106
.endif
107
110
108
.include <bsd.port.mk>
111
.include <bsd.port.mk>
(-)graphics/ayam/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (ayam1.20.src.tar.gz) = 4cf5fc46b0722ee12d5b5d0b2baadbf3c5f2a9cbf38e23fc837d6ce91139dad9
1
SHA256 (ayam1.22.src.tar.gz) = b583bfad827d70c31225fcd5158c595727806252eaf4f48bdb95dd453ef2b209
2
SIZE (ayam1.20.src.tar.gz) = 4593617
2
SIZE (ayam1.22.src.tar.gz) = 5070423
(-)graphics/ayam/files/patch-MF3D_mffile.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- MF3D/mffile.c.orig	2007-12-17 19:24:47.000000000 +0100
1
--- MF3D/mffile.c.orig	2015-06-23 18:03:50 UTC
2
+++ MF3D/mffile.c	2007-12-17 19:25:03.000000000 +0100
2
+++ MF3D/mffile.c
3
@@ -102,7 +102,7 @@
3
@@ -102,7 +102,7 @@ MF3D_TypeObjWrite (
4
       /* Add this type to the table */
4
       /* Add this type to the table */
5
       ++inMetafilePtr->typeTable.nTypes;
5
       ++inMetafilePtr->typeTable.nTypes;
6
       numTypes = inMetafilePtr->typeTable.nTypes;
6
       numTypes = inMetafilePtr->typeTable.nTypes;
(-)graphics/ayam/files/patch-MF3D_mfobject.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- MF3D/mfobject.c.orig	2007-09-21 13:30:36.000000000 +0200
1
--- MF3D/mfobject.c.orig	2015-06-23 18:03:50 UTC
2
+++ MF3D/mfobject.c	2007-12-17 19:48:57.000000000 +0100
2
+++ MF3D/mfobject.c
3
@@ -930,7 +930,7 @@
3
@@ -930,7 +930,7 @@ MF3D_ObjTypeReader (
4
       ++inMetafilePtr->typeTable.nTypes;
4
       ++inMetafilePtr->typeTable.nTypes;
5
       numTypes = inMetafilePtr->typeTable.nTypes;
5
       numTypes = inMetafilePtr->typeTable.nTypes;
6
 
6
 
(-)graphics/ayam/files/patch-MF3D_mfprimtv.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- MF3D/mfprimtv.c.orig	2007-12-17 19:30:09.000000000 +0100
1
--- MF3D/mfprimtv.c.orig	2015-06-23 18:03:50 UTC
2
+++ MF3D/mfprimtv.c	2007-12-17 19:30:24.000000000 +0100
2
+++ MF3D/mfprimtv.c
3
@@ -1000,7 +1000,7 @@
3
@@ -1000,7 +1000,7 @@ MF3D_LabelWrite (
4
   if (result == kMF3DNoErr)
4
   if (result == kMF3DNoErr)
5
     {
5
     {
6
       ++metafile->tocStuff.numReferences;
6
       ++metafile->tocStuff.numReferences;
(-)graphics/ayam/files/patch-MF3D_mftextrd.c (-8 / +8 lines)
Lines 1-6 Link Here
1
--- MF3D/mftextrd.c.orig	2007-12-17 19:30:49.000000000 +0100
1
--- MF3D/mftextrd.c.orig	2015-06-23 18:03:50 UTC
2
+++ MF3D/mftextrd.c	2007-12-17 19:32:02.000000000 +0100
2
+++ MF3D/mftextrd.c
3
@@ -178,7 +178,7 @@
3
@@ -178,7 +178,7 @@ MF3D_GetTOCLabels(
4
 			MFASSERT(numNewLabels >= 0);
4
 			MFASSERT(numNewLabels >= 0);
5
 
5
 
6
 			if (numNewLabels > 0)
6
 			if (numNewLabels > 0)
Lines 9-15 Link Here
9
 						(numLabels + numNewLabels) * sizeof(*tocLabelNames));
9
 						(numLabels + numNewLabels) * sizeof(*tocLabelNames));
10
 		}
10
 		}
11
 
11
 
12
@@ -250,7 +250,7 @@
12
@@ -250,7 +250,7 @@ MF3D_ConvertTableLabels(
13
 			if (result != kMF3DNoErr)
13
 			if (result != kMF3DNoErr)
14
 				break;
14
 				break;
15
 
15
 
Lines 18-24 Link Here
18
 			if (result != kMF3DNoErr)
18
 			if (result != kMF3DNoErr)
19
 				break;
19
 				break;
20
 
20
 
21
@@ -381,7 +381,7 @@
21
@@ -381,7 +381,7 @@ MF3D_PreprocessTextFile(
22
 			char			objName[kMF3D_MaxObjNameLength + 1];
22
 			char			objName[kMF3D_MaxObjNameLength + 1];
23
 
23
 
24
 			if (numObjects % kMF3D_ObjTableChunk == 0)
24
 			if (numObjects % kMF3D_ObjTableChunk == 0)
Lines 27-33 Link Here
27
 						(numObjects + kMF3D_ObjTableChunk) * sizeof(*objTable));
27
 						(numObjects + kMF3D_ObjTableChunk) * sizeof(*objTable));
28
 				if (result != kMF3DNoErr)
28
 				if (result != kMF3DNoErr)
29
 					goto PreprocessTextFileAbort;
29
 					goto PreprocessTextFileAbort;
30
@@ -419,7 +419,7 @@
30
@@ -419,7 +419,7 @@ MF3D_PreprocessTextFile(
31
 					{	/* We found a TOC object. We will want to find
31
 					{	/* We found a TOC object. We will want to find
32
 						 * this later; so save the index.
32
 						 * this later; so save the index.
33
 						 */
33
 						 */
Lines 36-42 Link Here
36
 								(numTocs + 1) * sizeof(*tocLocations));
36
 								(numTocs + 1) * sizeof(*tocLocations));
37
 						if (result != kMF3DNoErr)
37
 						if (result != kMF3DNoErr)
38
 							goto PreprocessTextFileAbort;
38
 							goto PreprocessTextFileAbort;
39
@@ -499,7 +499,7 @@
39
@@ -499,7 +499,7 @@ MF3D_PreprocessTextFile(
40
 
40
 
41
 	/* Readjust the object table from its chunky size */
41
 	/* Readjust the object table from its chunky size */
42
 	if (result == kMF3DNoErr)
42
 	if (result == kMF3DNoErr)
Lines 45-51 Link Here
45
 		if (result == kMF3DNoErr)
45
 		if (result == kMF3DNoErr)
46
 		{	/* Store the file length here */
46
 		{	/* Store the file length here */
47
 			AssignInt64(objTable[numObjects].objLocation, location);
47
 			AssignInt64(objTable[numObjects].objLocation, location);
48
@@ -1027,7 +1027,7 @@
48
@@ -1027,7 +1027,7 @@ MF3D_BuildString_AddChar(
49
 
49
 
50
 	result = kMF3DNoErr;
50
 	result = kMF3DNoErr;
51
 	if ((ioStringPtr->pos % kMF3D_StringBufferChunk) == 0)
51
 	if ((ioStringPtr->pos % kMF3D_StringBufferChunk) == 0)
(-)graphics/ayam/files/patch-Makefile.shared (-46 / +68 lines)
Lines 1-15 Link Here
1
--- Makefile.shared.orig	2010-12-23 21:04:42.000000000 +0100
1
--- Makefile.shared.orig	2015-06-23 18:03:50 UTC
2
+++ Makefile.shared	2011-01-05 10:49:15.000000000 +0100
2
+++ Makefile.shared
3
@@ -4,7 +4,7 @@
3
@@ -7,7 +7,7 @@
4
 # Makefile for Ayam (shared version)
4
 # You can also use "wish ayamConf.tcl" to create a Makefile.
5
 
5
 
6
 # Choose an installation prefix.
6
 # Choose an installation prefix.
7
-PREFIX = /usr/local/ayam
7
-PREFIX = /usr/local/ayam
8
+#PREFIX = /usr/local/ayam
8
+#PREFIX = /usr/local/ayam
9
 #PREFIX = /opt/ayam
9
 #PREFIX = /opt/ayam
10
 # if you use one of the following, be sure to change LIBDIR
10
 #PREFIX = /home/user/ayam
11
 # and DOCDIR to a more suitable (Ayam specific) path
11
 
12
@@ -31,14 +31,14 @@
12
@@ -25,14 +25,14 @@ SCNDIR = $(PREFIX)/scn
13
 
13
 
14
 INSTALL = ./ninstall
14
 INSTALL = ./ninstall
15
 #INSTALL = install
15
 #INSTALL = install
Lines 23-33 Link Here
23
 
23
 
24
 # the C++ compiler (just in use for the AyCSG and onio plugin)
24
 # the C++ compiler (just in use for the AyCSG and onio plugin)
25
-#CXX = CC
25
-#CXX = CC
26
+CXX = ${CC}
26
+CXX ?= c++
27
 #CXX = g++
27
 #CXX = g++
28
 
28
 
29
 # the linker
29
 # the linker
30
@@ -82,7 +82,10 @@
30
@@ -77,7 +77,10 @@ LD = $(CXX)
31
 # the default configuration is to build with Affine as RIB writer without
31
 # the default configuration is to build with Affine as RIB writer without
32
 # any shader parsing library (i.e. you will have to build and load a
32
 # any shader parsing library (i.e. you will have to build and load a
33
 # plugin for shader parsing)
33
 # plugin for shader parsing)
Lines 35-54 Link Here
35
+#CFLAGS = -O -DAYUSEAFFINE
35
+#CFLAGS = -O -DAYUSEAFFINE
36
+
36
+
37
+# make amd64 happy with fPIC
37
+# make amd64 happy with fPIC
38
+CFLAGS += -O -fPIC -DAYUSESLXARGS -DAYUSEAQSISRIB -DAYENABLEWAIT
38
+CFLAGS += -fPIC -DAYUSESLXARGS -DAYUSEAQSISRIB -DAYENABLEWAIT
39
 
39
 
40
 # simple configuration using BMRT
40
 # simple configuration using BMRT
41
 #CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
41
 #CFLAGS = -O -DAYUSESLCARGS -DAYUSEBMRTRIBOUT
42
@@ -96,7 +99,7 @@
42
@@ -114,9 +117,9 @@ LDSWDYNAMIC = -dynamic
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
@@ -121,9 +124,9 @@
52
 # extra ld flags needed to compile Ayam
43
 # extra ld flags needed to compile Ayam
53
 # (gcc needs -rdynamic to allow shared objects access to global symbols)
44
 # (gcc needs -rdynamic to allow shared objects access to global symbols)
54
 # IRIX:
45
 # IRIX:
Lines 56-66 Link Here
56
+#EXLDFLAGS =
47
+#EXLDFLAGS =
57
 # Linux:
48
 # Linux:
58
-#EXLDFLAGS = -rdynamic
49
-#EXLDFLAGS = -rdynamic
59
+EXLDFLAGS = -rdynamic
50
+EXLDFLAGS = -Wl,-export-dynamic
60
 # MacOSX (X11):
51
 # MacOSX (X11):
61
 #EXLDFLAGS = -flat_namespace -undefined suppress
52
 #EXLDFLAGS = -flat_namespace -undefined suppress
62
 # MacOSX (Aqua):
53
 # MacOSX (Aqua):
63
@@ -140,7 +143,7 @@
54
@@ -133,7 +136,7 @@ TOGLOBJECT = togl/togl.o
64
 
55
 
65
 # OpenGL
56
 # OpenGL
66
 # OpenGL includes
57
 # OpenGL includes
Lines 69-75 Link Here
69
 # MacOSX (Aqua):
60
 # MacOSX (Aqua):
70
 #GLINC =
61
 #GLINC =
71
 # link options for linking with OpenGL libraries
62
 # link options for linking with OpenGL libraries
72
@@ -150,24 +153,26 @@
63
@@ -143,24 +146,26 @@ GLLIBS = -lGLU -lGL
73
 
64
 
74
 # TIFF
65
 # TIFF
75
 # TIFF includes
66
 # TIFF includes
Lines 80-126 Link Here
80
 
71
 
81
 # Tcl/Tk
72
 # Tcl/Tk
82
 # Tcl directory
73
 # Tcl directory
83
-TCLDIR = ../../tcl8.2.2
74
-TCLDIR = ../../tcl8.4.19
84
+#TCLDIR = ../../tcl9.2.2
75
+#TCLDIR = ../../tcl8.4.19
85
 #TCLDIR = ../../tcl8.0
76
 #TCLDIR = ../../tcl8.0
86
 
77
 
87
 # Tcl includes
78
 # Tcl includes
88
-TCLINC = -I$(TCLDIR)/generic
79
-TCLINC = -I$(TCLDIR)/generic
89
+#TCLINC = -I$(TCLDIR)/generic
80
+#TCLINC = -I$(TCLDIR)/generic
90
+TCLINC = -I%%TCL_INCLUDEDIR%%
81
+TCLINC = -I${TCL_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}
91
 # MacOSX (Aqua):
82
 # MacOSX (Aqua):
92
 #TCLINC =
83
 #TCLINC =
93
 
84
 
94
 # Tcl library
85
 # Tcl library
95
 # link options for linking with Tcl library
86
 # link options for linking with Tcl library
96
-TCLLIB = -L$(TCLDIR)/unix -ltcl8.2
87
-TCLLIB = -L$(TCLDIR)/unix -ltcl8.4
97
+#TCLLIB = -L$(TCLDIR)/unix -ltcl9.2
88
+#TCLLIB = -L$(TCLDIR)/unix -ltcl8.4
98
 #TCLLIB = -L$(TCLDIR)/unix -ltcl8.0
89
 #TCLLIB = -L$(TCLDIR)/unix -ltcl8.0
99
+TCLLIB = -L%%TCL_LIBDIR%% -ltcl%%TCL_SHLIB_VER%%
90
+TCLLIB = -L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}
100
 # if you have an installed Tcl/Tk, you probably just want:
91
 # if you have an installed Tcl/Tk, you probably just want:
101
 #TCLLIB = -ltcl
92
 #TCLLIB = -ltcl
102
 # MacOSX (Aqua):
93
 # MacOSX (Aqua):
103
@@ -175,7 +180,7 @@
94
@@ -168,18 +173,20 @@ TCLLIB = -L$(TCLDIR)/unix -ltcl8.4
104
 
95
 
105
 # Tk sources directory
96
 # Tk sources directory
106
 # Note: You really need the Tk _sources_ in order to compile Ayam!
97
 # Note: You really need the Tk _sources_ in order to compile Ayam!
107
-TKDIR = ../../tk8.2.2
98
-TKDIR = ../../tk8.4.19
108
+TKDIR = %%TK_INCLUDEDIR%%
99
+#TKDIR = ../../tk8.4.19
109
 #TKDIR = ../../tk8.0
100
 #TKDIR = ../../tk8.0
110
 
101
 
111
 # Tk includes
102
 # Tk includes
112
@@ -185,8 +190,9 @@
103
-TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix
104
+#TKINC = -I$(TKDIR)/generic -I$(TKDIR)/unix
105
+TKINC = -I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}
106
 # MacOSX (Aqua):
107
 #TKINC = -I$(TKDIR)/generic -I$(TKDIR)/macosx -I$(TKDIR)/xlib
113
 
108
 
114
 # Tk library
109
 # Tk library
115
 # link options for linking with Tk library
110
 # link options for linking with Tk library
116
-TKLIB = -L$(TKDIR)/unix -ltk8.2
111
-TKLIB = -L$(TKDIR)/unix -ltk8.4
117
+#TKLIB = -L$(TKDIR)/unix -ltk8.2
112
+#TKLIB = -L$(TKDIR)/unix -ltk8.4
118
 #TKLIB = -L$(TKDIR)/unix -ltk8.0
113
 #TKLIB = -L$(TKDIR)/unix -ltk8.0
119
+TKLIB = -L%%TK_LIBDIR%% -ltk%%TK_SHLIB_VER%%
114
+TKLIB = -L${LOCALBASE}/lib -ltk${TK_SHLIB_VER}
120
 # if you have an installed Tcl/Tk, you probably just want:
115
 # if you have an installed Tcl/Tk, you probably just want:
121
 #TKLIB = -ltk
116
 #TKLIB = -ltk
122
 # MacOSX (Aqua):
117
 # MacOSX (Aqua):
123
@@ -194,11 +200,11 @@
118
@@ -187,11 +194,11 @@ TKLIB = -L$(TKDIR)/unix -ltk8.4
124
 
119
 
125
 # X11
120
 # X11
126
 # X11 includes
121
 # X11 includes
Lines 134-140 Link Here
134
 #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
129
 #X11LIBS = -L/usr/X11R6/lib -lXmu -lXext -lX11
135
 # MacOSX (Aqua):
130
 # MacOSX (Aqua):
136
 #X11LIBS =
131
 #X11LIBS =
137
@@ -209,23 +215,25 @@
132
@@ -202,23 +209,25 @@ X11LIBS = -L/usr/X11R6/lib -lXmu -lXext 
138
 AFFINEINC = -Iaffine/include
133
 AFFINEINC = -Iaffine/include
139
 # if you use Affine as BMRT libribout replacement
134
 # if you use Affine as BMRT libribout replacement
140
 # (also add -DAYUSEAFFINE to CFLAGS!):
135
 # (also add -DAYUSEAFFINE to CFLAGS!):
Lines 155-161 Link Here
155
+#AQSISOBJS =
150
+#AQSISOBJS =
156
 # if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!):
151
 # if you use Aqsis libslxargs (add -DAYUSESLXARGS to CFLAGS!):
157
 #AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp
152
 #AQSISOBJS = $(AQSISLIBDIR)/rcdummy.o $(AQSISLIBDIR)/libshadervm.so $(AQSISLIBDIR)/libshaderexecenv.so $(AQSISLIBDIR)/libslxargs.so $(AQSISLIBDIR)/libaqsistypes.so -L /usr/local/lib -llog4cpp
158
+AQSISOBJS = $(AQSISDIR)/lib/libaqsis_core.so $(AQSISLIBDIR)/libaqsis_shadervm.so $(AQSISLIBDIR)/libaqsis_slxargs.so -L${AQSISLIBDIR} -lstdc++
153
+AQSISOBJS = $(AQSISDIR)/lib/libaqsis_core.so $(AQSISLIBDIR)/libaqsis_shadervm.so $(AQSISLIBDIR)/libaqsis_slxargs.so -L${AQSISLIBDIR}
159
+
154
+
160
 
155
 
161
 # if you do not use Aqsis libri2rib as BMRT libribout replacement:
156
 # if you do not use Aqsis libri2rib as BMRT libribout replacement:
Lines 163-173 Link Here
163
+#AQSISRI2RIB =
158
+#AQSISRI2RIB =
164
 # if you use Aqsis libri2rib (add -DAYUSEAQSISRIB to CFLAGS above!):
159
 # if you use Aqsis libri2rib (add -DAYUSEAQSISRIB to CFLAGS above!):
165
-#AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L /usr/local/lib -llog4cpp
160
-#AQSISRI2RIB = $(AQSISLIBDIR)/libri2rib.so -L /usr/local/lib -llog4cpp
166
+AQSISRI2RIB = $(AQSISLIBDIR)/libaqsis_ri2rib.so -L${AQSISLIBDIR} -lstdc++ -lpthread
161
+AQSISRI2RIB = $(AQSISLIBDIR)/libaqsis_ri2rib.so -L${AQSISLIBDIR} -pthread
167
 
162
 
168
 
163
 
169
 # BMRT
164
 # BMRT
170
@@ -253,9 +261,9 @@
165
@@ -246,9 +255,9 @@ SLCARGSLIB =
171
 # IRIX, Solaris, (MacOSX<10.4: get libdl from Fink!):
166
 # IRIX, Solaris, (MacOSX<10.4: get libdl from Fink!):
172
 #DL = -ldl
167
 #DL = -ldl
173
 # Linux:
168
 # Linux:
Lines 179-185 Link Here
179
 
174
 
180
 
175
 
181
 # linker flags to produce shared modules:
176
 # linker flags to produce shared modules:
182
@@ -274,8 +282,9 @@
177
@@ -267,8 +276,9 @@ AFFINEDIR = ../../affine0008
183
 RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm
178
 RRIBLIBS = -L$(AFFINEDIR)/lib -lribrdr -lribhash -lribnop -lm
184
 
179
 
185
 # Ayslx Plugin (Aqsis)
180
 # Ayslx Plugin (Aqsis)
Lines 191-205 Link Here
191
 
186
 
192
 # Ayslc Plugin (BMRT)
187
 # Ayslc Plugin (BMRT)
193
 AYSLCINCDIR = $(BMRTDIR)/include
188
 AYSLCINCDIR = $(BMRTDIR)/include
194
@@ -520,9 +529,9 @@
189
@@ -536,9 +546,9 @@ RRIBOBJS = plugins/rrib.o
195
 .cpp.o:
190
 .cpp.o:
196
 	$(CXX) -c $(CFLAGS) $*.cpp -o $@ $(AYINC) $(OPENCSGINC) -Iplugins
191
 	$(CXX) -c $(CFLAGS) $*.cpp -o $@ $(OPENCSGINC) $(AYINC) -Iplugins
197
 
192
 
198
-all: ayamsh
193
-all: ayamsh
199
+all: ayamsh plugins
194
+all: ayamsh plugins
200
 
195
 
201
-plugins: csphere.so mfio.so metaobj.so mopsi.so
196
-plugins: csphere.so sfcurve.so mfio.so metaobj.so mopsi.so
202
+plugins: csphere.so mfio.so metaobj.so mopsi.so ayslx.so
197
+plugins: ayslx.so csphere.so sfcurve.so mfio.so metaobj.so mopsi.so
203
 
198
 
204
 ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS)
199
 ayamsh: $(AYAMOBJS) $(TOGLOBJECT) $(AFFINEOBJS)
205
 	$(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL)
200
 	$(LD) $(AYAMOBJS) $(TOGLOBJECT) $(EXLDFLAGS) -o ayamsh $(TKLIB) $(TCLLIB) $(GLLIBS) $(X11LIBS) $(RIBOUTLIB) $(AQSISRI2RIB) $(SLCARGSLIB) $(AFFINEOBJS) $(AQSISOBJS) $(TIFFLIB) -lm $(DL)
201
@@ -591,7 +601,7 @@ idr.so: $(IDROBJS)
202
 	$(CC) $(SHLFLAGS) $(IDROBJS) -o plugins/idr.so $(TIFFLIB)
203
 
204
 mf3d:
205
-	cd MF3D; make -f Makefile.mf3d
206
+	cd MF3D; $(MAKE) -f Makefile.mf3d
207
 
208
 mfio.so: plugins/mfio.o mf3d
209
 	$(CC) $(SHLFLAGS) $(MF3DOBJS) plugins/mfio.o -o plugins/mfio.so
210
@@ -657,7 +667,7 @@ sdnpatch.so:
211
 	$(CXX) $(SHLFLAGS) plugins/sdnpatch.o -o plugins/sdnpatch.so $(SDNPATCHLIB)
212
 
213
 libsub:
214
-	cd plugins/subdivide/src;make -f $(SUBDIVMK)
215
+	cd plugins/subdivide/src;$(MAKE) -f $(SUBDIVMK)
216
 
217
 subdiv.so: libsub
218
 	$(CXX) -c $(CFLAGS) plugins/subdiv.cpp -o plugins/subdiv.o $(AYINC) $(SUBDIVINC)
219
@@ -695,7 +705,7 @@ mostlyclean:
220
 
221
 clean: mostlyclean
222
 	-rm -f $(AFFINEOBJS)
223
-	-cd MF3D; make -f Makefile.mf3d clean
224
+	-cd MF3D; $(MAKE) -f Makefile.mf3d clean
225
 
226
 DOCFILES = ../Setup.txt ../Changes.txt ../License.txt ../doc/refcard.tcl\
227
 ../doc/refcard.pdf ../doc/ayam.pdf
(-)graphics/ayam/files/patch-ayam.tcl (-11 lines)
Lines 1-11 Link Here
1
--- tcl/ayam.tcl.orig	2011-01-04 13:54:09.000000000 +0100
2
+++ tcl/ayam.tcl	2011-01-04 13:54:31.000000000 +0100
3
@@ -555,7 +555,7 @@
4
  pady 3
5
  failsafe 0
6
  showsplash 1
7
- aysplash "../lib/ayam-splash.gif"
8
+ aysplash "%%DATADIR%%/ayam-splash.gif"
9
  filename ""
10
  tmpfiles ""
11
  ayamrc "~/.ayamrc"
(-)graphics/ayam/files/patch-contrib-meta_metaobj.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- contrib/meta/metaobj.c.orig	2007-12-17 19:32:36.000000000 +0100
1
--- contrib/meta/metaobj.c.orig	2015-06-23 18:03:50 UTC
2
+++ contrib/meta/metaobj.c	2007-12-17 19:33:01.000000000 +0100
2
+++ contrib/meta/metaobj.c
3
@@ -851,7 +851,7 @@
3
@@ -859,7 +859,7 @@ metaobj_notifycb (ay_object *o)
4
  meta_world *w;
4
  meta_world *w;
5
  meta_blob *b;
5
  meta_blob *b;
6
  ay_object *down;
6
  ay_object *down;
(-)graphics/ayam/files/patch-contrib_ai.c (-18 lines)
Lines 1-18 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);
(-)graphics/ayam/files/patch-contrib_sm.c (-4 / +4 lines)
Lines 1-6 Link Here
1
--- contrib/sm.c.orig	2007-09-21 13:30:37.000000000 +0200
1
--- contrib/sm.c.orig	2015-06-23 18:03:50 UTC
2
+++ contrib/sm.c	2007-12-17 19:01:46.000000000 +0100
2
+++ contrib/sm.c
3
@@ -473,7 +473,7 @@
3
@@ -474,7 +474,7 @@ ay_sm_wriballsm(char *file, char *objfil
4
  static int countsm = 0;
4
  static int countsm = 0;
5
  char arrname[] = "ayprefs";
5
  char arrname[] = "ayprefs";
6
  char ffvarname[] = "SMFileFormat", ftvarname[] = "SMFileType";
6
  char ffvarname[] = "SMFileFormat", ftvarname[] = "SMFileType";
Lines 9-15 Link Here
9
 
9
 
10
   if(!o)
10
   if(!o)
11
     return;
11
     return;
12
@@ -498,10 +498,10 @@
12
@@ -499,10 +499,10 @@ ay_sm_wriballsm(char *file, char *objfil
13
       return;
13
       return;
14
     }
14
     }
15
 
15
 
(-)graphics/ayam/files/patch-contrib_tree.c (-28 lines)
Lines 1-28 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
 
(-)graphics/ayam/files/patch-objects_ncurve.c (-11 lines)
Lines 1-11 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
 	{
(-)graphics/ayam/files/patch-objects_npatch.c (-9 / +9 lines)
Lines 1-20 Link Here
1
--- objects/npatch.c.orig	2007-12-17 18:39:37.000000000 +0100
1
--- objects/npatch.c.orig	2015-06-23 18:03:50 UTC
2
+++ objects/npatch.c	2007-12-17 18:40:02.000000000 +0100
2
+++ objects/npatch.c
3
@@ -1260,7 +1260,7 @@
3
@@ -1934,7 +1934,7 @@ ay_npatch_setpropcb(Tcl_Interp *interp, 
4
       ay_error(AY_EOUTPUT, fname, "Checking new knots for U...");
4
     {
5
       Tcl_SplitList(interp, Tcl_GetVar2(interp, n1, "Knots_U",
5
       Tcl_SplitList(interp, Tcl_GetVar2(interp, n1, "Knots_U",
6
 					TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
6
 					TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
7
-		    &knotc, &knotv);
7
-		    &knotc, &knotv);
8
+		    &knotc, (const char ***)&knotv);
8
+		    &knotc, (const char ***)&knotv);
9
 
9
 
10
       if(!(nknotv = calloc(knotc, sizeof(double))))
10
       if(!(nknotv = malloc(knotc * sizeof(double))))
11
 	{
11
 	{
12
@@ -1324,7 +1324,7 @@
12
@@ -1988,7 +1988,7 @@ ay_npatch_setpropcb(Tcl_Interp *interp, 
13
       ay_error(AY_EOUTPUT, fname, "Checking new knots for V...");
13
     {
14
       Tcl_SplitList(interp,Tcl_GetVar2(interp, n1, "Knots_V",
14
       Tcl_SplitList(interp, Tcl_GetVar2(interp, n1, "Knots_V",
15
 				       TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
15
 				       TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY),
16
-		    &knotc, &knotv);
16
-		    &knotc, &knotv);
17
+		    &knotc, (const char ***)&knotv);
17
+		    &knotc, (const char ***)&knotv);
18
 
18
 
19
       if(!(nknotv = calloc(knotc, sizeof(double))))
19
       if(!(nknotv = malloc(knotc * sizeof(double))))
20
 	{
20
 	{
(-)graphics/ayam/files/patch-objects_riinc.c (-4 / +4 lines)
Lines 1-11 Link Here
1
--- objects/riinc.c.orig	2007-12-17 18:40:30.000000000 +0100
1
--- objects/riinc.c.orig	2015-06-23 18:03:50 UTC
2
+++ objects/riinc.c	2007-12-17 18:40:55.000000000 +0100
2
+++ objects/riinc.c
3
@@ -165,7 +165,7 @@
3
@@ -184,7 +184,7 @@ ay_riinc_setpropcb(Tcl_Interp *interp, i
4
  char *n1 = "RiIncAttrData";
4
  char *n1 = "RiIncAttrData";
5
  Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL;
5
  Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL;
6
  ay_riinc_object *riinc = NULL;
6
  ay_riinc_object *riinc = NULL;
7
- char *result = NULL;
7
- char *result = NULL;
8
+ const char *result;
8
+ const char *result;
9
 
9
 
10
   if(!o)
10
   if(!interp || !o)
11
     return AY_ENULL;
11
     return AY_ENULL;
(-)graphics/ayam/files/patch-objects_riproc.c (-4 / +4 lines)
Lines 1-11 Link Here
1
--- objects/riproc.c.orig	2007-12-17 18:41:21.000000000 +0100
1
--- objects/riproc.c.orig	2015-06-23 18:03:50 UTC
2
+++ objects/riproc.c	2007-12-17 18:41:58.000000000 +0100
2
+++ objects/riproc.c
3
@@ -197,7 +197,7 @@
3
@@ -197,7 +197,7 @@ ay_riproc_setpropcb(Tcl_Interp *interp, 
4
  char *n1 = "RiProcAttrData";
4
  char *n1 = "RiProcAttrData";
5
  Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL;
5
  Tcl_Obj *to = NULL, *toa = NULL, *ton = NULL;
6
  ay_riproc_object *riproc = NULL;
6
  ay_riproc_object *riproc = NULL;
7
- char *result = NULL;
7
- char *result = NULL;
8
+ const char *result;
8
+ const char *result;
9
 
9
 
10
   if(!o)
10
   if(!interp || !o)
11
     return AY_ENULL;
11
     return AY_ENULL;
(-)graphics/ayam/files/patch-objects_root.c (-4 / +4 lines)
Lines 1-11 Link Here
1
--- objects/root.c.orig	2007-12-17 18:43:32.000000000 +0100
1
--- objects/root.c.orig	2015-06-23 18:03:50 UTC
2
+++ objects/root.c	2007-12-17 18:44:08.000000000 +0100
2
+++ objects/root.c
3
@@ -186,7 +186,7 @@
3
@@ -215,7 +215,7 @@ ay_root_setpropcb(Tcl_Interp *interp, in
4
  ay_riopt *riopt = NULL;
4
  ay_riopt *riopt = NULL;
5
  double dtemp = 0.0;
5
  double dtemp = 0.0;
6
  int itemp = 0;
6
  int itemp = 0;
7
- char *result;
7
- char *result;
8
+ const char *result;
8
+ const char *result;
9
 
9
 
10
   if(!o)
10
   if(!interp || !o)
11
     return AY_ENULL;
11
     return AY_ENULL;
(-)graphics/ayam/files/patch-objects_text.c (-4 / +4 lines)
Lines 1-7 Link Here
1
--- objects/text.c.orig	2007-12-17 18:46:17.000000000 +0100
1
--- objects/text.c.orig	2015-06-23 18:03:50 UTC
2
+++ objects/text.c	2007-12-17 18:46:39.000000000 +0100
2
+++ objects/text.c
3
@@ -164,7 +164,7 @@
3
@@ -274,7 +274,7 @@ ay_text_setpropcb(Tcl_Interp *interp, in
4
  int ay_status = AY_OK;
4
  /*int ay_status = AY_OK;*/
5
  char fname[] = "setProp";
5
  char fname[] = "setProp";
6
  char *n1 = "TextAttrData";
6
  char *n1 = "TextAttrData";
7
- char *result;
7
- char *result;
(-)graphics/ayam/files/patch-plugins_ayslx.c (-4 / +4 lines)
Lines 1-5 Link Here
1
--- plugins/ayslx.c.orig	2007-09-21 13:30:37.000000000 +0200
1
--- plugins/ayslx.c.orig	2015-06-23 18:03:50 UTC
2
+++ plugins/ayslx.c	2007-12-17 19:50:54.000000000 +0100
2
+++ plugins/ayslx.c
3
@@ -17,7 +17,7 @@
3
@@ -17,7 +17,7 @@
4
 #include <string.h>
4
 #include <string.h>
5
 #include "tcl.h"
5
 #include "tcl.h"
Lines 9-15 Link Here
9
 
9
 
10
 
10
 
11
 /* prototypes: */
11
 /* prototypes: */
12
@@ -311,8 +311,8 @@
12
@@ -319,8 +319,8 @@ Ayslx_Init(Tcl_Interp *interp)
13
 
13
 
14
   Tcl_SetVar(interp, vname, vval, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
14
   Tcl_SetVar(interp, vname, vval, TCL_LEAVE_ERR_MSG | TCL_GLOBAL_ONLY);
15
 
15
 
Lines 19-22 Link Here
19
+		    NULL, NULL);
19
+		    NULL, NULL);
20
 
20
 
21
   ay_error(AY_EOUTPUT, fname,
21
   ay_error(AY_EOUTPUT, fname,
22
 	   "Plug-In 'ayslx' loaded.");
22
 	   "Plugin 'ayslx' successfully loaded.");
(-)graphics/ayam/files/patch-scn-shaders_Makefile (-18 lines)
Lines 1-18 Link Here
1
--- ../scn/shaders/Makefile.orig	2013-10-31 15:39:27.000000000 +0100
2
+++ ../scn/shaders/Makefile	2013-10-31 15:39:41.000000000 +0100
3
@@ -18,7 +18,7 @@
4
 
5
 # AQSIS
6
 AQSHADERS := $(SOURCES:%.sl=%.slx)
7
-AQSL = aqsl
8
+AQSL = %%LOCALBASE%%/bin/aqsl
9
 AQSLFLAGS =
10
 
11
 # 3Delight
12
@@ -136,4 +136,4 @@
13
 	rm -f $*.slpp
14
 
15
 .sl.sdr:
16
-	$(SDRC) $(SDRCFLAGS) $*.sl
17
\ No newline at end of file
18
+	$(SDRC) $(SDRCFLAGS) $*.sl
(-)graphics/ayam/files/patch-tcl_shader.tcl (+21 lines)
Line 0 Link Here
1
--- tcl/shader.tcl.orig	2015-06-23 18:03:50 UTC
2
+++ tcl/shader.tcl
3
@@ -76,14 +76,14 @@
4
 
5
     foreach p $spathstr {
6
 	set files [glob -nocomplain "${p}/*${sext}"]
7
-	append allfiles "$files "
8
+	append temp "$files "
9
     }
10
 
11
     set allshaders ""
12
-    foreach f $allfiles {
13
+    foreach s $temp {
14
 	# silently omit unreadable shader files
15
-	if {[file readable $f]} {
16
-	    lappend allshaders $f
17
+	if {[file readable $s]} {
18
+	    lappend allshaders $s
19
 	}
20
     }
21
     # foreach
(-)graphics/ayam/files/patch-togl_togl.c (-5 / +5 lines)
Lines 1-6 Link Here
1
--- togl/togl.c.orig	2007-12-17 19:12:44.000000000 +0100
1
--- togl/togl.c.orig	2015-06-23 18:03:50 UTC
2
+++ togl/togl.c	2007-12-17 19:14:18.000000000 +0100
2
+++ togl/togl.c
3
@@ -709,7 +709,7 @@
3
@@ -709,7 +709,7 @@ int Togl_Init(Tcl_Interp *interp)
4
    }
4
    }
5
 #endif
5
 #endif
6
 
6
 
Lines 9-15 Link Here
9
                      (ClientData) Tk_MainWindow(interp), NULL);
9
                      (ClientData) Tk_MainWindow(interp), NULL);
10
    Tcl_InitHashTable(&CommandTable, TCL_STRING_KEYS);
10
    Tcl_InitHashTable(&CommandTable, TCL_STRING_KEYS);
11
 
11
 
12
@@ -941,7 +941,7 @@
12
@@ -941,7 +941,7 @@ int Togl_Configure(Tcl_Interp *interp, s
13
    int oldAuxNumber   = togl->AuxNumber;
13
    int oldAuxNumber   = togl->AuxNumber;
14
 
14
 
15
    if (Tk_ConfigureWidget(interp, togl->TkWin, configSpecs,
15
    if (Tk_ConfigureWidget(interp, togl->TkWin, configSpecs,
Lines 18-24 Link Here
18
       return(TCL_ERROR);
18
       return(TCL_ERROR);
19
    }
19
    }
20
    /*fprintf(stderr,"hier %d %d %d\n", togl->TkWin, togl->Width, togl->Height);*/
20
    /*fprintf(stderr,"hier %d %d %d\n", togl->TkWin, togl->Width, togl->Height);*/
21
@@ -1154,7 +1154,7 @@
21
@@ -1154,7 +1154,7 @@ static int Togl_Cmd(ClientData clientDat
22
 
22
 
23
    /* Create command event handler */
23
    /* Create command event handler */
24
    togl->widgetCmd = Tcl_CreateCommand(interp, Tk_PathName(tkwin),
24
    togl->widgetCmd = Tcl_CreateCommand(interp, Tk_PathName(tkwin),
(-)graphics/ayam/pkg-plist (-73 / +92 lines)
Lines 1-19 Link Here
1
bin/ayam
1
bin/ayam
2
bin/ayamsh
2
bin/ayamsh
3
lib/ayam/ayslx.so
3
lib/ayam/ayslx.so
4
lib/ayam/loadayslx.tcl
5
lib/ayam/csphere.tcl
6
lib/ayam/csphere.so
4
lib/ayam/csphere.so
7
lib/ayam/metaobj.so
5
lib/ayam/csphere.tcl
6
lib/ayam/loadayslx.tcl
8
lib/ayam/metacomp.tcl
7
lib/ayam/metacomp.tcl
8
lib/ayam/metaobj.so
9
lib/ayam/metaobj.tcl
9
lib/ayam/metaobj.tcl
10
lib/ayam/mfio.tcl
11
lib/ayam/mfio.so
10
lib/ayam/mfio.so
11
lib/ayam/mfio.tcl
12
lib/ayam/shaders/DSnoisedsp.slx
12
lib/ayam/shaders/DSnoisedsp.slx
13
lib/ayam/shaders/MFicydsp.slx
13
lib/ayam/shaders/MFicydsp.slx
14
lib/ayam/shaders/MFicysrf.slx
14
lib/ayam/shaders/MFicysrf.slx
15
lib/ayam/shaders/RCClouds.slx
15
lib/ayam/shaders/RCClouds.slx
16
lib/ayam/shaders/RSstripessrf.slx
16
lib/ayam/shaders/RSstripessrf.slx
17
lib/ayam/tcl/BWidget-1.2.1/arrow.tcl
18
lib/ayam/tcl/BWidget-1.2.1/bitmap.tcl
19
lib/ayam/tcl/BWidget-1.2.1/button.tcl
20
lib/ayam/tcl/BWidget-1.2.1/buttonbox.tcl
21
lib/ayam/tcl/BWidget-1.2.1/color.tcl
22
lib/ayam/tcl/BWidget-1.2.1/combobox.tcl
23
lib/ayam/tcl/BWidget-1.2.1/dialog.tcl
24
lib/ayam/tcl/BWidget-1.2.1/dragsite.tcl
25
lib/ayam/tcl/BWidget-1.2.1/dropsite.tcl
26
lib/ayam/tcl/BWidget-1.2.1/dynhelp.tcl
27
lib/ayam/tcl/BWidget-1.2.1/entry.tcl
28
lib/ayam/tcl/BWidget-1.2.1/font.tcl
29
lib/ayam/tcl/BWidget-1.2.1/images/bold.gif
30
lib/ayam/tcl/BWidget-1.2.1/images/copy.gif
31
lib/ayam/tcl/BWidget-1.2.1/images/cut.gif
32
lib/ayam/tcl/BWidget-1.2.1/images/dragfile.gif
33
lib/ayam/tcl/BWidget-1.2.1/images/dragicon.gif
34
lib/ayam/tcl/BWidget-1.2.1/images/error.gif
35
lib/ayam/tcl/BWidget-1.2.1/images/file.gif
36
lib/ayam/tcl/BWidget-1.2.1/images/folder.gif
37
lib/ayam/tcl/BWidget-1.2.1/images/hourglass.gif
38
lib/ayam/tcl/BWidget-1.2.1/images/info.gif
39
lib/ayam/tcl/BWidget-1.2.1/images/italic.gif
40
lib/ayam/tcl/BWidget-1.2.1/images/minus.xbm
41
lib/ayam/tcl/BWidget-1.2.1/images/new.gif
42
lib/ayam/tcl/BWidget-1.2.1/images/opcopy.xbm
43
lib/ayam/tcl/BWidget-1.2.1/images/open.gif
44
lib/ayam/tcl/BWidget-1.2.1/images/openfold.gif
45
lib/ayam/tcl/BWidget-1.2.1/images/oplink.xbm
46
lib/ayam/tcl/BWidget-1.2.1/images/opmove.xbm
47
lib/ayam/tcl/BWidget-1.2.1/images/overstrike.gif
48
lib/ayam/tcl/BWidget-1.2.1/images/palette.gif
49
lib/ayam/tcl/BWidget-1.2.1/images/passwd.gif
50
lib/ayam/tcl/BWidget-1.2.1/images/paste.gif
51
lib/ayam/tcl/BWidget-1.2.1/images/plus.xbm
52
lib/ayam/tcl/BWidget-1.2.1/images/print.gif
53
lib/ayam/tcl/BWidget-1.2.1/images/question.gif
54
lib/ayam/tcl/BWidget-1.2.1/images/save.gif
55
lib/ayam/tcl/BWidget-1.2.1/images/underline.gif
56
lib/ayam/tcl/BWidget-1.2.1/images/undo.gif
57
lib/ayam/tcl/BWidget-1.2.1/images/warning.gif
58
lib/ayam/tcl/BWidget-1.2.1/init.tcl
59
lib/ayam/tcl/BWidget-1.2.1/label.tcl
60
lib/ayam/tcl/BWidget-1.2.1/labelentry.tcl
61
lib/ayam/tcl/BWidget-1.2.1/labelframe.tcl
62
lib/ayam/tcl/BWidget-1.2.1/lang/de.rc
63
lib/ayam/tcl/BWidget-1.2.1/lang/en.rc
64
lib/ayam/tcl/BWidget-1.2.1/lang/es.rc
65
lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
66
lib/ayam/tcl/BWidget-1.2.1/listbox.tcl
67
lib/ayam/tcl/BWidget-1.2.1/mainframe.tcl
68
lib/ayam/tcl/BWidget-1.2.1/messagedlg.tcl
69
lib/ayam/tcl/BWidget-1.2.1/notebook.tcl
70
lib/ayam/tcl/BWidget-1.2.1/pagesmgr.tcl
71
lib/ayam/tcl/BWidget-1.2.1/panedw.tcl
72
lib/ayam/tcl/BWidget-1.2.1/passwddlg.tcl
73
lib/ayam/tcl/BWidget-1.2.1/pkgIndex.tcl
74
lib/ayam/tcl/BWidget-1.2.1/progressbar.tcl
75
lib/ayam/tcl/BWidget-1.2.1/progressdlg.tcl
76
lib/ayam/tcl/BWidget-1.2.1/scrollframe.tcl
77
lib/ayam/tcl/BWidget-1.2.1/scrollview.tcl
78
lib/ayam/tcl/BWidget-1.2.1/scrollw.tcl
79
lib/ayam/tcl/BWidget-1.2.1/separator.tcl
80
lib/ayam/tcl/BWidget-1.2.1/spinbox.tcl
81
lib/ayam/tcl/BWidget-1.2.1/titleframe.tcl
82
lib/ayam/tcl/BWidget-1.2.1/tree.tcl
83
lib/ayam/tcl/BWidget-1.2.1/utils.tcl
84
lib/ayam/tcl/BWidget-1.2.1/widget.tcl
85
lib/ayam/tcl/BWidget-1.2.1/xpm2image.tcl
17
lib/ayam/tcl/about.tcl
86
lib/ayam/tcl/about.tcl
18
lib/ayam/tcl/action.tcl
87
lib/ayam/tcl/action.tcl
19
lib/ayam/tcl/acurve.tcl
88
lib/ayam/tcl/acurve.tcl
Lines 103-177 Link Here
103
lib/ayam/tcl/widget.tcl
172
lib/ayam/tcl/widget.tcl
104
lib/ayam/tcl/win.tcl
173
lib/ayam/tcl/win.tcl
105
lib/ayam/tcl/zap.tcl
174
lib/ayam/tcl/zap.tcl
106
lib/ayam/tcl/BWidget-1.2.1/arrow.tcl
107
lib/ayam/tcl/BWidget-1.2.1/bitmap.tcl
108
lib/ayam/tcl/BWidget-1.2.1/button.tcl
109
lib/ayam/tcl/BWidget-1.2.1/buttonbox.tcl
110
lib/ayam/tcl/BWidget-1.2.1/color.tcl
111
lib/ayam/tcl/BWidget-1.2.1/combobox.tcl
112
lib/ayam/tcl/BWidget-1.2.1/dialog.tcl
113
lib/ayam/tcl/BWidget-1.2.1/dragsite.tcl
114
lib/ayam/tcl/BWidget-1.2.1/dropsite.tcl
115
lib/ayam/tcl/BWidget-1.2.1/dynhelp.tcl
116
lib/ayam/tcl/BWidget-1.2.1/entry.tcl
117
lib/ayam/tcl/BWidget-1.2.1/font.tcl
118
lib/ayam/tcl/BWidget-1.2.1/init.tcl
119
lib/ayam/tcl/BWidget-1.2.1/label.tcl
120
lib/ayam/tcl/BWidget-1.2.1/labelentry.tcl
121
lib/ayam/tcl/BWidget-1.2.1/labelframe.tcl
122
lib/ayam/tcl/BWidget-1.2.1/listbox.tcl
123
lib/ayam/tcl/BWidget-1.2.1/mainframe.tcl
124
lib/ayam/tcl/BWidget-1.2.1/messagedlg.tcl
125
lib/ayam/tcl/BWidget-1.2.1/notebook.tcl
126
lib/ayam/tcl/BWidget-1.2.1/pagesmgr.tcl
127
lib/ayam/tcl/BWidget-1.2.1/panedw.tcl
128
lib/ayam/tcl/BWidget-1.2.1/passwddlg.tcl
129
lib/ayam/tcl/BWidget-1.2.1/pkgIndex.tcl
130
lib/ayam/tcl/BWidget-1.2.1/progressbar.tcl
131
lib/ayam/tcl/BWidget-1.2.1/progressdlg.tcl
132
lib/ayam/tcl/BWidget-1.2.1/scrollframe.tcl
133
lib/ayam/tcl/BWidget-1.2.1/scrollview.tcl
134
lib/ayam/tcl/BWidget-1.2.1/scrollw.tcl
135
lib/ayam/tcl/BWidget-1.2.1/separator.tcl
136
lib/ayam/tcl/BWidget-1.2.1/spinbox.tcl
137
lib/ayam/tcl/BWidget-1.2.1/titleframe.tcl
138
lib/ayam/tcl/BWidget-1.2.1/tree.tcl
139
lib/ayam/tcl/BWidget-1.2.1/utils.tcl
140
lib/ayam/tcl/BWidget-1.2.1/widget.tcl
141
lib/ayam/tcl/BWidget-1.2.1/xpm2image.tcl
142
lib/ayam/tcl/BWidget-1.2.1/images/bold.gif
143
lib/ayam/tcl/BWidget-1.2.1/images/copy.gif
144
lib/ayam/tcl/BWidget-1.2.1/images/cut.gif
145
lib/ayam/tcl/BWidget-1.2.1/images/dragfile.gif
146
lib/ayam/tcl/BWidget-1.2.1/images/dragicon.gif
147
lib/ayam/tcl/BWidget-1.2.1/images/error.gif
148
lib/ayam/tcl/BWidget-1.2.1/images/file.gif
149
lib/ayam/tcl/BWidget-1.2.1/images/folder.gif
150
lib/ayam/tcl/BWidget-1.2.1/images/hourglass.gif
151
lib/ayam/tcl/BWidget-1.2.1/images/info.gif
152
lib/ayam/tcl/BWidget-1.2.1/images/italic.gif
153
lib/ayam/tcl/BWidget-1.2.1/images/minus.xbm
154
lib/ayam/tcl/BWidget-1.2.1/images/new.gif
155
lib/ayam/tcl/BWidget-1.2.1/images/opcopy.xbm
156
lib/ayam/tcl/BWidget-1.2.1/images/open.gif
157
lib/ayam/tcl/BWidget-1.2.1/images/openfold.gif
158
lib/ayam/tcl/BWidget-1.2.1/images/oplink.xbm
159
lib/ayam/tcl/BWidget-1.2.1/images/opmove.xbm
160
lib/ayam/tcl/BWidget-1.2.1/images/overstrike.gif
161
lib/ayam/tcl/BWidget-1.2.1/images/palette.gif
162
lib/ayam/tcl/BWidget-1.2.1/images/passwd.gif
163
lib/ayam/tcl/BWidget-1.2.1/images/paste.gif
164
lib/ayam/tcl/BWidget-1.2.1/images/plus.xbm
165
lib/ayam/tcl/BWidget-1.2.1/images/print.gif
166
lib/ayam/tcl/BWidget-1.2.1/images/question.gif
167
lib/ayam/tcl/BWidget-1.2.1/images/save.gif
168
lib/ayam/tcl/BWidget-1.2.1/images/underline.gif
169
lib/ayam/tcl/BWidget-1.2.1/images/undo.gif
170
lib/ayam/tcl/BWidget-1.2.1/images/warning.gif
171
lib/ayam/tcl/BWidget-1.2.1/lang/de.rc
172
lib/ayam/tcl/BWidget-1.2.1/lang/en.rc
173
lib/ayam/tcl/BWidget-1.2.1/lang/es.rc
174
lib/ayam/tcl/BWidget-1.2.1/lang/fr.rc
175
%%DATADIR%%/ayam-splash.gif
175
%%DATADIR%%/ayam-splash.gif
176
%%PORTDOCS%%%%DOCSDIR%%/Setup.txt
176
%%PORTDOCS%%%%DOCSDIR%%/Setup.txt
177
%%PORTDOCS%%%%DOCSDIR%%/ayam.pdf
177
%%PORTDOCS%%%%DOCSDIR%%/ayam.pdf
Lines 187-192 Link Here
187
%%PORTDOCS%%%%DOCSDIR%%/html/ayam.html
187
%%PORTDOCS%%%%DOCSDIR%%/html/ayam.html
188
%%PORTDOCS%%%%DOCSDIR%%/html/pics/acurve-sym.gif
188
%%PORTDOCS%%%%DOCSDIR%%/html/pics/acurve-sym.gif
189
%%PORTDOCS%%%%DOCSDIR%%/html/pics/acurves.gif
189
%%PORTDOCS%%%%DOCSDIR%%/html/pics/acurves.gif
190
%%PORTDOCS%%%%DOCSDIR%%/html/pics/addmodtag.gif
190
%%PORTDOCS%%%%DOCSDIR%%/html/pics/ampick.gif
191
%%PORTDOCS%%%%DOCSDIR%%/html/pics/ampick.gif
191
%%PORTDOCS%%%%DOCSDIR%%/html/pics/aycsgic.gif
192
%%PORTDOCS%%%%DOCSDIR%%/html/pics/aycsgic.gif
192
%%PORTDOCS%%%%DOCSDIR%%/html/pics/bbxvscog.gif
193
%%PORTDOCS%%%%DOCSDIR%%/html/pics/bbxvscog.gif
Lines 210-221 Link Here
210
%%PORTDOCS%%%%DOCSDIR%%/html/pics/console.gif
211
%%PORTDOCS%%%%DOCSDIR%%/html/pics/console.gif
211
%%PORTDOCS%%%%DOCSDIR%%/html/pics/csgex.gif
212
%%PORTDOCS%%%%DOCSDIR%%/html/pics/csgex.gif
212
%%PORTDOCS%%%%DOCSDIR%%/html/pics/deleteac.gif
213
%%PORTDOCS%%%%DOCSDIR%%/html/pics/deleteac.gif
214
%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmdraw.gif
215
%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmdrawshade.gif
216
%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmhiddenwire.gif
217
%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmhiddenwirenosil.gif
213
%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmmenu.gif
218
%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmmenu.gif
219
%%PORTDOCS%%%%DOCSDIR%%/html/pics/dmshade.gif
214
%%PORTDOCS%%%%DOCSDIR%%/html/pics/editac.gif
220
%%PORTDOCS%%%%DOCSDIR%%/html/pics/editac.gif
215
%%PORTDOCS%%%%DOCSDIR%%/html/pics/editdac.gif
221
%%PORTDOCS%%%%DOCSDIR%%/html/pics/editdac.gif
216
%%PORTDOCS%%%%DOCSDIR%%/html/pics/editwac.gif
222
%%PORTDOCS%%%%DOCSDIR%%/html/pics/editwac.gif
217
%%PORTDOCS%%%%DOCSDIR%%/html/pics/edmult.gif
223
%%PORTDOCS%%%%DOCSDIR%%/html/pics/edmult.gif
218
%%PORTDOCS%%%%DOCSDIR%%/html/pics/elevate.gif
224
%%PORTDOCS%%%%DOCSDIR%%/html/pics/elevate.gif
225
%%PORTDOCS%%%%DOCSDIR%%/html/pics/euchom.gif
226
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extendnc.gif
219
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnc.gif
227
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnc.gif
220
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnp.gif
228
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrnp.gif
221
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif
229
%%PORTDOCS%%%%DOCSDIR%%/html/pics/extrude.gif
Lines 253-258 Link Here
253
%%PORTDOCS%%%%DOCSDIR%%/html/pics/ncurve.gif
261
%%PORTDOCS%%%%DOCSDIR%%/html/pics/ncurve.gif
254
%%PORTDOCS%%%%DOCSDIR%%/html/pics/npatch.gif
262
%%PORTDOCS%%%%DOCSDIR%%/html/pics/npatch.gif
255
%%PORTDOCS%%%%DOCSDIR%%/html/pics/numpnted.gif
263
%%PORTDOCS%%%%DOCSDIR%%/html/pics/numpnted.gif
264
%%PORTDOCS%%%%DOCSDIR%%/html/pics/objsearch.gif
256
%%PORTDOCS%%%%DOCSDIR%%/html/pics/offnc.gif
265
%%PORTDOCS%%%%DOCSDIR%%/html/pics/offnc.gif
257
%%PORTDOCS%%%%DOCSDIR%%/html/pics/offnp.gif
266
%%PORTDOCS%%%%DOCSDIR%%/html/pics/offnp.gif
258
%%PORTDOCS%%%%DOCSDIR%%/html/pics/pamesh.gif
267
%%PORTDOCS%%%%DOCSDIR%%/html/pics/pamesh.gif
Lines 261-272 Link Here
261
%%PORTDOCS%%%%DOCSDIR%%/html/pics/prefs.gif
270
%%PORTDOCS%%%%DOCSDIR%%/html/pics/prefs.gif
262
%%PORTDOCS%%%%DOCSDIR%%/html/pics/primitives.gif
271
%%PORTDOCS%%%%DOCSDIR%%/html/pics/primitives.gif
263
%%PORTDOCS%%%%DOCSDIR%%/html/pics/propgui.gif
272
%%PORTDOCS%%%%DOCSDIR%%/html/pics/propgui.gif
273
%%PORTDOCS%%%%DOCSDIR%%/html/pics/rect.gif
264
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refine.gif
274
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refine.gif
265
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refinecv.gif
275
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refinecv.gif
266
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refinenp.gif
276
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refinenp.gif
267
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refinepe.gif
277
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refinepe.gif
278
%%PORTDOCS%%%%DOCSDIR%%/html/pics/refinesel.gif
268
%%PORTDOCS%%%%DOCSDIR%%/html/pics/remkn.gif
279
%%PORTDOCS%%%%DOCSDIR%%/html/pics/remkn.gif
269
%%PORTDOCS%%%%DOCSDIR%%/html/pics/remknnp.gif
280
%%PORTDOCS%%%%DOCSDIR%%/html/pics/remknnp.gif
281
%%PORTDOCS%%%%DOCSDIR%%/html/pics/resetwac.gif
270
%%PORTDOCS%%%%DOCSDIR%%/html/pics/revolve.gif
282
%%PORTDOCS%%%%DOCSDIR%%/html/pics/revolve.gif
271
%%PORTDOCS%%%%DOCSDIR%%/html/pics/rotateaac.gif
283
%%PORTDOCS%%%%DOCSDIR%%/html/pics/rotateaac.gif
272
%%PORTDOCS%%%%DOCSDIR%%/html/pics/rotateac.gif
284
%%PORTDOCS%%%%DOCSDIR%%/html/pics/rotateac.gif
Lines 287-292 Link Here
287
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sdmesh.gif
299
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sdmesh.gif
288
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sdnpatch.gif
300
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sdnpatch.gif
289
%%PORTDOCS%%%%DOCSDIR%%/html/pics/selpnts.gif
301
%%PORTDOCS%%%%DOCSDIR%%/html/pics/selpnts.gif
302
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sfcurve.gif
303
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sfcurvetmax.gif
290
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sgordon.gif
304
%%PORTDOCS%%%%DOCSDIR%%/html/pics/sgordon.gif
291
%%PORTDOCS%%%%DOCSDIR%%/html/pics/shiftclsbsp.gif
305
%%PORTDOCS%%%%DOCSDIR%%/html/pics/shiftclsbsp.gif
292
%%PORTDOCS%%%%DOCSDIR%%/html/pics/skin.gif
306
%%PORTDOCS%%%%DOCSDIR%%/html/pics/skin.gif
Lines 303-315 Link Here
303
%%PORTDOCS%%%%DOCSDIR%%/html/pics/swing.gif
317
%%PORTDOCS%%%%DOCSDIR%%/html/pics/swing.gif
304
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tagac.gif
318
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tagac.gif
305
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tce.gif
319
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tce.gif
320
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tcone.gif
306
%%PORTDOCS%%%%DOCSDIR%%/html/pics/text-ayam.gif
321
%%PORTDOCS%%%%DOCSDIR%%/html/pics/text-ayam.gif
307
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tgui.gif
322
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tgui.gif
323
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tnpatch.gif
308
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tools.gif
324
%%PORTDOCS%%%%DOCSDIR%%/html/pics/tools.gif
309
%%PORTDOCS%%%%DOCSDIR%%/html/pics/toxy.gif
325
%%PORTDOCS%%%%DOCSDIR%%/html/pics/toxy.gif
326
%%PORTDOCS%%%%DOCSDIR%%/html/pics/trect.gif
310
%%PORTDOCS%%%%DOCSDIR%%/html/pics/treeview.gif
327
%%PORTDOCS%%%%DOCSDIR%%/html/pics/treeview.gif
311
%%PORTDOCS%%%%DOCSDIR%%/html/pics/trimnc.gif
328
%%PORTDOCS%%%%DOCSDIR%%/html/pics/trimnc.gif
312
%%PORTDOCS%%%%DOCSDIR%%/html/pics/trpnt.gif
329
%%PORTDOCS%%%%DOCSDIR%%/html/pics/trpnt.gif
330
%%PORTDOCS%%%%DOCSDIR%%/html/pics/unclampnc.gif
331
%%PORTDOCS%%%%DOCSDIR%%/html/pics/unclampnp.gif
313
%%PORTDOCS%%%%DOCSDIR%%/html/pics/view.gif
332
%%PORTDOCS%%%%DOCSDIR%%/html/pics/view.gif
314
%%PORTDOCS%%%%DOCSDIR%%/html/pics/zoomvac.gif
333
%%PORTDOCS%%%%DOCSDIR%%/html/pics/zoomvac.gif
315
%%PORTDOCS%%%%DOCSDIR%%/refcard.pdf
334
%%PORTDOCS%%%%DOCSDIR%%/refcard.pdf

Return to bug 199232