(1) Honor CFLAGS passed in from environment during build.

(2) Use devel/readline/Makefile.readline to get readline support, and note
    why GNU readline is required.
(3) Make this package work with xpkgwedge...the app-defaults file was
    always being installed under ${X11BASE}.

3 files changed, 32 insertions, 20 deletions

diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index a595fe76711..daf9651aa4d 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/13 14:34:08 jtb Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/22 16:48:59 jlam Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -10,22 +10,30 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://felt.sourceforge.net/
 COMMENT=		Free system for introductory level finite element analysis
 
-DEPENDS+=		readline-[0-9]*:../../devel/readline
-
 EXTRACT_ONLY=		felt-3.05.src.tar.gz
 WRKSRC=			${WRKDIR}/FElt-3.05
 NO_CONFIGURE=		# defined
 
-RL_PREFIX_DEFAULT=	${LOCALBASE}
-EVAL_PREFIX+=		RL_PREFIX=readline
-
-USE_X11BASE=		yes
-USE_XAW=		yes
+USE_X11BASE=		# defined
+USE_XAW=		# defined
 XAW_TYPE?=		3d
 
+MAKE_ENV+=		CCOPTS="${CFLAGS}"
+MAKE_ENV+=		LDOPTS="${LDFLAGS}"
+MAKE_ENV+=		SH="${SH}"
+
+USE_GNU_READLINE=	# uses remove_history() and history_list()
+
+.include "../../devel/readline/Makefile.readline"
+
+CFLAGS+=		-I${WRKINCDIR}
+LDFLAGS+=		-L${WRKLIBDIR}
+
 post-extract:
 	@${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
 
+pre-build: link-readline-headers link-readline-libs
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/felt
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/felt
diff --git a/cad/felt/distinfo b/cad/felt/distinfo
index 710efde8522..4ca3e3a576b 100644
--- a/cad/felt/distinfo
+++ b/cad/felt/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/04/30 20:56:52 jtb Exp $
+$NetBSD: distinfo,v 1.4 2001/05/22 16:48:59 jlam Exp $
 
 SHA1 (felt-3.05.src.tar.gz) = da3e1ced626cc1c65a570d3e6e242252c039c28b
 Size (felt-3.05.src.tar.gz) = 956901 bytes
 SHA1 (felt-3.05.ps.gz) = 10fbac9927fe20cec3884d989204fe1a92d61784
 Size (felt-3.05.ps.gz) = 626985 bytes
-SHA1 (patch-aa) = c04149bfa4161a3618971961d7b6b1b6d619bb07
+SHA1 (patch-aa) = fbf4c14dec40fc1e5aa5009625c6465bc8d763ab
 SHA1 (patch-ab) = 0d11d58b7f84d4f57526a38e7fc0d2a68aa4ce3f
diff --git a/cad/felt/patches/patch-aa b/cad/felt/patches/patch-aa
index 76367cfcedb..226d81ab97d 100644
--- a/cad/felt/patches/patch-aa
+++ b/cad/felt/patches/patch-aa
@@ -1,12 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2001/04/07 19:00:10 jtb Exp $
+$NetBSD: patch-aa,v 1.5 2001/05/22 16:48:59 jlam Exp $
 
---- etc/Makefile.conf.orig	Sun Mar  5 01:37:06 2000
-+++ etc/Makefile.conf
-@@ -1,26 +1,22 @@
+--- etc/Makefile.conf.orig	Sat Mar  4 20:37:06 2000
++++ etc/Makefile.conf	Tue May 22 12:21:18 2001
+@@ -1,26 +1,26 @@
 -AR		= ar
 -CC		= gcc
 -CCOPTS		= -O3 -g
-+CCOPTS		= -O2
++#AR		= ar
++#CC		= gcc
++#CCOPTS		= -O3 -g
  CONTRIBDIR	= none
  CONTRIBFLAGS	= 
 -CPP		= /lib/cpp
@@ -15,11 +17,12 @@ $NetBSD: patch-aa,v 1.4 2001/04/07 19:00:10 jtb Exp $
 -DESTMAN		= /usr/local/man
 -INSTALL		= sh $(TOPDIR)/etc/install.sh -c
 -LDOPTS		= -g
++#CPP		= /lib/cpp
 +DESTBIN		= ${PREFIX}/bin
 +DESTLIB		= ${PREFIX}/share/felt
 +DESTMAN		= ${PREFIX}/man
-+INSTALL		= /bin/sh $(TOPDIR)/etc/install.sh -c
-+LDOPTS		= -s -Wl,-R${X11BASE}/lib
++INSTALL		= ${SH} $(TOPDIR)/etc/install.sh -c
++#LDOPTS		= -g
  LIBELT		= $(TOPDIR)/lib/Elements/libelt.a
  LIBFELT		= $(TOPDIR)/lib/Felt/libfelt.a
  LIBGEN		= $(TOPDIR)/lib/Generate/libgen.a
@@ -28,15 +31,16 @@ $NetBSD: patch-aa,v 1.4 2001/04/07 19:00:10 jtb Exp $
  LIBWIDGETS	= $(TOPDIR)/lib/Widgets/libwidgets.a
 -MKDIR		= sh $(TOPDIR)/etc/mkdirhier.sh
 -RANLIB		= ranlib
-+MKDIR		= /bin/sh $(TOPDIR)/etc/mkdirhier.sh
++MKDIR		= ${SH} $(TOPDIR)/etc/mkdirhier.sh
++#RANLIB		= ranlib
  READLINE	= -DREADLINE
 -READLIBS	= -L/usr/lib -lreadline -ltermcap
-+READLIBS	= -L${RL_PREFIX}/lib -Wl,-R${RL_PREFIX}/lib -lreadline -ltermcap
++READLIBS	= -lreadline -ltermcap
  RM		= rm -f
  SYSLIBS		=
 -X11DEF		= /usr/X11R6/lib/X11/app-defaults
 -X11INC		= /usr/X11R6/include
 -X11LIB		= /usr/X11R6/lib
-+X11DEF		= ${X11BASE}/lib/X11/app-defaults
++X11DEF		= ${PREFIX}/lib/X11/app-defaults
 +X11INC		= ${X11BASE}/include
 +X11LIB		= ${X11BASE}/lib