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 93F647A221 for ; Sat, 15 Oct 2016 15:18:02 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 46C9F85F2A; Sat, 15 Oct 2016 15:18:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CC04F85F28 for ; Sat, 15 Oct 2016 15:18:01 +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 8kGbSy_Z5QZh for ; Sat, 15 Oct 2016 15:18:01 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4C12E85E24 for ; Sat, 15 Oct 2016 15:18:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4A11FFBD2; Sat, 15 Oct 2016 15:18:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1476544681198110" MIME-Version: 1.0 Date: Sat, 15 Oct 2016 15:18:01 +0000 From: "Izumi Tsutsui" Subject: CVS commit: pkgsrc/www/nspluginwrapper To: pkgsrc-changes@NetBSD.org Reply-To: tsutsui@netbsd.org X-Mailer: log_accum Message-Id: <20161015151801.4A11FFBD2@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. --_----------=_1476544681198110 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tsutsui Date: Sat Oct 15 15:18:01 UTC 2016 Modified Files: pkgsrc/www/nspluginwrapper: Makefile distinfo Added Files: pkgsrc/www/nspluginwrapper/patches: patch-src_npw-player.c Log Message: Make npplayer search default pkgsrc dirs. Now npplayer works without MOZ_PLUGIN_PATH env as /usr/pkg/lib/nspluginwrapper/i386/netbsd/npplayer \ src=https://helpx.adobe.com/content/dam/help/en/flash-player/assets/flash_tree.swf etc. Bump PKGREVISION. XXX: probably we should move the default dir for adobe-flash-plugins11 from historical ${PREFIX}/lib/netscape to ${PREFIX}/lib/mozilla To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 pkgsrc/www/nspluginwrapper/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/nspluginwrapper/distinfo cvs rdiff -u -r0 -r1.3 \ pkgsrc/www/nspluginwrapper/patches/patch-src_npw-player.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1476544681198110 Content-Disposition: inline Content-Length: 2852 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/nspluginwrapper/Makefile diff -u pkgsrc/www/nspluginwrapper/Makefile:1.51 pkgsrc/www/nspluginwrapper/Makefile:1.52 --- pkgsrc/www/nspluginwrapper/Makefile:1.51 Fri Oct 7 18:26:12 2016 +++ pkgsrc/www/nspluginwrapper/Makefile Sat Oct 15 15:18:01 2016 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.51 2016/10/07 18:26:12 adam Exp $ +# $NetBSD: Makefile,v 1.52 2016/10/15 15:18:01 tsutsui Exp $ # DISTNAME= nspluginwrapper-1.4.4 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= www MASTER_SITES= http://nspluginwrapper.org/download/ \ http://teokurebsd.org/netbsd/packages/distfiles/nspluginwrapper/ Index: pkgsrc/www/nspluginwrapper/distinfo diff -u pkgsrc/www/nspluginwrapper/distinfo:1.14 pkgsrc/www/nspluginwrapper/distinfo:1.15 --- pkgsrc/www/nspluginwrapper/distinfo:1.14 Sat Sep 17 19:02:52 2016 +++ pkgsrc/www/nspluginwrapper/distinfo Sat Oct 15 15:18:01 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2016/09/17 19:02:52 tsutsui Exp $ +$NetBSD: distinfo,v 1.15 2016/10/15 15:18:01 tsutsui Exp $ SHA1 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = cc093d1c6d6729434ec90e216afeae1601e0b3b4 RMD160 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = a9d79dcd31efc4b1a9b71e29694eff9c8555b10d @@ -16,4 +16,5 @@ SHA1 (patch-aa) = b39ff156d0a769e44140a7 SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a SHA1 (patch-ac) = 87cb838f6b203947d9efc4350313e410d06d486e SHA1 (patch-src_npw-config-template.h) = 01af56f639ce88f7896fb733107bb4436cd299a5 +SHA1 (patch-src_npw-player.c) = c054f19e7067aafee347e0398673345fe56ae12e SHA1 (patch-src_npw-viewer.c) = eb8855ae6d1015eb7627ada5c39af5e0d80f0e75 Added files: Index: pkgsrc/www/nspluginwrapper/patches/patch-src_npw-player.c diff -u /dev/null pkgsrc/www/nspluginwrapper/patches/patch-src_npw-player.c:1.3 --- /dev/null Sat Oct 15 15:18:01 2016 +++ pkgsrc/www/nspluginwrapper/patches/patch-src_npw-player.c Sat Oct 15 15:18:01 2016 @@ -0,0 +1,26 @@ +$NetBSD: patch-src_npw-player.c,v 1.3 2016/10/15 15:18:01 tsutsui Exp $ + +- add and use proper pkgsrc libdir. + +--- src/npw-player.c.orig 2011-07-01 03:18:57.000000000 +0000 ++++ src/npw-player.c +@@ -2012,12 +2012,17 @@ get_plugin_dirs (void) + } + + path = g_build_filename +- (G_DIR_SEPARATOR_S "usr", "lib", "mozilla", "plugins", NULL); ++ (G_DIR_SEPARATOR_S LIBDIR, "mozilla", "plugins", NULL); + dirs = g_list_prepend_if_path_exists (dirs, path); + g_free (path); + + path = g_build_filename +- (G_DIR_SEPARATOR_S "usr", "lib", "browser", "plugins", NULL); ++ (G_DIR_SEPARATOR_S LIBDIR, "browser", "plugins", NULL); ++ dirs = g_list_prepend_if_path_exists (dirs, path); ++ g_free (path); ++ ++ path = g_build_filename ++ (G_DIR_SEPARATOR_S LIBDIR, "netscape", "plugins", NULL); + dirs = g_list_prepend_if_path_exists (dirs, path); + g_free (path); + --_----------=_1476544681198110--