From owner-freebsd-ports Tue Nov 13 19:51:20 2001 Delivered-To: freebsd-ports@freebsd.org Received: from ginsberg.uol.com.br (ginsberg.uol.com.br [200.231.206.26]) by hub.freebsd.org (Postfix) with ESMTP id 7228337B405 for ; Tue, 13 Nov 2001 19:51:15 -0800 (PST) Received: from 200.181.48.122 ([200.181.48.122]) by ginsberg.uol.com.br (8.9.1/8.9.1) with ESMTP id BAA10112 for ; Wed, 14 Nov 2001 01:48:50 -0200 (BRST) Received: (qmail 17778 invoked by uid 1001); 14 Nov 2001 03:48:55 -0000 From: "Mario Sergio Fujikawa Ferreira" Date: Wed, 14 Nov 2001 01:48:33 -0200 To: Thomas Gellekum Cc: freebsd-ports@FreeBSD.org, portmgr@FreeBSD.org Subject: Re: cvs commit: ports/Mk bsd.port.mk Message-ID: <20011114014833.A17257@exxodus.fedaykin.here> References: <200111131312.fADDCC911711@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200111131312.fADDCC911711@freefall.freebsd.org>; from tg@FreeBSD.org on Tue, Nov 13, 2001 at 05:11:50AM -0800 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org On Tue, Nov 13, 2001 at 05:11:50AM -0800, Thomas Gellekum wrote: > tg 2001/11/13 05:12:12 PST > > Modified files: > Mk bsd.port.mk > Log: > Add variables $ACLOCAL and $AUTOHEADER, now that the program names > contain version numbers. > > Approved by: portmgr (sobomax) > > Revision Changes Path > 1.388 +3 -1 ports/Mk/bsd.port.mk 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 For reference, the original message had Message-ID: <20011101002119.A47809@exxodus.fedaykin.here> Regards, ------ --- bsd.port.mk.orig Wed Nov 14 00:26:42 2001 +++ bsd.port.mk Wed Nov 14 01:47:11 2001 @@ -793,11 +793,42 @@ .endif .if defined(USE_AUTOMAKE) USE_AUTOCONF= yes +USE_AUTOMAKE_VER?= 14 +.endif +.if defined(USE_AUTOMAKE_VER) +USE_AUTOMAKE?= yes +.if ${USE_AUTOMAKE_VER} == 15 +BUILD_DEPENDS+= automake:${PORTSDIR}/devel/automake + +AUTOMAKE?= automake +ACLOCAL?= aclocal +ACLOCAL_DIR?= ${LOCALBASE}/share/aclocal +AUTOMAKE_DIR?= ${LOCALBASE}/share/automake +.else 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 .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 +972,6 @@ # Miscellaneous overridable commands: GMAKE?= gmake -ACLOCAL?= aclocal14 -AUTOMAKE?= automake14 -AUTOCONF?= autoconf213 -AUTOHEADER?= autoheader213 LIBTOOL?= libtool XMKMF?= xmkmf -a .if exists(/sbin/md5) ------ -- 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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message