textproc/discount: Update 2.2.2 -> 2.2.6

Approved by:	jlaffaye (maintainer timeout; 14 days)

3 files changed, 45 insertions, 29 deletions

diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile
index 9a4412d6aece..f902baa72a64 100644
--- a/textproc/discount/Makefile
+++ b/textproc/discount/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	discount
-DISTVERSION=	2.2.2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.2.6
 CATEGORIES=	textproc devel
-MASTER_SITES=	http://www.pell.portland.or.us/~orc/Code/discount/ \
-		LOCAL/jlaffaye
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	C implementation of the Markdown markup language
@@ -13,39 +12,33 @@ COMMENT=	C implementation of the Markdown markup language
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-USES=	tar:bzip2
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=configure.sh
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--mandir=${MANPREFIX}/man
+USES=		pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	Orc
+
+HAS_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	configure.sh
+CONFIGURE_ARGS=		--prefix=${PREFIX} \
+			--mandir=${MANPREFIX}/man
+
 INSTALL_TARGET=	install install.man
 
-PLIST_FILES=	bin/markdown lib/libmarkdown.a include/mkdio.h \
-		man/man1/markdown.1.gz man/man3/markdown.3.gz \
-		man/man3/mkd-callbacks.3.gz man/man3/mkd-functions.3.gz \
-		man/man3/mkd-line.3.gz man/man3/mkd_cleanup.3.gz \
-		man/man3/mkd_compile.3.gz man/man3/mkd_css.3.gz \
-		man/man3/mkd_doc_author.3.gz man/man3/mkd_doc_date.3.gz \
-		man/man3/mkd_doc_title.3.gz man/man3/mkd_generatecss.3.gz \
-		man/man3/mkd_generatehtml.3.gz man/man3/mkd_generateline.3.gz \
-		man/man3/mkd_in.3.gz man/man3/mkd_line.3.gz \
-		man/man3/mkd_string.3.gz man/man7/markdown.7.gz \
-		man/man7/mkd-extensions.7.gz
-
-OPTIONS_DEFINE=	EXTRA TAB8 SAMPLES
+CFLAGS+=	-fPIC
+
+MAKE_JOBS_UNSAFE=	yes # libmarkdown is used before it is built
+
+OPTIONS_DEFINE=		EXTRA TAB8 SAMPLES
 OPTIONS_DEFAULT=	EXTRA TAB8
 
-EXTRA_DESC=	Enable all extra features
-TAB8_DESC=	Use a tabstop of 8 (default is 4)
-SAMPLES_DESC=	Install sample programs
+EXTRA_DESC=		Enable all extra features
+TAB8_DESC=		Use a tabstop of 8 (default is 4)
+SAMPLES_DESC=		Install sample programs
 
 EXTRA_CONFIGURE_ON=	--with-dl=both --with-fenced-code --with-github-tags \
 			--with-id-anchor
 
 TAB8_CONFIGURE_ON=	--with-tabstops=8
 
-CFLAGS+=	-fPIC
-
 SAMPLES_INSTALL_TARGET=	install install.samples
 SAMPLES_PLIST_FILES=	bin/makepage bin/mkd2html bin/theme \
 			man/man1/makepage.1.gz man/man1/mkd2html.1.gz \
diff --git a/textproc/discount/distinfo b/textproc/discount/distinfo
index 9bc2edc26c29..63644d140d99 100644
--- a/textproc/discount/distinfo
+++ b/textproc/discount/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490057858
-SHA256 (discount-2.2.2.tar.bz2) = ec7916731e3ef8516336333f8b7aa9e2af51e57c0017b1e03fa43f1ba6978f64
-SIZE (discount-2.2.2.tar.bz2) = 89288
+TIMESTAMP = 1584899335
+SHA256 (Orc-discount-v2.2.6_GH0.tar.gz) = 0beb98a66a6e38ed125e2d0a161ff6b461f6a38538bb72498766f376c94a0ad3
+SIZE (Orc-discount-v2.2.6_GH0.tar.gz) = 128790
diff --git a/textproc/discount/pkg-plist b/textproc/discount/pkg-plist
new file mode 100644
index 000000000000..ff05a45ec209
--- /dev/null
+++ b/textproc/discount/pkg-plist
@@ -0,0 +1,23 @@
+bin/markdown
+include/mkdio.h
+lib/libmarkdown.a
+libdata/pkgconfig/libmarkdown.pc
+man/man1/markdown.1.gz
+man/man3/markdown.3.gz
+man/man3/mkd-callbacks.3.gz
+man/man3/mkd-functions.3.gz
+man/man3/mkd-line.3.gz
+man/man3/mkd_cleanup.3.gz
+man/man3/mkd_compile.3.gz
+man/man3/mkd_css.3.gz
+man/man3/mkd_doc_author.3.gz
+man/man3/mkd_doc_date.3.gz
+man/man3/mkd_doc_title.3.gz
+man/man3/mkd_generatecss.3.gz
+man/man3/mkd_generatehtml.3.gz
+man/man3/mkd_generateline.3.gz
+man/man3/mkd_in.3.gz
+man/man3/mkd_line.3.gz
+man/man3/mkd_string.3.gz
+man/man7/markdown.7.gz
+man/man7/mkd-extensions.7.gz