CVS commit: pkgsrc/audio/grip

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

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Thu Mar 22 13:29:11 UTC 2018

Modified Files:
        pkgsrc/audio/grip: Makefile distinfo
        pkgsrc/audio/grip/patches: patch-src_grip.c
Added Files:
        pkgsrc/audio/grip/patches: patch-src_grip.h

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/grip/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/grip/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/grip/patches/patch-src_grip.c
cvs rdiff -u -r0 -r1.3 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.9 pkgsrc/audio/grip/Makefile:1.10
--- pkgsrc/audio/grip/Makefile:1.9      Mon Mar 12 11:16:02 2018
+++ pkgsrc/audio/grip/Makefile  Thu Mar 22 13:29:11 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2018/03/12 11:16:02 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/03/22 13:29:11 triaxx Exp $
 
-DISTNAME=      grip-3.6.1
-PKGREVISION=   4
+DISTNAME=      grip-3.7.0
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=grip/}       
 
@@ -18,6 +17,7 @@ USE_LANGUAGES=                c c++
 .include "../../audio/grip/options.mk"
 
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"

Index: pkgsrc/audio/grip/distinfo
diff -u pkgsrc/audio/grip/distinfo:1.3 pkgsrc/audio/grip/distinfo:1.4
--- pkgsrc/audio/grip/distinfo:1.3      Sun Oct 22 07:55:24 2017
+++ pkgsrc/audio/grip/distinfo  Thu Mar 22 13:29:11 2018
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2017/10/22 07:55:24 triaxx Exp $
+$NetBSD: distinfo,v 1.4 2018/03/22 13:29:11 triaxx Exp $
 
-SHA1 (grip-3.6.1.tar.gz) = c7ad80476f35d2d966458995c34660452c24225a
-RMD160 (grip-3.6.1.tar.gz) = e34efd335ac5da54f3963433e9161c9855ad395c
-SHA512 (grip-3.6.1.tar.gz) = ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf
-Size (grip-3.6.1.tar.gz) = 958967 bytes
+SHA1 (grip-3.7.0.tar.gz) = 8274adb5b680f1bd8ed3f3ae9ba656af71461532
+RMD160 (grip-3.7.0.tar.gz) = a8a7dcae40d229d2898f032ba9912a53c44e5c0d
+SHA512 (grip-3.7.0.tar.gz) = bc2cbfbc1602a3639944009326e485195dbbab83a3ee15ab7291050ccc8b62dc52e052dca50a040335cfb20ff8d244c5315a15e8d940f6a9d89b2808d7876ca1
+Size (grip-3.7.0.tar.gz) = 961006 bytes
 SHA1 (patch-configure) = aefe8f4fdfaba93b95cca656d0ea6c8ec7b3348f
 SHA1 (patch-src_cdplay.c) = ae6dd708d4a5bc61ad49477e79b2005959290634
-SHA1 (patch-src_grip.c) = ed6ff6e70d0395af4a1ca3b06337a7fb354a0fae
+SHA1 (patch-src_grip.c) = 6df01ec5a7e30b96a94f5db7dc9b6f6bd7890c06
+SHA1 (patch-src_grip.h) = 5898c8b949d6a119095e96d56896ce8abe4dd4b6

Index: pkgsrc/audio/grip/patches/patch-src_grip.c
diff -u pkgsrc/audio/grip/patches/patch-src_grip.c:1.1 pkgsrc/audio/grip/patches/patch-src_grip.c:1.2
--- pkgsrc/audio/grip/patches/patch-src_grip.c:1.1      Fri Aug 18 12:21:29 2017
+++ pkgsrc/audio/grip/patches/patch-src_grip.c  Thu Mar 22 13:29:11 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_grip.c,v 1.1 2017/08/18 12:21:29 triaxx Exp $
+$NetBSD: patch-src_grip.c,v 1.2 2018/03/22 13:29:11 triaxx Exp $
 
 Add system dependent headers.
 
---- src/grip.c.orig    2017-07-31 21:04:12.000000000 +0000
+--- src/grip.c.orig    2018-01-31 15:06:36.000000000 +0000
 +++ src/grip.c
 @@ -26,6 +26,9 @@
  #include <stdio.h>
@@ -14,3 +14,12 @@ Add system dependent headers.
  #include <gdk/gdkx.h>
  #include <X11/Xlib.h>
  #include <time.h>
+@@ -773,7 +776,7 @@ static void DoLoadConfig(GripInfo *ginfo
+ 
+   *ginfo->version='\0';
+ 
+-  strcpy(ginfo->cd_device,"/dev/cdrom");
++  strcpy(ginfo->cd_device,CD_DEVICE);
+   *ginfo->force_scsi='\0';
+ 
+   ginfo->local_mode=FALSE;

Added files:

Index: pkgsrc/audio/grip/patches/patch-src_grip.h
diff -u /dev/null pkgsrc/audio/grip/patches/patch-src_grip.h:1.3
--- /dev/null   Thu Mar 22 13:29:11 2018
+++ pkgsrc/audio/grip/patches/patch-src_grip.h  Thu Mar 22 13:29:11 2018
@@ -0,0 +1,17 @@
+$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;