Get rid of some use of __NetBSD__. "values.h" is either inexistant or

deprecated on most systems.

1 files changed, 31 insertions, 62 deletions

diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index 1219f48ce42..9f17b10a6c1 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/03 19:22:23 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/11 21:31:59 jtb Exp $
 
 DISTNAME=		tcm-2.01.src
 PKGNAME=		tcm-2.01
@@ -11,15 +11,19 @@ COMMENT=		TCM - Toolkit for Conceptual Modeling
 
 WRKSRC=			${WRKDIR}/tcm-2.01/src
 
-HAS_CONFIGURE=		#defined
+HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${SCRIPTDIR}/configure
-USE_X11=		#defined
-USE_X11BASE=		#defined
-USE_MOTIF=		#defined
+
+USE_X11=		yes
+USE_X11BASE=		yes
+USE_MOTIF=		yes
+
 MAKE_ENV+=		XWIN_HOME="${X11BASE}"
 MAKE_ENV+=		MOTIF_HOME="${MOTIFBASE}"
+
 TCM_SRC=		${WRKDIR}/tcm-2.01
 MAKE_ENV+=		TCM_HOME=${TCM_SRC}
+
 ALL_TARGET=		depend all
 
 post-extract:
@@ -29,80 +33,45 @@ do-configure:
 	${CONFIGURE_SCRIPT} ${WRKSRC}
 
 do-install:
-	@for f in tcm tcmd tcmt text2ps; do				\
-	i="${INSTALL_PROGRAM} ${TCM_SRC}/bin/$$f			\
-	${PREFIX}/bin/";						\
-	${ECHO} $$i; $$i;						\
-	done
-	@for f in tatd tcpd tcrd tdfd tdpd tefd terd tesd tfrt tgd	\
+	cd ${TCM_SRC}/bin && ${INSTALL_PROGRAM} tcm tcmd tcmt text2ps 	\
+		${PREFIX}/bin/
+	for f in tatd tcpd tcrd tdfd tdpd tefd terd tesd tfrt tgd	\
 	tgtt tpsd trpg tsnd tssd tstd tucd; do				\
 	${LN} -fs ${PREFIX}/bin/tcmd ${PREFIX}/bin/$$f;			\
 	done
-	@for f in tfet tgt ttdt ttut; do				\
+	for f in tfet tgt ttdt ttut; do					\
 	${LN} -fs ${PREFIX}/bin/tcmt ${PREFIX}/bin/$$f;			\
 	done
 	${INSTALL_SCRIPT} ${TCM_SRC}/bin/psf ${PREFIX}/bin
 	${INSTALL_DATA} ${TCM_SRC}/lib/tcm.conf ${PREFIX}/etc
-
-	${INSTALL_DATA} ${TCM_SRC}/lib/TCM				\
-	${PREFIX}/lib/X11/app-defaults/
-	@for f in ${TCM_SRC}/man/man1/*.1; do				\
-	i="${INSTALL_MAN} $$f ${PREFIX}/man/man1/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/lib/TCM ${PREFIX}/lib/X11/app-defaults/
+	${INSTALL_DATA} ${TCM_SRC}/man/man1/*.1 ${PREFIX}/man/man1/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tcm
 	${INSTALL_DATA} ${TCM_SRC}/lib/colorrgb.txt ${PREFIX}/share/tcm
 	${INSTALL_DATA} ${TCM_SRC}/lib/banner.ps ${PREFIX}/share/tcm
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tcm/help
-	@for f in ${TCM_SRC}/lib/help/* ${TCM_SRC}/CHANGELOG 		\
-	${TCM_SRC}/COPYING; do					   	\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/tcm/help/";		\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${TCM_SRC} && ${INSTALL_DATA} COPYING CHANGELOG lib/help/* 	\
+		${PREFIX}/share/tcm/help/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcm
-	@for f in README COPYING CHANGELOG; do				\
-	i="${INSTALL_DATA} ${TCM_SRC}/$$f				\
-	${PREFIX}/share/doc/tcm/";					\
-	${ECHO} $$i; $$i;						\
-	done
-	@for f in ${TCM_SRC}/doc/*.ps.gz; do				\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/doc/tcm/";		\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${TCM_SRC} && ${INSTALL_DATA} README COPYING CHANGELOG 	\
+		${PREFIX}/share/doc/tcm/
+	${INSTALL_DATA} ${TCM_SRC}/doc/*.ps.gz ${PREFIX}/share/doc/tcm/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm
-	@for f in ${TCM_SRC}/doc/*.html; do				\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/doc/html/tcm/";		\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/*.html ${PREFIX}/share/doc/html/tcm/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/developersguide
-	@for f in ${TCM_SRC}/doc/developersguide/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/developersguide/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/developersguide/* 		\
+		${PREFIX}/share/doc/html/tcm/developersguide/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/sourcecode
-	@for f in ${TCM_SRC}/doc/sourcecode/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/sourcecode/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/sourcecode/* 			\
+		${PREFIX}/share/doc/html/tcm/sourcecode/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/specifications
-	@for f in ${TCM_SRC}/doc/specifications/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/specifications/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/specifications/* 		\
+		${PREFIX}/share/doc/html/tcm/specifications/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/usersguide
-	@for f in ${TCM_SRC}/doc/usersguide/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/usersguide/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/usersguide/* 			\
+		${PREFIX}/share/doc/html/tcm/usersguide/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/wishlist
-	@for f in ${TCM_SRC}/doc/wishlist/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/wishlist/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/wishlist/* 			\
+		${PREFIX}/share/doc/html/tcm/wishlist/
 
 .include "../../mk/bsd.pkg.mk"