Fri Aug 18 13:26:38 2017 UTC ()
Fix MASTER_SITES that did not used MASTER_SITE_SOURCEFORGE.
Remove useless patches using buildlink framework (thanks to wip/grip).


(triaxx)
diff -r1.1 -r1.2 pkgsrc/audio/grip/Makefile
diff -r1.1 -r1.2 pkgsrc/audio/grip/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/grip/options.mk
diff -r1.1 -r0 pkgsrc/audio/grip/patches/patch-configure
diff -r1.1 -r0 pkgsrc/audio/grip/patches/patch-src_cdpar.h
diff -r1.1 -r0 pkgsrc/audio/grip/patches/patch-src_grip.h
cvs diff -r1.1 -r1.2 pkgsrc/audio/grip/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/grip/Makefile 2017/08/18 12:21:29 1.1
+++ pkgsrc/audio/grip/Makefile 2017/08/18 13:26:37 1.2
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: Makefile,v 1.1 2017/08/18 12:21:29 triaxx Exp $ 1# $NetBSD: Makefile,v 1.2 2017/08/18 13:26:37 triaxx Exp $
2 2
3DISTNAME= grip-3.5.2 3DISTNAME= grip-3.5.2
4CATEGORIES= audio 4CATEGORIES= audio
5MASTER_SITES= https://downloads.sourceforge.net/project/grip/3.5.2/ 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grip/}
6 6
7MAINTAINER= triaxx@NetBSD.org 7MAINTAINER= triaxx@NetBSD.org
8HOMEPAGE= https://sourceforge.net/project/grip/ 8HOMEPAGE= https://sourceforge.net/project/grip/
9COMMENT= CD-player and CD-ripper for the Gnome desktop 9COMMENT= CD-player and CD-ripper for the Gnome desktop
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12GNU_CONFIGURE= yes 12USE_TOOLS+= pkg-config
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_LANGUAGES= c c++ 14GNU_CONFIGURE= yes
15USE_TOOLS+= pkg-config 15USE_LANGUAGES= c c++
16 16
17.include "../../audio/grip/options.mk" 17.include "../../audio/grip/options.mk"
18 18
19.include "../../devel/libgnomeui/buildlink3.mk" 19.include "../../devel/libgnomeui/buildlink3.mk"
20.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 20.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
21.include "../../x11/vte/buildlink3.mk" 21.include "../../x11/vte/buildlink3.mk"
22.include "../../www/curl/buildlink3.mk" 22.include "../../www/curl/buildlink3.mk"
23 23
24.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/audio/grip/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/grip/distinfo 2017/08/18 12:21:29 1.1
+++ pkgsrc/audio/grip/distinfo 2017/08/18 13:26:37 1.2
@@ -1,11 +1,8 @@ @@ -1,11 +1,8 @@
1$NetBSD: distinfo,v 1.1 2017/08/18 12:21:29 triaxx Exp $ 1$NetBSD: distinfo,v 1.2 2017/08/18 13:26:37 triaxx Exp $
2 2
3SHA1 (grip-3.5.2.tar.gz) = 6a9c20502a4c71decc454348457021844c6958de 3SHA1 (grip-3.5.2.tar.gz) = 6a9c20502a4c71decc454348457021844c6958de
4RMD160 (grip-3.5.2.tar.gz) = e95b15315f8ca1bbde0d3a66d8f30394aa04b7f3 4RMD160 (grip-3.5.2.tar.gz) = e95b15315f8ca1bbde0d3a66d8f30394aa04b7f3
5SHA512 (grip-3.5.2.tar.gz) = 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421 5SHA512 (grip-3.5.2.tar.gz) = 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421
6Size (grip-3.5.2.tar.gz) = 952153 bytes 6Size (grip-3.5.2.tar.gz) = 952153 bytes
7SHA1 (patch-configure) = ada978fd8a4261a225f1728a050c7e7193331ce8 
8SHA1 (patch-src_cdpar.h) = d23ad69260de44da8d10e9b4e9b83d220e4dc0ef 
9SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634 7SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634
10SHA1 (patch-src_grip.c) = ed6ff6e70d0395af4a1ca3b06337a7fb354a0fae 8SHA1 (patch-src_grip.c) = ed6ff6e70d0395af4a1ca3b06337a7fb354a0fae
11SHA1 (patch-src_grip.h) = 3e7ed2dbee435b3ee975e2e4bd0d5530cdd9ec92 
cvs diff -r1.1 -r1.2 pkgsrc/audio/grip/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/grip/options.mk 2017/08/18 12:21:29 1.1
+++ pkgsrc/audio/grip/options.mk 2017/08/18 13:26:37 1.2
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: options.mk,v 1.1 2017/08/18 12:21:29 triaxx Exp $ 1# $NetBSD: options.mk,v 1.2 2017/08/18 13:26:37 triaxx Exp $
2# 2#
3 3
4PKG_OPTIONS_VAR= PKG_OPTIONS.grip 4PKG_OPTIONS_VAR= PKG_OPTIONS.grip
5PKG_SUPPORTED_OPTIONS= cdparanoia id3 5PKG_SUPPORTED_OPTIONS= cdparanoia id3
6PKG_SUGGESTED_OPTIONS= cdparanoia id3 6PKG_SUGGESTED_OPTIONS= cdparanoia id3
7 7
8.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11### 11###
12### Cdparanoia support 12### Cdparanoia support
13### 13###
14.if !empty(PKG_OPTIONS:Mcdparanoia) 14.if !empty(PKG_OPTIONS:Mcdparanoia)
 15BUILDLINK_FNAME_TRANSFORM.cdparanoia+= -e s,/cdparanoia/,/,g
15. include "../../audio/cdparanoia/buildlink3.mk" 16. include "../../audio/cdparanoia/buildlink3.mk"
16.else 17.else
17CONFIGURE_ARGS+= --disable-cdpar 18CONFIGURE_ARGS+= --disable-cdpar
18.endif 19.endif
19 20
20### 21###
21### ID3v2 support 22### ID3v2 support
22### 23###
23.if !empty(PKG_OPTIONS:Mid3) 24.if !empty(PKG_OPTIONS:Mid3)
24. include "../../audio/id3lib/buildlink3.mk" 25. include "../../audio/id3lib/buildlink3.mk"
25.else 26.else
26CONFIGURE_ARGS+= --disable-id3 27CONFIGURE_ARGS+= --disable-id3
27.endif 28.endif
File Deleted: pkgsrc/audio/grip/patches/Attic/patch-configure
File Deleted: pkgsrc/audio/grip/patches/Attic/patch-src_cdpar.h
File Deleted: pkgsrc/audio/grip/patches/Attic/patch-src_grip.h