Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Apr 2021 20:37:34 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 686f85208f17 - main - textproc/discount: Convert REINPLACE_CMD to patch file
Message-ID:  <202104252037.13PKbYSi077194@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=686f85208f178a98a420daa83785fd3a9dfae608

commit 686f85208f178a98a420daa83785fd3a9dfae608
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-04-25 20:12:27 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104252037.13PKbYSi077194>