diff --git a/srcpkgs/bk/patches/size_t.patch b/srcpkgs/bk/patches/size_t.patch deleted file mode 100644 index 23dcfd76587..00000000000 --- a/srcpkgs/bk/patches/size_t.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/slib.c.orig -+++ src/slib.c -@@ -14921,7 +14921,7 @@ - * Makefile). - */ - extern struct kwval *kw2val_lookup(register const char *str, -- register unsigned int len); -+ register size_t len); - #include "kw2val_lookup.c" - - #define notKeyword -1 ---- src/cmd.pl.orig -+++ src/cmd.pl -@@ -63,7 +63,7 @@ - u8 remote:1; /* always allowed as a remote command */ - } CMD; - --CMD *cmd_lookup(const char *str, unsigned int len); -+CMD *cmd_lookup(const char *str, size_t len); - - END - diff --git a/srcpkgs/bk/template b/srcpkgs/bk/template index 1213326970c..cabb264ef62 100644 --- a/srcpkgs/bk/template +++ b/srcpkgs/bk/template @@ -1,8 +1,8 @@ # Template file for 'bk' pkgname=bk reverts="7.3ce.1_1 7.3ce.1_2 7.3ce_1 7.3ce_2" -version=7.3.2 -revision=4 +version=7.3.3 +revision=1 hostmakedepends="gperf groff perl bison pkg-config" makedepends="libXft-devel libtomcrypt-devel libtommath-devel pcre-devel liblz4-devel" # bundles: tcl tk @@ -11,24 +11,26 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="http://www.bitkeeper.org/" distfiles="http://www.bitkeeper.org/downloads/${version}/${pkgname}-${version}.src.tar.gz" -checksum=833bf095a1f9c2be435fddbb3ffe10dadfad1853127b97892f1a81c884d4fe1d +checksum=da2b8ef3044b9fc9d96cbd5990e5a9e989f5856f9b394013affc1e25014a2928 # Needs reworking of the build system. nocross=yes post_extract() { # For musl: - sed -i '1i#define __DEFINED_FILE' src/libc/stdio_remap.h + vsed -e '1i#define __DEFINED_FILE' -i src/libc/stdio_remap.h # For glibc: - sed -i '1i#define __FILE_defined' src/libc/stdio_remap.h - sed -i 's/__linux__/__GLIBC__/' src/libc/utils/stackdump.c + vsed -e '1i#define __FILE_defined' -i src/libc/stdio_remap.h + vsed -e 's/__linux__/__GLIBC__/' -i src/libc/utils/stackdump.c } + do_build() { make ${makejobs} \ CC="$CC" CXX="$CXX" LD="$CC" RANLIB="$RANLIB" \ CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" CFLAGS="$CFLAGS" \ LDFLAGS="$CFLAGS $LDFLAGS" Q= } + do_install() { # Upstream recommended site-wide location. make install DESTDIR=${DESTDIR} BINDIR=/usr/libexec/bitkeeper