CVS commit: pkgsrc/textproc/halibut

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 15 08:24:08 UTC 2020

Modified Files:
        pkgsrc/textproc/halibut: Makefile distinfo
        pkgsrc/textproc/halibut/patches: patch-aa

Log Message:
halibut: update to 1.1nb5.

Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/halibut/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/halibut/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/halibut/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/halibut/Makefile
diff -u pkgsrc/textproc/halibut/Makefile:1.13 pkgsrc/textproc/halibut/Makefile:1.14
--- pkgsrc/textproc/halibut/Makefile:1.13       Sun Aug 11 13:23:24 2019
+++ pkgsrc/textproc/halibut/Makefile    Wed Apr 15 08:24:08 2020
@@ -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/
 

Index: pkgsrc/textproc/halibut/distinfo
diff -u pkgsrc/textproc/halibut/distinfo:1.4 pkgsrc/textproc/halibut/distinfo:1.5
--- pkgsrc/textproc/halibut/distinfo:1.4        Fri Apr  1 11:41:42 2016
+++ pkgsrc/textproc/halibut/distinfo    Wed Apr 15 08:24:08 2020
@@ -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

Index: pkgsrc/textproc/halibut/patches/patch-aa
diff -u pkgsrc/textproc/halibut/patches/patch-aa:1.3 pkgsrc/textproc/halibut/patches/patch-aa:1.4
--- pkgsrc/textproc/halibut/patches/patch-aa:1.3        Fri Apr  1 11:41:42 2016
+++ pkgsrc/textproc/halibut/patches/patch-aa    Wed Apr 15 08:24:08 2020
@@ -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