Enclosed a diff for bringing discount to 2.2.3. Passes all included
tests.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/discount/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 27 Mar 2017 23:46:55 -0000 1.14
+++ Makefile 2 Mar 2018 17:11:40 -0000
@@ -2,7 +2,7 @@
COMMENT = fast C implementation of Markdown
-DISTNAME = discount-2.2.2
+DISTNAME = discount-2.2.3
CATEGORIES = textproc
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/discount/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 27 Mar 2017 23:46:55 -0000 1.6
+++ distinfo 2 Mar 2018 17:11:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (discount-2.2.2.tar.bz2) = 7HkWcx4++FFjNjM/i3qp4q9R5XwAF7HgP6Q/G6aXj2Q=
-SIZE (discount-2.2.2.tar.bz2) = 89288
+SHA256 (discount-2.2.3.tar.bz2) = qP+82vA5I/poeNzSNzoKJZKXX2o7E3lFCXMCrGI/6Zw=
+SIZE (discount-2.2.3.tar.bz2) = 98369
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/discount/patches/patch-Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_in
--- patches/patch-Makefile_in 27 Mar 2017 23:46:55 -0000 1.5
+++ patches/patch-Makefile_in 2 Mar 2018 17:11:40 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.5 2017/03/27 23:46:55 danj Exp $
---- Makefile.in.orig Wed Jan 18 21:42:06 2017
-+++ Makefile.in Thu Jan 26 18:11:47 2017
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
@@ -10,7 +10,7 @@ LIBDIR=@libdir@
INCDIR=@prefix@/include
@MK_PKGCONFIG@PKGDIR=$(LIBDIR)/pkgconfig
@@ -10,7 +11,7 @@ $OpenBSD: patch-Makefile_in,v 1.5 2017/0
SAMPLE_PGMS=mkd2html makepage
@THEME@SAMPLE_PGMS+= theme
MKDLIB=libmarkdown
-@@ -56,7 +56,8 @@ install.man:
+@@ -58,7 +58,8 @@ install.man:
@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man7
@INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)$(MANDIR)/man7
@INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
@@ -20,14 +21,14 @@ $OpenBSD: patch-Makefile_in,v 1.5 2017/0
install.everything: install install.man
-@@ -91,8 +92,8 @@ blocktags: mktags
- mkd2html: mkd2html.o $(MKDLIB) mkdio.h
- $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
+@@ -93,8 +94,8 @@ blocktags: mktags
+ mkd2html: mkd2html.o $(MKDLIB) mkdio.h gethopt.h $(COMMON)
+ $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o $(COMMON) -lmarkdown
@LIBS@
--markdown: main.o pgm_options.o $(MKDLIB)
-- $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown
@LIBS@
-+discount: main.o pgm_options.o $(MKDLIB)
-+ $(CC) $(CFLAGS) $(LFLAGS) -o discount main.o pgm_options.o -lmarkdown
@LIBS@
+-markdown: main.o $(COMMON) $(MKDLIB)
+- $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o $(COMMON) -lmarkdown @LIBS@
++discount: main.o $(COMMON) $(MKDLIB)
++ $(CC) $(CFLAGS) $(LFLAGS) -o discount main.o $(COMMON) -lmarkdown @LIBS@
- makepage: makepage.c pgm_options.o $(MKDLIB) mkdio.h
- $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c pgm_options.o
-lmarkdown @LIBS@
+ makepage: makepage.c $(COMMON) $(MKDLIB) mkdio.h
+ $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c $(COMMON) -lmarkdown
@LIBS@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/discount/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 1 Nov 2014 11:06:55 -0000 1.3
+++ pkg/PLIST 2 Mar 2018 17:11:40 -0000
@@ -5,6 +5,7 @@
@bin bin/theme
include/mkdio.h
lib/libmarkdown.a
+lib/pkgconfig/libmarkdown.pc
@man man/man1/discount.1
@man man/man1/makepage.1
@man man/man1/mkd2html.1
