Date: Thu, 15 Nov 2001 23:00:18 -0200 From: "Mario Sergio Fujikawa Ferreira" <lioux@uol.com.br> To: Maxim Sobolev <sobomax@FreeBSD.org> Cc: Will Andrews <will@physics.purdue.edu>, Thomas Gellekum <tg@FreeBSD.org>, freebsd-ports@FreeBSD.org, portmgr@FreeBSD.org Subject: Re: cvs commit: ports/Mk bsd.port.mk Message-ID: <20011115230018.A2836@exxodus.fedaykin.here> In-Reply-To: <3BF40798.7F66C0DD@FreeBSD.org>; from sobomax@FreeBSD.org on Thu, Nov 15, 2001 at 08:20:50PM %2B0200 References: <200111131312.fADDCC911711@freefall.freebsd.org> <20011114014833.A17257@exxodus.fedaykin.here> <20011113225250.I17600@casimir.physics.purdue.edu> <3BF40798.7F66C0DD@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Thu, Nov 15, 2001 at 08:20:50PM +0200, Maxim Sobolev wrote:
> Will Andrews wrote:
> >
> > On Wed, Nov 14, 2001 at 01:48:33AM -0200, Mario Sergio Fujikawa Ferreira wrote:
> > > That's sweeeet but what about discussing this one too?
> > > It was proposed a while ago. :) So that we can automagically take
> > > care of this based on _VER
> >
> > Yes, please.
>
> This patch is incomplete because it lacks documentation in the
> comments at the beginning of the file. Please extend it appropriately
> and resubmit. Other than that looks fine to me.
Sweeet. I added some documentation. Could you review?
Regards,
--
Mario S F Ferreira - UnB - Brazil - "I guess this is a signature."
lioux at ( freebsd dot org | linf dot unb dot br )
flames to beloved devnull@someotherworldbeloworabove.org
feature, n: a documented bug | bug, n: an undocumented feature
--ikeVEW9yuYc//A+q
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-autotools
--- bsd.port.mk.orig Tue Nov 13 11:11:49 2001
+++ bsd.port.mk Thu Nov 15 20:33:36 2001
@@ -139,18 +139,54 @@
# the system or installed from a port.
# USE_GMAKE - Says that the port uses gmake.
# GMAKE - Set to path of GNU make if not in $PATH (default: gmake).
-# USE_AUTOMAKE - Says that the port uses automake. Implies USE_AUTOCONF.
+# USE_AUTOMAKE - Says that the port uses automake. Implies
+# USE_AUTOCONF and USE_AUTOMAKE_VER?=14.
+# USE_AUTOMAKE_VER - Says that the port uses automake. Possible
+# values: 14, 15;
+# each specify a version of automake to use
+# and appropriatly set both AUTOMAKE{,_DIR}
+# and ACLOCAL{,_DIR} variables.
+# Implies USE_AUTOMAKE. If set with
+# unknown value, defaults to 15.
# AUTOMAKE - Set to path of GNU automake if not in $PATH (default:
-# automake).
-# AUTOMAKE_ARGS - Pass these args to automake if ${USE_AUTOMAKE} is set.
-# AUTOMAKE_ENV - Pass these env (shell-like) to automake if
-# ${USE_AUTOMAKE} is set.
-# USE_AUTOCONF - Says that the port uses autoconf. Implies GNU_CONFIGURE.
-# AUTOCONF - Set to path of GNU autoconf if not in $PATH (default:
-# autoconf).
-# AUTOCONF_ARGS - Pass these args to autoconf if ${USE_AUTOCONF} is set.
-# AUTOCONF_ENV - Pass these env (shell-like) to autoconf if
-# ${USE_AUTOCONF} is set.
+# according to USE_AUTOMAKE_VER value)
+# AUTOMAKE_ARGS - Pass these args to ${AUTOMAKE} if ${USE_AUTOMAKE_VER} is set.
+# AUTOMAKE_ENV - Pass these env (shell-like) to ${AUTOMAKE} if
+# ${USE_AUTOMAKE_VER} is set.
+# ACLOCAL - Set to path of GNU automake aclocal if not in $PATH (default:
+# according to USE_AUTOMAKE_VER value)
+# ACLOCAL_DIR - Set to path of GNU automake aclocal shared directory (default:
+# according to USE_AUTOMAKE_VER value)
+# AUTOMAKE_DIR - Set to path of GNU automake shared directory (default:
+# according to USE_AUTOMAKE_VER value)
+# USE_AUTOCONF_VER - Says that the port uses autoconf. Possible
+# values: 213;
+# each specify a version of autoconf to use
+# and appropriatly set both AUTOCONF{,_DIR}
+# and ACLOCAL{,_DIR} variables.
+# Implies USE_AUTOCONF. If set with
+# unknown value, defaults to 213.
+# USE_AUTOCONF - Says that the port uses autoconf. Implies
+# GNU_CONFIGURE and USE_AUTOCONF_VER?=213.
+# AUTOCONF - Set to path of GNU autoconf if not in $PATH (default:
+# according to USE_AUTOCONF_VER value)
+# AUTOCONF_ARGS - Pass these args to ${AUTOCONF} if ${USE_AUTOCONF} is set.
+# AUTOCONF_ENV - Pass these env (shell-like) to ${AUTOCONF} if
+# ${USE_AUTOCONF} is set.
+# AUTOHEADER - Set to path of GNU autoconf autoheader
+# if not in $PATH (default: according
+# to USE_AUTOCONF_VER value)
+# AUTORECONF - Set to path of GNU autoconf autoreconf
+# if not in $PATH (default: according
+# to USE_AUTOCONF_VER value)
+# AUTOSCAN - Set to path of GNU autoconf autoscan
+# if not in $PATH (default: according
+# to USE_AUTOCONF_VER value)
+# AUTOIFNAMES - Set to path of GNU autoconf autoifnames
+# if not in $PATH (default: according
+# to USE_AUTOCONF_VER value)
+# AUTOCONF_DIR - Set to path of GNU autoconf shared directory (default:
+# according to USE_AUTOCONF_VER value)
# USE_LIBTOOL - Says that the port uses Libtool. Implies GNU_CONFIGURE.
# LIBTOOL - Set to path of libtool (default: libtool).
# LIBTOOLFILES - Files to patch for libtool (defaults: "aclocal.m4" if
@@ -791,13 +827,44 @@
BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
CONFIGURE_ENV+= MAKE=${GMAKE}
.endif
-.if defined(USE_AUTOMAKE)
+.if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER)
USE_AUTOCONF= yes
+USE_AUTOMAKE?= yes
+USE_AUTOMAKE_VER?= 14
+.endif
+.if defined(USE_AUTOMAKE_VER)
+.if ${USE_AUTOMAKE_VER} == 14
BUILD_DEPENDS+= automake14:${PORTSDIR}/devel/automake14
+
+USE_AUTOCONF_VER?= 213
+
+AUTOMAKE?= automake14
+ACLOCAL?= aclocal14
+ACLOCAL_DIR?= ${LOCALBASE}/share/automake14/aclocal
+AUTOMAKE_DIR?= ${LOCALBASE}/share/automake14/automake
+.else
+BUILD_DEPENDS+= automake:${PORTSDIR}/devel/automake
+
+AUTOMAKE?= automake
+ACLOCAL?= aclocal
+ACLOCAL_DIR?= ${LOCALBASE}/share/aclocal
+AUTOMAKE_DIR?= ${LOCALBASE}/share/automake
.endif
-.if defined(USE_AUTOCONF)
+.endif
+.if defined(USE_AUTOCONF) || defined(USE_AUTOCONF_VER)
+USE_AUTOCONF?= yes
+
GNU_CONFIGURE= yes
BUILD_DEPENDS+= autoconf213:${PORTSDIR}/devel/autoconf213
+
+AUTOCONF?= autoconf213
+AUTOHEADER?= autoheader213
+AUTORECONF?= autoreconf213
+AUTOSCAN?= autoscan213
+AUTOUPDATE?= autoupdate213
+AUTOIFNAMES?= ifnames213
+
+AUTOCONF_DIR?= ${LOCALBASE}/share/autoconf213/autoconf
.endif
.if defined(USE_LIBTOOL)
GNU_CONFIGURE= yes
@@ -941,10 +1008,6 @@
# Miscellaneous overridable commands:
GMAKE?= gmake
-ACLOCAL?= aclocal14
-AUTOMAKE?= automake14
-AUTOCONF?= autoconf213
-AUTOHEADER?= autoheader213
LIBTOOL?= libtool
XMKMF?= xmkmf -a
.if exists(/sbin/md5)
--ikeVEW9yuYc//A+q--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011115230018.A2836>