Add some defaults for EVAL_PREFIX.

3 files changed, 47 insertions, 38 deletions

diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index ccde290d19e..5e20f58976e 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,24 +1,27 @@
-# $NetBSD: Makefile,v 1.6 2001/04/30 20:56:51 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=	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
-EVAL_PREFIX+=	RL_PREFIX=readline
-USE_X11BASE=	yes
-USE_XAW=	yes
-XAW_TYPE=	3d
+# $NetBSD: Makefile,v 1.7 2001/05/03 22:02:59 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=		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
+XAW_TYPE=		3d
 
 post-extract:
 	@${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index f3028a1bc82..d4a706a2a6c 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,19 +1,26 @@
-# $NetBSD: Makefile,v 1.2 2001/04/14 21:43:39 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/05/03 22:02:59 jtb Exp $
 
-DISTNAME=	qcad-1.4.7-src
-PKGNAME=	qcad-1.4.7
-CATEGORIES=	cad
-MASTER_SITES=	http://www.qcad.org/archives/
+DISTNAME=		qcad-1.4.7-src
+PKGNAME=		qcad-1.4.7
+CATEGORIES=		cad
+MASTER_SITES=		http://www.qcad.org/archives/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.qcad.org/
-COMMENT=	2D CAD System
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.qcad.org/
+COMMENT=		2D CAD System
 
-DEPENDS+=	qt2-libs>=2.2.4:../../x11/qt2-libs
+DEPENDS+=		qt2-libs>=2.2.4:../../x11/qt2-libs
 
-USE_X11=	#defined
-EVAL_PREFIX+=	QT2_PREFIX=qt2 JPEG_PREFIX=jpeg PNG_PREFIX=png
-MAKE_ENV+=	QTDIR=${QT2_PREFIX}/qt2
+USE_X11=		#defined
+
+EVAL_PREFIX+=		QT2_PREFIX=qt2
+MAKE_ENV+=		QTDIR=${QT2_PREFIX}/qt2
+
+JPEG_PREFIX_DEFAULT=	${LOCALBASE}
+EVAL_PREFIX+=		JPEG_PREFIX=jpeg
+
+PNG_PREFIX_DEFAULT=	${LOCALBASE}
+EVAL_PREFIX+=		PNG_PREFIX=png
 
 do-configure:
 	@for f in rappwin.cpp rconfig.cpp relement.cpp rfile.cpp	\
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 9de8f0f0cd4..7c0e4ba7982 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:38 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/03 22:02:59 jtb Exp $
 
 DISTNAME=	xcircuit-2.2.0
 CATEGORIES=	cad graphics
@@ -14,6 +14,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_IMAKE=	yes
 USE_X11BASE=	yes
 USE_XPM=	yes
+
+GS_PREFIX_DEFAULT=	${LOCALBASE}
 EVAL_PREFIX+=	GS_PREFIX=ghostscript
 
 post-extract:
@@ -23,9 +25,6 @@ post-extract:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xcircuit/
-	@for f in ${WRKSRC}/examples/*; do \
-		c="${INSTALL_DATA} $$f ${PREFIX}/share/examples/xcircuit/"; \
-		${ECHO} $$c; $$c; \
-	done
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit/
 
 .include "../../mk/bsd.pkg.mk"