From owner-dev-commits-ports-all@freebsd.org Sun Apr 25 20:37:34 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9EE4C5E6951; Sun, 25 Apr 2021 20:37:34 +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 4FT0Fp3HpLz4VSs; Sun, 25 Apr 2021 20:37:34 +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 46E181A771; Sun, 25 Apr 2021 20:37:34 +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 13PKbYjc077195; Sun, 25 Apr 2021 20:37:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13PKbYSi077194; Sun, 25 Apr 2021 20:37:34 GMT (envelope-from git) Date: Sun, 25 Apr 2021 20:37:34 GMT Message-Id: <202104252037.13PKbYSi077194@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: 686f85208f17 - main - textproc/discount: Convert REINPLACE_CMD to patch file 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: 686f85208f178a98a420daa83785fd3a9dfae608 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2021 20:37:34 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=686f85208f178a98a420daa83785fd3a9dfae608 commit 686f85208f178a98a420daa83785fd3a9dfae608 Author: Po-Chuan Hsieh AuthorDate: 2021-04-25 20:12:27 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-04-25 20:35:11 +0000 textproc/discount: Convert REINPLACE_CMD to patch file --- textproc/discount/Makefile | 3 --- textproc/discount/files/patch-configure.inc | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile index 76f811f7ee52..73ddf971178e 100644 --- a/textproc/discount/Makefile +++ b/textproc/discount/Makefile @@ -39,9 +39,6 @@ EXTRA_CONFIGURE_ON= --with-dl=both --with-fenced-code --with-github-tags --with- SAMPLES_INSTALL_TARGET= install.samples TAB8_CONFIGURE_ON= --with-tabstops=8 -post-configure: - @${REINPLACE_CMD} -e 's|/sbin/ldconfig|#&|' ${WRKSRC}/librarian.sh - post-install: ${INSTALL_DATA} ${WRKSRC}/libmarkdown.a ${STAGEDIR}${PREFIX}/lib/libmarkdown.a ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmarkdown.so diff --git a/textproc/discount/files/patch-configure.inc b/textproc/discount/files/patch-configure.inc new file mode 100644 index 000000000000..ec33a22e576c --- /dev/null +++ b/textproc/discount/files/patch-configure.inc @@ -0,0 +1,10 @@ +--- configure.inc.orig 2020-08-24 05:45:49 UTC ++++ configure.inc +@@ -1501,7 +1501,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1" + $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR + $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME + EOF +- test "$LDCONFIG" && echo ' '$LDCONFIG '"$1"' >> librarian.sh + cat >> librarian.sh << EOF + ;; + esac