From 25a43fbe33d8a2f5e7f217bbf9149441cfcd4976 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Sun, 13 Jun 2010 14:35:28 +0000
Subject: [PATCH] Install plugin in lib/mozilla/plugins instead of
 lib/mozilla-plugins

---
 www/gnash/Makefile  | 6 +++---
 www/gnash/pkg/PLIST | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/gnash/Makefile b/www/gnash/Makefile
index cb5c6776f29..dffa5051f00 100644
--- a/www/gnash/Makefile
+++ b/www/gnash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/06/11 09:40:43 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.26 2010/06/13 14:35:28 landry Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	flash player with firefox browser plugin
 
 VER=		0.8.3
 DISTNAME=	gnash-${VER}
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 
 CATEGORIES=	www
 MASTER_SITES=	http://getgnash.org/packages/releases/
@@ -54,7 +54,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/libbase/{gnashpluginrc,gnashrc} \
 	${PREFIX}/share/examples/gnash
 
-CONFIGURE_ARGS+=--with-npapi-plugindir=${LOCALBASE}/lib/mozilla-plugins \
+CONFIGURE_ARGS+=--with-npapi-plugindir=${LOCALBASE}/lib/mozilla/plugins \
 		--disable-cygnal \
 		--disable-debugger \
 		--enable-renderer=agg \
diff --git a/www/gnash/pkg/PLIST b/www/gnash/pkg/PLIST
index b687528bac7..29f89b0bca4 100644
--- a/www/gnash/pkg/PLIST
+++ b/www/gnash/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/06/28 15:46:33 deanna Exp $
+@comment $OpenBSD: PLIST,v 1.5 2010/06/13 14:35:28 landry Exp $
 @bin bin/dumpshm
 bin/gnash
 @bin bin/gprocessor
@@ -21,8 +21,9 @@ lib/gnash/libgnashserver.la
 lib/gnash/libgnashserver.so
 lib/gnash/libmozsdk.la
 @lib lib/gnash/libmozsdk.so.${LIBmozsdk_VERSION}
-lib/mozilla-plugins/
-lib/mozilla-plugins/libgnashplugin.so
+lib/mozilla/
+lib/mozilla/plugins/
+lib/mozilla/plugins/libgnashplugin.so
 @man man/man1/cygnal.1
 @man man/man1/dumpshm.1
 @man man/man1/gnash.1