From nobody Fri Nov 26 06:32:48 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 99A8E18A384C; Fri, 26 Nov 2021 06:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J0lKs0F6jz3jvF; Fri, 26 Nov 2021 06:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC2372BE30; Fri, 26 Nov 2021 06:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AQ6WmYi074626; Fri, 26 Nov 2021 06:32:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AQ6WmSk074625; Fri, 26 Nov 2021 06:32:48 GMT (envelope-from git) Date: Fri, 26 Nov 2021 06:32:48 GMT Message-Id: <202111260632.1AQ6WmSk074625@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 1568bb8e0053 - main - cad/alliance: respect users' IMAGEMAGICK_DEFAULT setting List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1568bb8e0053cd99f3b5156479687536f04ef292 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637908369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0fr2p0TgPUYEEVh62ifMmMXezppjaxGoT7mNvzUpfoI=; b=YcV2n1TcUaGFjh8nTH5hlRed1V8QXoj+zEpUsSKSaPut/7F5fP16ls6hL8VpbOGuni0Jts wC16XpWdCvlySizwxiqeaJ/ZBASENPY9/lMJ4wPoLRemIfHrryhPqB/BuwjqsnE5p3HRCU Ro517XyfnWFGAKQmdIolKhUYScicymMxMzy+egTf/ZZtM7vP58816BlpLI8OH544R9SjdM KNtR53Z8LL+LnsGeMpj4zIK1UZ4lbFWmpASgO8gCCbrmecv+0dRjSU2MoafyAfMlFrm4am +VdQviwy1dq+1pA1/rtRze64wf1ckgop3ScYwDL9x58RZcUiIVJraggHeROZZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637908369; a=rsa-sha256; cv=none; b=DbgGBgqeS6zogNekF+SwMS+mfFRvIMqCG8FcsMbpQRAFyoJpQ2z6pjq3AgIjORKr6mku4r Z6wdSqFWrqcndITYIc9CP3OT3weIiVzq0BmRgWw50S7BJ2h+U5OKGqzFy3sbN77TiRf4SU RrQ7lD9p65W9Hjog9TyxOv32L/8MlGrvfvkwhPDLm75soRJGwrqJ2cgUyYX2jGeyoQAA9o 6yZujSY8Ne4gh/Gf3O+9LmsdXjWBcfN7YkVLuCMJ8oYNOKuW1HZUaiSOgLXFFZHINqQWaV 7FlTPOfWkCM//v1iWUiahIcH3y8Q2ujXxJQv5wfqO1Qxd2TGLwBbTmhmssDOZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=1568bb8e0053cd99f3b5156479687536f04ef292 commit 1568bb8e0053cd99f3b5156479687536f04ef292 Author: Alexey Dokuchaev AuthorDate: 2021-11-26 06:31:58 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-11-26 06:31:58 +0000 cad/alliance: respect users' IMAGEMAGICK_DEFAULT setting While here, fix submake invocation correctly and quote the explanation from the GNU make manual. --- cad/alliance/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile index f6472b71e480..9b9f8473d2d1 100644 --- a/cad/alliance/Makefile +++ b/cad/alliance/Makefile @@ -18,7 +18,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= fails to link: collect2: error: ld returned 1 exit status -BUILD_DEPENDS= convert:graphics/ImageMagick7 \ +BUILD_DEPENDS= convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ fig2dev:print/fig2dev USES= autoreconf:build gmake libtool motif tar:bz2 xorg @@ -45,9 +45,9 @@ ALLIANCE_TOP= ${PREFIX}/alliance post-patch: @${REINPLACE_CMD} -e '/include /d' \ ${WRKSRC}/xgra/src/XSB_parse.c - # These Makefiles contain hardcoded references to make(1). Replace them with - # gmake(1) to avoid build failures of the documentation. - @${REINPLACE_CMD} -e 's/; make/; gmake/' \ +# Recursive make commands should always use the variable MAKE, not the +# explicit command name `make' (see the GNU make manual, section 5.7.1) + @${REINPLACE_CMD} -e 's/; make/; $$(MAKE)/' \ ${WRKSRC}/documentation/Makefile.am \ ${WRKSRC}/documentation/alliance-examples/Makefile \ ${WRKSRC}/documentation/tutorials/Makefile.am