CVS commit: pkgsrc/textproc/discount

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/discount
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 4 Jan 2026 21:56:31 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan  4 21:56:31 UTC 2026

Modified Files:
        pkgsrc/textproc/discount: Makefile distinfo
        pkgsrc/textproc/discount/patches: patch-Makefile.in patch-main.c

Log Message:
discount: revert update, breaks p5-Text-Markdown-Discount


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/discount/Makefile \
    pkgsrc/textproc/discount/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/discount/patches/patch-Makefile.in
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/discount/patches/patch-main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/discount/Makefile
diff -u pkgsrc/textproc/discount/Makefile:1.20 pkgsrc/textproc/discount/Makefile:1.21
--- pkgsrc/textproc/discount/Makefile:1.20      Sun Jan  4 21:21:00 2026
+++ pkgsrc/textproc/discount/Makefile   Sun Jan  4 21:56:31 2026
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.20 2026/01/04 21:21:00 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2026/01/04 21:56:31 wiz Exp $
 
-DISTNAME=              discount-3.0.1.2
+DISTNAME=              discount-2.2.7d
+PKGREVISION=           1
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=Orc/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
-HOMEPAGE=              https://www.pell.portland.or.us/~orc/Code/discount/
+HOMEPAGE=              http://www.pell.portland.or.us/~orc/Code/discount/
 COMMENT=               Markdown C implementation
 LICENSE=               modified-bsd
 
Index: pkgsrc/textproc/discount/distinfo
diff -u pkgsrc/textproc/discount/distinfo:1.20 pkgsrc/textproc/discount/distinfo:1.21
--- pkgsrc/textproc/discount/distinfo:1.20      Sun Jan  4 21:21:00 2026
+++ pkgsrc/textproc/discount/distinfo   Sun Jan  4 21:56:31 2026
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.20 2026/01/04 21:21:00 wiz Exp $
+$NetBSD: distinfo,v 1.21 2026/01/04 21:56:31 wiz Exp $
 
-BLAKE2s (discount-3.0.1.2.tar.gz) = 1b3c68f42ca437087dc71773134bfe130c709fb1dd0bc538a26b26daeb0d58e5
-SHA512 (discount-3.0.1.2.tar.gz) = ca10220e4a4f8cd5c3e849873d24a61f8bcbb85f230fe554537d9cdd4e3d4d23c5f5fbc9c917da379000e331c40473038b481f5ac2db29dfa7011a634526688a
-Size (discount-3.0.1.2.tar.gz) = 143419 bytes
-SHA1 (patch-Makefile.in) = 37d308d1c36f99d64d8a6d8b9da312f059a8d423
-SHA1 (patch-main.c) = dd6836bfdca2f031b16f0b3f0541a7c520531469
+BLAKE2s (discount-2.2.7d.tar.gz) = 57f5465f1b921b1561377c6e4e862ad210f2a100b6527f8909c21f665c434569
+SHA512 (discount-2.2.7d.tar.gz) = d7e652a2687bc31605a9fcb4d95133627778d13e84c0a663ebb848d6b356f4892cc14648540627280590c8d422a9d91b6503bf223be1e7f98c9900d084dfc3b5
+Size (discount-2.2.7d.tar.gz) = 133382 bytes
+SHA1 (patch-Makefile.in) = 7919a26def7f5aceb7fa0570824fd183ac0bb856
+SHA1 (patch-generate.c) = 41a6d7e1dea9c52b24df5853ed0db5b17030b51e
+SHA1 (patch-main.c) = 71e2a3f2c3ccdfbae587d11235d008257e7bfaf5
+SHA1 (patch-markdown.c) = 4bb9971a04c2f7320d62b4c1fb478faac4a5d0c9

Index: pkgsrc/textproc/discount/patches/patch-Makefile.in
diff -u pkgsrc/textproc/discount/patches/patch-Makefile.in:1.5 pkgsrc/textproc/discount/patches/patch-Makefile.in:1.6
--- pkgsrc/textproc/discount/patches/patch-Makefile.in:1.5      Sun Jan  4 21:21:00 2026
+++ pkgsrc/textproc/discount/patches/patch-Makefile.in  Sun Jan  4 21:56:31 2026
@@ -1,29 +1,27 @@
-$NetBSD: patch-Makefile.in,v 1.5 2026/01/04 21:21:00 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.6 2026/01/04 21:56:31 wiz Exp $
 
 Libtoolize for portability across pkgsrc platforms.
 
---- Makefile.in.orig   2025-09-08 16:51:18.000000000 +0000
+--- Makefile.in.orig   2022-03-30 19:34:50.000000000 +0000
 +++ Makefile.in
-@@ -1,4 +1,5 @@
- CC=@CC@
+@@ -1,3 +1,4 @@
 +LIBTOOL=libtool --tag=CC
- CPPFLAGS=@CPPFLAGS@
+ CC=@CC@
  CFLAGS=@CFLAGS@
  LDFLAGS=@LDFLAGS@
-@@ -8,8 +9,9 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+@@ -7,8 +8,8 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
  INSTALL_DIR=@INSTALL_DIR@
  INSTALL_DATA=@INSTALL_DATA@
  
--BUILD=$(CC) -I. $(CPPFLAGS) $(CFLAGS)
+-BUILD=$(CC) -I. $(CFLAGS)
 -LINK=$(CC) -L. $(LDFLAGS)
-+BUILD=$(LIBTOOL) --mode=compile $(CC) -I. $(CPPFLAGS) $(CFLAGS)
++BUILD=$(LIBTOOL) --mode=compile $(CC) -I. $(CFLAGS)
 +LINK=$(LIBTOOL) --mode=link $(CC) -L. $(LDFLAGS)
-+
  
  .c.o:
        $(BUILD) -c -o $@ $<
-@@ -41,8 +43,10 @@ MAN3PAGES=mkd-callbacks.3 mkd-functions.
- all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK) all_subdirs
+@@ -39,8 +40,10 @@ MAN3PAGES=mkd-callbacks.3 mkd-functions.
+ all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK)
  
  install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR) $(DESTDIR)$(PKGDIR)
 -      $(INSTALL_PROGRAM) $(PGMS) $(DESTDIR)$(BINDIR)
@@ -35,7 +33,7 @@ Libtoolize for portability across pkgsrc
        $(INSTALL_DATA) mkdio.h $(DESTDIR)$(INCDIR)
        @MK_PKGCONFIG@$(INSTALL_DATA) $(MKDLIB).pc $(DESTDIR)$(PKGDIR)
  
-@@ -51,7 +55,7 @@ install.everything: install install.samp
+@@ -49,7 +52,7 @@ install.everything: install install.samp
  install.samples: $(SAMPLE_PGMS) install $(DESTDIR)$(BINDIR)
        $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
        for x in $(SAMPLE_PGMS); do \
@@ -44,7 +42,7 @@ Libtoolize for portability across pkgsrc
            $(INSTALL_DATA) $$x.1 $(DESTDIR)$(MANDIR)/man1/$(SAMPLE_PFX)$$x.1; \
        done
  
-@@ -102,19 +106,19 @@ mktags: mktags.o
+@@ -100,19 +103,19 @@ mktags: mktags.o
  
  # example programs
  @THEME@theme:  theme.o $(COMMON) $(MKDLIB) mkdio.h
@@ -68,19 +66,18 @@ Libtoolize for portability across pkgsrc
  
  pgm_options.o: pgm_options.c mkdio.h config.h
        $(BUILD) -c pgm_options.c
-@@ -128,8 +132,13 @@ gethopt.o: gethopt.c
+@@ -126,8 +129,12 @@ gethopt.o: gethopt.c
  main.o: main.c mkdio.h config.h
        $(BUILD) -c main.c
  
--$(MKDLIB): $(OBJS) .libmarkdown
+-$(MKDLIB): $(OBJS)
 -      ./librarian.sh make $(MKDLIB) VERSION $(OBJS)
 +libtool-version-info: VERSION
 +      awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }' < VERSION > libtool-version-info
 +
 +$(MKDLIB): $(MKDLIB).la
-+$(MKDLIB).la: $(OBJS) libtool-version-info .libmarkdown
++$(MKDLIB).la: $(OBJS) libtool-version-info
 +      $(LINK) -o $(MKDLIB).la $(OBJS:S/.o/.lo/g) -version-info `cat libtool-version-info` -rpath $(LIBDIR)
-+
  
- .libmarkdown: $(OBJS)
-       touch $@
+ verify: echo tools/checkbits.sh
+       @./echo -n "headers ... "; tools/checkbits.sh && echo "GOOD"

Index: pkgsrc/textproc/discount/patches/patch-main.c
diff -u pkgsrc/textproc/discount/patches/patch-main.c:1.2 pkgsrc/textproc/discount/patches/patch-main.c:1.3
--- pkgsrc/textproc/discount/patches/patch-main.c:1.2   Sun Jan  4 21:21:00 2026
+++ pkgsrc/textproc/discount/patches/patch-main.c       Sun Jan  4 21:56:31 2026
@@ -1,17 +1,17 @@
-$NetBSD: patch-main.c,v 1.2 2026/01/04 21:21:00 wiz Exp $
+$NetBSD: patch-main.c,v 1.3 2026/01/04 21:56:31 wiz Exp $
 
 Make function prototypes match for GCC 14.
 
---- main.c.orig        2025-09-08 16:51:18.000000000 +0000
-+++ main.c
-@@ -107,8 +107,9 @@ char *external_formatter = 0;
- #define SENDER 1
+--- main.c.orig        2023-08-23 01:09:27.000000000 -0700
++++ main.c     2025-09-25 12:07:41.131761165 -0700
+@@ -100,8 +100,9 @@
+ }
  
  char *
 -external_codefmt(char *src, int len, char *lang)
 +external_codefmt(const char *src, const int len, void *arg3)
  {
 +    char *lang = arg3;
-     int child_status;
-     int size, bufsize, curr;
+     int extra = 0;
+     int i, x;
      char *res;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/textproc/discount/patches
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/textproc/discount/patches
Indexes:

Home | Main Index | Thread Index | Old Index