CVS commit: pkgsrc/www/nspluginwrapper

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Sat Sep 17 19:02:52 UTC 2016

Modified Files:
        pkgsrc/www/nspluginwrapper: Makefile distinfo
        pkgsrc/www/nspluginwrapper/patches: patch-aa

Log Message:
Remove duplicated entry in plugin dirs.

Fixes duplicated output of nspluginwrapper -l.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/www/nspluginwrapper/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/nspluginwrapper/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/nspluginwrapper/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/nspluginwrapper/Makefile
diff -u pkgsrc/www/nspluginwrapper/Makefile:1.49 pkgsrc/www/nspluginwrapper/Makefile:1.50
--- pkgsrc/www/nspluginwrapper/Makefile:1.49    Wed Aug  3 10:23:32 2016
+++ pkgsrc/www/nspluginwrapper/Makefile Sat Sep 17 19:02:52 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2016/08/03 10:23:32 adam Exp $
+# $NetBSD: Makefile,v 1.50 2016/09/17 19:02:52 tsutsui Exp $
 #
 
 DISTNAME=      nspluginwrapper-1.4.4
-PKGREVISION=   2
+PKGREVISION=   3
 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.13 pkgsrc/www/nspluginwrapper/distinfo:1.14
--- pkgsrc/www/nspluginwrapper/distinfo:1.13    Mon Jun 27 11:03:29 2016
+++ pkgsrc/www/nspluginwrapper/distinfo Sat Sep 17 19:02:52 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2016/06/27 11:03:29 tnn Exp $
+$NetBSD: distinfo,v 1.14 2016/09/17 19:02:52 tsutsui Exp $
 
 SHA1 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = cc093d1c6d6729434ec90e216afeae1601e0b3b4
 RMD160 (nspluginwrapper-1.4.4-suse121-generic.i386.tar.gz) = a9d79dcd31efc4b1a9b71e29694eff9c8555b10d
@@ -12,7 +12,7 @@ SHA1 (nspluginwrapper-1.4.4.tar.gz) = ff
 RMD160 (nspluginwrapper-1.4.4.tar.gz) = 6acd93653aa8466e1e3703c2b794f32691c10d12
 SHA512 (nspluginwrapper-1.4.4.tar.gz) = 41126d98284cae6d25d23233b08ccca0dea841d457d4e41210282c6ab4c0fbf020f2ab4173ce39db8a47a1db20840bcc856f9c7309aa2e6ef2a777e3f2ebf503
 Size (nspluginwrapper-1.4.4.tar.gz) = 412513 bytes
-SHA1 (patch-aa) = 28f9e18e519337852cb47d04ed0c1cea76b3416d
+SHA1 (patch-aa) = b39ff156d0a769e44140a713b8ffc2b50a8022d4
 SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a
 SHA1 (patch-ac) = 87cb838f6b203947d9efc4350313e410d06d486e
 SHA1 (patch-src_npw-config-template.h) = 01af56f639ce88f7896fb733107bb4436cd299a5

Index: pkgsrc/www/nspluginwrapper/patches/patch-aa
diff -u pkgsrc/www/nspluginwrapper/patches/patch-aa:1.6 pkgsrc/www/nspluginwrapper/patches/patch-aa:1.7
--- pkgsrc/www/nspluginwrapper/patches/patch-aa:1.6     Wed Sep 16 10:16:58 2009
+++ pkgsrc/www/nspluginwrapper/patches/patch-aa Sat Sep 17 19:02:52 2016
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2009/09/16 10:16:58 abs Exp $
+$NetBSD: patch-aa,v 1.7 2016/09/17 19:02:52 tsutsui Exp $
 
---- src/npw-config.c.orig      2009-09-16 11:05:23.000000000 +0100
+--- src/npw-config.c.orig      2011-07-01 03:18:57.000000000 +0000
 +++ src/npw-config.c
-@@ -125,22 +125,15 @@ static const char *get_system_mozilla_pl
+@@ -138,22 +138,15 @@ static const char *get_system_mozilla_pl
          };
          dirs = freebsd_dirs;
        }
@@ -29,21 +29,21 @@ $NetBSD: patch-aa,v 1.6 2009/09/16 10:16
  #elif defined(__sun__)
        {
          static const char *solaris_dirs[] = {
-@@ -223,16 +216,11 @@ static const char **get_mozilla_plugin_d
+@@ -238,16 +231,10 @@ static const char **get_mozilla_plugin_d
        "/usr/local/lib/npapi/linux-flashplugin",
        "/usr/X11R6/Adobe/Acrobat7.0/ENU/Browser/intellinux",
  #endif
 -#if defined(__DragonFly__)
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-       "/usr/pkg/lib/netscape/plugins",
-       "/usr/pkg/lib/firefox/plugins",
+-      "/usr/pkg/lib/netscape/plugins",
+-      "/usr/pkg/lib/firefox/plugins",
 -      "/usr/pkg/lib/RealPlayer/mozilla",
 -      "/usr/pkg/Acrobat5/Browsers/intellinux",
 -      "/usr/pkg/Acrobat7/Browser/intellinux",
 -#endif
 -#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
        "/usr/pkg/lib/netscape/plugins",
--      "/usr/pkg/lib/firefox/plugins",
+       "/usr/pkg/lib/firefox/plugins",
 +      "/usr/pkg/lib/seamonkey/plugins",
        "/usr/pkg/lib/RealPlayer/mozilla",
        "/usr/pkg/Acrobat5/Browsers/intellinux",