pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Support the automake17 package, and for now,



details:   https://anonhg.NetBSD.org/pkgsrc/rev/601907e024de
branches:  trunk
changeset: 464552:601907e024de
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 12 19:06:34 2003 +0000

description:
Support the automake17 package, and for now,
default to it until all packages have been fixed.

diffstat:

 mk/automake.mk |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (36 lines):

diff -r 452cc0d58635 -r 601907e024de mk/automake.mk
--- a/mk/automake.mk    Fri Dec 12 19:05:39 2003 +0000
+++ b/mk/automake.mk    Fri Dec 12 19:06:34 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.5 2003/12/12 07:12:38 wiz Exp $
+# $NetBSD: automake.mk,v 1.6 2003/12/12 19:06:34 wiz Exp $
 #
 # makefile fragment for packages that use automake
 # AUTOMAKE_REQD can be set to the minimum version required.
@@ -14,16 +14,20 @@
 AUTOMAKE_MK=   # defined
 
 # minimal required version
-AUTOMAKE_REQD?= 1.8
+AUTOMAKE_REQD?= 1.7
 
-.if ${AUTOMAKE_REQD:M1.4*} == ""
+.if !empty(AUTOMAKE_REQD:M1.4*)
+BUILD_DEPENDS+=                automake14>=${AUTOMAKE_REQD}:../../devel/automake14
+_AUTOMAKE_API_VERSION= 1.4
+AUTOCONF_REQD?=                2.13
+.elif !empty(AUTOMAKE_REQD:M1.7*)
+BUILD_DEPENDS+=                automake17>=${AUTOMAKE_REQD}:../../devel/automake17
+_AUTOMAKE_API_VERSION= 1.7
+AUTOCONF_REQD?=                2.54
+.else
 BUILD_DEPENDS+=                automake>=${AUTOMAKE_REQD}:../../devel/automake
 _AUTOMAKE_API_VERSION= 1.8
 AUTOCONF_REQD?=                2.58
-.else
-BUILD_DEPENDS+=                automake14>=${AUTOMAKE_REQD}:../../devel/automake14
-_AUTOMAKE_API_VERSION= 1.4
-AUTOCONF_REQD?=                2.13
 .endif
 
 AUTOMAKE=              ${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION}



Home | Main Index | Thread Index | Old Index