diff options
Diffstat (limited to 'textproc/discount')
| -rw-r--r-- | textproc/discount/Makefile | 6 | ||||
| -rw-r--r-- | textproc/discount/distinfo | 6 | ||||
| -rw-r--r-- | textproc/discount/files/patch-clang16 | 11 | ||||
| -rw-r--r-- | textproc/discount/files/patch-configure.inc | 10 | ||||
| -rw-r--r-- | textproc/discount/pkg-plist | 4 |
5 files changed, 14 insertions, 23 deletions
diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile index 3044d687be19..b27cc4b02915 100644 --- a/textproc/discount/Makefile +++ b/textproc/discount/Makefile @@ -1,5 +1,5 @@ PORTNAME= discount -PORTVERSION= 2.2.7d +PORTVERSION= 3.0.1.2 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..8a2aef3521eb 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 = 1759324024 +SHA256 (discount-3.0.1.2.tar.bz2) = ec670ca34fba6dd99cf30170b98f57fbd84ed51528cc3ae732b5ec298e738d9d +SIZE (discount-3.0.1.2.tar.bz2) = 113055 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.gz |