diff --git a/srcpkgs/fortune-mod/files/error.c b/srcpkgs/fortune-mod/files/error.c deleted file mode 100644 index 7b12fe45adf..00000000000 --- a/srcpkgs/fortune-mod/files/error.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include -#define _GNU_SOURCE -#include - -void error(int status, int errnum, const char* format, ...) -{ - va_list ap; - - fflush(stdout); - fprintf(stderr, "%s: ", program_invocation_name); - va_start(ap, format); - vfprintf(stderr, format, ap); - va_end(ap); - if (errnum) - fprintf(stderr, ":%d", errnum); - if (status) - exit(status); -} diff --git a/srcpkgs/fortune-mod/files/error.h b/srcpkgs/fortune-mod/files/error.h deleted file mode 100644 index 81a410f8cfc..00000000000 --- a/srcpkgs/fortune-mod/files/error.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _ERROR_H_ -#define _ERROR_H_ -void error(int status, int errnum, const char* format, ...); -#endif /* _ERROR_H_ */ diff --git a/srcpkgs/fortune-mod/template b/srcpkgs/fortune-mod/template index 0eb27936c07..27824c3617e 100644 --- a/srcpkgs/fortune-mod/template +++ b/srcpkgs/fortune-mod/template @@ -1,7 +1,7 @@ # Template file for 'fortune-mod' pkgname=fortune-mod version=1.99.1 -revision=5 +revision=6 hostmakedepends="recode" makedepends="recode-devel" short_desc="Implementation of the BSDGames 'fortune' program" @@ -18,14 +18,12 @@ if [ "$CROSS_BUILD" ]; then fi do_build() { - sed -i "s|^CFLAGS=.*|CFLAGS=${CFLAGS} -fsigned-char \$(DEFINES)|" Makefile - sed -i "s|^LDFLAGS=.*|LDFLAGS=${LDFLAGS}|" Makefile - sed -i "s;u_int;uint;" util/strfile.h + vsed -i "s|^CFLAGS=.*|CFLAGS=${CFLAGS} -fsigned-char \$(DEFINES)|" Makefile + vsed -i "s|^LDFLAGS=.*|LDFLAGS=${LDFLAGS}|" Makefile + vsed -i "s;u_int;uint;" util/strfile.h case "$XBPS_TARGET_MACHINE" in *-musl) - cp ${FILESDIR}/error.{c,h} ${wrksrc}/fortune - sed -e "s;-DBSD_REGEX;-DPOSIX_REGEX;" -i Makefile - sed -e "s;fortune\.o;fortune.o error.o;" -i fortune/Makefile + vsed -e "s;-DBSD_REGEX;-DPOSIX_REGEX;" -i Makefile esac make CC=$CC COOKIEDIR=/usr/share/fortunes $_strfile sed -n '/[*][[:space:]]*The Regents/,/SUCH DAMAGE/p' fortune/fortune.c |