Received: by mail.netbsd.org (Postfix, from userid 605) id 2CBED84DDA; Mon, 25 Dec 2017 22:22:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ABA5184DCC for ; Mon, 25 Dec 2017 22:22:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id fbZTRnhQKN5P for ; Mon, 25 Dec 2017 22:22:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E53DE84D21 for ; Mon, 25 Dec 2017 22:22:11 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DFE95FB40; Mon, 25 Dec 2017 22:22:11 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1514240531292620" MIME-Version: 1.0 Date: Mon, 25 Dec 2017 22:22:11 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/games/nethack-lib To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20171225222211.DFE95FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1514240531292620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Mon Dec 25 22:22:11 UTC 2017 Modified Files: pkgsrc/games/nethack-lib: Makefile distinfo Added Files: pkgsrc/games/nethack-lib/patches: patch-include_system.h Removed Files: pkgsrc/games/nethack-lib/patches: patch-ac Log Message: Don't try to provide own declarations for vsprintf, vfprintf and vprintf, as this causes build failure and a run-in with __builtin___vsprintf_chk() on NetBSD 8.0. Instead just include and . Rename the patch file for include/system.h in the process. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 pkgsrc/games/nethack-lib/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/games/nethack-lib/distinfo cvs rdiff -u -r1.10 -r0 pkgsrc/games/nethack-lib/patches/patch-ac cvs rdiff -u -r0 -r1.1 \ pkgsrc/games/nethack-lib/patches/patch-include_system.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1514240531292620 Content-Disposition: inline Content-Length: 4850 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/nethack-lib/Makefile diff -u pkgsrc/games/nethack-lib/Makefile:1.30 pkgsrc/games/nethack-lib/Makefile:1.31 --- pkgsrc/games/nethack-lib/Makefile:1.30 Thu Feb 25 13:19:47 2016 +++ pkgsrc/games/nethack-lib/Makefile Mon Dec 25 22:22:11 2017 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.30 2016/02/25 13:19:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.31 2017/12/25 22:22:11 he Exp $ # .include "../../games/nethack-lib/Makefile.common" PKGNAME= nethack-lib-${NETHACK_VERSION} -PKGREVISION= 4 +PKGREVISION= 5 COMMENT= Data files for Nethack Index: pkgsrc/games/nethack-lib/distinfo diff -u pkgsrc/games/nethack-lib/distinfo:1.20 pkgsrc/games/nethack-lib/distinfo:1.21 --- pkgsrc/games/nethack-lib/distinfo:1.20 Thu Dec 14 16:13:31 2017 +++ pkgsrc/games/nethack-lib/distinfo Mon Dec 25 22:22:11 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2017/12/14 16:13:31 jperkin Exp $ +$NetBSD: distinfo,v 1.21 2017/12/25 22:22:11 he Exp $ SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd RMD160 (nethack-343-src.tgz) = 42f600d24715a0b7e631b357c135761410b3ca95 @@ -6,12 +6,12 @@ SHA512 (nethack-343-src.tgz) = 052342c19 Size (nethack-343-src.tgz) = 3497458 bytes SHA1 (patch-aa) = 31d89b27e52189de9a51fbb04f1ed390c5377b2b SHA1 (patch-ab) = 49947b960f2b7871fc798398d1c1ceab8d462ec9 -SHA1 (patch-ac) = 50cac811281c629edf2a72e523b62b51f8c3c840 SHA1 (patch-ad) = be56ef8459f3273a0b316bb94e0ae7397a53c37f SHA1 (patch-ae) = 8530c1e033f2522e05b699db36d84f77ecf886be SHA1 (patch-af) = a567c4c664f135ad24f3f0069ddc29bf5b950b21 SHA1 (patch-ag) = 5bf322fb92a3cd9df9559e56265f0477d9e92487 SHA1 (patch-ai) = 73c5b2ea1227531089474705f2f18bc411366365 +SHA1 (patch-include_system.h) = a352695aa31c9459ec5559ec5fb7fef7bfdcb9c8 SHA1 (patch-sys_unix_Makefile.src) = d2d961ab9aec3d9f88d5b5340530f95181b0a92b SHA1 (patch-sys_unix_Makefile.utl) = 3bcec6ffab218370f132b4a850f7b35316487ec6 SHA1 (patch-util_makedefs.c) = 63faf92a7f511fcf73317789a3008350cdd404d9 Added files: Index: pkgsrc/games/nethack-lib/patches/patch-include_system.h diff -u /dev/null pkgsrc/games/nethack-lib/patches/patch-include_system.h:1.1 --- /dev/null Mon Dec 25 22:22:11 2017 +++ pkgsrc/games/nethack-lib/patches/patch-include_system.h Mon Dec 25 22:22:11 2017 @@ -0,0 +1,61 @@ +$NetBSD: patch-include_system.h,v 1.1 2017/12/25 22:22:11 he Exp $ + +Fix for NetBSD. + +--- include/system.h.orig 2003-12-07 23:39:13.000000000 +0000 ++++ include/system.h +@@ -79,10 +79,10 @@ typedef long off_t; + # if !defined(__SC__) && !defined(LINUX) + E long NDECL(random); + # endif +-# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM) ++# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)) || defined(RANDOM) + E void FDECL(srandom, (unsigned int)); + # else +-# if !defined(bsdi) && !defined(__FreeBSD__) ++# if !defined(bsdi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__APPLE__) + E int FDECL(srandom, (unsigned int)); + # endif + # endif +@@ -132,7 +132,7 @@ E void FDECL(perror, (const char *)); + E void FDECL(qsort, (genericptr_t,size_t,size_t, + int(*)(const genericptr,const genericptr))); + #else +-# if defined(BSD) || defined(ULTRIX) ++# if defined(BSD) || defined(ULTRIX) && !defined(__NetBSD__) + E int qsort(); + # else + # if !defined(LATTICE) && !defined(AZTEC_50) +@@ -421,7 +421,7 @@ E size_t FDECL(strlen, (const char *)); + # ifdef HPUX + E unsigned int FDECL(strlen, (char *)); + # else +-# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) ++# if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) && !defined(__NetBSD__) + E int FDECL(strlen, (const char *)); + # endif + # endif /* HPUX */ +@@ -476,9 +476,14 @@ E char *sprintf(); + # if !defined(SVR4) && !defined(apollo) + # if !(defined(ULTRIX_PROTO) && defined(__GNUC__)) + # if !(defined(SUNOS4) && defined(__STDC__)) /* Solaris unbundled cc (acc) */ ++#if 0 + E int FDECL(vsprintf, (char *, const char *, va_list)); + E int FDECL(vfprintf, (FILE *, const char *, va_list)); + E int FDECL(vprintf, (const char *, va_list)); ++#else ++#include ++#include ++#endif + # endif + # endif + # endif +@@ -521,7 +526,7 @@ E struct tm *FDECL(localtime, (const tim + # endif + # endif + +-# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) ++# if defined(ULTRIX) || (defined(BSD) && defined(POSIX_TYPES)) || defined(SYSV) || defined(MICRO) || defined(VMS) || defined(MAC) || (defined(HPUX) && defined(_POSIX_SOURCE)) || defined(__NetBSD__) + E time_t FDECL(time, (time_t *)); + # else + E long FDECL(time, (time_t *)); --_----------=_1514240531292620--