From 319cbd207da038fdf5c1f2153ca4ba88eaf2222b Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 6 Mar 2011 16:04:32 +0000
Subject: Remove options that use GTK1.

---
 audio/normalize/Makefile           |  4 +---
 audio/normalize/options.mk         | 13 -------------
 audio/xfce4-xmms-plugin/Makefile   |  7 +++----
 audio/xfce4-xmms-plugin/options.mk | 15 ---------------
 4 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 audio/normalize/options.mk
 delete mode 100644 audio/xfce4-xmms-plugin/options.mk

(limited to 'audio')

diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index afb0f7af034..bc2ac99ff7a 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/06/20 01:09:07 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2011/03/06 16:04:32 wiz Exp $
 
 DISTNAME=	normalize-0.7.7
 CATEGORIES=	audio
@@ -20,8 +20,6 @@ CONFIGURE_ARGS+=	--with-mad
 
 REPLACE_PERL=		src/normalize-mp3
 
-.include "options.mk"
-
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/audio/normalize/options.mk b/audio/normalize/options.mk
deleted file mode 100644
index e81b3754e02..00000000000
--- a/audio/normalize/options.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:58 jlam Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.normalize
-PKG_SUPPORTED_OPTIONS=	xmms
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		xmms
-
-.if !empty(PKG_OPTIONS:Mxmms)
-PLIST.xmms=		yes
-.include "../../audio/xmms/buildlink3.mk"
-.endif
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index db6313ca4c8..c4652e3bd6a 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2011/01/13 13:36:50 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2011/03/06 16:04:32 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,12 +7,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=	0.5.1
 
 DISTNAME=	xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-xmms-plugin/
 COMMENT=	Xfce XMMS plugin
 
-.include "options.mk"
-
+.include "../../audio/bmp/buildlink3.mk"
 .include "../../x11/xfce4-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xfce4-xmms-plugin/options.mk b/audio/xfce4-xmms-plugin/options.mk
deleted file mode 100644
index 109f7610307..00000000000
--- a/audio/xfce4-xmms-plugin/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2007/04/12 09:55:09 martti Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.xfce4-xmms-plugin
-PKG_SUPPORTED_OPTIONS=
-PKG_OPTIONS_REQUIRED_GROUPS+=	xfce4-xmms-plugin-player
-PKG_OPTIONS_GROUP.xfce4-xmms-plugin-player=	xmms bmp
-PKG_SUGGESTED_OPTIONS=		xmms
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mbmp)
-.include "../../audio/bmp/buildlink3.mk"
-.else
-.include "../../audio/xmms/buildlink3.mk"
-.endif
-- 
cgit v1.2.3