From 20f51701c357c41aa22b59d1a175be37b8e1ee6a Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 30 Aug 2010 21:40:29 +0000 Subject: [PATCH] - update discount to 1.6.6 - mirror distfile due to stupid github - maintainer timed-out --- textproc/discount/Makefile | 11 ++++++++--- textproc/discount/distinfo | 10 +++++----- textproc/discount/patches/patch-Makefile_in | 10 +++++----- textproc/discount/patches/patch-cstring_h | 8 ++++---- textproc/discount/patches/patch-markdown_3 | 12 ++++++------ textproc/discount/patches/patch-markdown_7 | 8 ++++---- textproc/discount/pkg/PLIST | 10 +++++++--- 7 files changed, 39 insertions(+), 30 deletions(-) diff --git a/textproc/discount/Makefile b/textproc/discount/Makefile index c8955268a75..7677d5ea15e 100644 --- a/textproc/discount/Makefile +++ b/textproc/discount/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ +# $OpenBSD: Makefile,v 1.2 2010/08/30 21:40:29 jasper Exp $ COMMENT = fast C implementation of Markdown -DISTNAME = discount-1.3.5 +DISTNAME = discount-1.6.6 CATEGORIES = textproc HOMEPAGE = http://www.pell.portland.or.us/~orc/Code/markdown/ @@ -17,12 +17,17 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB += c -MASTER_SITES = http://www.pell.portland.or.us/~orc/Code/markdown/ +# Stupid github. +MASTER_SITES = http://www.phil.uu.nl/~lievisse/distfiles/ +WRKDIST = ${WRKDIR}/Orc-discount-9dabdb8 CONFIGURE_STYLE = simple CONFIGURE_SCRIPT = configure.sh CONFIGURE_ARGS += ${CONFIGURE_SHARED} +BUILD_DEPENDS = ::archivers/gtar +TAR = ${LOCALBASE}/bin/gtar + INSTALL_TARGET = install.everything REGRESS_TARGET = test diff --git a/textproc/discount/distinfo b/textproc/discount/distinfo index b1e9fa9befa..983f9fa7e0d 100644 --- a/textproc/discount/distinfo +++ b/textproc/discount/distinfo @@ -1,5 +1,5 @@ -MD5 (discount-1.3.5.tar.gz) = IDbEM2jjxRFCBhArnskcUA== -RMD160 (discount-1.3.5.tar.gz) = 2wm87/8H0kd9JLk/6lWSnh+DwDw= -SHA1 (discount-1.3.5.tar.gz) = kvTbT0yfcKklP6jJBbyjioD9Nw4= -SHA256 (discount-1.3.5.tar.gz) = O6yaGc6BJrckB+NLQoprnulAGQdt1tsDlAosV0VVBlY= -SIZE (discount-1.3.5.tar.gz) = 70287 +MD5 (discount-1.6.6.tar.gz) = wFy4BL31ATrqLoFuXSIz1w== +RMD160 (discount-1.6.6.tar.gz) = a+hDjXvYYgHgTy5b/D5HRi13mvI= +SHA1 (discount-1.6.6.tar.gz) = Ii8ka+XoKlEKT191HDm5/VvU1b0= +SHA256 (discount-1.6.6.tar.gz) = 1Zu9/eQY80h6v88kH7l8h9cuXL3KiHPQDO05w+7bgnc= +SIZE (discount-1.6.6.tar.gz) = 93003 diff --git a/textproc/discount/patches/patch-Makefile_in b/textproc/discount/patches/patch-Makefile_in index f313f4fffbe..b0dc564f614 100644 --- a/textproc/discount/patches/patch-Makefile_in +++ b/textproc/discount/patches/patch-Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ ---- Makefile.in.orig Sun Apr 12 18:45:50 2009 -+++ Makefile.in Sun Apr 12 18:48:28 2009 +$OpenBSD: patch-Makefile_in,v 1.2 2010/08/30 21:40:29 jasper Exp $ +--- Makefile.in.orig Thu Jun 17 03:14:33 2010 ++++ Makefile.in Mon Aug 30 15:01:46 2010 @@ -7,7 +7,7 @@ MANDIR=@mandir@ LIBDIR=@libdir@ INCDIR=@prefix@/include @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ SAMPLE_PGMS=mkd2html makepage @THEME@SAMPLE_PGMS+= theme MKDLIB=libmarkdown.a -@@ -40,15 +40,16 @@ install.man: +@@ -47,15 +47,16 @@ install.man: @INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man7 @INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)/$(MANDIR)/man7 @INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man1 @@ -29,4 +29,4 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ + $(CC) -o discount main.o -lmarkdown @LIBS@ # example programs - @THEME@theme: theme.o $(MKDLIB) + @THEME@theme: theme.o $(MKDLIB) mkdio.h diff --git a/textproc/discount/patches/patch-cstring_h b/textproc/discount/patches/patch-cstring_h index ff2f21f6ef9..22646788553 100644 --- a/textproc/discount/patches/patch-cstring_h +++ b/textproc/discount/patches/patch-cstring_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-cstring_h,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ ---- cstring.h.orig Fri Apr 3 17:57:34 2009 -+++ cstring.h Mon Apr 13 10:39:25 2009 -@@ -16,7 +16,7 @@ +$OpenBSD: patch-cstring_h,v 1.2 2010/08/30 21:40:29 jasper Exp $ +--- cstring.h.orig Thu Jun 17 03:14:33 2010 ++++ cstring.h Mon Aug 30 15:01:46 2010 +@@ -18,7 +18,7 @@ */ #define STRING(type) struct { type *text; int size, alloc; } diff --git a/textproc/discount/patches/patch-markdown_3 b/textproc/discount/patches/patch-markdown_3 index cc1481e5ac0..08a3c58db6a 100644 --- a/textproc/discount/patches/patch-markdown_3 +++ b/textproc/discount/patches/patch-markdown_3 @@ -1,12 +1,12 @@ -$OpenBSD: patch-markdown_3,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ ---- markdown.3.orig Sun Apr 12 18:57:11 2009 -+++ markdown.3 Sun Apr 12 18:57:23 2009 -@@ -107,7 +107,7 @@ and +$OpenBSD: patch-markdown_3,v 1.2 2010/08/30 21:40:29 jasper Exp $ +--- markdown.3.orig Mon Aug 30 15:00:43 2010 ++++ markdown.3 Mon Aug 30 15:00:57 2010 +@@ -102,7 +102,7 @@ and .Fn mkd_string functions return a MMIOT* on success, null on failure. .Sh SEE ALSO -.Xr markdown 1 , +.Xr discount 1 , + .Xr mkd-callbacks 3 , .Xr mkd-functions 3 , - .Xr markdown 7 , - .Xr mkd-extensions 7 , + .Xr mkd-line 3 , diff --git a/textproc/discount/patches/patch-markdown_7 b/textproc/discount/patches/patch-markdown_7 index 72ceef2b62b..9aeb04ab9be 100644 --- a/textproc/discount/patches/patch-markdown_7 +++ b/textproc/discount/patches/patch-markdown_7 @@ -1,6 +1,6 @@ -$OpenBSD: patch-markdown_7,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ ---- markdown.7.orig Sun Apr 12 18:57:14 2009 -+++ markdown.7 Sun Apr 12 18:57:35 2009 +$OpenBSD: patch-markdown_7,v 1.2 2010/08/30 21:40:29 jasper Exp $ +--- markdown.7.orig Thu Jun 17 03:14:33 2010 ++++ markdown.7 Mon Aug 30 15:01:46 2010 @@ -999,7 +999,7 @@ assumes that tabs are set to 4 spaces. John Gruber .%T http://daringfireball.net/ @@ -8,5 +8,5 @@ $OpenBSD: patch-markdown_7,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ -.Xr markdown 1 , +.Xr discount 1 , .Xr markdown 3 , + .Xr mkd-callbacks 3 , .Xr mkd-functions 3 , - .Xr mkd-extensions 7 . diff --git a/textproc/discount/pkg/PLIST b/textproc/discount/pkg/PLIST index 46d1252605b..c3997ce7960 100644 --- a/textproc/discount/pkg/PLIST +++ b/textproc/discount/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/04/13 20:45:05 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.2 2010/08/30 21:40:29 jasper Exp $ @bin bin/discount @bin bin/makepage @bin bin/mkd2html @@ -8,16 +8,20 @@ lib/libmarkdown.a @man man/man1/discount.1 @man man/man1/theme.1 @man man/man3/markdown.3 +@man man/man3/mkd-callbacks.3 @man man/man3/mkd-functions.3 +@man man/man3/mkd-line.3 @man man/man3/mkd_cleanup.3 @man man/man3/mkd_compile.3 +@man man/man3/mkd_css.3 @man man/man3/mkd_doc_author.3 @man man/man3/mkd_doc_date.3 @man man/man3/mkd_doc_title.3 +@man man/man3/mkd_generatecss.3 @man man/man3/mkd_generatehtml.3 +@man man/man3/mkd_generateline.3 @man man/man3/mkd_in.3 +@man man/man3/mkd_line.3 @man man/man3/mkd_string.3 -@man man/man3/mkd_style.3 -@man man/man3/mkd_text.3 @man man/man7/markdown.7 @man man/man7/mkd-extensions.7