Sat Aug 2 04:27:51 2014 UTC ()
Latest version should be also marked `missing'.
Fixes unwanted execution of {aclocal,automake}-${latest_version} for the
case configure.ac (or something) is patched, but configure is also alredy
regenerated and aclocal and automake are not required (not in USE_TOOLS).
XXX: if {aclocal,automake}-${latest_version} is really required by somewhere,
XXX: it should be created below, same as plain aclocal and automake.


(obache)
diff -r1.21 -r1.22 pkgsrc/mk/tools/automake.mk
cvs diff -r1.21 -r1.22 pkgsrc/mk/tools/automake.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/automake.mk 2013/11/30 06:24:38 1.21
+++ pkgsrc/mk/tools/automake.mk 2014/08/02 04:27:51 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: automake.mk,v 1.21 2013/11/30 06:24:38 richard Exp $ 1# $NetBSD: automake.mk,v 1.22 2014/08/02 04:27:51 obache 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
@@ -68,49 +68,50 @@ @@ -68,49 +68,50 @@
68# To globally prevent any GNU automake handling, set the following 68# To globally prevent any GNU automake handling, set the following
69# in the package Makefile: 69# in the package Makefile:
70# 70#
71# AUTOMAKE_OVERRIDE= no 71# AUTOMAKE_OVERRIDE= no
72# 72#
73 73
74# Only allow one of "automake" and "automake14" in USE_TOOLS. 74# Only allow one of "automake" and "automake14" in USE_TOOLS.
75.if !empty(USE_TOOLS:C/:.*//:Mautomake) && \ 75.if !empty(USE_TOOLS:C/:.*//:Mautomake) && \
76 !empty(USE_TOOLS:C/:.*//:Mautomake14) 76 !empty(USE_TOOLS:C/:.*//:Mautomake14)
77PKG_FAIL_REASON+= "\`\`automake'' and \`\`automake14'' conflict in USE_TOOLS." 77PKG_FAIL_REASON+= "\`\`automake'' and \`\`automake14'' conflict in USE_TOOLS."
78.endif 78.endif
79 79
80# This is an exhaustive list of all of the scripts supplied by GNU 80# This is an exhaustive list of all of the scripts supplied by GNU
81# automake, up to but not including the current version as supplied 81# automake.
82# by the automake package itself. 
83# 82#
84_TOOLS_AM_NAMES= aclocal aclocal-1.4 \ 83_TOOLS_AM_NAMES= aclocal aclocal-1.4 \
85 aclocal-1.5 \ 84 aclocal-1.5 \
86 aclocal-1.6 \ 85 aclocal-1.6 \
87 aclocal-1.7 \ 86 aclocal-1.7 \
88 aclocal-1.8 \ 87 aclocal-1.8 \
89 aclocal-1.9 \ 88 aclocal-1.9 \
90 aclocal-1.10 \ 89 aclocal-1.10 \
91 aclocal-1.11 \ 90 aclocal-1.11 \
92 aclocal-1.12 \ 91 aclocal-1.12 \
93 aclocal-1.13 92 aclocal-1.13 \
 93 aclocal-1.14
94_TOOLS_AM_NAMES+= automake automake-1.4 \ 94_TOOLS_AM_NAMES+= automake automake-1.4 \
95 automake-1.5 \ 95 automake-1.5 \
96 automake-1.6 \ 96 automake-1.6 \
97 automake-1.7 \ 97 automake-1.7 \
98 automake-1.8 \ 98 automake-1.8 \
99 automake-1.9 \ 99 automake-1.9 \
100 automake-1.10 \ 100 automake-1.10 \
101 automake-1.11 \ 101 automake-1.11 \
102 automake-1.12 \ 102 automake-1.12 \
103 automake-1.13 103 automake-1.13 \
 104 automake-1.14
104 105
105.for _t_ in ${_TOOLS_AM_NAMES} 106.for _t_ in ${_TOOLS_AM_NAMES}
106_TOOLS_AM_TYPE.${_t_}?= TOOLS_GNU_MISSING 107_TOOLS_AM_TYPE.${_t_}?= TOOLS_GNU_MISSING
107.endfor 108.endfor
108 109
109.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:C/:.*//:Mautomake) 110.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:C/:.*//:Mautomake)
110. if !empty(PKGPATH:Mdevel/automake) 111. if !empty(PKGPATH:Mdevel/automake)
111MAKEFLAGS+= TOOLS_IGNORE.automake= 112MAKEFLAGS+= TOOLS_IGNORE.automake=
112. else 113. else
113AUTOMAKE_REQD?= 1.9 114AUTOMAKE_REQD?= 1.9
114AUTOCONF_REQD?= 2.58 115AUTOCONF_REQD?= 2.58
115 116
116. if !empty(USE_TOOLS:Mautomake\:run) 117. if !empty(USE_TOOLS:Mautomake\:run)