From 5be2c56c3c705800da4ef8c8c85aad7afab886dc Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 31 Oct 2021 14:22:43 +0100 Subject: [PATCH] halibut: update to 1.3. --- srcpkgs/halibut/patches/pie.patch | 11 ----------- srcpkgs/halibut/template | 21 +++++++-------------- 2 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/halibut/patches/pie.patch diff --git a/srcpkgs/halibut/patches/pie.patch b/srcpkgs/halibut/patches/pie.patch deleted file mode 100644 index 4295314f95c..00000000000 --- a/srcpkgs/halibut/patches/pie.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -110,7 +110,7 @@ - $(CC) $(CFLAGS) -MD -c $< - - version.o: FORCE -- $(CC) $(VDEF) -MD -c $(SRC)version.c -+ $(CC) $(CFLAGS) $(VDEF) -MD -c $(SRC)version.c - - spotless:: clean - rm -f *.d diff --git a/srcpkgs/halibut/template b/srcpkgs/halibut/template index e428d771ea8..2debc019756 100644 --- a/srcpkgs/halibut/template +++ b/srcpkgs/halibut/template @@ -1,8 +1,8 @@ # Template file for 'halibut' pkgname=halibut -version=1.2 +version=1.3 revision=1 -build_style=gnu-makefile +build_style=cmake hostmakedepends="perl" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" halibut" @@ -12,20 +12,13 @@ maintainer="Leah Neukirchen " license="MIT" homepage="http://www.chiark.greenend.org.uk/~sgtatham/halibut/" distfiles="http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" -checksum=1aedfb6240f27190c36a390fcac9ce732edbdbaa31c85ee675b994e2b083163f +checksum=aaa0f7696f17f74f42d97d0880aa088f5d68ed3079f3ed15d13b6e74909d3132 -CFLAGS='-I../charset -I../build -fcommon' - -pre_build() { - export LIBS="$LDFLAGS" -} do_install() { - if [ "$CROSS_BUILD" ]; then - export HALIBUT=/usr/bin/halibut - fi - make -e -C doc - vman doc/halibut.1 - vdoc doc/halibut.txt vbin build/halibut + if [ "$CROSS_BUILD" ]; then + halibut doc/manpage.but --man=build/doc/halibut.1 + fi + vman build/doc/halibut.1 vlicense LICENCE LICENSE }