discount3: add package for discount major version 3

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: discount3: add package for discount major version 3
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 4 Jan 2026 23:16:58 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Jan 5 00:16:41 2026 +0100
Changeset:	b036ff4addc52f0c89ce1011e3691c522804b64f

Modified Files:
	Makefile
Added Files:
	discount3/DESCR
	discount3/Makefile
	discount3/PLIST
	discount3/buildlink3.mk
	discount3/distinfo
	discount3/patches/patch-Makefile.in
	discount3/patches/patch-main.c

Log Message:
discount3: add package for discount major version 3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b036ff4addc52f0c89ce1011e3691c522804b64f

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

diffstat:
 Makefile                            |  1 +
 discount3/DESCR                     | 14 ++++++
 discount3/Makefile                  | 33 ++++++++++++++
 discount3/PLIST                     | 30 +++++++++++++
 discount3/buildlink3.mk             | 12 ++++++
 discount3/distinfo                  |  7 +++
 discount3/patches/patch-Makefile.in | 86 +++++++++++++++++++++++++++++++++++++
 discount3/patches/patch-main.c      | 17 ++++++++
 8 files changed, 200 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index f8e09c3cb6..ae5d6f9b7a 100644
--- a/Makefile
+++ b/Makefile
@@ -744,6 +744,7 @@ SUBDIR+=	ding
 SUBDIR+=	dionysus
 SUBDIR+=	discident-glib
 SUBDIR+=	discordo
+SUBDIR+=	discount3
 SUBDIR+=	diskonaut
 SUBDIR+=	dispred
 SUBDIR+=	disque
diff --git a/discount3/DESCR b/discount3/DESCR
new file mode 100644
index 0000000000..8633d174cf
--- /dev/null
+++ b/discount3/DESCR
@@ -0,0 +1,14 @@
+Markdown is a text-to-HTML conversion tool for web writers. Markdown
+allows you to write using an easy-to-read, easy-to-write plain text
+format, then convert it to structurally valid XHTML (or HTML).
+
+The overriding design goal for Markdown's formatting syntax is to make
+it as readable as possible. The idea is that a Markdown-formatted
+document should be publishable as-is, as plain text, without looking
+like it's been marked up with tags or formatting instructions. While
+Markdown's syntax has been influenced by several existing text-to-HTML
+filters, the single biggest source of inspiration for Markdown's
+syntax is the format of plain text email.
+
+Original Markdown implementation is written in Perl. Discount provides a
+Markdown CLI tool and a library, written in C.
diff --git a/discount3/Makefile b/discount3/Makefile
new file mode 100644
index 0000000000..61fa7c62ae
--- /dev/null
+++ b/discount3/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.20 2026/01/04 21:21:00 wiz Exp $
+
+DISTNAME=		discount-3.0.1.2
+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/
+COMMENT=		Markdown C implementation
+LICENSE=		modified-bsd
+
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+
+CONFLICTS+=		multimarkdown-[0-9]*
+
+HAS_CONFIGURE=		YES
+CONFIGURE_SCRIPT=	./configure.sh
+CONFIGURE_ARGS=		--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--execdir=${PREFIX}/bin
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--shared
+CONFIGURE_ARGS+=	--enable-all-features
+
+USE_LIBTOOL=		yes
+
+PKGCONFIG_OVERRIDE+=	libmarkdown.pc.in
+
+INSTALL_TARGET=		install.everything
+TEST_TARGET=		test
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/discount3/PLIST b/discount3/PLIST
new file mode 100644
index 0000000000..a05c4a2058
--- /dev/null
+++ b/discount3/PLIST
@@ -0,0 +1,30 @@
+@comment $NetBSD: PLIST,v 1.5 2018/03/16 03:45:18 schmonz Exp $
+bin/makepage
+bin/markdown
+bin/mkd2html
+bin/theme
+include/mkdio.h
+lib/libmarkdown.la
+lib/pkgconfig/libmarkdown.pc
+man/man1/makepage.1
+man/man1/markdown.1
+man/man1/mkd2html.1
+man/man1/theme.1
+man/man3/markdown.3
+man/man3/mkd-callbacks.3
+man/man3/mkd-functions.3
+man/man3/mkd-line.3
+man/man3/mkd_cleanup.3
+man/man3/mkd_compile.3
+man/man3/mkd_css.3
+man/man3/mkd_doc_author.3
+man/man3/mkd_doc_date.3
+man/man3/mkd_doc_title.3
+man/man3/mkd_generatecss.3
+man/man3/mkd_generatehtml.3
+man/man3/mkd_generateline.3
+man/man3/mkd_in.3
+man/man3/mkd_line.3
+man/man3/mkd_string.3
+man/man7/markdown.7
+man/man7/mkd-extensions.7
diff --git a/discount3/buildlink3.mk b/discount3/buildlink3.mk
new file mode 100644
index 0000000000..5bc910e12e
--- /dev/null
+++ b/discount3/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.2 2018/03/10 05:37:44 schmonz Exp $
+
+BUILDLINK_TREE+=	discount
+
+.if !defined(DISCOUNT_BUILDLINK3_MK)
+DISCOUNT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.discount+=	discount>=3
+BUILDLINK_PKGSRCDIR.discount?=		../../wip/discount3
+.endif	# DISCOUNT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-discount
diff --git a/discount3/distinfo b/discount3/distinfo
new file mode 100644
index 0000000000..689b58c4e7
--- /dev/null
+++ b/discount3/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.20 2026/01/04 21:21:00 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
diff --git a/discount3/patches/patch-Makefile.in b/discount3/patches/patch-Makefile.in
new file mode 100644
index 0000000000..8a5340bc4e
--- /dev/null
+++ b/discount3/patches/patch-Makefile.in
@@ -0,0 +1,86 @@
+$NetBSD: patch-Makefile.in,v 1.5 2026/01/04 21:21:00 wiz Exp $
+
+Libtoolize for portability across pkgsrc platforms.
+
+--- Makefile.in.orig	2025-09-08 16:51:18.000000000 +0000
++++ Makefile.in
+@@ -1,4 +1,5 @@
+ CC=@CC@
++LIBTOOL=libtool --tag=CC
+ CPPFLAGS=@CPPFLAGS@
+ CFLAGS=@CFLAGS@
+ LDFLAGS=@LDFLAGS@
+@@ -8,8 +9,9 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+ INSTALL_DIR=@INSTALL_DIR@
+ INSTALL_DATA=@INSTALL_DATA@
+ 
+-BUILD=$(CC) -I. $(CPPFLAGS) $(CFLAGS)
+-LINK=$(CC) -L. $(LDFLAGS)
++BUILD=$(LIBTOOL) --mode=compile $(CC) -I. $(CPPFLAGS) $(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
+ 
+ install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR) $(DESTDIR)$(PKGDIR)
+-	$(INSTALL_PROGRAM) $(PGMS) $(DESTDIR)$(BINDIR)
+-	./librarian.sh install libmarkdown VERSION $(DESTDIR)$(LIBDIR)
++	for x in $(PGMS); do \
++	    $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(BINDIR)/$$x; \
++	done
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(MKDLIB).la $(DESTDIR)$(LIBDIR)/$(MKDLIB).la
+ 	$(INSTALL_DATA) mkdio.h $(DESTDIR)$(INCDIR)
+ 	@MK_PKGCONFIG@$(INSTALL_DATA) $(MKDLIB).pc $(DESTDIR)$(PKGDIR)
+ 
+@@ -51,7 +55,7 @@ install.everything: install install.samp
+ install.samples: $(SAMPLE_PGMS) install $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
+ 	for x in $(SAMPLE_PGMS); do \
+-	    $(INSTALL_PROGRAM) $$x $(DESTDIR)$(BINDIR)/$(SAMPLE_PFX)$$x; \
++	    $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(BINDIR)/$(SAMPLE_PFX)$$x; \
+ 	    $(INSTALL_DATA) $$x.1 $(DESTDIR)$(MANDIR)/man1/$(SAMPLE_PFX)$$x.1; \
+ 	done
+ 
+@@ -102,19 +106,19 @@ mktags: mktags.o
+ 
+ # example programs
+ @THEME@theme:  theme.o $(COMMON) $(MKDLIB) mkdio.h
+-@THEME@	$(LINK) -o theme theme.o $(COMMON) -lmarkdown @LIBS@
++@THEME@	$(LINK) -o theme theme.o $(COMMON) $(MKDLIB).la @LIBS@
+ 
+ 
+ mkd2html:  mkd2html.o $(MKDLIB) mkdio.h gethopt.h $(COMMON)
+-	$(LINK) -o mkd2html mkd2html.o $(COMMON) -lmarkdown @LIBS@
++	$(LINK) -o mkd2html mkd2html.o $(COMMON) $(MKDLIB).la @LIBS@
+ 
+ markdown: main.o $(COMMON) $(MKDLIB)
+-	$(LINK) -o markdown main.o $(COMMON) -lmarkdown @LIBS@
++	$(LINK) -o markdown main.o $(COMMON) $(MKDLIB).la @LIBS@
+ 	
+ makepage.o: makepage.c mkdio.h
+ 	$(BUILD) -c makepage.c
+ makepage:  makepage.o $(COMMON) $(MKDLIB)
+-	$(LINK) -o makepage makepage.o $(COMMON) -lmarkdown @LIBS@
++	$(LINK) -o makepage makepage.o $(COMMON) $(MKDLIB).la @LIBS@
+ 
+ pgm_options.o: pgm_options.c mkdio.h config.h
+ 	$(BUILD) -c pgm_options.c
+@@ -128,8 +132,13 @@ gethopt.o: gethopt.c
+ main.o: main.c mkdio.h config.h
+ 	$(BUILD) -c main.c
+ 
+-$(MKDLIB): $(OBJS) .libmarkdown
+-	./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
++	$(LINK) -o $(MKDLIB).la $(OBJS:S/.o/.lo/g) -version-info `cat libtool-version-info` -rpath $(LIBDIR)
++
+ 
+ .libmarkdown: $(OBJS)
+ 	touch $@
diff --git a/discount3/patches/patch-main.c b/discount3/patches/patch-main.c
new file mode 100644
index 0000000000..da4234a162
--- /dev/null
+++ b/discount3/patches/patch-main.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-main.c,v 1.2 2026/01/04 21:21:00 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
+ 
+ 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;
+     char *res;
Prev by Date: ham/xnecview: Makefile
Next by Date: discount3: change PKGNAME
Previous by Thread: ham/xnecview: Makefile
Next by Thread: discount3: change PKGNAME
Indexes:
Home | Main Index | Thread Index | Old Index