Upgrade, 3.01 -> 3.02.

PR:		3871
Submitted by:	Pedro Giffuni S. <pgiffuni@FPS.biblos.unal.edu.co>

5 files changed, 115 insertions, 37 deletions

diff --git a/science/felt/Makefile b/science/felt/Makefile
index 9a65b07fbbed..d23668c4ef27 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -1,28 +1,31 @@
 # New ports collection makefile for:	FElt
-# Version required:	 3.01
+# Version required:	3.02
 # Date created:		19 October 1996
-# Whom:			
+# Whom:			Pedro Giffuni
 #
-# $Id: Makefile,v 1.2 1997/01/18 23:55:39 asami Exp $
+# $Id: Makefile,v 1.3 1997/01/19 02:47:27 obrien Exp $
 #
 
-DISTNAME=	felt-3.01
+DISTNAME=	felt-3.02
 CATEGORIES=	cad
 MASTER_SITES=	http://www-cse.ucsd.edu/users/atkinson/FElt/Binaries/ \
-		ftp://lucy.ifi.unibas.ch/unix/general/
+		ftp://ftp.isd.uni-stuttgart.de/pub/src/FEM/FElt/
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	pgiffuni@FPS.biblos.unal.edu.co
 
-WRKSRC=		${WRKDIR}/FElt-3.00
+WRKSRC=         ${WRKDIR}/FElt-3.02
 GNU_CONFIGURE=	yes
 MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
 MAN4=		corduroy.4 felt.4
-
-#DOCS= 		ftp://cs.ucsd.edu/pub/felt/felt-3.00.ps.gz
+#DOCS= 		ftp://cs.ucsd.edu/pub/felt/felt-3.02.ps.gz
 
 post-patch:
 	${RM} -f $(WRKSRC)/lib/Geompack/*.c
 
+post-install:
+	$(MKDIR) $(PREFIX)/share/examples/FElt
+	$(CP) $(WRKSRC)/examples/* $(PREFIX)/share/examples/FElt
+
 .include <bsd.port.mk>
diff --git a/science/felt/distinfo b/science/felt/distinfo
index 54de91ca848c..62fe63fb8f8a 100644
--- a/science/felt/distinfo
+++ b/science/felt/distinfo
@@ -1 +1 @@
-MD5 (felt-3.01.src.tar.gz) = 265c8e84eefc96d0ca5e1a0260b92dab
+MD5 (felt-3.02.src.tar.gz) = 18798981dfbc5a0c2e77eda1090f36c0
diff --git a/science/felt/files/patch-aa b/science/felt/files/patch-aa
index e39c5f74a9e9..c1c9f3ec5c45 100644
--- a/science/felt/files/patch-aa
+++ b/science/felt/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.orig	Fri Aug  4 23:57:09 1995
-+++ configure	Sat Jan 11 12:14:28 1997
+--- configure.orig	Tue May 30 15:29:15 1995
++++ configure	Mon Jun 16 14:18:42 1997
 @@ -221,8 +221,10 @@
  CONTRIBDIR	= $CONTRIBDIR
  CONTRIBFLAGS	= $CONTRIBFLAGS
@@ -11,4 +11,4 @@
 +DESTLIB		= $DEST/share/felt
  DESTMAN		= $DEST/man
  INSTALL		= sh \$(TOPDIR)/etc/install.sh -c
- LDOPTS		= -s
+ LDOPTS		=
diff --git a/science/felt/files/patch-ac b/science/felt/files/patch-ac
index 0e835d66f35c..c9361f62f8ee 100644
--- a/science/felt/files/patch-ac
+++ b/science/felt/files/patch-ac
@@ -1,28 +1,16 @@
-*** ../FElt-3.00/src/Velvet/velvet.c	Wed May 31 19:03:06 1995
---- ./src/Velvet/velvet.c	Wed Dec 18 20:50:30 1996
+*** src/Burlap/allocate.h.orig	Sat Jun 14 22:32:22 1997
+--- src/Burlap/allocate.h	Sat Jun 14 22:35:28 1997
 ***************
-*** 73,78 ****
---- 73,81 ----
-  # include "popup.xbm"
-  # include "FElt.icon"
+*** 28,34 ****
+--- 28,38 ----
   
-+ #ifdef __FreeBSD__
-+ #include <floatingpoint.h>
+  # ifndef _ALLOCATE_H
+  # define _ALLOCATE_H
++ #ifdef __STDC__
++ #include <stdlib.h>
++ #else
+  # include <malloc.h>
 + #endif
+  # include <string.h>
   
-  static char *defaults [ ] = {
-  # include "velvet.ad.h"
-***************
-*** 595,600 ****
---- 598,608 ----
-      static String  output_buttons [ ]  = {"dismiss", "save"};
-      static String  proceed_buttons [ ] = {"okay", "cancel"};
-      static String  qsave_buttons [ ]   = {"yes", "no", "cancel"};
-+ 
-+ #ifdef __FreeBSD__
-+   fpsetmask (0);
-+ #endif
-+ 
-  
-  
-      /* Parse the initial command line options */
+  # define New(type) \
diff --git a/science/felt/pkg-plist b/science/felt/pkg-plist
index 6f6afe89a6ce..d7abed989ed6 100644
--- a/science/felt/pkg-plist
+++ b/science/felt/pkg-plist
@@ -4,6 +4,93 @@ bin/felt
 bin/patchwork
 bin/velvet
 bin/yardstick
+share/examples/FElt/frame3.flt
+share/examples/FElt/beam3d_b.flt
+share/examples/FElt/bridge.flt
+share/examples/FElt/cube.flt
+share/examples/FElt/iso.flt
+share/examples/FElt/pstress.flt
+share/examples/FElt/pstress_a.flt
+share/examples/FElt/truss3d.flt
+share/examples/FElt/truss_d.flt
+share/examples/FElt/distrib.flt
+share/examples/FElt/distrib_a.flt
+share/examples/FElt/distrib_b.flt
+share/examples/FElt/frame.flt
+share/examples/FElt/mixed_dist.flt
+share/examples/FElt/mixed.flt
+share/examples/FElt/pstress_dist.flt
+share/examples/FElt/truss.flt
+share/examples/FElt/truss_a.flt
+share/examples/FElt/beam.flt
+share/examples/FElt/beam3d_2d.flt
+share/examples/FElt/iso_a.flt
+share/examples/FElt/distrib_c.flt
+share/examples/FElt/README
+share/examples/FElt/iso_b.flt
+share/examples/FElt/iso_c.flt
+share/examples/FElt/iso_tri.flt
+share/examples/FElt/truss_trig.flt
+share/examples/FElt/wrench.flt
+share/examples/FElt/isoq_dist.flt
+share/examples/FElt/isoq_tri.flt
+share/examples/FElt/distrib_d.flt
+share/examples/FElt/beam3d_dist.flt
+share/examples/FElt/pstress_new.flt
+share/examples/FElt/mixed_dist.ans
+share/examples/FElt/displ.flt
+share/examples/FElt/beam3d_dist_a.flt
+share/examples/FElt/german.flt
+share/examples/FElt/errors.flt
+share/examples/FElt/distrib_e.flt
+share/examples/FElt/timoshenko.flt
+share/examples/FElt/timoshenko_a.flt
+share/examples/FElt/timoshenko_c.flt
+share/examples/FElt/global.flt
+share/examples/FElt/global_a.flt
+share/examples/FElt/hinged.flt
+share/examples/FElt/tower.flt
+share/examples/FElt/global3d_a.flt
+share/examples/FElt/global3d.flt
+share/examples/FElt/global3d_b.flt
+share/examples/FElt/bicycle_boys.flt
+share/examples/FElt/bicycle_girls.flt
+share/examples/FElt/dynamic.flt
+share/examples/FElt/dynframe.flt
+share/examples/FElt/golden.flt
+share/examples/FElt/bridge_dyn.flt
+share/examples/FElt/htk.flt
+share/examples/FElt/truss_canvas.flt
+share/examples/FElt/brick.flt
+share/examples/FElt/beam_ss.flt
+share/examples/FElt/dist_mult.flt
+share/examples/FElt/modal.flt
+share/examples/FElt/modal_8.flt
+share/examples/FElt/modal_sample.flt
+share/examples/FElt/ctg.flt
+share/examples/FElt/ctg_simple.flt
+share/examples/FElt/heat.flt
+share/examples/FElt/rod.flt
+share/examples/FElt/beamspec.flt
+share/examples/FElt/heat_transient.flt
+share/examples/FElt/rod_transient.flt
+share/examples/FElt/dynspect.flt
+share/examples/FElt/spring_modal.flt
+share/examples/FElt/spring2.flt
+share/examples/FElt/truss_spec.flt
+share/examples/FElt/boxtruss.flt
+share/examples/FElt/bridge_spec.flt
+share/examples/FElt/loadcase1.flt
+share/examples/FElt/axisymm.flt
+share/examples/FElt/beam_lc.flt
+share/examples/FElt/beam_nl.flt
+share/examples/FElt/beam_range.flt
+share/examples/FElt/flexure.flt
+share/examples/FElt/modal_test.flt
+share/examples/FElt/nl_range.flt
+share/examples/FElt/truss_nl.flt
+share/examples/FElt/beam3d_a.flt
+@dirrm share/examples/FElt
 man/man1/burlap.1.gz
 man/man1/corduroy.1.gz
 man/man1/felt.1.gz
@@ -19,4 +106,4 @@ share/felt/truss.defaults
 share/felt/german.trn
 share/felt/german_new.trn
 share/felt/spanish.trn
-
+@dirrm share/felt