From owner-svn-ports-head@freebsd.org Sun Dec 24 15:20:55 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DD6DCE9634A; Sun, 24 Dec 2017 15:20:55 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3DC07EBFC; Sun, 24 Dec 2017 15:20:55 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBOFKsKF040033; Sun, 24 Dec 2017 15:20:54 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBOFKsVN040032; Sun, 24 Dec 2017 15:20:54 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201712241520.vBOFKsVN040032@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 24 Dec 2017 15:20:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457175 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 457175 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Dec 2017 15:20:56 -0000 Author: tijl Date: Sun Dec 24 15:20:54 2017 New Revision: 457175 URL: https://svnweb.freebsd.org/changeset/ports/457175 Log: Remove support for USE_AUTOTOOLS=automake. Modified: head/Mk/bsd.autotools.mk Modified: head/Mk/bsd.autotools.mk ============================================================================== --- head/Mk/bsd.autotools.mk Sun Dec 24 15:05:55 2017 (r457174) +++ head/Mk/bsd.autotools.mk Sun Dec 24 15:20:54 2017 (r457175) @@ -13,7 +13,7 @@ Autotools_Include_MAINTAINER= tijl@FreeBSD.org # USE_AUTOTOOLS= tool[:env] ... # # 'tool' can currently be one of the following: -# autoconf, automake +# autoconf # # ':env' is used to specify that the environmental variables are needed # but the relevant tool should NOT be run as part of the @@ -22,9 +22,6 @@ Autotools_Include_MAINTAINER= tijl@FreeBSD.org # In addition, these variables can be set in the port Makefile to be # passed to the relevant tools: # -# AUTOMAKE_ARGS=... -# - Extra arguments passed to automake during configure step -# # AUTOCONF_ARGS=... # - Extra arguments passed to autoconf during configure step # @@ -35,7 +32,7 @@ Autotools_Include_MAINTAINER= tijl@FreeBSD.org #--------------------------------------------------------------------------- # Known autotools components -_AUTOTOOLS_ALL= autoconf automake +_AUTOTOOLS_ALL= autoconf #--------------------------------------------------------------------------- # Primary magic to break out the USE_AUTOTOOLS stanza into something @@ -81,34 +78,6 @@ IGNORE+= Bad autotool stanza: ${_AUTOTOOLS_BADCOMP:O:u .endif #--------------------------------------------------------------------------- -# automake -#--------------------------------------------------------------------------- - -.if defined(_AUTOTOOL_automake) -AUTOMAKE_VERSION= 1.15 -AUTOMAKE_APIVER= 1.15 -AUTOMAKE_PORT= devel/automake - -. if ${_AUTOTOOL_automake} == "yes" -_AUTOTOOL_rule_automake= yes -GNU_CONFIGURE?= yes -. endif -.endif - -.if defined(AUTOMAKE_VERSION) -AUTOMAKE= ${LOCALBASE}/bin/automake-${AUTOMAKE_VERSION} -AUTOMAKE_DIR= ${LOCALBASE}/share/automake-${AUTOMAKE_VERSION} - -AUTOMAKE_VARS= AUTOMAKE=${AUTOMAKE} \ - AUTOMAKE_DIR=${AUTOMAKE_DIR} \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \ - AUTOMAKE_APIVER=${AUTOMAKE_APIVER} - -AUTOMAKE_DEPENDS= ${AUTOMAKE}:${AUTOMAKE_PORT} -BUILD_DEPENDS+= ${AUTOMAKE_DEPENDS} -.endif - -#--------------------------------------------------------------------------- # autoconf #--------------------------------------------------------------------------- @@ -148,7 +117,7 @@ BUILD_DEPENDS+= ${AUTOCONF_DEPENDS} # Add to the environment #--------------------------------------------------------------------------- -AUTOTOOLS_VARS= ${AUTOMAKE_VARS} ${AUTOCONF_VARS} +AUTOTOOLS_VARS= ${AUTOCONF_VARS} .if defined(AUTOTOOLS_VARS) && !empty(AUTOTOOLS_VARS) . for var in AUTOTOOLS CONFIGURE MAKE SCRIPTS @@ -160,16 +129,10 @@ ${var:tu}_ENV+= ${AUTOTOOLS_VARS} # Make targets #--------------------------------------------------------------------------- -_USES_configure+=461:run-autotools-autoconf 463:run-autotools-automake +_USES_configure+=461:run-autotools-autoconf .if defined(_AUTOTOOL_rule_autoconf) && !target(run-autotools-autoconf) run-autotools-autoconf: @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \ ${AUTOCONF_ARGS}) -.endif - -.if defined(_AUTOTOOL_rule_automake) && !target(run-autotools-automake) -run-autotools-automake: - @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \ - ${AUTOMAKE_ARGS}) .endif