cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to discount-2.2.6.

Browse Source
This commit is contained in:
ajacoutot 2021-02-19 19:13:26 +00:00
parent f9fab164af
commit 85c6c8e6aa
8 changed files with 24 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
textproc/discount/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2019/07/12 20:49:57 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2021/02/19 19:13:26 ajacoutot Exp $
COMMENT = fast C implementation of Markdown
DISTNAME = discount-2.2.4
DISTNAME = discount-2.2.6
SHARED_LIBS = markdown 0.0
CATEGORIES = textproc
REVISION = 0
HOMEPAGE = http://www.pell.portland.or.us/~orc/Code/markdown/
@ -26,6 +25,13 @@ CONFIGURE_ARGS = --github-checkbox \
INSTALL_TARGET = install.everything
pre-configure:
@sed -i 's,\./markdown,\./discount,' ${WRKSRC}/tests/*.*
sed -i 's,\./markdown,\./discount,' ${WRKSRC}/tests/*.*
post-install:
mv ${PREFIX}/bin/{markdown,discount}
mv ${PREFIX}/man/man1/{markdown,discount}.1
mv ${PREFIX}/man/man3/{markdown,discount}.3
mv ${PREFIX}/man/man7/{markdown,discount}.7
.include <bsd.port.mk>

4
textproc/discount/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (discount-2.2.4.tar.bz2) = dP0ePMK06s9zJdP9id84tYnbYNXdD08UoBFffaXiMKU=
SIZE (discount-2.2.4.tar.bz2) = 99482
SHA256 (discount-2.2.6.tar.bz2) = rmikgy/45iAoYwTsUlwf6JV75Njx53RYjrA9HD3rdKc=
SIZE (discount-2.2.6.tar.bz2) = 102303

34
textproc/discount/patches/patch-Makefile_in
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.6 2018/03/06 18:59:48 bket Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -10,7 +10,7 @@ LIBDIR=@libdir@
INCDIR=@prefix@/include
@MK_PKGCONFIG@PKGDIR=$(LIBDIR)/pkgconfig
-PGMS=markdown
+PGMS=discount
SAMPLE_PGMS=mkd2html makepage
@THEME@SAMPLE_PGMS+= theme
MKDLIB=libmarkdown
@@ -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
- @INSTALL_DATA@ markdown.1 $(DESTDIR)$(MANDIR)/man1
+ @mv markdown.1 discount.1
+ @INSTALL_DATA@ discount.1 $(DESTDIR)$(MANDIR)/man1
install.everything: install install.man
@@ -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 $(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 $(COMMON) $(MKDLIB) mkdio.h
$(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c $(COMMON) -lmarkdown @LIBS@

6
textproc/discount/patches/patch-configure_inc
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure_inc,v 1.1 2019/05/07 19:44:30 landry Exp $
$OpenBSD: patch-configure_inc,v 1.2 2021/02/19 19:13:26 ajacoutot Exp $
Index: configure.inc
--- configure.inc.orig
+++ configure.inc
@@ -1419,7 +1419,8 @@ eval \`awk -F. '{ printf "MAJOR=%d\n", \$1;
@@ -1481,7 +1481,8 @@ eval \`awk -F. '{ printf "MAJOR=%d\n", \$1;
shift
LIBNAME=\$LIBRARY.so
@ -13,7 +13,7 @@ Index: configure.inc
case "\$ACTION" in
make) FLAGS="$AC_CFLAGS -shared"
@@ -1428,18 +1429,13 @@ make) FLAGS="$AC_CFLAGS -shared"
@@ -1490,18 +1491,13 @@ make) FLAGS="$AC_CFLAGS -shared"
rm -f \$LIBRARY \$LIBNAME \$LIBNAME.\$MAJOR
if $AC_CC \$FLAGS \$VFLAGS -o \$FULLNAME "\$@"; then

3
textproc/discount/patches/patch-markdown_1
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-markdown_1,v 1.1 2014/11/01 11:06:55 jca Exp $
$OpenBSD: patch-markdown_1,v 1.2 2021/02/19 19:13:26 ajacoutot Exp $
--- markdown.1.orig Sat Aug 16 12:51:44 2014
+++ markdown.1 Sat Aug 16 12:52:05 2014
@@ -4,7 +4,7 @@

3
textproc/discount/patches/patch-markdown_3
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-markdown_3,v 1.5 2017/03/27 23:46:55 danj Exp $
$OpenBSD: patch-markdown_3,v 1.6 2021/02/19 19:13:26 ajacoutot Exp $
--- markdown.3.orig Wed Jan 18 21:42:06 2017
+++ markdown.3 Thu Jan 26 18:11:47 2017
@@ -131,7 +131,7 @@ and

3
textproc/discount/patches/patch-markdown_7
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-markdown_7,v 1.3 2014/11/01 11:06:55 jca Exp $
$OpenBSD: patch-markdown_7,v 1.4 2021/02/19 19:13:27 ajacoutot Exp $
--- markdown.7.orig Sat Aug 16 12:07:45 2014
+++ markdown.7 Sat Aug 16 12:09:20 2014
@@ -999,7 +999,7 @@ assumes that tabs are set to 4 spaces.

6
textproc/discount/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2019/05/07 19:44:30 landry Exp $
@comment $OpenBSD: PLIST,v 1.6 2021/02/19 19:13:27 ajacoutot Exp $
@bin bin/discount
@bin bin/makepage
@bin bin/mkd2html
@ -10,7 +10,7 @@ lib/pkgconfig/libmarkdown.pc
@man man/man1/makepage.1
@man man/man1/mkd2html.1
@man man/man1/theme.1
@man man/man3/markdown.3
@man man/man3/discount.3
@man man/man3/mkd-callbacks.3
@man man/man3/mkd-functions.3
@man man/man3/mkd-line.3
@ -26,5 +26,5 @@ lib/pkgconfig/libmarkdown.pc
@man man/man3/mkd_in.3
@man man/man3/mkd_line.3
@man man/man3/mkd_string.3
@man man/man7/markdown.7
@man man/man7/discount.7
@man man/man7/mkd-extensions.7