[pkgsrc/trunk]: pkgsrc Remove some unnecessarily strong dependencies on perl ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e0f6f63be06
branches:  trunk
changeset: 496933:2e0f6f63be06
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Jul 16 19:10:37 2005 +0000

description:
Remove some unnecessarily strong dependencies on perl that resulted
from including perl5/buildlink3.mk.  These packages just need the Perl
interpreter, and can just add "perl" to USE_TOOLS instead.

diffstat:

 audio/disc-cover/Makefile               |  4 ++--
 audio/ices-mp3/Makefile                 |  4 ++--
 benchmarks/hbench/Makefile              |  4 ++--
 benchmarks/lmbench/Makefile             |  5 ++---
 biology/mummer/Makefile                 |  5 ++---
 cad/spiceprm/Makefile                   |  4 ++--
 chat/sirc/Makefile                      |  4 ++--
 comms/fidogate/Makefile                 |  5 ++---
 comms/pilot-link/Makefile               |  5 ++---
 converters/rpm2cpio/Makefile            |  4 ++--
 converters/txt2html/Makefile            |  4 ++--
 databases/gnome-mime-data/buildlink3.mk |  9 +++++++--
 databases/jdb/Makefile                  |  4 ++--
 devel/autoconf/Makefile                 |  5 ++---
 devel/autoconf213/Makefile              |  5 ++---
 devel/automake/Makefile                 |  5 ++---
 devel/automake14/Makefile               |  4 ++--
 devel/global/Makefile                   |  4 ++--
 devel/sdcc/Makefile                     |  5 +++--
 devel/tet3/Makefile                     |  4 ++--
 editors/vile/Makefile                   |  4 ++--
 editors/xvile/Makefile                  |  4 ++--
 games/minami/Makefile                   |  4 ++--
 games/netmaj/Makefile                   |  4 ++--
 games/openmortal/Makefile               |  3 +--
 games/xboard/Makefile                   |  4 ++--
 graphics/claraocr/Makefile              |  6 +++---
 graphics/gnome-icon-theme/buildlink3.mk |  8 ++++++--
 inputmethod/xcin/Makefile               |  4 ++--
 lang/cim/Makefile                       |  4 ++--
 lang/dylan-interpreter/Makefile.common  |  5 ++---
 mail/demime/Makefile                    |  4 ++--
 mail/faces/Makefile                     |  4 ++--
 mail/ja-squirrelmail/Makefile           |  4 ++--
 mail/squirrelmail/Makefile              |  4 ++--
 math/pari/Makefile                      |  4 ++--
 misc/gkrellm-weather/Makefile           |  5 ++---
 misc/openoffice/Makefile                |  3 +--
 misc/vfu/Makefile                       |  4 ++--
 net/ddclient/Makefile                   |  4 ++--
 net/freewais-sf/Makefile                |  4 ++--
 net/net-snmp/Makefile                   |  3 +--
 news/inn/Makefile                       |  5 ++---
 pkgtools/pkgdiff/Makefile               |  4 ++--
 print/chktex/Makefile                   |  5 ++---
 security/fprot-workstation-bin/Makefile |  4 ++--
 shells/mudsh/Makefile                   |  4 ++--
 sysutils/stow/Makefile                  |  4 ++--
 textproc/gtk-doc/Makefile               |  4 ++--
 textproc/html2wml/Makefile              |  4 ++--
 textproc/intltool/Makefile              |  5 ++---
 textproc/intltool/buildlink3.mk         |  4 +---
 textproc/kdoc/Makefile                  |  6 +++---
 textproc/libxslt/Makefile               |  3 +--
 textproc/libxslt/buildlink3.mk          |  3 +--
 textproc/texi2html/Makefile             |  8 ++++----
 time/titrax/Makefile                    |  4 ++--
 wm/bbkeys/Makefile                      |  5 ++---
 www/apache2/Makefile                    |  4 ++--
 www/bannerfilter/Makefile               |  4 ++--
 www/bins/Makefile                       |  6 ++++--
 www/screws/Makefile                     |  4 ++--
 www/wdg-validate/Makefile               |  4 ++--
 www/weblint/Makefile                    |  5 ++---
 x11/gdkxft/Makefile                     |  4 ++--
 x11/p5-gtk/Makefile.subpackage          |  4 +---
 x11/xephem/Makefile                     |  4 ++--
 67 files changed, 143 insertions(+), 154 deletions(-)

diffs (truncated from 1517 to 300 lines):

diff -r ded423b71777 -r 2e0f6f63be06 audio/disc-cover/Makefile
--- a/audio/disc-cover/Makefile Sat Jul 16 18:57:17 2005 +0000
+++ b/audio/disc-cover/Makefile Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 19:10:37 jlam Exp $
 #
 
 DISTNAME=      disc-cover-1.5.4
@@ -11,6 +11,7 @@
 
 DEPENDS+=      p5-Audio-CD>=0.05:../../audio/p5-Audio-CD
 
+USE_TOOLS+=            perl:run
 REPLACE_PERL=          disc-cover
 
 DCTMPL=        ${PREFIX}/share/disc-cover/templates
@@ -29,5 +30,4 @@
        ${INSTALL_DATA_DIR} ${DCTMPL}
        ${INSTALL_DATA} ${WRKSRC}/templates/* ${DCTMPL}
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 audio/ices-mp3/Makefile
--- a/audio/ices-mp3/Makefile   Sat Jul 16 18:57:17 2005 +0000
+++ b/audio/ices-mp3/Makefile   Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/24 05:56:25 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:37 jlam Exp $
 #
 
 DISTNAME=              ices-${ICES_VERSION}
@@ -59,7 +59,7 @@
 .include "../../audio/libvorbis/buildlink3.mk"
 .if defined(ICES_USE_PERL) && (${ICES_USE_PERL} == "YES")
 PERL5_REQD+=           5.8.0
-.include "../../lang/perl5/buildlink3.mk"
+USE_TOOLS+=            perl:run
 CONFIGURE_ARGS+=       --with-perl=${PERL5}
 .endif
 .if defined(ICES_USE_PYTHON) && (${ICES_USE_PYTHON} == "YES")
diff -r ded423b71777 -r 2e0f6f63be06 benchmarks/hbench/Makefile
--- a/benchmarks/hbench/Makefile        Sat Jul 16 18:57:17 2005 +0000
+++ b/benchmarks/hbench/Makefile        Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/16 19:10:37 jlam Exp $
 
 DISTNAME=              hbench-OS-1.0
 PKGNAME=               hbench-1.0
@@ -17,6 +17,7 @@
 WRKSRC=                        ${WRKDIR}/hbench-OS
 OSVERSION_SPECIFIC=    YES
 BUILD_TARGET=          build
+USE_TOOLS+=            perl:run
 
 DIST_SUBDIR=           ${PKGNAME_NOREV}
 
@@ -55,5 +56,4 @@
        -@cd ${WRKSRC} ; \
        tar -cf /tmp/benches/`domainname`/hbench.`uname`-`uname -m`-`uname -r`.`hostname`.tar results conf
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 benchmarks/lmbench/Makefile
--- a/benchmarks/lmbench/Makefile       Sat Jul 16 18:57:17 2005 +0000
+++ b/benchmarks/lmbench/Makefile       Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 19:10:38 jlam Exp $
 
 DISTNAME=              lmbench-2alpha11
 PKGNAME=               lmbench-2.11a
@@ -12,7 +12,7 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake perl:run
 BUILD_TARGET=          build
 MAKE_ENV+=             MACHINE_ARCH=${MACHINE_ARCH}
 
@@ -60,5 +60,4 @@
        -@cd ${PREFIX}/share/lmbench ; \
        tar -cf /tmp/benches/`domainname`/lmbench.`uname`-`uname -m`-`uname -r`.`hostname`.tar results
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 biology/mummer/Makefile
--- a/biology/mummer/Makefile   Sat Jul 16 18:57:17 2005 +0000
+++ b/biology/mummer/Makefile   Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/19 01:13:23 kristerw Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:38 jlam Exp $
 #
 
 DISTNAME=              MUMmer3.15
@@ -12,7 +12,7 @@
 COMMENT=               System for aligning whole genome sequences
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake perl:run
 
 MAKE_ENV+=             SH="${SH}"
 MAKE_ENV+=             PERL="${PERL5}"
@@ -45,5 +45,4 @@
        ${INSTALL_DATA} ${WRKSRC}/docs/${DOC} ${PREFIX}/share/doc/mummer
 .endfor
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 cad/spiceprm/Makefile
--- a/cad/spiceprm/Makefile     Sat Jul 16 18:57:17 2005 +0000
+++ b/cad/spiceprm/Makefile     Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 19:10:38 jlam Exp $
 #
 
 DISTNAME=      spiceprm-0.11
@@ -10,6 +10,7 @@
 
 WRKSRC=                        ${WRKDIR}/spiceprm
 NO_BUILD=              YES
+USE_TOOLS+=            perl:run
 REPLACE_PERL=          spiceprm
 INSTALLATION_DIRS=     bin
 
@@ -20,5 +21,4 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/spiceprm
        ${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${PREFIX}/share/examples/spiceprm
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 chat/sirc/Makefile
--- a/chat/sirc/Makefile        Sat Jul 16 18:57:17 2005 +0000
+++ b/chat/sirc/Makefile        Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 19:10:38 jlam Exp $
 
 DISTNAME=      sirc-2.211
 PKGREVISION=   1
@@ -20,6 +20,7 @@
 BUILD_DEFS+=   USE_INET6
 
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
+USE_TOOLS+=    perl:run
 SIRC_SCRIPTS= \
                adcc.pl                         \
                akickban.pl                     \
@@ -78,5 +79,4 @@
                ${ECHO} installing $$i ; \
                ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$i ${PREFIX}/lib/sirc/scripts/$$i ; done
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 comms/fidogate/Makefile
--- a/comms/fidogate/Makefile   Sat Jul 16 18:57:17 2005 +0000
+++ b/comms/fidogate/Makefile   Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/07/16 19:10:38 jlam Exp $
 #
 
 DISTNAME=      fidogate-4.4.9
@@ -11,7 +11,7 @@
 COMMENT=       FidoNet (FTN) <-> Internet mail and news gateway
 
 USE_PKGINSTALL=                yes
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake perl:run
 MAKE_ENV=              DEBUG="${CFLAGS} -Werror"
 BUILDLINK_SETENV.CC=   CC="cc ${_STRIPFLAG_CC}"
 
@@ -65,5 +65,4 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/fidogate.txt ${PREFIX}/share/doc/fidogate
        ${INSTALL_DATA} ${WRKSRC}/fidogate.conf ${EGDIR}
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 comms/pilot-link/Makefile
--- a/comms/pilot-link/Makefile Sat Jul 16 18:57:17 2005 +0000
+++ b/comms/pilot-link/Makefile Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/01 18:02:41 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 19:10:38 jlam Exp $
 
 .include "../../comms/pilot-link/Makefile.common"
 
@@ -8,7 +8,7 @@
 
 BUILDLINK_DEPENDS.pilot-link-libs=     pilot-link-libs>=${PILOT_LINK_VERS}
 
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake perl:run
 USE_GNU_READLINE=      YES
 
 CONFIGURE_ARGS+=       --with-perl5=${PERL5}
@@ -32,7 +32,6 @@
 .include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
diff -r ded423b71777 -r 2e0f6f63be06 converters/rpm2cpio/Makefile
--- a/converters/rpm2cpio/Makefile      Sat Jul 16 18:57:17 2005 +0000
+++ b/converters/rpm2cpio/Makefile      Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 19:10:38 jlam Exp $
 
 DISTNAME=      rpm2cpio
 PKGNAME=       rpm2cpio-1.1
@@ -14,6 +14,7 @@
 WRKSRC=                ${WRKDIR}
 
 DIST_SUBDIR=   ${PKGNAME_NOREV}
+USE_TOOLS+=    perl:run
 REPLACE_PERL=  rpm2cpio
 
 EXTRACT_CMD=   ${CP} ${DOWNLOADED_DISTFILE} .
@@ -27,5 +28,4 @@
 do-install:
        ${INSTALL_SCRIPT} ${WRKDIR}/rpm2cpio ${PREFIX}/bin/rpm2cpio.pl
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 converters/txt2html/Makefile
--- a/converters/txt2html/Makefile      Sat Jul 16 18:57:17 2005 +0000
+++ b/converters/txt2html/Makefile      Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 19:10:38 jlam Exp $
 
 DISTNAME=      txt2html-1.28
 CATEGORIES=    converters www
@@ -9,6 +9,7 @@
 COMMENT=       Text to HTML converter
 
 NO_BUILD=      YES
+USE_TOOLS+=    perl:run
 REPLACE_PERL=  txt2html.pl
 
 INSTALLATION_DIRS=     bin
@@ -25,5 +26,4 @@
        ${INSTALL_DATA} ${WRKSRC}/sample.html ${PREFIX}/share/txt2html
        ${INSTALL_DATA} ${WRKSRC}/sample.txt ${PREFIX}/share/txt2html
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 databases/gnome-mime-data/buildlink3.mk
--- a/databases/gnome-mime-data/buildlink3.mk   Sat Jul 16 18:57:17 2005 +0000
+++ b/databases/gnome-mime-data/buildlink3.mk   Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:09 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/07/16 19:10:38 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GNOME_MIME_DATA_BUILDLINK3_MK:=        ${GNOME_MIME_DATA_BUILDLINK3_MK}+
@@ -13,9 +13,14 @@
 .if !empty(GNOME_MIME_DATA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-mime-data+=    gnome-mime-data>=2.4.0
 BUILDLINK_PKGSRCDIR.gnome-mime-data?=  ../../databases/gnome-mime-data
+
+# intltool-{extract,merge,update} are Perl scripts included in the sources
+# of packages that use gnome-mime-data and are executed during build.
+#
+USE_TOOLS+=    perl
+
 .endif # GNOME_MIME_DATA_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r ded423b71777 -r 2e0f6f63be06 databases/jdb/Makefile
--- a/databases/jdb/Makefile    Sat Jul 16 18:57:17 2005 +0000
+++ b/databases/jdb/Makefile    Sat Jul 16 19:10:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 19:10:38 jlam Exp $
 
 DISTNAME=      jdb-1.13
 CATEGORIES=    databases
@@ -9,9 +9,9 @@
 COMMENT=       Commands for manipulating flat-ASCII databases
 
 GNU_CONFIGURE=         # defined
+USE_TOOLS+=            perl:run
 
 CONFIGURE_ARGS+=       --with-perl=${LOCALBASE}/bin
 CONFIGURE_ARGS+=       --datadir=${PREFIX}/share/jdb
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ded423b71777 -r 2e0f6f63be06 devel/autoconf/Makefile