summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjlam <jlam>2005-05-22 20:07:36 +0000
committerjlam <jlam>2005-05-22 20:07:36 +0000
commit9de24f22bc36b6b4056ab56dd2c15fffe3e8413e (patch)
treeed91fd903dcb96e6914328617419b0659c2bb9f1 /print
parent5bc50cfa0e921c9ff61145c62023b2e2dcc094f1 (diff)
downloadpkgsrc-9de24f22bc36b6b4056ab56dd2c15fffe3e8413e.tar.gz
Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS -> USE_TOOLS awk -> gawk m4 -> gm4 make -> gmake sed -> gsed yacc -> bison
Diffstat (limited to 'print')
-rw-r--r--print/LPRng-core/Makefile4
-rw-r--r--print/a2ps/Makefile4
-rw-r--r--print/advi/Makefile4
-rw-r--r--print/auctex/Makefile4
-rw-r--r--print/chktex/Makefile4
-rw-r--r--print/cups/Makefile4
-rw-r--r--print/enscript/Makefile4
-rw-r--r--print/foomatic-filters/Makefile4
-rw-r--r--print/ggv2/Makefile4
-rw-r--r--print/ghostscript-esp/Makefile.common4
-rw-r--r--print/ghostscript-gnu/Makefile.common4
-rw-r--r--print/ghostscript-nox11/Makefile.common4
-rw-r--r--print/gimp-print-cups/Makefile4
-rw-r--r--print/gimp-print-escputil/Makefile4
-rw-r--r--print/gimp-print-ijs/Makefile4
-rw-r--r--print/gimp-print-lib/Makefile4
-rw-r--r--print/gimp-print/Makefile4
-rw-r--r--print/glabels/Makefile4
-rw-r--r--print/gpdf/Makefile4
-rw-r--r--print/gv/Makefile4
-rw-r--r--print/ijs/Makefile4
-rw-r--r--print/imposter/Makefile4
-rw-r--r--print/ja-vfxdvik/Makefile4
-rw-r--r--print/libgnomeprint/Makefile4
-rw-r--r--print/libgnomeprintui/Makefile4
-rw-r--r--print/lilypond/Makefile4
-rw-r--r--print/magicfilter/Makefile4
-rw-r--r--print/pdflib/Makefile.common4
-rw-r--r--print/psify/Makefile4
-rw-r--r--print/scribus/Makefile4
-rw-r--r--print/teTeX-bin/Makefile.common4
-rw-r--r--print/teTeX-share/Makefile4
-rw-r--r--print/teTeX1-bin/Makefile4
-rw-r--r--print/teTeX1-share/Makefile4
-rw-r--r--print/teTeX3-bin/Makefile.common4
-rw-r--r--print/teTeX3-texmf/Makefile4
-rw-r--r--print/texfamily/Makefile4
-rw-r--r--print/transfig/Makefile4
-rw-r--r--print/xpp/Makefile4
39 files changed, 78 insertions, 78 deletions
diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index ab487876670..46fb6622942 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:27 jlam Exp $
DISTNAME= LPRng-3.8.28
PKGNAME= LPRng-core-3.8.28
@@ -14,7 +14,7 @@ COMMENT= Enhanced Printer Spooler
CONFLICTS+= cups-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 1026d45a16a..8a4c2da4e02 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:27 jlam Exp $
DISTNAME= a2ps-4.13b
PKGNAME= a2ps-4.13.0.2
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/a2ps-4.13
STRIP= # empty
USE_PERL5= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= YES
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 99c268d9776..e6cd1aea21a 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:27 jlam Exp $
DISTNAME= advi-1.6.0
CATEGORIES= print
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= ocaml>=3.04:../../lang/ocaml
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
post-extract:
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 065c6e86a0e..6f55a517554 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:27 jlam Exp $
DISTNAME= auctex-11.13
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.nongnu.org/auctex/
COMMENT= Enhanced LaTeX mode for Emacs
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
TEX_PREFIX_DEFAULT= ${LOCALBASE}
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index a569cfbf239..0e9665e50e5 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:27 jlam Exp $
#
DISTNAME= chktex-1.6.1
@@ -12,7 +12,7 @@ COMMENT= LaTeX semantic checker
DEPENDS+= lynx-[0-9]*:../../www/lynx
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
GNU_CONFIGURE= YES
CFLAGS+= -D__unix__
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 139c29abf00..d485ae53450 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.92 2005/05/22 20:08:27 jlam Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -33,7 +33,7 @@ UNLIMIT_RESOURCES= datasize memorysize
USE_LANGUAGES= c c++ # pdftops is a C++ application
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
INSTALL_TARGET= installcups
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index 853a6dfa064..4fd155644af 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:27 jlam Exp $
#
DISTNAME= enscript-1.6.3
@@ -15,7 +15,7 @@ DEPENDS+= papersize-[0-9]*:../../print/papersize
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}"
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 9422f5e353e..50b86c61c2c 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/28 22:29:43 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:27 jlam Exp $
DISTNAME= foomatic-filters-3.0.2
CATEGORIES= print
@@ -25,7 +25,7 @@ CONFIGURE_ENV+= CUPS=${LOCALBASE}/share/cups
CONFIGURE_ENV+= CUPS_FILTERS=${LOCALBASE}/lib/cups/filter
CONFIGURE_ENV+= PRINTCAP=/etc/printcap
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
USE_PKGINSTALL= yes
PERL5_REQD= 5.6
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 1e670cb8e7c..1068dc52cc6 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:27 jlam Exp $
#
DISTNAME= ggv-2.8.4
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
GCONF2_SCHEMAS= ggv.schemas
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 12478726188..1801f73863a 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.22 2005/05/22 20:08:27 jlam Exp $
DISTNAME= espgs-${GS_VERS}-source
BASEGS_VERS= 7.07
@@ -23,7 +23,7 @@ DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ijs
CONFIGURE_ARGS+= --with-gimp-print
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
index 9b35094b439..b807f07f03a 100644
--- a/print/ghostscript-gnu/Makefile.common
+++ b/print/ghostscript-gnu/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:08:27 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 7.07
@@ -16,7 +16,7 @@ CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-ijs
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 99e74f1c64e..facd4c34b81 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.58 2005/05/22 20:08:27 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
@@ -19,7 +19,7 @@ DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
DEPENDS+= watanabe-vfont-19930318:../../fonts/watanabe_vfont
WRKSRC= ${WRKDIR}/gs${GS_VERS}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
GS_SRCS= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index f1ba04afc79..9c877cd2e3d 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:27 jlam Exp $
DISTNAME= gimp-print-4.2.7
PKGNAME= gimp-print-cups-4.2.7
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= GIMP print plugin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index f90fe14c1be..baae1e28615 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gimp-print-4.2.7
PKGNAME= gimp-print-escputil-4.2.7
@@ -13,7 +13,7 @@ COMMENT= Epson Stylus inkjet printer tool
BUILDLINK_DEPMETHOD.gimp-print-lib= build
CONFLICTS+= gimp<=1.2.3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-libgimpprint=no
diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile
index 1b4261a1b03..4410c7cbcd2 100644
--- a/print/gimp-print-ijs/Makefile
+++ b/print/gimp-print-ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gimp-print-4.2.6
PKGNAME= gimp-print-ijs-4.2.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= GIMP print IJS server
USE_LIBTOOL= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-ijs
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index cf0559adb26..63823713be0 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gimp-print-4.2.7
PKGNAME= gimp-print-lib-4.2.7
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= Drivers for Canon, Epson, Lexmark, and PCL printers
-USE_GNU_TOOLS+= make lex
+USE_TOOLS+= gmake lex
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
INFO_FILES= gimpprint.info
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 6f998a0cff4..052be3c6711 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gimp-print-4.2.7
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= GIMP print plugin
CONFLICTS+= gimp<=1.2.3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 4ec01a12467..cb26cd65efe 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/29 04:48:24 reed Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= glabels-2.0.2
@@ -13,7 +13,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index faf10157f7c..8c19d8a7b74 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= gpdf-2.10.0
@@ -13,7 +13,7 @@ COMMENT= GNOME 2 version of xpdf
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 9c206946a74..5690dcbce63 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/18 13:20:57 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gv-3.6.1
CATEGORIES= print
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.gnu.org/software/gv/
COMMENT= PostScript and PDF previewer
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_MAKEINFO= yes
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index 6744a45deed..7179935fa79 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:28 jlam Exp $
DISTNAME= ijs-0.34
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.linuxprinting.org/ijs/
COMMENT= Protocol library for raster page transmission
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
diff --git a/print/imposter/Makefile b/print/imposter/Makefile
index 00d9d8e93d6..bf1d8fb9bc2 100644
--- a/print/imposter/Makefile
+++ b/print/imposter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= imposter-0.2
@@ -13,7 +13,7 @@ COMMENT= Standalone OpenOffice presentations viewer using GTK2
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index 1185341cc5e..ef8e1c9999c 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:28 jlam Exp $
DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS}
PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -25,7 +25,7 @@ DEPENDS+= ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
XDVI_DIR= ${WRKDIR}/${DISTNAME}/texk/xdvik
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/config/config
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 2a4786fda11..6f201ede7d6 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/26 18:07:49 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= libgnomeprint-2.10.3
@@ -12,7 +12,7 @@ COMMENT= Library for the GNOME2 Printing Architecture
BUILD_USES_MSGFMT= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
USE_X11= YES
USE_LIBTOOL= YES
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 77db554e966..6bee92b222a 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/18 16:07:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= libgnomeprintui-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 7bdd2dd5885..d7d70706bcb 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/22 12:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= lilypond-2.4.3
@@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.mftrace+= mftrace>=1.1.0
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
USE_MAKEINFO= YES
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index e5118bea8c9..75b2dca4ded 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:08:28 jlam Exp $
DISTNAME= magicfilter-1.2
PKGREVISION= 3
@@ -15,7 +15,7 @@ DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
DEPENDS+= teTeX-bin-[0-9]*:../../print/teTeX-bin
DEPENDS+= papersize-[0-9]*:../../print/papersize
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ENV+= GHOSTSCRIPT=${LOCALBASE}/bin/gs
diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common
index 07ff62f4d42..78f51946610 100644
--- a/print/pdflib/Makefile.common
+++ b/print/pdflib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/05/22 20:08:28 jlam Exp $
DISTNAME= pdflib-${PDFLIB_DIST_VERS}
PKGREVISION= 1
@@ -20,7 +20,7 @@ DISTINFO_FILE= ${.CURDIR}/../pdflib/distinfo
PATCHDIR= ${.CURDIR}/../pdflib/patches
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-pnglib
CONFIGURE_ARGS+= --with-tifflib
diff --git a/print/psify/Makefile b/print/psify/Makefile
index c18cc9f2b06..0e741d7ba00 100644
--- a/print/psify/Makefile
+++ b/print/psify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= psify-19980216
@@ -15,7 +15,7 @@ DIST_SUBDIR= psify
EXTRACT_ONLY= #empty
NO_CONFIGURE= yes
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
INSTALL_TARGET= install prefix=${PREFIX}
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 7c371a945f4..a7f0f23e60c 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:28 jlam Exp $
DISTNAME= scribus-1.2.1
CATEGORIES= print
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.scribus.net/
COMMENT= Publishing layout with graphical interface
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PTHREAD_OPTS+= require
USE_LIBTOOL= YES
diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common
index 29cd6d52e36..7fc8e6103b4 100644
--- a/print/teTeX-bin/Makefile.common
+++ b/print/teTeX-bin/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.7 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:29 jlam Exp $
TETEX_BIN_VERS= 2.0.2
DIST_SUBDIR= teTeX
BUILD_TARGET= all
INSTALL_TARGET= install strip
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_PKGINSTALL= yes
USE_X11= yes
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index 764d99370d9..eb61548bea1 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/17 22:00:13 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= tetex-texmf-2.0.2
@@ -24,7 +24,7 @@ EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_GNU_TOOLS+= patch
+USE_TOOLS+= patch
.include "../../mk/bsd.prefs.mk"
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index 07570a696e5..e4735f41e62 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:29 jlam Exp $
DISTNAME= teTeX-src-1.0.7
PKGNAME= teTeX-bin-1.0.7
@@ -23,7 +23,7 @@ BUILD_TARGET= all
INSTALL_TARGET= install strip
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= yes
CFLAGS+= -Dunix
diff --git a/print/teTeX1-share/Makefile b/print/teTeX1-share/Makefile
index c1d9086a504..14a93470768 100644
--- a/print/teTeX1-share/Makefile
+++ b/print/teTeX1-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= teTeX-texmf-1.0.2
@@ -19,7 +19,7 @@ EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
NO_MTREE= yes
-USE_GNU_TOOLS+= patch
+USE_TOOLS+= patch
EXTRA_PATCH= ${FILESDIR}/latex.ltx.diff
diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common
index f789a7d69f8..5ee64ca05a7 100644
--- a/print/teTeX3-bin/Makefile.common
+++ b/print/teTeX3-bin/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/05/22 20:08:29 jlam Exp $
TETEX_BIN_VERS= 3.0
DIST_SUBDIR= teTeX
BUILD_TARGET= all
INSTALL_TARGET= install strip
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_PKGINSTALL= yes
USE_X11= yes
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 7c055c0fb6c..4a78080de90 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/18 15:11:13 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= tetex-texmf-3.0
@@ -19,7 +19,7 @@ DIST_SUBDIR= teTeX
EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_GNU_TOOLS+= patch
+USE_TOOLS+= patch
.include "../../mk/bsd.prefs.mk"
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index 8791d3ed38a..36edb9d9274 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/16 01:15:33 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:29 jlam Exp $
DISTNAME= TeXfamily-1.2.1
PKGREVISION= 5
@@ -39,7 +39,7 @@ PKGSRC_USE_TOOLS+= gtar
BUILD_TARGET= all
INSTALL_TARGET= install strip
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
PLIST_SUBST+= MV="${MV}"
CFLAGS+= -Dunix
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 05b8c3bd995..7817ecea6c2 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= transfig.3.2.4
@@ -21,7 +21,7 @@ MAKE_ENV+= DDA4="-DA4"
# We must use GNU make on Linux
.if ${OPSYS} == "Linux"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.endif
.include "../../graphics/png/buildlink3.mk"
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index a6112f5e405..36aa5e7906b 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:29 jlam Exp $
DISTNAME= xpp-1.1
PKGREVISION= 5
@@ -10,7 +10,7 @@ HOMEPAGE= http://cups.sourceforge.net/xpp/index.html
COMMENT= X Printing Panel
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LANGUAGES= c++