From nobody Sun Nov 21 21:20:27 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 260E9188D899; Sun, 21 Nov 2021 21:20:33 +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 4Hy3GQ3g55z3rWX; Sun, 21 Nov 2021 21:20:30 +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 D524016854; Sun, 21 Nov 2021 21:20:27 +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 1ALLKRf7027034; Sun, 21 Nov 2021 21:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ALLKRjO027033; Sun, 21 Nov 2021 21:20:27 GMT (envelope-from git) Date: Sun, 21 Nov 2021 21:20:27 GMT Message-Id: <202111212120.1ALLKRjO027033@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 209f8b3d0009 - main - devel/m4: Add INFO option 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 209f8b3d00098482f9079ce3e4482562f4b3621e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=209f8b3d00098482f9079ce3e4482562f4b3621e commit 209f8b3d00098482f9079ce3e4482562f4b3621e Author: Greg V AuthorDate: 2021-11-21 21:17:17 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-11-21 21:17:17 +0000 devel/m4: Add INFO option PR: 259554 --- devel/m4/Makefile | 11 +++++++---- devel/m4/files/extra-patch-no-info | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/devel/m4/Makefile b/devel/m4/Makefile index b81572d62abf..8369784e465b 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -12,21 +12,24 @@ COMMENT= GNU M4 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe iconv makeinfo tar:xz +USES= cpe iconv tar:xz CONFIGURE_ARGS= --program-prefix=g -CONFIGURE_ENV= MAKEINFO="${MAKEINFO} --no-split" GNU_CONFIGURE= yes EXAMPLESDIR= ${PREFIX}/share/examples/gm4 -INFO= m4 CPE_VENDOR= gnu -OPTIONS_DEFINE= EXAMPLES LIBSIGSEGV NLS +OPTIONS_DEFINE= EXAMPLES INFO LIBSIGSEGV NLS +OPTIONS_DEFAULT=INFO OPTIONS_SUB= yes LIBSIGSEGV_DESC=Use alternative page fault handler (GNU libsigsegv) +INFO_CONFIGURE_ENV= MAKEINFO="${MAKEINFO} --no-split" +INFO_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-no-info +INFO_INFO= m4 +INFO_USES= makeinfo LIBSIGSEGV_CONFIGURE_WITH= libsigsegv-prefix=${LOCALBASE} LIBSIGSEGV_LIB_DEPENDS= libsigsegv.so:devel/libsigsegv NLS_CONFIGURE_ENABLE= nls diff --git a/devel/m4/files/extra-patch-no-info b/devel/m4/files/extra-patch-no-info new file mode 100644 index 000000000000..7be833cf2c47 --- /dev/null +++ b/devel/m4/files/extra-patch-no-info @@ -0,0 +1,20 @@ +--- doc/Makefile.in.orig 2021-05-28 18:48:48 UTC ++++ doc/Makefile.in +@@ -2223,7 +2223,7 @@ distdir-am: $(DISTFILES) + dist-info + check-am: all-am + check: check-am +-all-am: Makefile $(INFO_DEPS) $(MANS) ++all-am: Makefile $(MANS) + installdirs: + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +@@ -2279,7 +2279,7 @@ info: info-am + + info-am: $(INFO_DEPS) + +-install-data-am: install-info-am install-man ++install-data-am: install-man + + install-dvi: install-dvi-am +