@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/08/26 19:58:27 sno Exp $
+# $NetBSD: Makefile,v 1.17 2009/09/16 10:16:58 abs Exp $
 #
 
 DISTNAME=       nspluginwrapper-1.2.2
-PKGREVISION=     1
+PKGREVISION=    2
 CATEGORIES=     www
 MASTER_SITES=   http://gwenole.beauchesne.info/projects/nspluginwrapper/files/
 EXTRACT_SUFX=   .tar.bz2

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/01/05 19:11:24 jmcneill Exp $
+$NetBSD: distinfo,v 1.8 2009/09/16 10:16:58 abs Exp $
 
 SHA1 (nspluginwrapper-1.2.2.tar.bz2) = be581c39dcc1a8d9a5b3f81e4650f553a30cf249
 RMD160 (nspluginwrapper-1.2.2.tar.bz2) = d5aa265966f87c51bb9ea4f2a079a87b74fdcbf3
@@ -6,5 +6,5 @@
 SHA1 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 0d49757623c62da52292e48a0173024c14aa12cd
 RMD160 (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 9cf3e6ac3e5171c2bbda71c082b6b9fc30d69a84
 Size (nspluginwrapper-i386-1.2.2-1.x86_64.rpm) = 69425 bytes
-SHA1 (patch-aa) = 5310798b88142b00141e7bef9978a1b29a7b965d
+SHA1 (patch-aa) = 28f9e18e519337852cb47d04ed0c1cea76b3416d
 SHA1 (patch-ab) = 20dc1b6ff4036a0946dd469860eb9b6c129fdb7a

@@ -1,48 +1,49 @@
-$NetBSD: patch-aa,v 1.5 2008/12/18 19:59:31 jmcneill Exp $
+$NetBSD: patch-aa,v 1.6 2009/09/16 10:16:58 abs Exp $
 
---- src/npw-config.c.orig	2008-10-12 15:02:08.000000000 -0400
+--- src/npw-config.c.orig	2009-09-16 11:05:23.000000000 +0100
 +++ src/npw-config.c
-@@ -128,16 +128,18 @@ static const char *get_system_mozilla_pl
- #elif defined(__DragonFly__)
+@@ -125,22 +125,15 @@ static const char *get_system_mozilla_pl
+ 	  };
+ 	  dirs = freebsd_dirs;
+ 	}
+-#elif defined(__DragonFly__)
++#elif defined(__NetBSD__) || defined(__DragonFly__)
  	{
  	  static const char *dragonfly_dirs[] = {
 -		"/usr/pkg/" LIB "/mozilla/plugins",
 -		"/usr/pkg/" LIB "/firefox/plugins",
-+		LIBDIR "/firefox3/plugins",
++		LIBDIR "/netscape/plugins",
 +		LIBDIR "/firefox/plugins",
 +		LIBDIR "/seamonkey/plugins",
  	  };
  	  dirs = dragonfly_dirs;
  	}
- #elif defined(__NetBSD__)
- 	{
- 	  static const char *netbsd_dirs[] = {
+-#elif defined(__NetBSD__)
+-	{
+-	  static const char *netbsd_dirs[] = {
 -		"/usr/pkg/" LIB "/mozilla/plugins",
 -		"/usr/pkg/" LIB "/firefox/plugins",
-+		LIBDIR "/firefox3/plugins",
-+		LIBDIR "/firefox/plugins",
-+		LIBDIR "/seamonkey/plugins",
- 	  };
- 	  dirs = netbsd_dirs;
- 	}
-@@ -224,15 +226,19 @@ static const char **get_mozilla_plugin_d
+-	  };
+-	  dirs = netbsd_dirs;
+-	}
+ #elif defined(__sun__)
+ 	{
+ 	  static const char *solaris_dirs[] = {
+@@ -223,16 +216,11 @@ 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__)
--	"/usr/pkg/lib/netscape/plugins",
-+	"/usr/pkg/lib/firefox3/plugins",
+-#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/seamonkey/plugins",
- 	"/usr/pkg/lib/RealPlayer/mozilla",
- 	"/usr/pkg/Acrobat5/Browsers/intellinux",
- 	"/usr/pkg/Acrobat7/Browser/intellinux",
- #endif
- #if defined(__NetBSD__)
--	"/usr/pkg/lib/netscape/plugins",
-+	"/usr/pkg/lib/firefox3/plugins",
- 	"/usr/pkg/lib/firefox/plugins",
-+	"/usr/pkg/lib/netscape/plugins",
+-	"/usr/pkg/lib/RealPlayer/mozilla",
+-	"/usr/pkg/Acrobat5/Browsers/intellinux",
+-	"/usr/pkg/Acrobat7/Browser/intellinux",
+-#endif
+-#if defined(__NetBSD__)
+ 	"/usr/pkg/lib/netscape/plugins",
+-	"/usr/pkg/lib/firefox/plugins",
 +	"/usr/pkg/lib/seamonkey/plugins",
  	"/usr/pkg/lib/RealPlayer/mozilla",
  	"/usr/pkg/Acrobat5/Browsers/intellinux",