discount: update to 2.2.5.

This commit is contained in:
Leah Neukirchen 2019-05-06 13:19:23 +02:00
parent ff41af04cc
commit 7a967085fe
2 changed files with 9 additions and 29 deletions

View File

@ -1,34 +1,13 @@
--- Makefile.in.orig
+++ Makefile.in
@@ -1,5 +1,5 @@
CC=@CC@ -I.
-LFLAGS=-L.
+LFLAGS=@LDFLAGS@ -L.
CFLAGS=@CFLAGS@
AR=@AR@
RANLIB=@RANLIB@
@@ -85,6 +85,9 @@
@@ -95,8 +95,8 @@
blocktags: mktags
./mktags > blocktags
-mktags: mktags.o
- $(LINK) -o mktags mktags.o
+mktags: mktags.c
+ cc -o $@ $<
+
+ $(BUILD_CC) -o mktags mktags.c
# example programs
@THEME@theme: theme.o $(COMMON) $(MKDLIB) mkdio.h
@THEME@ $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) -lmarkdown @LIBS@
@@ -123,11 +126,11 @@
done
branch: tools/branch.c config.h
- $(CC) -o branch tools/branch.c
+ cc -I. -o branch tools/branch.c
cols: tools/cols.c config.h
- $(CC) -o cols tools/cols.c
+ cc -o cols tools/cols.c
echo: tools/echo.c config.h
- $(CC) -o echo tools/echo.c
+ cc -o echo tools/echo.c
clean:
rm -f $(PGMS) $(TESTFRAMEWORK) $(SAMPLE_PGMS) *.o

View File

@ -1,6 +1,6 @@
# Template file for 'discount'
pkgname=discount
version=2.2.4
version=2.2.5
revision=1
build_style=configure
configure_script="./configure.sh"
@ -9,8 +9,9 @@ short_desc="C implementation of John Gruber's Markdown"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="http://www.pell.portland.or.us/~orc/Code/discount"
distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
checksum=74fd1e3cc2b4eacf7325d3fd89df38b589db60d5dd0f4f14a0115f7da5e230a5
distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
checksum=1feccbd8164610cb345cf6c524a6eab77f108ad9e8420c579c9a18ff0c2affab
disable_parallel_build=yes
do_install() {
make DESTDIR=${DESTDIR} install install.man