10 files changed, 48 insertions, 80 deletions

diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index e711336aad46..91cf8244e155 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	felt
-PORTVERSION=	3.02
+PORTVERSION=	3.05
 CATEGORIES=	cad
 MASTER_SITES=	ftp://felt.sourceforge.net/pub/FElt/ \
 		http://symphony.clarku.edu/atkinson/felt/Binaries/ \
@@ -17,7 +17,7 @@ MAINTAINER=	giffunip@asme.org
 
 LIB_DEPENDS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 
-WRKSRC=		${WRKDIR}/FElt-3.02
+WRKSRC=		${WRKDIR}/FElt-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 
@@ -25,9 +25,6 @@ MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
 MAN4=		corduroy.4 felt.4
 
-post-patch:
-	${RM} -f ${WRKSRC}/lib/Geompack/*.c
-
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/FElt
 	${CP} ${WRKSRC}/examples/* ${PREFIX}/share/examples/FElt
diff --git a/cad/felt/distinfo b/cad/felt/distinfo
index 62fe63fb8f8a..4fd54b6a954f 100644
--- a/cad/felt/distinfo
+++ b/cad/felt/distinfo
@@ -1 +1 @@
-MD5 (felt-3.02.src.tar.gz) = 18798981dfbc5a0c2e77eda1090f36c0
+MD5 (felt-3.05.src.tar.gz) = 3cadb25d7039604b862a30df55bf49f8
diff --git a/cad/felt/files/patch-aa b/cad/felt/files/patch-aa
index c1c9f3ec5c45..73bdcbfccea7 100644
--- a/cad/felt/files/patch-aa
+++ b/cad/felt/files/patch-aa
@@ -1,14 +1,19 @@
---- 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
- CPP		= $CPP
-+FC		= f77
-+FFLAGS		= $CCOPTS -Dfreebsd
- DESTBIN		= $DEST/bin
--DESTLIB		= $DEST/lib/felt
-+DESTLIB		= $DEST/share/felt
- DESTMAN		= $DEST/man
- INSTALL		= sh \$(TOPDIR)/etc/install.sh -c
- LDOPTS		=
+*** configure.orig	Fri May 12 00:33:57 2000
+--- configure	Fri May 12 00:39:34 2000
+***************
+*** 222,228 ****
+  CONTRIBFLAGS	= $CONTRIBFLAGS
+  CPP		= $CPP
+  DESTBIN		= $DEST/bin
+! DESTLIB		= $DEST/lib/felt
+  DESTMAN		= $DEST/man
+  INSTALL		= sh \$(TOPDIR)/etc/install.sh -c
+  LDOPTS		=
+--- 222,228 ----
+  CONTRIBFLAGS	= $CONTRIBFLAGS
+  CPP		= $CPP
+  DESTBIN		= $DEST/bin
+! DESTLIB		= $DEST/share/felt
+  DESTMAN		= $DEST/man
+  INSTALL		= sh \$(TOPDIR)/etc/install.sh -c
+  LDOPTS		=
diff --git a/cad/felt/files/patch-ab b/cad/felt/files/patch-ab
index e13826e2172c..59a8c9cf6685 100644
--- a/cad/felt/files/patch-ab
+++ b/cad/felt/files/patch-ab
@@ -1,23 +1,3 @@
-diff -rc src/Velvet.orig/Makefile src/Velvet/Makefile
-*** src/Velvet.orig/Makefile	Wed Dec 23 23:01:05 1998
---- src/Velvet/Makefile	Wed Dec 23 23:01:34 1998
-***************
-*** 18,24 ****
-  CFLAGS	= $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
-  LDFLAGS	= $(LDOPTS) -L$(X11LIB)
-  LIBS	= $(LIBWIDGETS) $(LIBGEN) $(LIBGEOMPACK) $(LIBFELT) $(LIBELT) $(LIBMTX)\
-! 	  -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
-  OBJS	= analysis.o animate.o apply.o bivar.o callbacks.o canvas.o\
-  	  colors.o constraint.o contour.o draw3d.o drawingshell.o\
-  	  element.o elementlist.o elementop.o eps.o error.o field.o file.o\
---- 18,24 ----
-  CFLAGS	= $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
-  LDFLAGS	= $(LDOPTS) -L$(X11LIB)
-  LIBS	= $(LIBWIDGETS) $(LIBGEN) $(LIBGEOMPACK) $(LIBFELT) $(LIBELT) $(LIBMTX)\
-! 	  -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
-  OBJS	= analysis.o animate.o apply.o bivar.o callbacks.o canvas.o\
-  	  colors.o constraint.o contour.o draw3d.o drawingshell.o\
-  	  element.o elementlist.o elementop.o eps.o error.o field.o file.o\
 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
diff --git a/cad/felt/pkg-plist b/cad/felt/pkg-plist
index 912ba40308cd..25f7ff0a2263 100644
--- a/cad/felt/pkg-plist
+++ b/cad/felt/pkg-plist
@@ -20,6 +20,7 @@ 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/htk_modal.flt
 share/examples/FElt/mixed_dist.flt
 share/examples/FElt/mixed.flt
 share/examples/FElt/pstress_dist.flt
@@ -101,3 +102,4 @@ share/felt/german.trn
 share/felt/german_new.trn
 share/felt/spanish.trn
 @dirrm share/felt
+
diff --git a/science/felt/Makefile b/science/felt/Makefile
index e711336aad46..91cf8244e155 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	felt
-PORTVERSION=	3.02
+PORTVERSION=	3.05
 CATEGORIES=	cad
 MASTER_SITES=	ftp://felt.sourceforge.net/pub/FElt/ \
 		http://symphony.clarku.edu/atkinson/felt/Binaries/ \
@@ -17,7 +17,7 @@ MAINTAINER=	giffunip@asme.org
 
 LIB_DEPENDS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 
-WRKSRC=		${WRKDIR}/FElt-3.02
+WRKSRC=		${WRKDIR}/FElt-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
 
@@ -25,9 +25,6 @@ MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
 MAN4=		corduroy.4 felt.4
 
-post-patch:
-	${RM} -f ${WRKSRC}/lib/Geompack/*.c
-
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/FElt
 	${CP} ${WRKSRC}/examples/* ${PREFIX}/share/examples/FElt
diff --git a/science/felt/distinfo b/science/felt/distinfo
index 62fe63fb8f8a..4fd54b6a954f 100644
--- a/science/felt/distinfo
+++ b/science/felt/distinfo
@@ -1 +1 @@
-MD5 (felt-3.02.src.tar.gz) = 18798981dfbc5a0c2e77eda1090f36c0
+MD5 (felt-3.05.src.tar.gz) = 3cadb25d7039604b862a30df55bf49f8
diff --git a/science/felt/files/patch-aa b/science/felt/files/patch-aa
index c1c9f3ec5c45..73bdcbfccea7 100644
--- a/science/felt/files/patch-aa
+++ b/science/felt/files/patch-aa
@@ -1,14 +1,19 @@
---- 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
- CPP		= $CPP
-+FC		= f77
-+FFLAGS		= $CCOPTS -Dfreebsd
- DESTBIN		= $DEST/bin
--DESTLIB		= $DEST/lib/felt
-+DESTLIB		= $DEST/share/felt
- DESTMAN		= $DEST/man
- INSTALL		= sh \$(TOPDIR)/etc/install.sh -c
- LDOPTS		=
+*** configure.orig	Fri May 12 00:33:57 2000
+--- configure	Fri May 12 00:39:34 2000
+***************
+*** 222,228 ****
+  CONTRIBFLAGS	= $CONTRIBFLAGS
+  CPP		= $CPP
+  DESTBIN		= $DEST/bin
+! DESTLIB		= $DEST/lib/felt
+  DESTMAN		= $DEST/man
+  INSTALL		= sh \$(TOPDIR)/etc/install.sh -c
+  LDOPTS		=
+--- 222,228 ----
+  CONTRIBFLAGS	= $CONTRIBFLAGS
+  CPP		= $CPP
+  DESTBIN		= $DEST/bin
+! DESTLIB		= $DEST/share/felt
+  DESTMAN		= $DEST/man
+  INSTALL		= sh \$(TOPDIR)/etc/install.sh -c
+  LDOPTS		=
diff --git a/science/felt/files/patch-ab b/science/felt/files/patch-ab
index e13826e2172c..59a8c9cf6685 100644
--- a/science/felt/files/patch-ab
+++ b/science/felt/files/patch-ab
@@ -1,23 +1,3 @@
-diff -rc src/Velvet.orig/Makefile src/Velvet/Makefile
-*** src/Velvet.orig/Makefile	Wed Dec 23 23:01:05 1998
---- src/Velvet/Makefile	Wed Dec 23 23:01:34 1998
-***************
-*** 18,24 ****
-  CFLAGS	= $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
-  LDFLAGS	= $(LDOPTS) -L$(X11LIB)
-  LIBS	= $(LIBWIDGETS) $(LIBGEN) $(LIBGEOMPACK) $(LIBFELT) $(LIBELT) $(LIBMTX)\
-! 	  -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
-  OBJS	= analysis.o animate.o apply.o bivar.o callbacks.o canvas.o\
-  	  colors.o constraint.o contour.o draw3d.o drawingshell.o\
-  	  element.o elementlist.o elementop.o eps.o error.o field.o file.o\
---- 18,24 ----
-  CFLAGS	= $(CCOPTS) -I$(X11INC) -I$(TOPDIR)/include
-  LDFLAGS	= $(LDOPTS) -L$(X11LIB)
-  LIBS	= $(LIBWIDGETS) $(LIBGEN) $(LIBGEOMPACK) $(LIBFELT) $(LIBELT) $(LIBMTX)\
-! 	  -lXaw3d -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
-  OBJS	= analysis.o animate.o apply.o bivar.o callbacks.o canvas.o\
-  	  colors.o constraint.o contour.o draw3d.o drawingshell.o\
-  	  element.o elementlist.o elementop.o eps.o error.o field.o file.o\
 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
diff --git a/science/felt/pkg-plist b/science/felt/pkg-plist
index 912ba40308cd..25f7ff0a2263 100644
--- a/science/felt/pkg-plist
+++ b/science/felt/pkg-plist
@@ -20,6 +20,7 @@ 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/htk_modal.flt
 share/examples/FElt/mixed_dist.flt
 share/examples/FElt/mixed.flt
 share/examples/FElt/pstress_dist.flt
@@ -101,3 +102,4 @@ share/felt/german.trn
 share/felt/german_new.trn
 share/felt/spanish.trn
 @dirrm share/felt
+