Enable the Konqueror plugin via the option klash.

6 files changed, 146 insertions, 13 deletions

diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 84757d3c9d5..5aa35f3e1bd 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/05 15:15:24 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2006/12/06 00:13:05 xtraeme Exp $
 #
 
 DISTNAME=		gnash-0.7.2
@@ -8,24 +8,27 @@ EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/gnash/
-COMMENT=		GPL'd Flash movie player
+COMMENT=		GPL Flash movie player
 
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-# XXX: plugin not enabled yet
-#CONFIGURE_ARGS+=	--with-plugindir=${PREFIX}/plugins
-CONFIGURE_ARGS+=	--disable-plugin
 CONFIGURE_ARGS+=	--enable-mp3
-USE_TOOLS+=		bash pkg-config
+USE_TOOLS+=		bash msgfmt pkg-config
+
 # /bin/sh finds a syntax error without line number
 CONFIG_SHELL=		${LOCALBASE}/bin/bash
 
+PLIST_SRC+=		${PKGDIR}/PLIST
+
+.include "options.mk"
+
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/gtkglext/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -34,5 +37,8 @@ CONFIG_SHELL=		${LOCALBASE}/bin/bash
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/oss.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnash/PLIST.klash b/multimedia/gnash/PLIST.klash
new file mode 100644
index 00000000000..195c4402fae
--- /dev/null
+++ b/multimedia/gnash/PLIST.klash
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST.klash,v 1.1 2006/12/06 00:13:05 xtraeme Exp $
+bin/klash
+lib/kde3/libklashpart.la
+share/kde/apps/klash/klashpartui.rc
+share/kde/apps/klash/pluginsinfo
+share/kde/config/klashrc
+share/gnash/plugins/libgnashplugin.la
+share/kde/services/klash_part.desktop
+@comment in kde: dirrm share/kde/services
+@dirrm share/gnash/plugins
+@comment in kde: dirrm share/kde/config
+@dirrm share/kde/apps/klash
+@comment in kde: @dirrm lib/kde3
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index cc2c64ba8a4..49b22956102 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/12/05 15:15:24 wiz Exp $
+$NetBSD: distinfo,v 1.2 2006/12/06 00:13:05 xtraeme Exp $
 
 SHA1 (gnash-0.7.2.tar.bz2) = e2bbd71d61665c435ed22339078070af196ea31a
 RMD160 (gnash-0.7.2.tar.bz2) = 0f5904b6c13ffb3b2b4a5f723d9fdacb0a8a6198
 Size (gnash-0.7.2.tar.bz2) = 1599810 bytes
-SHA1 (patch-aa) = 7f0b5e1d392fde54b0f06325c7087a56d1712abe
+SHA1 (patch-aa) = e90a02a4123262e2cd95c6fb16f37806a2177e28
+SHA1 (patch-ab) = 1ad18261886442e6cec44bc0f3db09ec2ced1e15
diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk
new file mode 100644
index 00000000000..4c6904b03c3
--- /dev/null
+++ b/multimedia/gnash/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2006/12/06 00:13:05 xtraeme Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnash
+PKG_SUPPORTED_OPTIONS=	klash
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mklash)
+PLIST_SRC+=		${PKGDIR}/PLIST.klash
+.include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
+CONFIGURE_ARGS+=	\
+	--with-plugindir=${PREFIX}/share/gnash/plugins
+CONFIGURE_ARGS+=	--enable-klash
+.else
+CONFIGURE_ARGS+=	--disable-klash
+CONFIGURE_ARGS+=	--disable-plugin
+.endif
+
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
index f2b5d82ac2f..86c98c8d9ba 100644
--- a/multimedia/gnash/patches/patch-aa
+++ b/multimedia/gnash/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/12/05 15:15:24 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/12/06 00:13:05 xtraeme Exp $
 
---- configure.orig	2006-11-17 19:09:10.000000000 +0000
-+++ configure
-@@ -4303,13 +4303,13 @@ echo $ECHO_N "checking for library file 
+--- configure.orig	2006-11-17 20:09:10.000000000 +0100
++++ configure	2006-12-06 00:22:10.000000000 +0100
+@@ -4303,13 +4303,13 @@
    LIBPRE="lib"
  
    if test "x$LIBPRE" != "x" ; then
@@ -18,7 +18,77 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/12/05 15:15:24 wiz Exp $
  	   LIBEXT="dll"
  	fi
    fi
-@@ -45388,7 +45388,7 @@ _ACEOF
+@@ -23066,13 +23066,13 @@
+     kde_appsdir='\${datadir}/applnk'
+   fi
+   if test -z "$kde_icondir"; then
+-    kde_icondir='\${datadir}/icons'
++    kde_icondir='\${datadir}/kde/icons'
+   fi
+   if test -z "$kde_sounddir"; then
+-    kde_sounddir='\${datadir}/sounds'
++    kde_sounddir='\${datadir}/kde/sounds'
+   fi
+   if test -z "$kde_datadir"; then
+-    kde_datadir='\${datadir}/apps'
++    kde_datadir='\${datadir}/kde/apps'
+   fi
+   if test -z "$kde_locale"; then
+     kde_locale='\${datadir}/locale'
+@@ -23081,31 +23081,31 @@
+     kde_cgidir='\${exec_prefix}/cgi-bin'
+   fi
+   if test -z "$kde_confdir"; then
+-    kde_confdir='\${datadir}/config'
++    kde_confdir='\${datadir}/kde/config'
+   fi
+   if test -z "$kde_kcfgdir"; then
+-    kde_kcfgdir='\${datadir}/config.kcfg'
++    kde_kcfgdir='\${datadir}/kde/config.kcfg'
+   fi
+   if test -z "$kde_mimedir"; then
+-    kde_mimedir='\${datadir}/mimelnk'
++    kde_mimedir='\${datadir}/kde/mimelnk'
+   fi
+   if test -z "$kde_toolbardir"; then
+-    kde_toolbardir='\${datadir}/toolbar'
++    kde_toolbardir='\${datadir}/kde/toolbar'
+   fi
+   if test -z "$kde_wallpaperdir"; then
+-    kde_wallpaperdir='\${datadir}/wallpapers'
++    kde_wallpaperdir='\${datadir}/kde/wallpapers'
+   fi
+   if test -z "$kde_templatesdir"; then
+-    kde_templatesdir='\${datadir}/templates'
++    kde_templatesdir='\${datadir}/kde/templates'
+   fi
+   if test -z "$kde_bindir"; then
+     kde_bindir='\${exec_prefix}/bin'
+   fi
+   if test -z "$kde_servicesdir"; then
+-    kde_servicesdir='\${datadir}/services'
++    kde_servicesdir='\${datadir}/kde/services'
+   fi
+   if test -z "$kde_servicetypesdir"; then
+-    kde_servicetypesdir='\${datadir}/servicetypes'
++    kde_servicetypesdir='\${datadir}/kde/servicetypes'
+   fi
+   if test -z "$kde_moduledir"; then
+     if test "$kde_qtver" = "2"; then
+@@ -23115,10 +23115,10 @@
+     fi
+   fi
+   if test -z "$kde_styledir"; then
+-    kde_styledir='\${libdir}/kde3/plugins/styles'
++    kde_styledir='\${libdir}/kde/plugins/styles'
+   fi
+   if test -z "$kde_widgetdir"; then
+-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
++    kde_widgetdir='\${libdir}/kde/plugins/designer'
+   fi
+   if test -z "$xdg_appsdir"; then
+     xdg_appsdir='\${datadir}/applications/kde'
+@@ -45388,7 +45388,7 @@
  
  
  
@@ -27,3 +97,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/12/05 15:15:24 wiz Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_WINSOCK 1
+@@ -47363,6 +47363,8 @@
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
diff --git a/multimedia/gnash/patches/patch-ab b/multimedia/gnash/patches/patch-ab
new file mode 100644
index 00000000000..bfdcf1aa7de
--- /dev/null
+++ b/multimedia/gnash/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/12/06 00:13:05 xtraeme Exp $
+
+--- plugin/Makefile.in.orig	2006-12-06 00:14:28.000000000 +0100
++++ plugin/Makefile.in	2006-12-06 00:23:19.000000000 +0100
+@@ -952,7 +952,7 @@
+ #if PLUGIN_LINK_UNDEFINED
+ #cp $(DESTDIR)$(plugindir)/.libs/libgnashplugin.so.0.* $(DESTDIR)$(plugindir)/libgnashplugin.so
+ #endif
+-	$(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a $(DESTDIR)$(plugindir)/libgnashplugin.so.0 $(DESTDIR)$(plugindir)/libgnashplugin.*.T
++	#$(RM) $(DESTDIR)$(plugindir)/libgnashplugin.*a $(DESTDIR)$(plugindir)/libgnashplugin.so.0 $(DESTDIR)$(plugindir)/libgnashplugin.*.T
+ 
+ # install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ # 	if test -d $(HOME)/.firefox ; then \