Thu Mar 22 13:29:11 2018 UTC ()
grip: update to 3.7.0

* Add the GConf missing dependency
* Patch the default cdrom device to /dev/rcd0d for NetBSD

Changes since 3.6.1:
v3.7.0

	* Sync Brazilian Portuguese from Translation Project
	* Patch by Phil Stracchino: extended genres to genre list

v3.6.3

	* Sync ukranian and hungarian translations from Translation Project
	* Patch from Adrian Reber: fix compiler warning with gcc 8.0
	* Update the FSF postal address in source files

v3.6.2

	* Translation updates: German, Italian, Brazilian Portuguese, Serbian


(triaxx)
diff -r1.9 -r1.10 pkgsrc/audio/grip/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/grip/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/grip/patches/patch-src_grip.c
diff -r0 -r1.3 pkgsrc/audio/grip/patches/patch-src_grip.h
cvs diff -r1.9 -r1.10 pkgsrc/audio/grip/Makefile (expand / switch to unified diff)

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

--- pkgsrc/audio/grip/distinfo 2017/10/22 07:55:24 1.3
+++ pkgsrc/audio/grip/distinfo 2018/03/22 13:29:11 1.4
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.3 2017/10/22 07:55:24 triaxx Exp $ 1$NetBSD: distinfo,v 1.4 2018/03/22 13:29:11 triaxx Exp $
2 2
3SHA1 (grip-3.6.1.tar.gz) = c7ad80476f35d2d966458995c34660452c24225a 3SHA1 (grip-3.7.0.tar.gz) = 8274adb5b680f1bd8ed3f3ae9ba656af71461532
4RMD160 (grip-3.6.1.tar.gz) = e34efd335ac5da54f3963433e9161c9855ad395c 4RMD160 (grip-3.7.0.tar.gz) = a8a7dcae40d229d2898f032ba9912a53c44e5c0d
5SHA512 (grip-3.6.1.tar.gz) = ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf 5SHA512 (grip-3.7.0.tar.gz) = bc2cbfbc1602a3639944009326e485195dbbab83a3ee15ab7291050ccc8b62dc52e052dca50a040335cfb20ff8d244c5315a15e8d940f6a9d89b2808d7876ca1
6Size (grip-3.6.1.tar.gz) = 958967 bytes 6Size (grip-3.7.0.tar.gz) = 961006 bytes
7SHA1 (patch-configure) = aefe8f4fdfaba93b95cca656d0ea6c8ec7b3348f 7SHA1 (patch-configure) = aefe8f4fdfaba93b95cca656d0ea6c8ec7b3348f
8SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634 8SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634
9SHA1 (patch-src_grip.c) = ed6ff6e70d0395af4a1ca3b06337a7fb354a0fae 9SHA1 (patch-src_grip.c) = 6df01ec5a7e30b96a94f5db7dc9b6f6bd7890c06
 10SHA1 (patch-src_grip.h) = 5898c8b949d6a119095e96d56896ce8abe4dd4b6
cvs diff -r1.1 -r1.2 pkgsrc/audio/grip/patches/Attic/patch-src_grip.c (expand / switch to unified diff)

--- pkgsrc/audio/grip/patches/Attic/patch-src_grip.c 2017/08/18 12:21:29 1.1
+++ pkgsrc/audio/grip/patches/Attic/patch-src_grip.c 2018/03/22 13:29:11 1.2
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
1$NetBSD: patch-src_grip.c,v 1.1 2017/08/18 12:21:29 triaxx Exp $ 1$NetBSD: patch-src_grip.c,v 1.2 2018/03/22 13:29:11 triaxx Exp $
2 2
3Add system dependent headers. 3Add system dependent headers.
4 4
5--- src/grip.c.orig 2017-07-31 21:04:12.000000000 +0000 5--- src/grip.c.orig 2018-01-31 15:06:36.000000000 +0000
6+++ src/grip.c 6+++ src/grip.c
7@@ -26,6 +26,9 @@ 7@@ -26,6 +26,9 @@
8 #include <stdio.h> 8 #include <stdio.h>
9 #include <unistd.h> 9 #include <unistd.h>
10 #include <sys/param.h> 10 #include <sys/param.h>
11+#if defined(__NetBSD__) 11+#if defined(__NetBSD__)
12+#include <sys/wait.h> 12+#include <sys/wait.h>
13+#endif 13+#endif
14 #include <gdk/gdkx.h> 14 #include <gdk/gdkx.h>
15 #include <X11/Xlib.h> 15 #include <X11/Xlib.h>
16 #include <time.h> 16 #include <time.h>
 17@@ -773,7 +776,7 @@ static void DoLoadConfig(GripInfo *ginfo
 18
 19 *ginfo->version='\0';
 20
 21- strcpy(ginfo->cd_device,"/dev/cdrom");
 22+ strcpy(ginfo->cd_device,CD_DEVICE);
 23 *ginfo->force_scsi='\0';
 24
 25 ginfo->local_mode=FALSE;
File Added: pkgsrc/audio/grip/patches/Attic/patch-src_grip.h
$NetBSD: patch-src_grip.h,v 1.3 2018/03/22 13:29:11 triaxx Exp $

--- src/grip.h.orig	2018-01-01 20:16:03.000000000 +0000
+++ src/grip.h
@@ -59,6 +59,12 @@
 
 #endif
 
+#if defined(__NetBSD__)
+#define CD_DEVICE "/dev/rcd0d"
+#else
+#define CD_DEVICE "/dev/cdrom"
+#endif
+
 typedef struct _grip_gui {
   GtkWidget *app;
   GtkWidget *winbox;