Make gmpc plugin packages' Makefiles look more similar.

5 files changed, 19 insertions, 34 deletions

diff --git a/audio/gmpc-albumview/Makefile b/audio/gmpc-albumview/Makefile
index 6ca877876cb..5117992d36c 100644
--- a/audio/gmpc-albumview/Makefile
+++ b/audio/gmpc-albumview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/02/27 19:52:53 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/27 23:16:36 wiz Exp $
 #
 
 DISTNAME=	gmpc-albumview-0.20.0
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS=	intltool pkg-config
+USE_TOOLS+=	intltool pkg-config
 
 .include "../../audio/gmpc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index c9ac30a8284..ec4099c3927 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/02/27 19:46:01 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/27 23:16:36 wiz Exp $
 #
 
 DISTNAME=	gmpc-lyrics-0.20.0
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS=	intltool pkg-config
+USE_TOOLS+=	intltool pkg-config
 
 .include "../../audio/gmpc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index e39a71e4d50..baedc848901 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/27 16:34:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2011/02/27 23:16:36 wiz Exp $
 #
 
 DISTNAME=	gmpc-lyricwiki-0.20.0
@@ -14,15 +14,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS=	intltool pkg-config
+USE_TOOLS+=	intltool pkg-config
 
-BUILDLINK_API_DEPENDS.gmpc+=	gmpc>=0.16.2
 .include "../../audio/gmpc/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libmpd+=	libmpd>=0.15.98
-.include "../../audio/libmpd/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index 5f26ce8f790..98827186709 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2011/01/13 13:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/27 23:16:36 wiz Exp $
 #
 
-DISTNAME=		gmpc-magnatune-0.20.0
-PKGREVISION=		3
-CATEGORIES=		audio
-MASTER_SITES=		http://download.sarine.nl/Programs/gmpc/0.20.0/ \
-			${MASTER_SITE_SOURCEFORGE:=musicpd/}
+DISTNAME=	gmpc-magnatune-0.20.0
+PKGREVISION=	3
+CATEGORIES=	audio
+MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/0.20.0/ \
+		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MAGNATUNE
-COMMENT=		Magnatune plugin for GMPC
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://gmpc.wikia.com/wiki/GMPC_PLUGIN_MAGNATUNE
+COMMENT=	Magnatune plugin for GMPC
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		intltool msgfmt pkg-config
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	intltool msgfmt pkg-config
 
 .include "../../audio/gmpc/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
diff --git a/audio/gmpc-tagedit/Makefile b/audio/gmpc-tagedit/Makefile
index 2738012aef3..90bdd924c7a 100644
--- a/audio/gmpc-tagedit/Makefile
+++ b/audio/gmpc-tagedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/02/27 16:12:42 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/27 23:16:36 wiz Exp $
 #
 
 DISTNAME=	gmpc-tagedit-0.20.0
@@ -16,15 +16,8 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS=	gmake intltool pkg-config
 
-BUILDLINK_API_DEPENDS.gmpc+=	gmpc>=0.16.2
 .include "../../audio/gmpc/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libmpd+=	libmpd>=0.15.98
-.include "../../audio/libmpd/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16
-.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gob2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"