Attachment #126412 for bug #170165

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




#

PORTNAME=	felt
PORTVERSION=	3.07
DISTVERSIONSUFFIX=	.src
CATEGORIES=	science
MASTER_SITES=	SF/${PORTNAME}/FElt/${PORTVERSION}
EXTRACT_SUFX=	-devel.src.tar.gz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A system for Finite Element Analysis

LICENSE=	GPLv2

OPTIONS_DEFINE=	DOCS EXAMPLES

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

USE_BZIP2=	yes
USE_MOTIF=	yes
USE_GL=		glu glw
HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	--prefix="${PREFIX}" \
		--x-defaults="${LOCALBASE}/lib/X11/app-defaults" \
		--x-includes="${LOCALBASE}/include" \
		--x-libraries="${LOCALBASE}/lib"
MAKE_JOBS_SAFE=	yes

MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
MAN3=		Drawing.3

DOCSDIR=	${PREFIX}/share/doc/FElt
EXAMPLESDIR=	${PREFIX}/share/examples/FElt

post-extract:
	@cd ${WRKSRC}/include && ${RM} -rf X11

post-patch:
	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
		's|["<]malloc\.h[">]|<stdlib.h>|g'
	@${REINPLACE_CMD} -e \
		'/which CC/s|^|#| ; \
		 /CCOPTS=-O3/s|^.*|CCOPTS=$${CFLAGS}| ; \
		 s|lib/felt|share/felt|' ${WRKSRC}/configure	
	@${REINPLACE_CMD} -e \
		's|-lpthread|$$(MOTIFLIB)|' ${WRKSRC}/src/Velvet/Makefile

.include <bsd.port.options.mk>

post-install:
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
	@${MKDIR} ${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
	${INSTALL_DATA} ${WRKSRC}/examples/*.ans ${EXAMPLESDIR}

Lines 1-2 Link Here

(-)science/felt/distinfo (-2 / +2 lines)
1	SHA256 (felt-3.06-devel.src.tar.gz) = 1444b74034a0d68d50a035983b4781f3d567c253533f0776ee19b48ea93de37d	1	SHA256 (felt-3.07.src.tar.bz2) = 8acbfefd4d8245338fa2bd575e6a6592d24812b1fd2ce3e051f119669cf37a78
2	SIZE (felt-3.06-devel.src.tar.gz) = 1005386	2	SIZE (felt-3.07.src.tar.bz2) = 795173




--- configure.orig	Mon May 29 23:29:15 1995
+++ configure	Mon Apr 30 03:03:43 2001
@@ -71,7 +71,6 @@
 
 echo Configuring ...
 
-which CC gcc
 which RANLIB ranlib
 which CAT cat
 which TRUE true
@@ -136,7 +135,6 @@
 
 # provide worst-case defaults
 
-: ${CC:=cc}
 : ${RANLIB:=$TRUE}
 : ${READDIR:=/lib}
 : ${DEST}:=.}
@@ -145,12 +143,11 @@
 : ${X11INC:=.}
 : ${X11LIB:=.}
 
-CC=`basename $CC`
 RANLIB=`basename $RANLIB`
 READDIR=`dirname $READDIR`
 CONTRIBDIR=none
 
-if [ $CC = gcc ]; then CCOPTS=-O3; else CCOPTS=-O; fi
+CCOPTS=${CFLAGS}
 
 
 # defaults for known architectures that fail the above
@@ -222,7 +219,7 @@
 CONTRIBFLAGS	= $CONTRIBFLAGS
 CPP		= $CPP
 DESTBIN		= $DEST/bin
-DESTLIB		= $DEST/lib/felt
+DESTLIB		= $DEST/share/felt
 DESTMAN		= $DEST/man
 INSTALL		= sh \$(TOPDIR)/etc/install.sh -c
 LDOPTS		=




diff -rc src/Velvet.orig/Velvet.ad src/Velvet/Velvet.ad
*** src/Velvet.orig/Velvet.ad	Wed Dec 23 23:01:06 1998
--- src/Velvet/Velvet.ad	Wed Dec 23 23:01:34 1998
***************
*** 1046,1052 ****
  
  ! 3d specific defaults
  
! !*shapeStyle:					Rectangle
! !*control*spacer.height:				43
! !*control*MenuButton*height:			26
! !*control*Command*height:			26
--- 1046,1052 ----
  
  ! 3d specific defaults
  
! *shapeStyle:					Rectangle
! *control*spacer.height:				43
! *control*MenuButton*height:			26
! *control*Command*height:			26

Lines 1-720 Link Here

(-)science/felt/files/patch-src+Patchwork+oogl+h (-720 lines)
1	--- src/Patchwork/oogl.h.orig Mon Feb 21 17:44:31 2000
2	+++ src/Patchwork/oogl.h Sun Jul 27 17:02:55 2003
3	@@ -2,370 +2,353 @@
4	symbols.h
5	**************************************************************************/
6
7	-static char *cone = "\n\
8	-unit { \n\
9	- { OFF\n\
10	-22 40 120\n\
11	-0.000000 1.000000 0.000000\n\
12	-0.000000 0.000000 0.000000\n\
13	-0.500000 0.000000 0.000000\n\
14	-0.475528 0.000000 0.154508\n\
15	-0.404508 0.000000 0.293893\n\
16	-0.293893 0.000000 0.404508\n\
17	-0.154508 0.000000 0.475528\n\
18	-0.000000 0.000000 0.500000\n\
19	--0.154508 0.000000 0.475528\n\
20	--0.293893 0.000000 0.404508\n\
21	--0.404508 0.000000 0.293893\n\
22	--0.475528 0.000000 0.154508\n\
23	--0.500000 0.000000 0.000000\n\
24	--0.475528 0.000000 -0.154508\n\
25	--0.404508 0.000000 -0.293893\n\
26	--0.293893 0.000000 -0.404508\n\
27	--0.154508 0.000000 -0.475528\n\
28	--0.000000 0.000000 -0.500000\n\
29	-0.154508 0.000000 -0.475528\n\
30	-0.293893 0.000000 -0.404508\n\
31	-0.404508 0.000000 -0.293893\n\
32	-0.475528 0.000000 -0.154508\n\
33	-3 2 3 0\n\
34	-3 3 2 1\n\
35	-3 3 4 0\n\
36	-3 4 3 1\n\
37	-3 4 5 0\n\
38	-3 5 4 1\n\
39	-3 5 6 0\n\
40	-3 6 5 1\n\
41	-3 6 7 0\n\
42	-3 7 6 1\n\
43	-3 7 8 0\n\
44	-3 8 7 1\n\
45	-3 8 9 0\n\
46	-3 9 8 1\n\
47	-3 9 10 0\n\
48	-3 10 9 1\n\
49	-3 10 11 0\n\
50	-3 11 10 1\n\
51	-3 11 12 0\n\
52	-3 12 11 1\n\
53	-3 12 13 0\n\
54	-3 13 12 1\n\
55	-3 13 14 0\n\
56	-3 14 13 1\n\
57	-3 14 15 0\n\
58	-3 15 14 1\n\
59	-3 15 16 0\n\
60	-3 16 15 1\n\
61	-3 16 17 0\n\
62	-3 17 16 1\n\
63	-3 17 18 0\n\
64	-3 18 17 1\n\
65	-3 18 19 0\n\
66	-3 19 18 1\n\
67	-3 19 20 0\n\
68	-3 20 19 1\n\
69	-3 20 21 0\n\
70	-3 21 20 1\n\
71	-3 21 2 0\n\
72	-3 2 21 1\n\
73	- }\n\
74	-}\n\
75	-";
76	-
77	-static char *sphere = "\n\
78	-unit { \n\
79	- { MESH\n\
80	-10 10\n\
81	-0 0 1\n\
82	-0 0 1\n\
83	-0 0 1\n\
84	-0 0 1\n\
85	-0 0 1\n\
86	-0 0 1\n\
87	-0 0 1\n\
88	-0 0 1\n\
89	-0 0 1\n\
90	-0 0 1\n\
91	- \n\
92	-0.34202 0 0.9396\n\
93	-0.262003 0.219846 0.939693\n\
94	-0.0593912 0.336824 0.939693\n\
95	--0.17101 0.296198 0.939693\n\
96	--0.321394 0.116978 0.939693\n\
97	--0.321394 -0.116978 0.939693\n\
98	--0.17101 -0.296198 0.939693\n\
99	-0.0593912 -0.336824 0.939693\n\
100	-0.262003 -0.219846 0.939693\n\
101	-0.34202 -8.37708e-17 0.939693\n\
102	- \n\
103	-0.642788 0 0.766044\n\
104	-0.492404 0.413176 0.766044\n\
105	-0.111619 0.633022 0.766044\n\
106	--0.321394 0.55667 0.766044\n\
107	--0.604023 0.219846 0.766044\n\
108	--0.604023 -0.219846 0.766044\n\
109	--0.321394 -0.55667 0.766044\n\
110	-0.111619 -0.633022 0.766044\n\
111	-0.492404 -0.413176 0.766044\n\
112	-0.642788 -1.57438e-16 0.766044\n\
113	- \n\
114	-0.866025 0 0.5\n\
115	-0.663414 0.55667 0.5\n\
116	-0.150384 0.852869 0.5\n\
117	--0.433013 0.75 0.5\n\
118	--0.813798 0.296198 0.5\n\
119	--0.813798 -0.296198 0.5\n\
120	--0.433013 -0.75 0.5\n\
121	-0.150384 -0.852869 0.5\n\
122	-0.663414 -0.55667 0.5\n\
123	-0.866025 -2.12115e-16 0.5\n\
124	- \n\
125	-0.984808 0 0.173648\n\
126	-0.754407 0.633022 0.173648\n\
127	-0.17101 0.969846 0.173648\n\
128	--0.492404 0.852868 0.173648\n\
129	--0.925417 0.336824 0.173648\n\
130	--0.925417 -0.336824 0.173648\n\
131	--0.492404 -0.852869 0.173648\n\
132	-0.17101 -0.969846 0.173648\n\
133	-0.754407 -0.633022 0.173648\n\
134	-0.984808 -2.41208e-16 0.173648\n\
135	- \n\
136	-0.984808 0 -0.173648\n\
137	-0.754407 0.633022 -0.173648\n\
138	-0.17101 0.969846 -0.173648\n\
139	--0.492404 0.852868 -0.173648\n\
140	--0.925417 0.336824 -0.173648\n\
141	--0.925417 -0.336824 -0.173648\n\
142	--0.492404 -0.852869 -0.173648\n\
143	-0.17101 -0.969846 -0.173648\n\
144	-0.754407 -0.633022 -0.173648\n\
145	-0.984808 -2.41208e-16 -0.173648\n\
146	- \n\
147	-0.866025 0 -0.5\n\
148	-0.663414 0.55667 -0.5\n\
149	-0.150384 0.852868 -0.5\n\
150	--0.433013 0.75 -0.5\n\
151	--0.813798 0.296198 -0.5\n\
152	--0.813798 -0.296198 -0.5\n\
153	--0.433013 -0.75 -0.5\n\
154	-0.150384 -0.852868 -0.5\n\
155	-0.663414 -0.55667 -0.5\n\
156	-0.866025 -2.12115e-16 -0.5\n\
157	- \n\
158	-0.642788 0 -0.766044\n\
159	-0.492404 0.413176 -0.766044\n\
160	-0.111619 0.633022 -0.766044\n\
161	--0.321394 0.55667 -0.766044\n\
162	--0.604023 0.219846 -0.766044\n\
163	--0.604023 -0.219846 -0.766044\n\
164	--0.321394 -0.55667 -0.766044\n\
165	-0.111619 -0.633022 -0.766044\n\
166	-0.492404 -0.413176 -0.766044\n\
167	-0.642788 -1.57438e-16 -0.766044\n\
168	- \n\
169	-0.34202 0 -0.939693\n\
170	-0.262003 0.219846 -0.939693\n\
171	-0.0593912 0.336824 -0.939693\n\
172	--0.17101 0.296198 -0.939693\n\
173	--0.321394 0.116978 -0.939693\n\
174	--0.321394 -0.116978 -0.939693\n\
175	--0.17101 -0.296198 -0.939693\n\
176	-0.0593912 -0.336824 -0.939693\n\
177	-0.262003 -0.219846 -0.939693\n\
178	-0.34202 -8.37708e-17 -0.939693\n\
179	- \n\
180	-1.22465e-16 0 -1\n\
181	-9.38134e-17 7.87188e-17 -1\n\
182	-2.12658e-17 1.20604e-16 -1\n\
183	--6.12323e-17 1.06058e-16 -1\n\
184	--1.15079e-16 4.18854e-17 -1\n\
185	--1.15079e-16 -4.18854e-17 -1\n\
186	--6.12323e-17 -1.06058e-16 -1\n\
187	-2.12658e-17 -1.20604e-16 -1\n\
188	-9.38134e-17 -7.87188e-17 -1\n\
189	-1.22465e-16 -2.99952e-32 -1\n\
190	- }\n\
191	-}\n\
192	-";
193	-
194	-static char *xyz = "{\n\
195	-=\n\
196	-VECT\n\
197	-8 19 3\n\
198	-2 2 2 2 2 3 2 4\n\
199	-1 0 0 1 0 0 1 0\n\
200	-\n\
201	-0 0 0 1 0 0\n\
202	-1 -.05 .05 1 .05 .25\n\
203	-1 .05 .05 1 -.05 .25\n\
204	-\n\
205	-0 0 0 0 1 0\n\
206	--.05 1 .25 0 1 .15\n\
207	- .05 1 .25 0 1 .15 0 1 .05\n\
208	-\n\
209	-0 0 0 0 0 1\n\
210	--.05 .25 1 .05 .25 1 -.05 .05 1 .05 .05 1\n\
211	-\n\
212	-1 0 0 1\n\
213	-0 1 0 1\n\
214	-0 .6 1 1\n}";
215	-
216	-static char *origin = "\n\
217	-unit { \n\
218	- { VECT\n\
219	-8 19 3\n\
220	-2 2 2 2 2 3 2 4\n\
221	-1 0 0 1 0 0 1 0\n\
222	-\n\
223	-0 0 0 1 0 0\n\
224	-1 -.05 .05 1 .05 .25\n\
225	-1 .05 .05 1 -.05 .25\n\
226	-\n\
227	-0 0 0 0 1 0\n\
228	--.05 1 .25 0 1 .15\n\
229	- .05 1 .25 0 1 .15 0 1 .05\n\
230	-\n\
231	-0 0 0 0 0 1\n\
232	--.05 .25 1 .05 .25 1 -.05 .05 1 .05 .05 1\n\
233	-\n\
234	-1 0 0 1\n\
235	-0 1 0 1\n\
236	-0 .6 1 1\n\
237	- }\n\
238	-}\n\
239	-";
240	-
241	-static char *color1 = "\n\
242	-0.26 0.7 0.7 1\
243	-\n}\n";
244	-
245	-static char *fzold = "\n\
246	-unit { \n\
247	- { VECT\n\
248	-3 6 1\n\
249	-2 2 2\n\
250	-1 0 0\n\
251	-\n\
252	-0 0 0 0 0 0.5\n\
253	-.05 0 .4 0 0 0.5\n\
254	-0 0 0.5 -.05 0 .4\n\
255	-\n\
256	-1 0 0 1\n\
257	- }\n\
258	-}\n\
259	-";
260	-
261	-static char *fz = "\n\
262	-unit { \n\
263	- { VECT\n\
264	-5 10 1\n\
265	-2 2 2 2 2\n\
266	-1 0 0 0 0\n\
267	-\n\
268	-0 0 0 0 0 0.5\n\
269	-.05 0 .4 0 0 0.5\n\
270	-0 0 0.5 -.05 0 .4\n\
271	-0 .05 .4 0 0 0.5\n\
272	-0 0 0.5 0 -.05 .4\n\
273	-\n\
274	-1 0 0 1\n\
275	- }\n\
276	-}\n\
277	-";
278	-
279	-static char *constraint = "\n\
280	-unit { \n\
281	- { OFF\n\
282	- 5 2 6\n\
283	- 0 0 0\n\
284	- -.1 0 .3\n\
285	- .1 0 .3\n\
286	- 0 -.1 .3\n\
287	- 0 .1 .3\n\
288	- 3 0 1 2 1 0 0 1\n\
289	- 3 0 3 4 1 0 0 1\n\
290	-\n\
291	- }\n\
292	-}\n\
293	-";
294	-
295	-static char *constraintrot = "\n\
296	-unit { \n\
297	- { OFF\n\
298	- 10 4 12\n\
299	- 0 0 0\n\
300	- -.07 -.07 .3\n\
301	- .07 .07 .3\n\
302	- -.07 .07 .3\n\
303	- .07 -.07 .3\n\
304	- 0 0 .3\n\
305	- -.07 -.07 .6\n\
306	- .07 .07 .6\n\
307	- -.07 .07 .6\n\
308	- .07 -.07 .6\n\
309	- 3 0 1 2 0 1 0 1 \n\
310	- 3 0 3 4 0 1 0 1 \n\
311	- 3 5 6 7 0 1 0 1 \n\
312	- 3 5 8 9 0 1 0 1 \n\
313	-\n\
314	- }\n\
315	-}\n\
316	-";
317	-
318	-static char *cross = "\n\
319	-unit { \n\
320	- { VECT\n\
321	-3 6 1\n\
322	-2 2 2\n\
323	-1 0 0\n\
324	-\n\
325	--.1 0 0 .1 0 0\n\
326	-0 -.1 0 0 .1 0\n\
327	-0 0 -.1 0 0 .1\n\
328	-\n\
329	-1 1 1 1\n\
330	- }\n\
331	-}\n\
332	-";
333	-
334	-static char *transformz = "\n\
335	-INST\n\
336	- transform\n\
337	- 1 0 0 0\n\
338	- 0 1 0 0\n\
339	- 0 0 1 0\n\
340	-";
341	-static char *transformx = "\n\
342	-INST\n\
343	- transform\n\
344	- 0 1 0 0\n\
345	- 0 0 1 0\n\
346	- 1 0 0 0\n\
347	-";
348	-static char *transformy = "\n\
349	-INST\n\
350	- transform\n\
351	- 0 0 1 0\n\
352	- 1 0 0 0\n\
353	- 0 1 0 0\n\
354	-";
355	+static char *cone = "\n"
356	+"unit { \n"
357	+" { OFF\n"
358	+"22 40 120\n"
359	+"0.000000 1.000000 0.000000\n"
360	+"0.000000 0.000000 0.000000\n"
361	+"0.500000 0.000000 0.000000\n"
362	+"0.475528 0.000000 0.154508\n"
363	+"0.404508 0.000000 0.293893\n"
364	+"0.293893 0.000000 0.404508\n"
365	+"0.154508 0.000000 0.475528\n"
366	+"0.000000 0.000000 0.500000\n"
367	+"-0.154508 0.000000 0.475528\n"
368	+"-0.293893 0.000000 0.404508\n"
369	+"-0.404508 0.000000 0.293893\n"
370	+"-0.475528 0.000000 0.154508\n"
371	+"-0.500000 0.000000 0.000000\n"
372	+"-0.475528 0.000000 -0.154508\n"
373	+"-0.404508 0.000000 -0.293893\n"
374	+"-0.293893 0.000000 -0.404508\n"
375	+"-0.154508 0.000000 -0.475528\n"
376	+"-0.000000 0.000000 -0.500000\n"
377	+"0.154508 0.000000 -0.475528\n"
378	+"0.293893 0.000000 -0.404508\n"
379	+"0.404508 0.000000 -0.293893\n"
380	+"0.475528 0.000000 -0.154508\n"
381	+"3 2 3 0\n"
382	+"3 3 2 1\n"
383	+"3 3 4 0\n"
384	+"3 4 3 1\n"
385	+"3 4 5 0\n"
386	+"3 5 4 1\n"
387	+"3 5 6 0\n"
388	+"3 6 5 1\n"
389	+"3 6 7 0\n"
390	+"3 7 6 1\n"
391	+"3 7 8 0\n"
392	+"3 8 7 1\n"
393	+"3 8 9 0\n"
394	+"3 9 8 1\n"
395	+"3 9 10 0\n"
396	+"3 10 9 1\n"
397	+"3 10 11 0\n"
398	+"3 11 10 1\n"
399	+"3 11 12 0\n"
400	+"3 12 11 1\n"
401	+"3 12 13 0\n"
402	+"3 13 12 1\n"
403	+"3 13 14 0\n"
404	+"3 14 13 1\n"
405	+"3 14 15 0\n"
406	+"3 15 14 1\n"
407	+"3 15 16 0\n"
408	+"3 16 15 1\n"
409	+"3 16 17 0\n"
410	+"3 17 16 1\n"
411	+"3 17 18 0\n"
412	+"3 18 17 1\n"
413	+"3 18 19 0\n"
414	+"3 19 18 1\n"
415	+"3 19 20 0\n"
416	+"3 20 19 1\n"
417	+"3 20 21 0\n"
418	+"3 21 20 1\n"
419	+"3 21 2 0\n"
420	+"3 2 21 1\n"
421	+" }\n"
422	+"}\n";
423	+
424	+static char *sphere = "\n"
425	+"unit { \n"
426	+" { MESH\n"
427	+"10 10\n"
428	+"0 0 1\n"
429	+"0 0 1\n"
430	+"0 0 1\n"
431	+"0 0 1\n"
432	+"0 0 1\n"
433	+"0 0 1\n"
434	+"0 0 1\n"
435	+"0 0 1\n"
436	+"0 0 1\n"
437	+"0 0 1\n"
438	+" \n"
439	+"0.34202 0 0.9396\n"
440	+"0.262003 0.219846 0.939693\n"
441	+"0.0593912 0.336824 0.939693\n"
442	+"-0.17101 0.296198 0.939693\n"
443	+"-0.321394 0.116978 0.939693\n"
444	+"-0.321394 -0.116978 0.939693\n"
445	+"-0.17101 -0.296198 0.939693\n"
446	+"0.0593912 -0.336824 0.939693\n"
447	+"0.262003 -0.219846 0.939693\n"
448	+"0.34202 -8.37708e-17 0.939693\n"
449	+" \n"
450	+"0.642788 0 0.766044\n"
451	+"0.492404 0.413176 0.766044\n"
452	+"0.111619 0.633022 0.766044\n"
453	+"-0.321394 0.55667 0.766044\n"
454	+"-0.604023 0.219846 0.766044\n"
455	+"-0.604023 -0.219846 0.766044\n"
456	+"-0.321394 -0.55667 0.766044\n"
457	+"0.111619 -0.633022 0.766044\n"
458	+"0.492404 -0.413176 0.766044\n"
459	+"0.642788 -1.57438e-16 0.766044\n"
460	+" \n"
461	+"0.866025 0 0.5\n"
462	+"0.663414 0.55667 0.5\n"
463	+"0.150384 0.852869 0.5\n"
464	+"-0.433013 0.75 0.5\n"
465	+"-0.813798 0.296198 0.5\n"
466	+"-0.813798 -0.296198 0.5\n"
467	+"-0.433013 -0.75 0.5\n"
468	+"0.150384 -0.852869 0.5\n"
469	+"0.663414 -0.55667 0.5\n"
470	+"0.866025 -2.12115e-16 0.5\n"
471	+" \n"
472	+"0.984808 0 0.173648\n"
473	+"0.754407 0.633022 0.173648\n"
474	+"0.17101 0.969846 0.173648\n"
475	+"-0.492404 0.852868 0.173648\n"
476	+"-0.925417 0.336824 0.173648\n"
477	+"-0.925417 -0.336824 0.173648\n"
478	+"-0.492404 -0.852869 0.173648\n"
479	+"0.17101 -0.969846 0.173648\n"
480	+"0.754407 -0.633022 0.173648\n"
481	+"0.984808 -2.41208e-16 0.173648\n"
482	+" \n"
483	+"0.984808 0 -0.173648\n"
484	+"0.754407 0.633022 -0.173648\n"
485	+"0.17101 0.969846 -0.173648\n"
486	+"-0.492404 0.852868 -0.173648\n"
487	+"-0.925417 0.336824 -0.173648\n"
488	+"-0.925417 -0.336824 -0.173648\n"
489	+"-0.492404 -0.852869 -0.173648\n"
490	+"0.17101 -0.969846 -0.173648\n"
491	+"0.754407 -0.633022 -0.173648\n"
492	+"0.984808 -2.41208e-16 -0.173648\n"
493	+" \n"
494	+"0.866025 0 -0.5\n"
495	+"0.663414 0.55667 -0.5\n"
496	+"0.150384 0.852868 -0.5\n"
497	+"-0.433013 0.75 -0.5\n"
498	+"-0.813798 0.296198 -0.5\n"
499	+"-0.813798 -0.296198 -0.5\n"
500	+"-0.433013 -0.75 -0.5\n"
501	+"0.150384 -0.852868 -0.5\n"
502	+"0.663414 -0.55667 -0.5\n"
503	+"0.866025 -2.12115e-16 -0.5\n"
504	+" \n"
505	+"0.642788 0 -0.766044\n"
506	+"0.492404 0.413176 -0.766044\n"
507	+"0.111619 0.633022 -0.766044\n"
508	+"-0.321394 0.55667 -0.766044\n"
509	+"-0.604023 0.219846 -0.766044\n"
510	+"-0.604023 -0.219846 -0.766044\n"
511	+"-0.321394 -0.55667 -0.766044\n"
512	+"0.111619 -0.633022 -0.766044\n"
513	+"0.492404 -0.413176 -0.766044\n"
514	+"0.642788 -1.57438e-16 -0.766044\n"
515	+" \n"
516	+"0.34202 0 -0.939693\n"
517	+"0.262003 0.219846 -0.939693\n"
518	+"0.0593912 0.336824 -0.939693\n"
519	+"-0.17101 0.296198 -0.939693\n"
520	+"-0.321394 0.116978 -0.939693\n"
521	+"-0.321394 -0.116978 -0.939693\n"
522	+"-0.17101 -0.296198 -0.939693\n"
523	+"0.0593912 -0.336824 -0.939693\n"
524	+"0.262003 -0.219846 -0.939693\n"
525	+"0.34202 -8.37708e-17 -0.939693\n"
526	+" \n"
527	+"1.22465e-16 0 -1\n"
528	+"9.38134e-17 7.87188e-17 -1\n"
529	+"2.12658e-17 1.20604e-16 -1\n"
530	+"-6.12323e-17 1.06058e-16 -1\n"
531	+"-1.15079e-16 4.18854e-17 -1\n"
532	+"-1.15079e-16 -4.18854e-17 -1\n"
533	+"-6.12323e-17 -1.06058e-16 -1\n"
534	+"2.12658e-17 -1.20604e-16 -1\n"
535	+"9.38134e-17 -7.87188e-17 -1\n"
536	+"1.22465e-16 -2.99952e-32 -1\n"
537	+" }\n"
538	+"}\n";
539	+
540	+static char *xyz = "{\n"
541	+"=\n"
542	+"VECT\n"
543	+"8 19 3\n"
544	+"2 2 2 2 2 3 2 4\n"
545	+"1 0 0 1 0 0 1 0\n"
546	+"\n"
547	+"0 0 0 1 0 0\n"
548	+"1 -.05 .05 1 .05 .25\n"
549	+"1 .05 .05 1 -.05 .25\n"
550	+"\n"
551	+"0 0 0 0 1 0\n"
552	+"-.05 1 .25 0 1 .15\n"
553	+" .05 1 .25 0 1 .15 0 1 .05\n"
554	+"\n"
555	+"0 0 0 0 0 1\n"
556	+"-.05 .25 1 .05 .25 1 -.05 .05 1 .05 .05 1\n"
557	+"\n"
558	+"1 0 0 1\n"
559	+"0 1 0 1\n"
560	+"0 .6 1 1\n}";
561	+
562	+static char *origin = "\n"
563	+"unit { \n"
564	+" { VECT\n"
565	+"8 19 3\n"
566	+"2 2 2 2 2 3 2 4\n"
567	+"1 0 0 1 0 0 1 0\n"
568	+"\n"
569	+"0 0 0 1 0 0\n"
570	+"1 -.05 .05 1 .05 .25\n"
571	+"1 .05 .05 1 -.05 .25\n"
572	+"\n"
573	+"0 0 0 0 1 0\n"
574	+"-.05 1 .25 0 1 .15\n"
575	+" .05 1 .25 0 1 .15 0 1 .05\n"
576	+"\n"
577	+"0 0 0 0 0 1\n"
578	+"-.05 .25 1 .05 .25 1 -.05 .05 1 .05 .05 1\n"
579	+"\n"
580	+"1 0 0 1\n"
581	+"0 1 0 1\n"
582	+"0 .6 1 1\n"
583	+" }\n"
584	+"}\n";
585	+
586	+static char *color1 = "\n"
587	+"0.26 0.7 0.7 1"
588	+"\n}\n";
589	+
590	+static char *fzold = "\n"
591	+"unit { \n"
592	+" { VECT\n"
593	+"3 6 1\n"
594	+"2 2 2\n"
595	+"1 0 0\n"
596	+"\n"
597	+"0 0 0 0 0 0.5\n"
598	+".05 0 .4 0 0 0.5\n"
599	+"0 0 0.5 -.05 0 .4\n"
600	+"\n"
601	+"1 0 0 1\n"
602	+" }\n"
603	+"}\n";
604	+
605	+static char *fz = "\n"
606	+"unit { \n"
607	+" { VECT\n"
608	+"5 10 1\n"
609	+"2 2 2 2 2\n"
610	+"1 0 0 0 0\n"
611	+"\n"
612	+"0 0 0 0 0 0.5\n"
613	+".05 0 .4 0 0 0.5\n"
614	+"0 0 0.5 -.05 0 .4\n"
615	+"0 .05 .4 0 0 0.5\n"
616	+"0 0 0.5 0 -.05 .4\n"
617	+"\n"
618	+"1 0 0 1\n"
619	+" }\n"
620	+"}\n";
621	+
622	+static char *constraint = "\n"
623	+"unit { \n"
624	+" { OFF\n"
625	+" 5 2 6\n"
626	+" 0 0 0\n"
627	+" -.1 0 .3\n"
628	+" .1 0 .3\n"
629	+" 0 -.1 .3\n"
630	+" 0 .1 .3\n"
631	+" 3 0 1 2 1 0 0 1\n"
632	+" 3 0 3 4 1 0 0 1\n"
633	+"\n"
634	+" }\n"
635	+"}\n";
636	+
637	+static char *constraintrot = "\n"
638	+"unit { \n"
639	+" { OFF\n"
640	+" 10 4 12\n"
641	+" 0 0 0\n"
642	+" -.07 -.07 .3\n"
643	+" .07 .07 .3\n"
644	+" -.07 .07 .3\n"
645	+" .07 -.07 .3\n"
646	+" 0 0 .3\n"
647	+" -.07 -.07 .6\n"
648	+" .07 .07 .6\n"
649	+" -.07 .07 .6\n"
650	+" .07 -.07 .6\n"
651	+" 3 0 1 2 0 1 0 1 \n"
652	+" 3 0 3 4 0 1 0 1 \n"
653	+" 3 5 6 7 0 1 0 1 \n"
654	+" 3 5 8 9 0 1 0 1 \n"
655	+"\n"
656	+" }\n"
657	+"}\n";
658	+
659	+static char *cross = "\n"
660	+"unit { \n"
661	+" { VECT\n"
662	+"3 6 1\n"
663	+"2 2 2\n"
664	+"1 0 0\n"
665	+"\n"
666	+"-.1 0 0 .1 0 0\n"
667	+"0 -.1 0 0 .1 0\n"
668	+"0 0 -.1 0 0 .1\n"
669	+"\n"
670	+"1 1 1 1\n"
671	+" }\n"
672	+"}\n";
673	+
674	+static char *transformz = "\n"
675	+"INST\n"
676	+" transform\n"
677	+" 1 0 0 0\n"
678	+" 0 1 0 0\n"
679	+" 0 0 1 0\n";
680	+
681	+static char *transformx = "\n"
682	+"INST\n"
683	+" transform\n"
684	+" 0 1 0 0\n"
685	+" 0 0 1 0\n"
686	+" 1 0 0 0\n";
687	+
688	+static char *transformy = "\n"
689	+"INST\n"
690	+" transform\n"
691	+" 0 0 1 0\n"
692	+" 1 0 0 0\n"
693	+" 0 1 0 0\n";
694
695	-static char *zero = " \nunit { { VECT 2 11 1 2 9 1 0 0 20 0 28 56 0 24 0 0 8 0 0 0 8 0 0 48 0 8 64 0
696	-24 64 0 32 52 0 32 12 0 24 0 0 1 1 1 1}} ";
697	+static char *zero = " \nunit { { VECT 2 11 1 2 9 1 0 0 20 0 28 56 0 24 0 0 8 0 0 0 8 0 0 48 0 8 64 0 24 64 0 32 52 0 32 12 0 24 0 0 1 1 1 1}} ";
698	static char *one = " \nunit { { VECT 2 5 1 2 3 1 0 4 0 0 28 0 0 4 44 0 16 64 0 16 0 0 1 1 1 1} } ";
699	-static char *two = " \nunit { { VECT 1 7 1 7 1 0 56 0 8 64 0 24 64 0 32 56 0 32 40 0 0 0 0 32 0 0 1
700	-1 1 1} } ";
701	-static char *three = " \nunit { { VECT 2 13 1 2 11 1 0 8 36 0 24 36 0 0 56 0 8 64 0 24 64 0 32 56 0
702	-32 44 0 24 36 0 32 24 0 32 8 0 24 0 0 8 0 0 0 8 0 1 1 1 1} } ";
703	-static char *four = " \nunit { { VECT 2 5 1 2 3 1 0 28 64 0 28 0 0 12 64 0 0 36 0 36 36 0 1 1 1 1} }
704	-";
705	-static char *five = " \nunit { { VECT 1 9 1 9 1 28 64 0 4 64 0 0 36 0 24 36 0 32 24 0 32 8 0 24 0 0
706	-8 0 0 0 8 0 1 1 1 1} } ";
707	-static char *six = " \nunit { { VECT 1 12 1 12 1 32 56 0 24 64 0 8 64 0 0 56 0 0 8 0 8 0 0 24 0 0
708	-32 8 0 32 28 0 24 36 0 8 36 0 0 28 0 1 1 1 1} } ";
709	+static char *two = " \nunit { { VECT 1 7 1 7 1 0 56 0 8 64 0 24 64 0 32 56 0 32 40 0 0 0 0 32 0 0 1 1 1 1} } ";
710	+static char *three = " \nunit { { VECT 2 13 1 2 11 1 0 8 36 0 24 36 0 0 56 0 8 64 0 24 64 0 32 56 0 32 44 0 24 36 0 32 24 0 32 8 0 24 0 0 8 0 0 0 8 0 1 1 1 1} } ";
711	+static char *four = " \nunit { { VECT 2 5 1 2 3 1 0 28 64 0 28 0 0 12 64 0 0 36 0 36 36 0 1 1 1 1} } ";
712	+static char *five = " \nunit { { VECT 1 9 1 9 1 28 64 0 4 64 0 0 36 0 24 36 0 32 24 0 32 8 0 24 0 0 8 0 0 0 8 0 1 1 1 1} } ";
713	+static char *six = " \nunit { { VECT 1 12 1 12 1 32 56 0 24 64 0 8 64 0 0 56 0 0 8 0 8 0 0 24 0 0 32 8 0 32 28 0 24 36 0 8 36 0 0 28 0 1 1 1 1} } ";
714	static char *seven = " \nunit { { VECT 1 4 1 4 1 0 56 0 4 64 0 32 64 0 8 0 0 1 1 1 1} } ";
715	-static char *eight = " \nunit { { VECT 1 16 1 16 1 20 36 0 28 44 0 28 56 0 20 64 0 12 64 0 4 56 0 4
716	-44 0 12 36 0 20 36 0 32 24 0 32 8 0 24 0 0 8 0 0 0 8 0 0 24 0 12 36 0 1 1 1 1} } ";
717	-static char *nine = " \nunit { { VECT 1 12 1 12 1 32 44 0 24 36 0 8 36 0 0 44 0 0 56 0 8 64 0 24 64
718	-0 32 56 0 32 8 0 24 0 0 8 0 0 0 8 0 1 1 1 1} } ";
719	+static char *eight = " \nunit { { VECT 1 16 1 16 1 20 36 0 28 44 0 28 56 0 20 64 0 12 64 0 4 56 0 4 44 0 12 36 0 20 36 0 32 24 0 32 8 0 24 0 0 8 0 0 0 8 0 0 24 0 12 36 0 1 1 1 1} } ";
720	+static char *nine = " \nunit { { VECT 1 12 1 12 1 32 44 0 24 36 0 8 36 0 0 44 0 0 56 0 8 64 0 24 64 0 32 56 0 32 8 0 24 0 0 8 0 0 0 8 0 1 1 1 1} } ";




--- src/Velvet/opengl.c.orig	Wed Mar 22 11:41:45 2000
+++ src/Velvet/opengl.c	Sun Jul 22 23:36:45 2007
@@ -35,7 +35,6 @@
 #include <X11/Shell.h>
 #include <X11/Xaw/Command.h>
 #include <X11/Xaw/Toggle.h>
-#include <GL/xmesa.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/GLwDrawA.h> 
@@ -789,7 +788,11 @@
                                    shell, args, n);
 
 
+#ifdef __GLX_MOTIF
+   mesa = XtVaCreateManagedWidget ("mesa", glwMDrawingAreaWidgetClass, layout,
+#else
    mesa = XtVaCreateManagedWidget ("mesa", glwDrawingAreaWidgetClass, layout,
+#endif
     				     GLwNvisualInfo, vi, 
 			  	     GLwNinstallColormap, True, 
 				     XtNheight, 500, 

Lines 1-11 Link Here

(-)science/felt/files/patch-src-Velvet-Makefile (-11 lines)
1	--- src/Velvet/Makefile.orig Sat Jan 29 18:21:57 2005
2	+++ src/Velvet/Makefile Sat Jan 29 18:19:36 2005
3	@@ -18,7 +18,7 @@
4	CFLAGS = $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
5	LDFLAGS = $(LDOPTS) -L$(X11LIB)
6	LIBS = $(LIBWIDGETS) $(LIBGEN) $(LIBFELT) $(LIBELT) $(LIBMTX)\
7	- -lGLw -lGLU -lGL -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
8	+ $(MOTIFLIB) -lGLw -lGLU -lGL -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
9	# /usr/X11R6/lib/libXaw3d.a /usr/X11R6/lib/libXmu.so.6.0 \
10	# /usr/X11R6/lib/libXt.so.6.0 /usr/X11R6/lib/libSM.so.6.0 \
11	# /usr/X11R6/lib/libICE.so.6.0 /usr/X11R6/lib/libXext.so.6.0 \

Lines 1-11 Link Here

(-)science/felt/files/patch-src-Velvet-analysis.c (-11 lines)
1	--- src/Velvet/analysis.c.orig Tue Mar 13 19:14:27 2007
2	+++ src/Velvet/analysis.c Tue Mar 13 19:14:35 2007
3	@@ -964,7 +964,7 @@
4	************************************************************************/
5
6	# if defined(__STDC__)
7	-void AnalysisDialogUpdate (AnalysisDialog analysisd, int force)
8	+void AnalysisDialogUpdate (AnalysisDialog analysisd, Boolean force)
9	# else
10	void AnalysisDialogUpdate (analysisd,force)
11	AnalysisDialog analysisd;

Lines 1-11 Link Here

(-)science/felt/files/patch-src__Burlap__descriptor.c (-11 lines)
1	--- src/Burlap/descriptor.c.orig Tue Feb 22 07:44:29 2000
2	+++ src/Burlap/descriptor.c Sat Aug 4 22:27:44 2007
3	@@ -307,7 +307,7 @@
4	D_Type (dest) = T_External;
5	D_Temp (dest) = F_False;
6	D_Trapped (dest) = F_False;
7	- D_External (dest) = D_External (src);
8	+ dest->u.ptr = D_External (src);
9	break;
10
11




--- src/Burlap/fefunc.c.orig	Tue Feb 22 07:44:30 2000
+++ src/Burlap/fefunc.c	Sat Aug  4 22:27:48 2007
@@ -190,7 +190,7 @@
 	    D_Type    (arg1) = T_Element;
 	    D_Temp    (arg1) = F_False;
 	    D_Trapped (arg1) = F_False;
-	    D_Element (arg1) = &element;
+	    arg1->u.ptr      = &element;
 
 	    D_Type    (arg2) = T_Int;
 	    D_Temp    (arg2) = F_False;
@@ -247,7 +247,7 @@
 	    D_Type    (arg1) = T_Element;
 	    D_Temp    (arg1) = F_False;
 	    D_Trapped (arg1) = F_False;
-	    D_Element (arg1) = &element;
+	    arg1->u.ptr      = &element;
 
 	    if (!function_call (function, 1)) {
 		result = top ( );




--- src/Burlap/felt.c.orig	Tue Feb 22 07:44:30 2000
+++ src/Burlap/felt.c	Sat Aug  4 22:27:50 2007
@@ -1780,7 +1780,7 @@
     D_Type    (d) = T_Problem;
     D_Temp    (d) = F_False;
     D_Trapped (d) = F_False;
-    D_Problem (d) = &problem;
+    d->u.ptr      = &problem;
 
 
     s = add_literal (&var_st, "analysis", GlblOp);
@@ -1789,7 +1789,7 @@
     D_Type     (d) = T_Analysis;
     D_Temp     (d) = F_False;
     D_Trapped  (d) = F_False;
-    D_Analysis (d) = &analysis;
+    d->u.ptr       = &analysis;
 
     return 0;
 }




--- src/Velvet/Velvet.ad.orig	2009-04-20 01:27:34.000000000 +0900
+++ src/Velvet/Velvet.ad	2012-07-11 23:01:19.000000000 +0900
@@ -1046,7 +1046,7 @@
 
 ! 3d specific defaults
 
-!*shapeStyle:					Rectangle
-!*control*spacer.height:				43
-!*control*MenuButton*height:			26
-!*control*Command*height:			26
+*shapeStyle:					Rectangle
+*control*spacer.height:				43
+*control*MenuButton*height:			26
+*control*Command*height:			26

Lines 7-108 Link Here

(-)science/felt/pkg-plist (-71 / +71 lines)
7	bin/yardstick	7	bin/yardstick
8	lib/X11/app-defaults/Velvet.ad	8	lib/X11/app-defaults/Velvet.ad
9	%%PORTDOCS%%%%DOCSDIR%%/FAQ.html	9	%%PORTDOCS%%%%DOCSDIR%%/FAQ.html
10	%%PORTDOCS%%@dirrm %%DOCSDIR%%	10	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frame3.flt	11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/axisymm.flt
		12	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam.flt
		13	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_2d.flt
		14	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_a.flt
12	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_b.flt	15	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_b.flt
13	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_ring.flt	16	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_dist.flt
14	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_cap.flt	17	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_dist_a.flt
		18	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_lc.flt
		19	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_nl.flt
		20	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_range.flt
		21	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_ss.flt
		22	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamspec.flt
		23	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicycle_boys.flt
		24	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicycle_girls.flt
		25	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxtruss.flt
		26	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick.flt
15	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_beam.flt	27	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_beam.flt
		28	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_cap.flt
		29	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick_ring.flt
16	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge.flt	30	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge.flt
		31	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge_dyn.flt
		32	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge_spec.flt
		33	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg.flt
		34	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg_simple.flt
17	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube.flt	35	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube.flt
18	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso.flt	36	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/displ.flt
19	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress.flt	37	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dist_mult.flt
20	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_a.flt
21	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss3d.flt
22	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_d.flt
23	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib.flt	38	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib.flt
24	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_a.flt	39	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_a.flt
25	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_b.flt	40	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_b.flt
		41	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_c.flt
		42	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_d.flt
		43	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_e.flt
		44	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic.flt
		45	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynframe.flt
		46	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynspect.flt
		47	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errors.flt
		48	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flexure.flt
26	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frame.flt	49	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frame.flt
		50	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frame3.flt
		51	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/german.flt
		52	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global.flt
		53	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d.flt
		54	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d_a.flt
		55	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d_b.flt
		56	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global_a.flt
		57	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/golden.flt
		58	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat.flt
		59	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat_transient.flt
		60	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hinged.flt
		61	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htk.flt
27	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htk_modal.flt	62	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htk_modal.flt
28	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed_dist.flt	63	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso.flt
29	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed.flt
30	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_dist.flt
31	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.flt
32	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_a.flt
33	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam.flt
34	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_2d.flt
35	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_a.flt	64	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_a.flt
36	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_c.flt
37	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
38	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_b.flt	65	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_b.flt
39	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_c.flt	66	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_c.flt
40	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_tri.flt	67	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iso_tri.flt
41	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_trig.flt
42	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrench.flt
43	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/isoq_dist.flt	68	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/isoq_dist.flt
44	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/isoq_tri.flt	69	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/isoq_tri.flt
45	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_d.flt	70	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadcase1.flt
46	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_dist.flt	71	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed.flt
47	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_new.flt
48	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed_dist.ans	72	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed_dist.ans
49	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/displ.flt	73	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixed_dist.flt
50	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_dist_a.flt
51	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/german.flt
52	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/errors.flt
53	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/distrib_e.flt
54	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko.flt
55	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko_a.flt
56	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko_c.flt
57	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global.flt
58	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global_a.flt
59	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hinged.flt
60	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower.flt
61	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d_a.flt
62	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d.flt
63	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/global3d_b.flt
64	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicycle_boys.flt
65	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bicycle_girls.flt
66	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic.flt
67	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynframe.flt
68	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/golden.flt
69	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge_dyn.flt
70	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/htk.flt
71	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_canvas.flt
72	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/brick.flt
73	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_ss.flt
74	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dist_mult.flt
75	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal.flt	74	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal.flt
76	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_8.flt	75	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_8.flt
77	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_sample.flt	76	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_sample.flt
78	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg.flt	77	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_test.flt
79	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg_simple.flt	78	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nl_range.flt
80	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat.flt	79	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress.flt
		80	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_a.flt
		81	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_dist.flt
		82	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pstress_new.flt
81	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rod.flt	83	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rod.flt
82	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamspec.flt
83	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heat_transient.flt
84	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rod_transient.flt	84	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rod_transient.flt
85	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynspect.flt
86	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spring_modal.flt
87	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spring2.flt	85	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spring2.flt
88	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_spec.flt	86	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spring_modal.flt
89	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxtruss.flt	87	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko.flt
90	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bridge_spec.flt	88	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko_a.flt
91	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loadcase1.flt	89	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timoshenko_c.flt
92	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/axisymm.flt	90	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tower.flt
93	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_lc.flt	91	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.flt
94	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_nl.flt	92	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss3d.flt
95	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam_range.flt	93	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_a.flt
96	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/flexure.flt	94	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_canvas.flt
97	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/modal_test.flt	95	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_d.flt
98	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nl_range.flt
99	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_nl.flt	96	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_nl.flt
100	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam3d_a.flt	97	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_spec.flt
101	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%	98	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss_trig.flt
		99	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrench.flt
102	%%DATADIR%%/beam.defaults	100	%%DATADIR%%/beam.defaults
103	%%DATADIR%%/material.defaults
104	%%DATADIR%%/truss.defaults
105	%%DATADIR%%/german.trn	101	%%DATADIR%%/german.trn
106	%%DATADIR%%/german_new.trn	102	%%DATADIR%%/german_new.trn
		103	%%DATADIR%%/material.defaults
107	%%DATADIR%%/spanish.trn	104	%%DATADIR%%/spanish.trn
		105	%%DATADIR%%/truss.defaults
108	@dirrm %%DATADIR%%	106	@dirrm %%DATADIR%%
		107	%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
		108	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 170165

Lines 6-29 Link Here

(-)science/felt/Makefile (-15 / +25 lines)
6	#	6	#
7		7
8	PORTNAME= felt	8	PORTNAME= felt
9	PORTVERSION= 3.06	9	PORTVERSION= 3.07
10	PORTREVISION= 3	10	DISTVERSIONSUFFIX= .src
11	CATEGORIES= science	11	CATEGORIES= science
12	MASTER_SITES= SF/${PORTNAME}/FElt/${PORTVERSION}devel	12	MASTER_SITES= SF/${PORTNAME}/FElt/${PORTVERSION}
13	EXTRACT_SUFX= -devel.src.tar.gz
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A system for Finite Element Analysis	15	COMMENT= A system for Finite Element Analysis
17		16
18	LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw	17	LICENSE= GPLv2
19		18
20	WRKSRC= ${WRKDIR}/FElt-${PORTVERSION}	19	OPTIONS_DEFINE= DOCS EXAMPLES
21		20
		21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		22
		23	USE_BZIP2= yes
22	USE_MOTIF= yes	24	USE_MOTIF= yes
23	USE_GL= glu	25	USE_GL= glu glw
24	GNU_CONFIGURE= yes	26	HAS_CONFIGURE= yes
25	CONFIGURE_ARGS= --x-defaults=${LOCALBASE}/lib/X11/app-defaults	27	CONFIGURE_ARGS= --prefix="${PREFIX}" \
26	CFLAGS+= -D__GLX_MOTIF	28	--x-defaults="${LOCALBASE}/lib/X11/app-defaults" \
		29	--x-includes="${LOCALBASE}/include" \
		30	--x-libraries="${LOCALBASE}/lib"
		31	MAKE_JOBS_SAFE= yes
27		32
28	MAN1= burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1	33	MAN1= burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
29	MAN3= Drawing.3	34	MAN3= Drawing.3
Lines 32-50 Link Here
32	DOCSDIR= ${PREFIX}/share/doc/FElt	37	DOCSDIR= ${PREFIX}/share/doc/FElt
33	EXAMPLESDIR= ${PREFIX}/share/examples/FElt	38	EXAMPLESDIR= ${PREFIX}/share/examples/FElt
34		39
35	post-extract:
36	@cd ${WRKSRC}/include && ${RM} -rf X11
37
38	post-patch:	40	post-patch:
39	@${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} ${REINPLACE_CMD} -e \	41	@${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} ${REINPLACE_CMD} -e \
40	's\|["<]malloc\.h[">]\|<stdlib.h>\|g'	42	's\|["<]malloc\.h[">]\|<stdlib.h>\|g'
		43	@${REINPLACE_CMD} -e \
		44	'/which CC/s\|^\|#\| ; \
		45	/CCOPTS=-O3/s\|^.*\|CCOPTS=$${CFLAGS}\| ; \
		46	s\|lib/felt\|share/felt\|' ${WRKSRC}/configure
		47	@${REINPLACE_CMD} -e \
		48	's\|-lpthread\|$$(MOTIFLIB)\|' ${WRKSRC}/src/Velvet/Makefile
		49
		50	.include <bsd.port.options.mk>
41		51
42	post-install:	52	post-install:
43	.if !defined(NOPORTDOCS)	53	.if ${PORT_OPTIONS:MDOCS}
44	@${MKDIR} ${DOCSDIR}	54	@${MKDIR} ${DOCSDIR}
45	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}	55	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCSDIR}
46	.endif	56	.endif
47	.if !defined(NOPORTEXAMPLES)	57	.if ${PORT_OPTIONS:MEXAMPLES}
48	@${MKDIR} ${EXAMPLESDIR}	58	@${MKDIR} ${EXAMPLESDIR}
49	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}	59	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
50	${INSTALL_DATA} ${WRKSRC}/examples/*.ans ${EXAMPLESDIR}	60	${INSTALL_DATA} ${WRKSRC}/examples/*.ans ${EXAMPLESDIR}

Lines 1-41 Link Here

(-)science/felt/files/patch-aa (-41 lines)
1	--- configure.orig Mon May 29 23:29:15 1995
2	+++ configure Mon Apr 30 03:03:43 2001
3	@@ -71,7 +71,6 @@
4
5	echo Configuring ...
6
7	-which CC gcc
8	which RANLIB ranlib
9	which CAT cat
10	which TRUE true
11	@@ -136,7 +135,6 @@
12
13	# provide worst-case defaults
14
15	-: ${CC:=cc}
16	: ${RANLIB:=$TRUE}
17	: ${READDIR:=/lib}
18	: ${DEST}:=.}
19	@@ -145,12 +143,11 @@
20	: ${X11INC:=.}
21	: ${X11LIB:=.}
22
23	-CC=`basename $CC`
24	RANLIB=`basename $RANLIB`
25	READDIR=`dirname $READDIR`
26	CONTRIBDIR=none
27
28	-if [ $CC = gcc ]; then CCOPTS=-O3; else CCOPTS=-O; fi
29	+CCOPTS=${CFLAGS}
30
31
32	# defaults for known architectures that fail the above
33	@@ -222,7 +219,7 @@
34	CONTRIBFLAGS = $CONTRIBFLAGS
35	CPP = $CPP
36	DESTBIN = $DEST/bin
37	-DESTLIB = $DEST/lib/felt
38	+DESTLIB = $DEST/share/felt
39	DESTMAN = $DEST/man
40	INSTALL = sh \$(TOPDIR)/etc/install.sh -c
41	LDOPTS =

Lines 1-20 Link Here

(-)science/felt/files/patch-ab (-20 lines)
1	diff -rc src/Velvet.orig/Velvet.ad src/Velvet/Velvet.ad
2	*** src/Velvet.orig/Velvet.ad Wed Dec 23 23:01:06 1998
3	--- src/Velvet/Velvet.ad Wed Dec 23 23:01:34 1998
4	***************
5	* 1046,1052 **
6
7	! 3d specific defaults
8
9	! !*shapeStyle: Rectangle
10	! !controlspacer.height: 43
11	! !controlMenuButton*height: 26
12	! !controlCommand*height: 26
13	--- 1046,1052 ----
14
15	! 3d specific defaults
16
17	! *shapeStyle: Rectangle
18	! controlspacer.height: 43
19	! controlMenuButton*height: 26
20	! controlCommand*height: 26

Lines 1-22 Link Here

(-)science/felt/files/patch-src+Velvet+opengl+c (-22 lines)
1	--- src/Velvet/opengl.c.orig Wed Mar 22 11:41:45 2000
2	+++ src/Velvet/opengl.c Sun Jul 22 23:36:45 2007
3	@@ -35,7 +35,6 @@
4	#include <X11/Shell.h>
5	#include <X11/Xaw/Command.h>
6	#include <X11/Xaw/Toggle.h>
7	-#include <GL/xmesa.h>
8	#include <GL/gl.h>
9	#include <GL/glu.h>
10	#include <GL/GLwDrawA.h>
11	@@ -789,7 +788,11 @@
12	shell, args, n);
13
14
15	+#ifdef __GLX_MOTIF
16	+ mesa = XtVaCreateManagedWidget ("mesa", glwMDrawingAreaWidgetClass, layout,
17	+#else
18	mesa = XtVaCreateManagedWidget ("mesa", glwDrawingAreaWidgetClass, layout,
19	+#endif
20	GLwNvisualInfo, vi,
21	GLwNinstallColormap, True,
22	XtNheight, 500,

Lines 1-20 Link Here

(-)science/felt/files/patch-src__Burlap__fefunc.c (-20 lines)
1	--- src/Burlap/fefunc.c.orig Tue Feb 22 07:44:30 2000
2	+++ src/Burlap/fefunc.c Sat Aug 4 22:27:48 2007
3	@@ -190,7 +190,7 @@
4	D_Type (arg1) = T_Element;
5	D_Temp (arg1) = F_False;
6	D_Trapped (arg1) = F_False;
7	- D_Element (arg1) = &element;
8	+ arg1->u.ptr = &element;
9
10	D_Type (arg2) = T_Int;
11	D_Temp (arg2) = F_False;
12	@@ -247,7 +247,7 @@
13	D_Type (arg1) = T_Element;
14	D_Temp (arg1) = F_False;
15	D_Trapped (arg1) = F_False;
16	- D_Element (arg1) = &element;
17	+ arg1->u.ptr = &element;
18
19	if (!function_call (function, 1)) {
20	result = top ( );

Lines 1-20 Link Here

(-)science/felt/files/patch-src__Burlap__felt.c (-20 lines)
1	--- src/Burlap/felt.c.orig Tue Feb 22 07:44:30 2000
2	+++ src/Burlap/felt.c Sat Aug 4 22:27:50 2007
3	@@ -1780,7 +1780,7 @@
4	D_Type (d) = T_Problem;
5	D_Temp (d) = F_False;
6	D_Trapped (d) = F_False;
7	- D_Problem (d) = &problem;
8	+ d->u.ptr = &problem;
9
10
11	s = add_literal (&var_st, "analysis", GlblOp);
12	@@ -1789,7 +1789,7 @@
13	D_Type (d) = T_Analysis;
14	D_Temp (d) = F_False;
15	D_Trapped (d) = F_False;
16	- D_Analysis (d) = &analysis;
17	+ d->u.ptr = &analysis;
18
19	return 0;
20	}

Line 0 Link Here

(-)science/felt/files/patch-src__Velvet__Velvet.ad (+14 lines)
	1	--- src/Velvet/Velvet.ad.orig 2009-04-20 01:27:34.000000000 +0900
	2	+++ src/Velvet/Velvet.ad 2012-07-11 23:01:19.000000000 +0900
	3	@@ -1046,7 +1046,7 @@
	4
	5	! 3d specific defaults
	6
	7	-!*shapeStyle: Rectangle
	8	-!controlspacer.height: 43
	9	-!controlMenuButton*height: 26
	10	-!controlCommand*height: 26
	11	+*shapeStyle: Rectangle
	12	+controlspacer.height: 43
	13	+controlMenuButton*height: 26
	14	+controlCommand*height: 26