Fixed problems from recent pkgsrc/i386 bulk build. Added the ~250 page

postscript manual.

5 files changed, 27 insertions, 15 deletions

diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index adf0ff657b2..c10648cf50d 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/27 23:28:23 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2000/12/14 02:07:43 jtb Exp $
 
 DISTNAME=	felt-3.05.src
 PKGNAME=	felt-3.05
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/FElt/
+DISTFILES=	felt-3.05.src.tar.gz felt-3.05.ps.gz
 
 MAINTAINER=	jtb@netbsd.org
 HOMEPAGE=	http://felt.sourceforge.net/
 
 DEPENDS+=	readline-[0-9]*:../../devel/readline
 
+EXTRACT_ONLY=	felt-3.05.src.tar.gz
 WRKSRC=		${WRKDIR}/FElt-3.05
 NO_CONFIGURE=	YES
 EVAL_PREFIX+=	RL_PREFIX=readline
@@ -17,12 +19,15 @@ USE_X11=	YES
 USE_XAW=	YES
 XAW_TYPE=	3d
 
+post-extract:
+	@${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/felt
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/felt
+	${INSTALL_DATA} ${WRKSRC}/felt.ps ${PREFIX}/share/doc/felt
 	@for i in FAQ* README* COPYING CHANGELOG TODO; do \
 	${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/felt; done
-	@for i in ${WRKSRC}/examples/*;	do \
-	${INSTALL_DATA} $$i ${PREFIX}/share/examples/felt; done
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/felt
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/felt/files/md5 b/cad/felt/files/md5
index 402c2898372..c28654fd53a 100644
--- a/cad/felt/files/md5
+++ b/cad/felt/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.1.1.1 2000/11/27 23:28:25 jtb Exp $
+$NetBSD: md5,v 1.2 2000/12/14 02:07:43 jtb Exp $
 
 MD5 (felt-3.05.src.tar.gz) = 3cadb25d7039604b862a30df55bf49f8
+MD5 (felt-3.05.ps.gz) = 6f8a50b1e4318d2519ce8a235cee16bd
diff --git a/cad/felt/files/patch-sum b/cad/felt/files/patch-sum
index c3fbf5afdaf..72bf798c65d 100644
--- a/cad/felt/files/patch-sum
+++ b/cad/felt/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/11/27 23:28:25 jtb Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/14 02:07:43 jtb Exp $
 
-MD5 (patch-aa) = 67744b60a5e985e643541edfb7fa0647
+MD5 (patch-aa) = 67bd2058c663ffcc4c491bd3217a7a5b
+MD5 (patch-ab) = e3e8d7291c4c39bc1a154d81ceb50022
diff --git a/cad/felt/patches/patch-aa b/cad/felt/patches/patch-aa
index 5b8802fc4f0..1a6e0db14d8 100644
--- a/cad/felt/patches/patch-aa
+++ b/cad/felt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/27 23:28:25 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2000/12/14 02:07:44 jtb Exp $
 
 --- etc/Makefile.conf.orig	Sun Mar  5 01:37:06 2000
 +++ etc/Makefile.conf
-@@ -1,14 +1,11 @@
+@@ -1,26 +1,22 @@
 -AR		= ar
 -CC		= gcc
 -CCOPTS		= -O3 -g
@@ -13,21 +13,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/27 23:28:25 jtb Exp $
 -DESTBIN		= /usr/local/bin
 -DESTLIB		= /usr/local/lib/felt
 -DESTMAN		= /usr/local/man
+-INSTALL		= sh $(TOPDIR)/etc/install.sh -c
+-LDOPTS		= -g
 +DESTBIN		= ${PREFIX}/bin
 +DESTLIB		= ${PREFIX}/share/felt
 +DESTMAN		= ${PREFIX}/man
- INSTALL		= sh $(TOPDIR)/etc/install.sh -c
--LDOPTS		= -g
++INSTALL		= /bin/sh $(TOPDIR)/etc/install.sh -c
 +LDOPTS		= -s
  LIBELT		= $(TOPDIR)/lib/Elements/libelt.a
  LIBFELT		= $(TOPDIR)/lib/Felt/libfelt.a
  LIBGEN		= $(TOPDIR)/lib/Generate/libgen.a
-@@ -18,9 +15,9 @@
- MKDIR		= sh $(TOPDIR)/etc/mkdirhier.sh
- RANLIB		= ranlib
+ LIBGEOMPACK	= $(TOPDIR)/lib/Geompack/libgeompack.a
+ LIBMTX		= $(TOPDIR)/lib/Matrix/libmtx.a
+ LIBWIDGETS	= $(TOPDIR)/lib/Widgets/libwidgets.a
+-MKDIR		= sh $(TOPDIR)/etc/mkdirhier.sh
+-RANLIB		= ranlib
++MKDIR		= /bin/sh $(TOPDIR)/etc/mkdirhier.sh
  READLINE	= -DREADLINE
 -READLIBS	= -L/usr/lib -lreadline -ltermcap
-+READLIBS	= -L${RL_PREFIX}/lib -lreadline -ltermcap
++READLIBS	= -L${RL_PREFIX}/lib -Wl,-R${RL_PREFIX}/lib -lreadline -ltermcap
  RM		= rm -f
  SYSLIBS		=
 -X11DEF		= /usr/X11R6/lib/X11/app-defaults
diff --git a/cad/felt/pkg/PLIST b/cad/felt/pkg/PLIST
index 843c75f831c..e2eb35f3e4b 100644
--- a/cad/felt/pkg/PLIST
+++ b/cad/felt/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/27 23:28:25 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/14 02:07:44 jtb Exp $
 bin/burlap
 bin/corduroy
 bin/felt
@@ -28,6 +28,7 @@ share/doc/felt/FAQ.html
 share/doc/felt/README
 share/doc/felt/README.old
 share/doc/felt/TODO
+share/doc/felt/felt.ps
 share/examples/felt/README
 share/examples/felt/axisymm.flt
 share/examples/felt/beam.flt