Slight tidyup of the KDE handling. No functional change.

3 files changed, 6 insertions, 89 deletions

diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index 1200ca9daee..0e560e18bc3 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/12/07 00:27:06 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/12/07 10:07:10 markd 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) = 2371b34fa7d74491af9009c944e269790e290d81
+SHA1 (patch-aa) = 703a62d4044644ba544432e90037e347fb5f9283
 SHA1 (patch-ab) = 1ad18261886442e6cec44bc0f3db09ec2ced1e15
diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk
index 4c6904b03c3..12f5e8bd308 100644
--- a/multimedia/gnash/options.mk
+++ b/multimedia/gnash/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2006/12/06 00:13:05 xtraeme Exp $
+# $NetBSD: options.mk,v 1.2 2006/12/07 10:07:10 markd Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnash
@@ -9,8 +9,7 @@ PKG_SUPPORTED_OPTIONS=	klash
 .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"
+.include "../../meta-pkgs/kde3/kde3.mk"
 CONFIGURE_ARGS+=	\
 	--with-plugindir=${PREFIX}/share/gnash/plugins
 CONFIGURE_ARGS+=	--enable-klash
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
index 475f339b18c..d48a36e357c 100644
--- a/multimedia/gnash/patches/patch-aa
+++ b/multimedia/gnash/patches/patch-aa
@@ -1,10 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2006/12/07 00:27:06 rillig Exp $
-
-* Fixed "test ==".
-* Fixed an invalid use of backticks (line 26598).
+$NetBSD: patch-aa,v 1.5 2006/12/07 10:07:10 markd Exp $
 
 --- configure.orig	2006-11-17 20:09:10.000000000 +0100
-+++ configure	2006-12-07 01:23:40.000000000 +0100
++++ configure	2006-12-06 00:22:10.000000000 +0100
 @@ -4303,13 +4303,13 @@
    LIBPRE="lib"
  
@@ -21,85 +18,6 @@ $NetBSD: patch-aa,v 1.4 2006/12/07 00:27:06 rillig Exp $
  	   LIBEXT="dll"
  	fi
    fi
-@@ -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'
-@@ -26598,7 +26598,7 @@
-     if test x"${with_atk_lib}" != x ; then
-       libname=atkatk-x11-${gnash_atk_version}
-       if test -f ${with_atk_lib}/lib${libname}.a -o -f ${with_atk_lib}/lib${libname}.so; then
--        ac_cv_path_atk_lib="`-L(cd ${with_atk_lib}; pwd)` -l${libname}"
-+        ac_cv_path_atk_lib="-L`cd ${with_atk_lib}; pwd` -l${libname}"
-       else
-         { { echo "$as_me:$LINENO: error: ${with_atk_lib} directory doesn't contain libatkatk." >&5
- echo "$as_me: error: ${with_atk_lib} directory doesn't contain libatkatk." >&2;}
 @@ -45388,7 +45388,7 @@