diff options
| author | jlam <jlam> | 2005-07-16 01:19:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-07-16 01:19:06 +0000 |
| commit | 4ff5f6ae062a1143c9d2a08f5e33e22d43752ad6 (patch) | |
| tree | fb130b4b27029c9f82bb28dd306abe9510817ec8 /mk | |
| parent | 054fad736d18fc06e189e90dc8c9836148b80ecb (diff) | |
| download | pkgsrc-4ff5f6ae062a1143c9d2a08f5e33e22d43752ad6.tar.gz | |
Get rid of USE_PERL5. The new way to express needing the Perl executable
around at either build-time or at run-time is:
USE_TOOLS+= perl # build-time
USE_TOOLS+= perl:run # run-time
Also remove some places where perl5/buildlink3.mk was being included
by a package Makefile, but all that the package wanted was the Perl
executable.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8e49d1d8c17..1dd0b5551e1 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1707 2005/07/15 18:27:54 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1708 2005/07/16 01:19:27 jlam Exp $ # # This file is in the public domain. # @@ -4225,7 +4225,7 @@ pre-install-fake-pkg: . if !empty(USE_LANGUAGES) @${ECHO} "CC_VERSION=${CC_VERSION}" >> ${BUILD_INFO_FILE} . endif -. if defined(USE_PERL5) && (${USE_PERL5} == "run") +. if !empty(USE_TOOLS:Mperl\:run) @${ECHO} "PERL=`${PERL5} --version 2>/dev/null | ${GREP} 'This is perl'`" >> ${BUILD_INFO_FILE} . endif . if defined(_USE_GMAKE) || !empty(USE_TOOLS:Mgmake) diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 97c5d6a4aaa..b44b58badf4 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.109 2005/07/15 20:14:04 jlam Exp $ +# $NetBSD: replace.mk,v 1.110 2005/07/16 01:19:27 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -75,17 +75,6 @@ # USE_TOOLS+= perl:run # -# Continue to allow USE_PERL5 until packages have been taught to use the -# new syntax. -# -.if defined(USE_PERL5) -. if empty(USE_PERL5:Mbuild) -USE_TOOLS+= perl:run -. else -USE_TOOLS+= perl -. endif -.endif - # XXX Keep this hack here until the day that msgfmt and msgfmt-plurals # XXX is handled directly by the tools framework. # XXX |