From owner-freebsd-ports Tue Oct 10 20:40: 8 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 264E337B66C for ; Tue, 10 Oct 2000 20:40:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id UAA46751; Tue, 10 Oct 2000 20:40:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from camus.cybercable.fr (camus.cybercable.fr [212.198.0.200]) by hub.freebsd.org (Postfix) with SMTP id 5D79037B502 for ; Tue, 10 Oct 2000 20:38:22 -0700 (PDT) Received: (qmail 13730756 invoked from network); 11 Oct 2000 03:38:20 -0000 Received: from r227m167.cybercable.tm.fr (HELO gits.dyndns.org) ([195.132.227.167]) (envelope-sender ) by camus.cybercable.fr (qmail-ldap-1.03) with SMTP for ; 11 Oct 2000 03:38:20 -0000 Received: (from root@localhost) by gits.dyndns.org (8.11.0/8.11.0) id e9B3cK092957; Wed, 11 Oct 2000 05:38:20 +0200 (CEST) (envelope-from root) Message-Id: <200010110338.e9B3cK092957@gits.dyndns.org> Date: Wed, 11 Oct 2000 05:38:20 +0200 (CEST) From: Cyrille Lefevre Reply-To: clefevre@citeweb.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/21903: bsd.ports.mk - automake/aclocal adds Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 21903 >Category: ports >Synopsis: bsd.ports.mk - automake/aclocal adds >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 10 20:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.1-STABLE i386 >Organization: ACME >Environment: FreeBSD gits 4.1-STABLE FreeBSD 4.1-STABLE #3: Sat Sep 23 10:20:30 CEST 2000 root@gits:/disk2/4.0-stable/src/sys/compile/CUSTOM i386 >Description: this patch adds support for AUTOMAKE_ARGS and ACLOCAL before AUTOCONF in case of autogenerated Makefiles such as in dico-1.1 (new port just submited which follow the old way, of course :). >How-To-Repeat: the following lines : AUTOMAKE= automake --add-missing --foreign --include-deps ACLOCAL= aclocal pre-configure: @cd ${WRKSRC} && ${ACLOCAL} could simply be replaced by : USE_ACLOCAL= true AUTOMAKE_ARGS= --add-missing --foreign --include-deps which is more consise. >Fix: apply the following patch. Index: bsd.port.mk =================================================================== RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.355 diff -u -r1.355 bsd.port.mk --- bsd.port.mk 2000/10/08 11:43:54 1.355 +++ bsd.port.mk 2000/10/11 03:25:52 @@ -139,6 +139,11 @@ # USE_AUTOMAKE - Says that the port uses automake. Implies USE_AUTOCONF. # AUTOMAKE - Set to path of GNU automake if not in $PATH (default: # automake). +# AUTOMAKE_ARGS - Any extra arguments to GNU automake in configure +# stages (default: none). +# USE_ACLOCAL - Says that the port uses autoconf. Implies USE_AUTOCONF. +# ACLOCAL - Set to path of GNU aclocal if not in $PATH (default: +# aclocal). # USE_AUTOCONF - Says that the port uses autoconf. Implies GNU_CONFIGURE. # AUTOCONF - Set to path of GNU autoconf if not in $PATH (default: # autoconf). @@ -750,6 +755,9 @@ USE_AUTOCONF= yes BUILD_DEPENDS+= automake:${PORTSDIR}/devel/automake .endif +.if defined(USE_ACLOCAL) +USE_AUTOCONF= yes +.endif .if defined(USE_AUTOCONF) GNU_CONFIGURE= yes BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf @@ -895,6 +903,7 @@ # Miscellaneous overridable commands: GMAKE?= gmake AUTOMAKE?= automake +ACLOCAL?= aclocal AUTOCONF?= autoconf LIBTOOL?= libtool XMKMF?= xmkmf -a @@ -1784,9 +1793,12 @@ .if !target(do-configure) do-configure: .if defined(USE_AUTOMAKE) - @(cd ${WRKSRC} && ${AUTOMAKE}) + @(cd ${WRKSRC} && ${AUTOMAKE} ${AUTOMAKE_ARGS}) .endif .if defined(USE_AUTOCONF) +.if defined(USE_ACLOCAL) + @(cd ${WRKSRC} && ${ACLOCAL}) +.endif @(cd ${WRKSRC} && ${AUTOCONF}) .endif @if [ -f ${SCRIPTDIR}/configure ]; then \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message