Wed Nov 30 15:09:22 2011 UTC ()
Fix perl version.mk botch.


(hans)
diff -r1.236 -r1.237 pkgsrc/mk/tools/replace.mk
cvs diff -r1.236 -r1.237 pkgsrc/mk/tools/replace.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/replace.mk 2011/11/29 18:00:56 1.236
+++ pkgsrc/mk/tools/replace.mk 2011/11/30 15:09:22 1.237
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: replace.mk,v 1.236 2011/11/29 18:00:56 hans Exp $ 1# $NetBSD: replace.mk,v 1.237 2011/11/30 15:09:22 hans Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -869,26 +869,27 @@ TOOLS_VALUE_GNU.yacc= ${TOOLS_CMDLINE.y @@ -869,26 +869,27 @@ TOOLS_VALUE_GNU.yacc= ${TOOLS_CMDLINE.y
869 869
870###################################################################### 870######################################################################
871 871
872# These tools are all supplied by the lang/perl5 package if there is 872# These tools are all supplied by the lang/perl5 package if there is
873# no native tool available. 873# no native tool available.
874# 874#
875_TOOLS.perl= perl perldoc pod2html pod2man 875_TOOLS.perl= perl perldoc pod2html pod2man
876 876
877.for _t_ in ${_TOOLS.perl} 877.for _t_ in ${_TOOLS.perl}
878. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 878. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
879. if !empty(PKGPATH:Mlang/perl5) 879. if !empty(PKGPATH:Mlang/perl5)
880MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 880MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
881. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 881. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 882. include "../../lang/perl5/version.mk"
882TOOLS_DEPENDS.${_t_}?= perl>=${PERL5_REQD}:../../lang/perl5 883TOOLS_DEPENDS.${_t_}?= perl>=${PERL5_REQD}:../../lang/perl5
883TOOLS_CREATE+= ${_t_} 884TOOLS_CREATE+= ${_t_}
884TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=perl 885TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=perl
885TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} 886TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
886. endif 887. endif
887. endif 888. endif
888.endfor 889.endfor
889 890
890# These tools are all supplied by the sysutils/coreutils package if 891# These tools are all supplied by the sysutils/coreutils package if
891# there is no native tool available. 892# there is no native tool available.
892# 893#
893_TOOLS.coreutils= basename cat chgrp chmod chown cp cut date \ 894_TOOLS.coreutils= basename cat chgrp chmod chown cp cut date \
894 dirname echo env expr false head hostname id \ 895 dirname echo env expr false head hostname id \