head 1.5; access; symbols pkgsrc-2020Q3:1.4.0.4 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.2 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.3.0.14 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.36 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.32 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.30 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.28 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.26 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.24 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.22 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.20 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.18 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.16 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.12 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.10 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.8 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.6 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.4 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.2 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.2.0.8 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.6 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.4 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.2 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.1.1.1.0.44 pkgsrc-2014Q4-base:1.1.1.1 pkgsrc-2014Q3:1.1.1.1.0.42 pkgsrc-2014Q3-base:1.1.1.1 pkgsrc-2014Q2:1.1.1.1.0.40 pkgsrc-2014Q2-base:1.1.1.1 pkgsrc-2014Q1:1.1.1.1.0.38 pkgsrc-2014Q1-base:1.1.1.1 pkgsrc-2013Q4:1.1.1.1.0.36 pkgsrc-2013Q4-base:1.1.1.1 pkgsrc-2013Q3:1.1.1.1.0.34 pkgsrc-2013Q3-base:1.1.1.1 pkgsrc-2013Q2:1.1.1.1.0.32 pkgsrc-2013Q2-base:1.1.1.1 pkgsrc-2013Q1:1.1.1.1.0.30 pkgsrc-2013Q1-base:1.1.1.1 pkgsrc-2012Q4:1.1.1.1.0.28 pkgsrc-2012Q4-base:1.1.1.1 pkgsrc-2012Q3:1.1.1.1.0.26 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.24 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.22 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-2011Q4:1.1.1.1.0.20 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.18 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-2011Q2:1.1.1.1.0.16 pkgsrc-2011Q2-base:1.1.1.1 pkgsrc-2011Q1:1.1.1.1.0.14 pkgsrc-2011Q1-base:1.1.1.1 pkgsrc-2010Q4:1.1.1.1.0.12 pkgsrc-2010Q4-base:1.1.1.1 pkgsrc-2010Q3:1.1.1.1.0.10 pkgsrc-2010Q3-base:1.1.1.1 pkgsrc-2010Q2:1.1.1.1.0.8 pkgsrc-2010Q2-base:1.1.1.1 pkgsrc-2010Q1:1.1.1.1.0.6 pkgsrc-2010Q1-base:1.1.1.1 pkgsrc-2009Q4:1.1.1.1.0.4 pkgsrc-2009Q4-base:1.1.1.1 pkgsrc-2009Q3:1.1.1.1.0.2 pkgsrc-2009Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2020.11.26.16.28.11; author nia; state dead; branches; next 1.4; commitid CnFbSRqWvBFQQpxC; 1.4 date 2020.04.15.08.24.08; author wiz; state Exp; branches; next 1.3; commitid k6FV286LsZ3jps4C; 1.3 date 2016.04.01.11.41.42; author jperkin; state Exp; branches; next 1.2; commitid YfogFM3foVdCUU0z; 1.2 date 2014.12.30.14.14.48; author wiz; state Exp; branches; next 1.1; commitid 848zTS2KF4UFt44y; 1.1 date 2009.09.06.18.42.41; author ahoka; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.09.06.18.42.41; author ahoka; state Exp; branches; next ; desc @@ 1.5 log @halibut: Update to 1.2 Unknown changes @ text @$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 @ 1.4 log @halibut: update to 1.1nb5. Honor LDFLAGS. Fixes RELRO build. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2016/04/01 11:41:42 jperkin Exp $ @ 1.3 log @Use PKGMANDIR. Add patch comments. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2014/12/30 14:14:48 wiz Exp $ d25 9 @ 1.2 log @Update to 1.1. Changes not found. @ text @d1 3 a3 1 $NetBSD: patch-aa,v 1.1.1.1 2009/09/06 18:42:41 ahoka Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 2006-12-06 20:12:44.000000000 +0100 d14 2 a15 2 @@@@ -89,7 +89,7 @@@@ else VDEF = `(cd $(SRC); md5sum -c manifest >& /dev/null && cat version)` d23 1 a23 1 @@@@ -122,6 +122,9 @@@@ halibut: $(OBJECTS) d33 1 a33 1 @@@@ -129,7 +132,8 @@@@ clean:: @ 1.1.1.1 log @Import halibut-1.0 as textproc/halibut. Halibut reads documentation source in a single input format, and produces multiple output formats containing the same text. The supported output formats are: * Plain ASCII text * HTML * PDF * PostScript * Unix man pages * Unix info, generated directly as .info files rather than .texi sources * Windows HTML Help (.CHM files), or rather source which can be fed to the MS HTML Help compiler to generate them * Windows WinHelp (old-style .HLP files), generated directly without needing a help compiler. @ text @@