From 467893b2e9e3899afe8bb3f22a9b57f9844a6ee2 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Sat, 26 Jun 2004 15:46:52 +0000
Subject: [PATCH] Fix detection of OSS and add support for gstreamer.  This
 lets multimedia keybindings work (like change the volume through the
 keyboard). Bump PKGREVISION to 1.

---
 x11/gnome2-control-center/Makefile         |  4 +++-
 x11/gnome2-control-center/distinfo         |  4 ++--
 x11/gnome2-control-center/patches/patch-ad | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 99babc49dcae..910e01a498c9 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2004/05/15 15:00:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.36 2004/06/26 15:46:52 jmmv Exp $
 #
 
 DISTNAME=	control-center-2.6.1
 PKGNAME=	gnome2-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -62,6 +63,7 @@ post-install:
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../multimedia/gst-plugins/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 5d0f8f26fa12..74e80bd9a43d 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2004/05/17 00:10:49 danw Exp $
+$NetBSD: distinfo,v 1.12 2004/06/26 15:46:52 jmmv Exp $
 
 SHA1 (control-center-2.6.1.tar.bz2) = a7e367e24c65dcde65b36f014945acfb1261667d
 Size (control-center-2.6.1.tar.bz2) = 2487807 bytes
 SHA1 (patch-ab) = 15d24efe8e39d948b5663e641f47ea41b815e17d
 SHA1 (patch-ac) = e2df2c5ffc0841f409985eafbafb96c5c9a5551a
-SHA1 (patch-ad) = 2ec051658a911d4adb243f3357089504ab412293
+SHA1 (patch-ad) = 7177bd7d915fd2d8fa43f0fb614aa61afab61722
diff --git a/x11/gnome2-control-center/patches/patch-ad b/x11/gnome2-control-center/patches/patch-ad
index e4e4817e3589..c08c7ab7d338 100644
--- a/x11/gnome2-control-center/patches/patch-ad
+++ b/x11/gnome2-control-center/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/05/17 00:10:49 danw Exp $
+$NetBSD: patch-ad,v 1.2 2004/06/26 15:46:52 jmmv Exp $
 
---- configure.orig	Tue Apr 13 22:49:27 2004
+--- configure.orig	2004-04-15 18:59:14.000000000 +0200
 +++ configure
-@@ -23063,7 +23063,7 @@ if test `eval echo '${'$as_ac_Header'}'`
+@@ -23220,7 +23220,7 @@ if test `eval echo '${'$as_ac_Header'}'`
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@ -11,3 +11,12 @@ $NetBSD: patch-ad,v 1.1 2004/05/17 00:10:49 danw Exp $
  fi
  
  done
+@@ -25958,6 +25958,8 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+ 	#ifdef __NetBSD__
++	#include <sys/param.h>
++	#include <sys/sysctl.h>
+ 	#include <soundcard.h>
+ 	#else
+ 	#include <sys/soundcard.h>