summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2020-04-15 08:24:08 +0000
committerwiz <wiz@pkgsrc.org>2020-04-15 08:24:08 +0000
commit8976a48f20de5a6871622fb4ffe0fb0b7c0b3497 (patch)
treec2054660a3ec52e0c0634992b0b92aa2d9f2f749 /textproc
parent992508493f0e02814b0b35fb4b6da7929668e94b (diff)
downloadpkgsrc-8976a48f20de5a6871622fb4ffe0fb0b7c0b3497.tar.gz
halibut: update to 1.1nb5.
Honor LDFLAGS. Fixes RELRO build.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/halibut/Makefile4
-rw-r--r--textproc/halibut/distinfo4
-rw-r--r--textproc/halibut/patches/patch-aa11
3 files changed, 14 insertions, 5 deletions
diff --git a/textproc/halibut/Makefile b/textproc/halibut/Makefile
index 254fe2240e4..adaf62e367f 100644
--- a/textproc/halibut/Makefile
+++ b/textproc/halibut/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2019/08/11 13:23:24 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2020/04/15 08:24:08 wiz Exp $
DISTNAME= halibut-1.1
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= textproc
MASTER_SITES= https://www.chiark.greenend.org.uk/~sgtatham/halibut/
diff --git a/textproc/halibut/distinfo b/textproc/halibut/distinfo
index 916a59e22e3..a4cb9c9156f 100644
--- a/textproc/halibut/distinfo
+++ b/textproc/halibut/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2016/04/01 11:41:42 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2020/04/15 08:24:08 wiz Exp $
SHA1 (halibut-1.1.tar.gz) = 77f40c585af031196564b92e4ca924d4a908fd1d
RMD160 (halibut-1.1.tar.gz) = f44ab0185d2cedb49838d4d37f271adffe805e5f
SHA512 (halibut-1.1.tar.gz) = 01b0563ebb3678dc1ff1cef1d752d5ebffed70ef73a10d8266d84da3b4401006b686104bbe3e1984ebd3a54254f16d008011b3be8c29a3b9f1e3a033d61cdb15
Size (halibut-1.1.tar.gz) = 956743 bytes
-SHA1 (patch-aa) = 517131dee0031d687cd1c440f82712ec944655ee
+SHA1 (patch-aa) = a93677997f2805e2ae63c1a26be55270e43fe44a
SHA1 (patch-ab) = 70af6b5026d3b727717de8dbdf77def8114a1430
diff --git a/textproc/halibut/patches/patch-aa b/textproc/halibut/patches/patch-aa
index cc03d38d94c..25d6afc0b85 100644
--- a/textproc/halibut/patches/patch-aa
+++ b/textproc/halibut/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2016/04/01 11:41:42 jperkin Exp $
+$NetBSD: patch-aa,v 1.4 2020/04/15 08:24:08 wiz Exp $
Use pkgsrc layout.
@@ -22,6 +22,15 @@ Use pkgsrc layout.
SRC := ../
+@@ -101,7 +101,7 @@ OBJECTS := $(addsuffix .o,$(MODULES)) $(
+ DEPS := $(addsuffix .d,$(MODULES))
+
+ halibut: $(OBJECTS)
+- $(CC) $(LFLAGS) -o halibut $(OBJECTS) $(LIBS)
++ $(CC) $(LFLAGS) ${LDFLAGS} -o halibut $(OBJECTS) $(LIBS)
+
+ %.o: $(SRC)%.c
+ $(CC) $(CFLAGS) -MD -c $<
@@ -109,6 +109,9 @@ halibut: $(OBJECTS)
version.o: FORCE
$(CC) $(VDEF) -MD -c $(SRC)version.c