Date: Tue, 30 Sep 2025 10:57:32 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: 5dacd701f21f - main - textproc/discount: Update to 3.0.1.1 Message-ID: <202509301057.58UAvW6v029943@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5dacd701f21f47b396bea2f81eddf9cd59be9218 commit 5dacd701f21f47b396bea2f81eddf9cd59be9218 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2025-09-30 10:42:13 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2025-09-30 10:50:45 +0000 textproc/discount: Update to 3.0.1.1 - Bump PORTREVISION of dependent ports for shlib change - While I'm here, fix b304d8ab18ac96ddcd15f3cf7255ef89aababe5a Changes: https://github.com/Orc/discount/commits/main --- graphics/minder/Makefile | 2 +- graphics/pdfpc/Makefile | 3 +-- math/labplot/Makefile | 2 +- misc/kookbook/Makefile | 2 +- sysutils/plasma6-discover/Makefile | 1 + textproc/discount/Makefile | 6 +++--- textproc/discount/distinfo | 6 +++--- textproc/discount/files/patch-clang16 | 11 ----------- textproc/discount/files/patch-configure.inc | 10 ++++++---- textproc/discount/pkg-plist | 4 ++-- 10 files changed, 19 insertions(+), 28 deletions(-) diff --git a/graphics/minder/Makefile b/graphics/minder/Makefile index aaa5242e945c..d24ba7662def 100644 --- a/graphics/minder/Makefile +++ b/graphics/minder/Makefile @@ -1,6 +1,6 @@ PORTNAME= minder PORTVERSION= 1.17.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics # avoid PKGBASE collision with net-p2p/minder PKGNAMESUFFIX= -app diff --git a/graphics/pdfpc/Makefile b/graphics/pdfpc/Makefile index fbb329de855e..bb7c7bf553e8 100644 --- a/graphics/pdfpc/Makefile +++ b/graphics/pdfpc/Makefile @@ -1,9 +1,8 @@ PORTNAME= pdfpc +DISTVERSIONPREFIX= v DISTVERSION= 4.7.0 PORTREVISION= 2 CATEGORIES= graphics -DISTVERSIONPREFIX= v -PORTREVISION= 1 MAINTAINER= bapt@FreeBSD.org COMMENT= Keynote-like multi-monitor presentation viewer diff --git a/math/labplot/Makefile b/math/labplot/Makefile index a2ff6b0f5b21..26f7312f48a1 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -1,6 +1,6 @@ PORTNAME= labplot DISTVERSION= 2.11.80 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math kde MASTER_SITES= KDE/stable/${PORTNAME}/ DIST_SUBDIR= KDE/invent.kde.org diff --git a/misc/kookbook/Makefile b/misc/kookbook/Makefile index a40879da352e..772b6f8d65d5 100644 --- a/misc/kookbook/Makefile +++ b/misc/kookbook/Makefile @@ -1,6 +1,6 @@ PORTNAME= kookbook DISTVERSION= 0.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc kde MASTER_SITES= KDE/unstable/${PORTNAME}/ diff --git a/sysutils/plasma6-discover/Makefile b/sysutils/plasma6-discover/Makefile index 09fe9069d28c..577197ffc437 100644 --- a/sysutils/plasma6-discover/Makefile +++ b/sysutils/plasma6-discover/Makefile @@ -1,5 +1,6 @@ PORTNAME= discover DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils kde kde-plasma MAINTAINER= kde@FreeBSD.org diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile index 3044d687be19..2c3b79e80cb8 100644 --- a/textproc/discount/Makefile +++ b/textproc/discount/Makefile @@ -1,5 +1,5 @@ PORTNAME= discount -PORTVERSION= 2.2.7d +PORTVERSION= 3.0.1.1 CATEGORIES= textproc devel MASTER_SITES= https://www.pell.portland.or.us/~orc/Code/discount/ @@ -21,12 +21,12 @@ INSTALL_TARGET= install install.man TEST_TARGET= test USE_LDCONFIG= yes +PLIST_SUB= PORTVERSION=${PORTVERSION:R} + CONFLICTS_INSTALL= markdown CPE_VENDOR= discount_project -PORTSCOUT= skipv:2.2.7 - OPTIONS_DEFINE= EXTRA SAMPLES TAB8 OPTIONS_DEFAULT=EXTRA TAB8 OPTIONS_SUB= yes diff --git a/textproc/discount/distinfo b/textproc/discount/distinfo index 14140f0ba5a4..bd863493744e 100644 --- a/textproc/discount/distinfo +++ b/textproc/discount/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693987425 -SHA256 (discount-2.2.7d.tar.bz2) = 12a2041e96ae8cde17e08ff1a215d331580a5c58688daa5a18842b6bb5b77b52 -SIZE (discount-2.2.7d.tar.bz2) = 106055 +TIMESTAMP = 1757436431 +SHA256 (discount-3.0.1.1.tar.bz2) = c1b1b9f37bb907aae5f4bcfc960269baeae9e6710cdd6860ee965abfa2676631 +SIZE (discount-3.0.1.1.tar.bz2) = 113052 diff --git a/textproc/discount/files/patch-clang16 b/textproc/discount/files/patch-clang16 deleted file mode 100644 index c16d5f6fae9f..000000000000 --- a/textproc/discount/files/patch-clang16 +++ /dev/null @@ -1,11 +0,0 @@ ---- main.c.orig 2022-03-30 19:34:50 UTC -+++ main.c -@@ -308,7 +308,7 @@ main(int argc, char **argv) - if ( squash ) - mkd_e_anchor(doc, (mkd_callback_t) anchor_format); - if ( use_e_codefmt ) -- mkd_e_code_format(doc, external_codefmt); -+ mkd_e_code_format(doc, (mkd_callback_t) external_codefmt); - - if ( use_e_codefmt || squash ) - mkd_e_free(doc, free_it); diff --git a/textproc/discount/files/patch-configure.inc b/textproc/discount/files/patch-configure.inc index ec33a22e576c..38d7b51efa32 100644 --- a/textproc/discount/files/patch-configure.inc +++ b/textproc/discount/files/patch-configure.inc @@ -1,10 +1,12 @@ ---- configure.inc.orig 2020-08-24 05:45:49 UTC +--- configure.inc.orig 2025-09-07 21:27:45 UTC +++ configure.inc -@@ -1501,7 +1501,6 @@ install)$PROG_INSTALL -c \$FULLNAME "\$1" +@@ -1501,9 +1501,6 @@ EOF $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR $PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME EOF -- test "$LDCONFIG" && echo ' '$LDCONFIG '"$1"' >> librarian.sh +- if [ "$LDCONFIG" -a -z "$CONTAINER" ]; then +- echo ' '$LDCONFIG '"$1"' >> librarian.sh +- fi + cat >> librarian.sh << EOF ;; - esac diff --git a/textproc/discount/pkg-plist b/textproc/discount/pkg-plist index f736121635c5..317dca112032 100644 --- a/textproc/discount/pkg-plist +++ b/textproc/discount/pkg-plist @@ -5,8 +5,8 @@ bin/markdown include/mkdio.h lib/libmarkdown.a lib/libmarkdown.so -lib/libmarkdown.so.2 -lib/libmarkdown.so.2.2.7 +lib/libmarkdown.so.3 +lib/libmarkdown.so.%%PORTVERSION%% libdata/pkgconfig/libmarkdown.pc %%SAMPLES%%share/man/man1/makepage.1.gz share/man/man1/markdown.1.gzhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202509301057.58UAvW6v029943>