Fix MASTER_SITES that did not used MASTER_SITE_SOURCEFORGE.

Remove useless patches using buildlink framework (thanks to wip/grip).

6 files changed, 9 insertions, 87 deletions

diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 02c3f253b6c..97245a1496f 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+# $NetBSD: Makefile,v 1.2 2017/08/18 13:26:37 triaxx Exp $
 
 DISTNAME=	grip-3.5.2
 CATEGORIES=	audio
-MASTER_SITES=	https://downloads.sourceforge.net/project/grip/3.5.2/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=grip/}	
 
 MAINTAINER=	triaxx@NetBSD.org
 HOMEPAGE=	https://sourceforge.net/project/grip/
 COMMENT=	CD-player and CD-ripper for the Gnome desktop
 LICENSE=	gnu-gpl-v2
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=		pkg-config
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++
 
 .include "../../audio/grip/options.mk"
 
diff --git a/audio/grip/distinfo b/audio/grip/distinfo
index 2ed85344640..e83366e9346 100644
--- a/audio/grip/distinfo
+++ b/audio/grip/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+$NetBSD: distinfo,v 1.2 2017/08/18 13:26:37 triaxx Exp $
 
 SHA1 (grip-3.5.2.tar.gz) = 6a9c20502a4c71decc454348457021844c6958de
 RMD160 (grip-3.5.2.tar.gz) = e95b15315f8ca1bbde0d3a66d8f30394aa04b7f3
 SHA512 (grip-3.5.2.tar.gz) = 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
 Size (grip-3.5.2.tar.gz) = 952153 bytes
-SHA1 (patch-configure) = ada978fd8a4261a225f1728a050c7e7193331ce8
-SHA1 (patch-src_cdpar.h) = d23ad69260de44da8d10e9b4e9b83d220e4dc0ef
 SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634
 SHA1 (patch-src_grip.c) = ed6ff6e70d0395af4a1ca3b06337a7fb354a0fae
-SHA1 (patch-src_grip.h) = 3e7ed2dbee435b3ee975e2e4bd0d5530cdd9ec92
diff --git a/audio/grip/options.mk b/audio/grip/options.mk
index 698ba667c65..9ac54a7cf5e 100644
--- a/audio/grip/options.mk
+++ b/audio/grip/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+# $NetBSD: options.mk,v 1.2 2017/08/18 13:26:37 triaxx Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.grip
@@ -12,6 +12,7 @@ PKG_SUGGESTED_OPTIONS=		cdparanoia id3
 ### Cdparanoia support
 ###
 .if !empty(PKG_OPTIONS:Mcdparanoia)
+BUILDLINK_FNAME_TRANSFORM.cdparanoia+=	-e s,/cdparanoia/,/,g
 .  include "../../audio/cdparanoia/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cdpar
diff --git a/audio/grip/patches/patch-configure b/audio/grip/patches/patch-configure
deleted file mode 100644
index 5d79b84184d..00000000000
--- a/audio/grip/patches/patch-configure
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2017/08/18 12:21:29 triaxx Exp $
-
-Add a test to find cdparanoia include directory.
-
-XXX: this patch could be useless if the cdparanoia package provided by pkgsrc
-did not override the default include directory.
-
---- configure.orig	2017-07-31 21:24:47.000000000 +0000
-+++ configure
-@@ -16529,6 +16529,27 @@ fi
- done
- 
- 
-+  for ac_header in cdparanoia/cdda_interface.h cdparanoia/cdda_paranoia.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_CDPARANOIA_CDDA_INTERFACE_H
-+    # include <cdparanoia/cdda_interface.h>
-+    #endif
-+    #ifdef HAVE_CDPARANOIA_CDDA_PARANOIA_H
-+    # include <cdparanoia/cdda_paranoia.h>
-+    #endif
-+
-+"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lcdda_interface" >&5
- $as_echo_n "checking for main in -lcdda_interface... " >&6; }
- if ${ac_cv_lib_cdda_interface_main+:} false; then :
diff --git a/audio/grip/patches/patch-src_cdpar.h b/audio/grip/patches/patch-src_cdpar.h
deleted file mode 100644
index 6ced3040911..00000000000
--- a/audio/grip/patches/patch-src_cdpar.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_cdpar.h,v 1.1 2017/08/18 12:21:29 triaxx Exp $
-
-Add a test to include cdparanoia headers.
-
-XXX: this patch could be useless if the cdparanoia package provided by pkgsrc
-did not override the default include directory.
-
---- src/cdpar.h.orig	2016-12-30 19:56:07.000000000 +0000
-+++ src/cdpar.h
-@@ -26,7 +26,10 @@
- #ifdef HAVE_CDDA_INTERFACE_H
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
--#else
-+#elif HAVE_CDDA_CDDA_INTERFACE_H
- #include <cdda/cdda_interface.h>
- #include <cdda/cdda_paranoia.h>
-+#else
-+#include <cdparanoia/cdda_interface.h>
-+#include <cdparanoia/cdda_paranoia.h>
- #endif
diff --git a/audio/grip/patches/patch-src_grip.h b/audio/grip/patches/patch-src_grip.h
deleted file mode 100644
index d506e3a193c..00000000000
--- a/audio/grip/patches/patch-src_grip.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_grip.h,v 1.1 2017/08/18 12:21:29 triaxx Exp $
-
-Add a test on the macro needed by pkgsrc cdparanoia.
-
-XXX: this patch could be useless if the cdparanoia package provided by pkgsrc
-did not override the default include directory.
-
---- src/grip.h.orig	2017-06-03 21:05:41.000000000 +0000
-+++ src/grip.h
-@@ -33,7 +33,7 @@
- #include "status_window.h"
- #include "eggtrayicon.h"
- 
--#if defined(HAVE_CDDA_INTERFACE_H) || defined(HAVE_CDDA_CDDA_INTERFACE_H)
-+#if defined(HAVE_CDDA_INTERFACE_H) || defined(HAVE_CDDA_CDDA_INTERFACE_H) || defined(HAVE_CDPARANOIA_CDDA_INTERFACE_H)
- #define CDPAR
- #endif
-