Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id D24EE7A476 for ; Mon, 27 Jun 2016 11:03:30 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 4A48785FA1; Mon, 27 Jun 2016 11:03:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CE2F185F9E for ; Mon, 27 Jun 2016 11:03:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id pBlPh65UmXNE for ; Mon, 27 Jun 2016 11:03:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5FBA585E61 for ; Mon, 27 Jun 2016 11:03:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 591C9FBB5; Mon, 27 Jun 2016 11:03:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1467025409254850" MIME-Version: 1.0 Date: Mon, 27 Jun 2016 11:03:29 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/www/nspluginwrapper To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20160627110329.591C9FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1467025409254850 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Jun 27 11:03:29 UTC 2016 Modified Files: pkgsrc/www/nspluginwrapper: distinfo Added Files: pkgsrc/www/nspluginwrapper/patches: patch-src_npw-config-template.h Log Message: Fix build on -current To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/nspluginwrapper/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/nspluginwrapper/patches/patch-src_npw-config-template.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1467025409254850 Content-Disposition: inline Content-Length: 1792 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/nspluginwrapper/distinfo diff -u pkgsrc/www/nspluginwrapper/distinfo:1.12 pkgsrc/www/nspluginwrapper/distinfo:1.13 --- pkgsrc/www/nspluginwrapper/distinfo:1.12 Sat Oct 24 06:30:40 2015 +++ pkgsrc/www/nspluginwrapper/distinfo Mon Jun 27 11:03:29 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2015/10/24 06:30:40 tsutsui Exp $ +$NetBSD: distinfo,v 1.13 2016/06/27 11:03:29 tnn Exp $ SHA1 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = cc093d1c6d6729434ec90e216afeae1601e0b3b4 RMD160 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = a9d79dcd31efc4b1a9b71e29694eff9c8555b10d @@ -15,4 +15,5 @@ Size (nspluginwrapper-1.4.4.tar.gz) = 41 SHA1 (patch-aa) = 28f9e18e519337852cb47d04ed0c1cea76b3416d SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a SHA1 (patch-ac) = 87cb838f6b203947d9efc4350313e410d06d486e +SHA1 (patch-src_npw-config-template.h) = 01af56f639ce88f7896fb733107bb4436cd299a5 SHA1 (patch-src_npw-viewer.c) = eb8855ae6d1015eb7627ada5c39af5e0d80f0e75 Added files: Index: pkgsrc/www/nspluginwrapper/patches/patch-src_npw-config-template.h diff -u /dev/null pkgsrc/www/nspluginwrapper/patches/patch-src_npw-config-template.h:1.1 --- /dev/null Mon Jun 27 11:03:29 2016 +++ pkgsrc/www/nspluginwrapper/patches/patch-src_npw-config-template.h Mon Jun 27 11:03:29 2016 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_npw-config-template.h,v 1.1 2016/06/27 11:03:29 tnn Exp $ + +Make sure FUNC macro is defined. (exec_elf.h v1.155) + +--- src/npw-config-template.h.orig 2011-07-01 03:18:57.000000000 +0000 ++++ src/npw-config-template.h +@@ -19,7 +19,7 @@ + */ + + #ifdef ELF_CLASS +-#ifndef ElfW ++#if !defined(ElfW) || defined(__NetBSD__) + # if ELF_CLASS == ELFCLASS32 + # define ElfW(x) Elf32_ ## x + # define ELFW(x) ELF32_ ## x --_----------=_1467025409254850--