From owner-freebsd-ports Thu Nov 1 17:59:27 2001 Delivered-To: freebsd-ports@freebsd.org Received: from traven.uol.com.br (traven.uol.com.br [200.231.206.184]) by hub.freebsd.org (Postfix) with ESMTP id 33DEB37B40A for ; Thu, 1 Nov 2001 17:59:17 -0800 (PST) Received: from 200.181.48.234 ([200.181.48.234]) by traven.uol.com.br (8.9.1/8.9.1) with ESMTP id XAA13294 for ; Thu, 1 Nov 2001 23:50:59 -0200 (BRST) Received: (qmail 11185 invoked by uid 1001); 2 Nov 2001 01:59:14 -0000 From: "Mario Sergio Fujikawa Ferreira" Date: Thu, 1 Nov 2001 23:58:52 -0200 To: freebsd-ports@freebsd.org Cc: obrien@freebsd.org, sobomax@freebsd.org, will@freebsd.org Subject: AUTO{MAKE,CONF} selectable by USE_AUTO{MAKE,CONF}_VER Message-ID: <20011101235852.A11123@exxodus.fedaykin.here> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="PNTmBPCT7hxwcZjr" Content-Disposition: inline User-Agent: Mutt/1.2.5i 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 --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, There has been some discussion about the recent AUTO{MAKE,CONF} updates. I hope I can contribute something. This is based on original work on bsd.kde.mk. This a patch I've been discussing with Will Andrews: 1) Make selection of AUTO* flexible depending on *_VER variables 2) Have the defaults be devel/autoconf and devel/automake ports (just set the USE_*VER?= in .mk to the latest values, or a bogus value). They are, also, the fall down cases. If the user sets a bogus value, we default to the .else part (the latest ports). 3) Furthermore, I added variables in the same sense of our PTHREAD_* vars. We must be able to automagically patch the ports based on the correct {ACLOCAL,AUTO{HEADER,RECONF,SCAN,UPDATES,IFNAMES}} values. I prefixed the vars so that there wouldn't be a name clashing, but if ppl are assured there is no problem, we can remove those prefixes. 4) Moreover, I added *_DIR variables pointing to the right locations based on the *_VER variables, this is useful if a port needs to grab files from those. This might seem too much but if we want automagical, we should go this extra mile. I added 2 versions of the patch. I was very tempted to add knobs for USE_LIBTOOL_VER ;) I hope these prove useful. 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 --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-autotools1 --- bsd.port.mk.orig Wed Oct 31 22:59:04 2001 +++ bsd.port.mk Thu Nov 1 00:06:33 2001 @@ -793,11 +793,51 @@ .endif .if defined(USE_AUTOMAKE) USE_AUTOCONF= yes +USE_AUTOMAKE_VER?= 14 +.if ${USE_AUTOMAKE_VER} == 14 BUILD_DEPENDS+= automake14:${PORTSDIR}/devel/automake14 + +USE_AUTOCONF_VER?= 213 + +AUTOMAKE?= automake14 +AUTOMAKE_ACLOCAL?= aclocal14 +AUTOMAKE_ACLOCAL_DIR?= ${LOCALBASE}/share/automake14/aclocal +AUTOMAKE_AUTOMAKE_DIR?= ${LOCALBASE}/share/automake14/automake +.else +BUILD_DEPENDS+= automake:${PORTSDIR}/devel/automake + +AUTOMAKE?= automake +AUTOMAKE_ACLOCAL?= aclocal +AUTOMAKE_ACLOCAL_DIR?= ${LOCALBASE}/share/aclocal +AUTOMAKE_AUTOMAKE_DIR?= ${LOCALBASE}/share/automake +.endif .endif .if defined(USE_AUTOCONF) GNU_CONFIGURE= yes +USE_AUTOCONF_VER?= 213 +.if ${USE_AUTOCONF_VER} == 213 BUILD_DEPENDS+= autoconf213:${PORTSDIR}/devel/autoconf213 + +AUTOCONF?= autoconf213 +AUTOCONF_AUTOHEADER?= autoheader213 +AUTOCONF_AUTORECONF?= autoreconf213 +AUTOCONF_AUTOSCAN?= autoscan213 +AUTOCONF_AUTOUPDATE?= autoupdate213 +AUTOCONF_AUTOIFNAMES?= ifnames213 + +AUTOCONF_AUTOCONF_DIR?= ${LOCALBASE}/share/autoconf213/autoconf +.else +BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf + +AUTOCONF?= autoconf +AUTOCONF_AUTOHEADER?= autoheader +AUTOCONF_AUTORECONF?= autoreconf +AUTOCONF_AUTOSCAN?= autoscan +AUTOCONF_AUTOUPDATE?= autoupdate +AUTOCONF_AUTOIFNAMES?= ifnames + +AUTOCONF_AUTOCONF_DIR?= ${LOCALBASE}/share/autoconf +.endif .endif .if defined(USE_LIBTOOL) GNU_CONFIGURE= yes @@ -941,8 +981,6 @@ # Miscellaneous overridable commands: GMAKE?= gmake -AUTOMAKE?= automake14 -AUTOCONF?= autoconf213 LIBTOOL?= libtool XMKMF?= xmkmf -a .if exists(/sbin/md5) --PNTmBPCT7hxwcZjr Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-autotools2 --- bsd.port.mk.orig Wed Oct 31 22:59:04 2001 +++ bsd.port.mk Thu Nov 1 23:45:58 2001 @@ -793,11 +793,49 @@ .endif .if defined(USE_AUTOMAKE) USE_AUTOCONF= yes +.if defined(USE_AUTOMAKE_VER) && ${USE_AUTOMAKE_VER} == 14 BUILD_DEPENDS+= automake14:${PORTSDIR}/devel/automake14 + +USE_AUTOCONF_VER?= 213 + +AUTOMAKE?= automake14 +AUTOMAKE_ACLOCAL?= aclocal14 +AUTOMAKE_ACLOCAL_DIR?= ${LOCALBASE}/share/automake14/aclocal +AUTOMAKE_AUTOMAKE_DIR?= ${LOCALBASE}/share/automake14/automake +.else +BUILD_DEPENDS+= automake:${PORTSDIR}/devel/automake + +AUTOMAKE?= automake +AUTOMAKE_ACLOCAL?= aclocal +AUTOMAKE_ACLOCAL_DIR?= ${LOCALBASE}/share/aclocal +AUTOMAKE_AUTOMAKE_DIR?= ${LOCALBASE}/share/automake +.endif .endif .if defined(USE_AUTOCONF) GNU_CONFIGURE= yes +.if defined(USE_AUTOCONF_VER) && ${USE_AUTOCONF_VER} == 213 BUILD_DEPENDS+= autoconf213:${PORTSDIR}/devel/autoconf213 + +AUTOCONF?= autoconf213 +AUTOCONF_AUTOHEADER?= autoheader213 +AUTOCONF_AUTORECONF?= autoreconf213 +AUTOCONF_AUTOSCAN?= autoscan213 +AUTOCONF_AUTOUPDATE?= autoupdate213 +AUTOCONF_AUTOIFNAMES?= ifnames213 + +AUTOCONF_AUTOCONF_DIR?= ${LOCALBASE}/share/autoconf213/autoconf +.else +BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf + +AUTOCONF?= autoconf +AUTOCONF_AUTOHEADER?= autoheader +AUTOCONF_AUTORECONF?= autoreconf +AUTOCONF_AUTOSCAN?= autoscan +AUTOCONF_AUTOUPDATE?= autoupdate +AUTOCONF_AUTOIFNAMES?= ifnames + +AUTOCONF_AUTOCONF_DIR?= ${LOCALBASE}/share/autoconf +.endif .endif .if defined(USE_LIBTOOL) GNU_CONFIGURE= yes @@ -941,8 +979,6 @@ # Miscellaneous overridable commands: GMAKE?= gmake -AUTOMAKE?= automake14 -AUTOCONF?= autoconf213 LIBTOOL?= libtool XMKMF?= xmkmf -a .if exists(/sbin/md5) --PNTmBPCT7hxwcZjr-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message