CVS commit: pkgsrc/audio/grip

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Aug 18 13:26:38 UTC 2017

Modified Files:
        pkgsrc/audio/grip: Makefile distinfo options.mk
Removed Files:
        pkgsrc/audio/grip/patches: patch-configure patch-src_cdpar.h
            patch-src_grip.h

Log Message:
Fix MASTER_SITES that did not used MASTER_SITE_SOURCEFORGE.
Remove useless patches using buildlink framework (thanks to wip/grip).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/grip/Makefile \
    pkgsrc/audio/grip/distinfo pkgsrc/audio/grip/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/audio/grip/patches/patch-configure \
    pkgsrc/audio/grip/patches/patch-src_cdpar.h \
    pkgsrc/audio/grip/patches/patch-src_grip.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/grip/Makefile
diff -u pkgsrc/audio/grip/Makefile:1.1 pkgsrc/audio/grip/Makefile:1.2
--- pkgsrc/audio/grip/Makefile:1.1      Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/Makefile  Fri Aug 18 13:26:37 2017
@@ -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@localhost
 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"
 
Index: pkgsrc/audio/grip/distinfo
diff -u pkgsrc/audio/grip/distinfo:1.1 pkgsrc/audio/grip/distinfo:1.2
--- pkgsrc/audio/grip/distinfo:1.1      Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/distinfo  Fri Aug 18 13:26:37 2017
@@ -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
Index: pkgsrc/audio/grip/options.mk
diff -u pkgsrc/audio/grip/options.mk:1.1 pkgsrc/audio/grip/options.mk:1.2
--- pkgsrc/audio/grip/options.mk:1.1    Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/options.mk        Fri Aug 18 13:26:37 2017
@@ -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