[pkgsrc/trunk]: pkgsrc/textproc/halibut halibut: Update to 1.2

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3dd6d2fb5199
branches:  trunk
changeset: 442611:3dd6d2fb5199
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Nov 26 16:28:11 2020 +0000

description:
halibut: Update to 1.2

Unknown changes

diffstat:

 textproc/halibut/Makefile         |  21 ++++++++++++--
 textproc/halibut/PLIST            |   2 +-
 textproc/halibut/distinfo         |  12 +++-----
 textproc/halibut/patches/patch-aa |  53 ---------------------------------------
 textproc/halibut/patches/patch-ab |  22 ----------------
 5 files changed, 23 insertions(+), 87 deletions(-)

diffs (143 lines):

diff -r c3a925430637 -r 3dd6d2fb5199 textproc/halibut/Makefile
--- a/textproc/halibut/Makefile Thu Nov 26 16:08:43 2020 +0000
+++ b/textproc/halibut/Makefile Thu Nov 26 16:28:11 2020 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2020/08/31 18:11:42 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2020/11/26 16:28:11 nia Exp $
 
-DISTNAME=      halibut-1.1
-PKGREVISION=   6
+DISTNAME=      halibut-1.2
 CATEGORIES=    textproc
-MASTER_SITES=  https://www.chiark.greenend.org.uk/~sgtatham/halibut/
+MASTER_SITES=  https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${PKGVERSION_NOREV}/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.chiark.greenend.org.uk/~sgtatham/halibut/
@@ -14,4 +13,18 @@
 
 USE_TOOLS+=    gmake perl
 
+BUILD_DIRS+=   . doc
+
+MAKE_FLAGS+=   RELEASE=1
+MAKE_FLAGS+=   VERSION=${PKGVERSION}
+
+INSTALLATION_DIRS+=    bin
+INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/build/halibut \
+               ${DESTDIR}${PREFIX}/bin/halibut
+       ${INSTALL_PROGRAM} ${WRKSRC}/doc/halibut.1 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/halibut.1
+
 .include "../../mk/bsd.pkg.mk"
diff -r c3a925430637 -r 3dd6d2fb5199 textproc/halibut/PLIST
--- a/textproc/halibut/PLIST    Thu Nov 26 16:08:43 2020 +0000
+++ b/textproc/halibut/PLIST    Thu Nov 26 16:28:11 2020 +0000
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/06 18:42:41 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/26 16:28:11 nia Exp $
 bin/halibut
 man/man1/halibut.1
diff -r c3a925430637 -r 3dd6d2fb5199 textproc/halibut/distinfo
--- a/textproc/halibut/distinfo Thu Nov 26 16:08:43 2020 +0000
+++ b/textproc/halibut/distinfo Thu Nov 26 16:28:11 2020 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/04/15 08:24:08 wiz Exp $
+$NetBSD: distinfo,v 1.6 2020/11/26 16:28:11 nia 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) = a93677997f2805e2ae63c1a26be55270e43fe44a
-SHA1 (patch-ab) = 70af6b5026d3b727717de8dbdf77def8114a1430
+SHA1 (halibut-1.2.tar.gz) = e2fd4239143152549c3aed1bdb48d8cd07526ba5
+RMD160 (halibut-1.2.tar.gz) = e1ca8d00c7e4c4969907e3826245a9cda78ad6bb
+SHA512 (halibut-1.2.tar.gz) = b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc
+Size (halibut-1.2.tar.gz) = 991975 bytes
diff -r c3a925430637 -r 3dd6d2fb5199 textproc/halibut/patches/patch-aa
--- a/textproc/halibut/patches/patch-aa Thu Nov 26 16:08:43 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2020/04/15 08:24:08 wiz Exp $
-
-Use pkgsrc layout.
-
---- Makefile.orig      2014-12-19 10:03:18.000000000 +0000
-+++ Makefile
-@@ -11,7 +11,7 @@
- #    pattern rules
- #  - we use .PHONY
- 
--prefix=/usr/local
-+prefix=$(PREFIX)
- exec_prefix=$(prefix)
- bindir=$(exec_prefix)/bin
- INSTALL=install -c
-@@ -76,7 +76,7 @@ CFLAGS += -DLOGALLOC
- LIBS += -lefence
- endif
- 
--all: halibut
-+all: halibut doc
- 
- 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
- 
-+doc:
-+      $(MAKE) -C ../doc
-+
- spotless:: clean
-       rm -f *.d
- 
-@@ -116,7 +119,8 @@ clean::
-       rm -f *.o halibut core
- 
- install:
--      $(INSTALL) -m 755 halibut $(bindir)/halibut
-+      mkdir -p $(DESTDIR)$(bindir)
-+      $(INSTALL) -m 755 halibut $(DESTDIR)$(bindir)/halibut
-       $(MAKE) -C ../doc install prefix="$(prefix)" INSTALL="$(INSTALL)"
- 
- FORCE: # phony target to force version.o to be rebuilt every time
diff -r c3a925430637 -r 3dd6d2fb5199 textproc/halibut/patches/patch-ab
--- a/textproc/halibut/patches/patch-ab Thu Nov 26 16:08:43 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2016/04/01 11:41:42 jperkin Exp $
-
-Use pkgsrc layout.
-
---- doc/Makefile.orig  2014-12-19 10:03:18.000000000 +0000
-+++ doc/Makefile
-@@ -1,4 +1,4 @@
--mandir=$(prefix)/man
-+mandir=$(prefix)/${PKGMANDIR}
- man1dir=$(mandir)/man1
- 
- CHAPTERS := $(SITE) blurb intro running input output licence manpage index
-@@ -17,7 +17,8 @@ halibut.1: manpage.but
-       $(HALIBUT) --man=halibut.1 manpage.but
- 
- install:
--      $(INSTALL) -m 644 halibut.1 $(man1dir)/halibut.1
-+      mkdir -p $(DESTDIR)$(man1dir)
-+      $(INSTALL) -m 644 halibut.1 $(DESTDIR)$(man1dir)/halibut.1
- 
- clean:
-       rm -f *.html *.txt *.hlp *.cnt *.1 *.info* *.ps *.pdf *.hh* *.chm