Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/grip/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile 26 Jul 2017 22:45:15 -0000 1.58
+++ Makefile 28 Aug 2017 18:45:19 -0000
@@ -2,14 +2,11 @@
COMMENT= front-end to external cd audio rippers and mp3 encoders
-DISTNAME= grip-3.3.1
+DISTNAME= grip-3.5.2
CATEGORIES= audio
-REVISION= 6
HOMEPAGE= http://sourceforge.net/projects/grip/
-MAINTAINER= Steve Shockley <steve.shockley@shockley.net>
-
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -21,8 +18,15 @@
WANTLIB += gnome-2 gnomecanvas-2 gnomeui-2 gnomevfs-2 gobject-2.0
WANTLIB += gthread-2.0 gtk-x11-2.0 id3 intl m nghttp2 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 popt pthread ssl ${COMPILER_LIBCXX} vte z
+WANTLIB += ORBitCosNaming-2 canberra dbus-1 dbus-glib-1 expat
+WANTLIB += ffi gailutil gcrypt gnome-keyring gpg-error graphite2
+WANTLIB += harfbuzz iconv ltdl lzma ncurses ogg pcre pixman-1
+WANTLIB += png pthread-stubs util vorbis vorbisfile xcb xcb-render
+WANTLIB += xcb-shm xml2
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=grip/}
+MODULES = x11/gnome
+MODGNOME_TOOLS = yelp desktop-file-utils
LIB_DEPENDS= audio/cdparanoia \
audio/id3lib \
@@ -32,14 +36,8 @@
x11/gnome/libgnomeui
RUN_DEPENDS= audio/vorbis-tools \
- devel/desktop-file-utils
+BUILD_DEPENDS = devel/gettext-tools
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-# see patch-src_grip_c
-post-install:
- rm -rf ${PREFIX}/share/gnome
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/grip/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 17 Jan 2013 13:30:32 -0000 1.7
+++ distinfo 28 Aug 2017 18:45:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (grip-3.3.1.tar.gz) = 1GOUoQYu0Gb5xjOwEP0QWeY9nteRu7eoW8ZWfPD9Zv0=
-SIZE (grip-3.3.1.tar.gz) = 812562
+SHA256 (grip-3.5.2.tar.gz) = qmeTHvOoDvVzUdSHviIQsvcDCha0H/LzjSLMx21/ibc=
+SIZE (grip-3.5.2.tar.gz) = 952153
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-configure,v
retrieving revision 1.6
diff -u -r1.6 patch-configure
--- patches/patch-configure 17 Jan 2013 13:30:32 -0000 1.6
+++ patches/patch-configure 28 Aug 2017 18:45:19 -0000
@@ -1,39 +1,13 @@
$OpenBSD: patch-configure,v 1.6 2013/01/17 13:30:32 ajacoutot Exp $
---- configure.orig Sat Jun 25 20:40:07 2005
-+++ configure Thu Jan 17 13:44:53 2013
-@@ -4313,7 +4313,7 @@ done
-
+Index: configure
+--- configure.orig
++++ configure
+@@ -4968,7 +4968,7 @@ fi
+ done
-for ac_header in linux/soundcard.h machine/soundcard.h sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h
+for ac_header in soundcard.h linux/soundcard.h machine/soundcard.h sys/soundcard.h sys/audioio.h sys/audio.io.h sun/audioio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -9454,7 +9454,7 @@ echo "$as_me: error: curl libs are missing" >&2;}
- fi
-
-
--GETTEXT_PACKAGE=grip-2.2
-+GETTEXT_PACKAGE=grip
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -11149,7 +11149,7 @@ fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_ID3Tag_Link" = no; then
-- for ac_lib in "id3 -lz -lstdc++"; do
-+ for ac_lib in "id3 -lm -lz -lstdc++"; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -11275,7 +11275,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- . conftest.id3
-+ . $srcdir/conftest.id3
- echo "${ID3LIB_MAJOR}.${ID3LIB_MINOR}.${ID3LIB_PATCH}"
- else
- echo "$as_me: program exited with status $ac_status" >&5
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 17 Jan 2013 13:30:32 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.4 2013/01/17 13:30:32 ajacoutot Exp $
---- src/Makefile.in.orig Sat Jan 29 19:34:17 2005
-+++ src/Makefile.in Thu Jan 17 14:17:27 2013
-@@ -203,7 +203,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
- DIST_SOURCES = $(grip_SOURCES)
Index: patches/patch-src_cddev_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_cddev_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_cddev_c
--- patches/patch-src_cddev_c 30 Jun 2005 22:34:29 -0000 1.3
+++ patches/patch-src_cddev_c 28 Aug 2017 18:45:19 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_cddev_c,v 1.3 2005/06/30 22:34:29 alek Exp $
---- src/cddev.c.orig Mon Jun 6 11:01:06 2005
-+++ src/cddev.c Mon Jun 6 11:03:07 2005
+Index: src/cddev.c
+--- src/cddev.c.orig
++++ src/cddev.c
@@ -52,7 +52,7 @@
#define NON_BLOCKING
#endif
@@ -10,7 +11,7 @@
#define CDIOREADSUBCHANNEL CDIOCREADSUBCHANNEL
#endif
-@@ -638,7 +638,11 @@ gboolean CDEject(DiscInfo *disc)
+@@ -641,7 +641,11 @@ gboolean CDEject(DiscInfo *disc)
if(ioctl(disc->cd_desc,CDROMEJECT)<0)
return FALSE;
#endif
Index: patches/patch-src_cdplay_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_cdplay_c,v
retrieving revision 1.3
diff -u -r1.3 patch-src_cdplay_c
--- patches/patch-src_cdplay_c 17 Jan 2013 13:30:32 -0000 1.3
+++ patches/patch-src_cdplay_c 28 Aug 2017 18:45:19 -0000
@@ -2,13 +2,14 @@
Fix implicit declaration.
---- src/cdplay.c.orig Sat Jun 25 20:00:55 2005
-+++ src/cdplay.c Thu Jan 17 13:49:26 2013
-@@ -28,6 +28,7 @@
- #include "cddev.h"
- #include "discedit.h"
- #include "dialog.h"
-+#include "tray.h"
- #include "rip.h"
- #include "grip_id3.h"
+Index: src/cdplay.c
+--- src/cdplay.c.orig
++++ src/cdplay.c
+@@ -20,6 +20,7 @@
+ * USA
+ */
++#include <sys/wait.h>
+ #include "cdplay.h"
+ #include "grip.h"
+ #include "config.h"
Index: patches/patch-src_discdb_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_discdb_c,v
retrieving revision 1.5
diff -u -r1.5 patch-src_discdb_c
--- patches/patch-src_discdb_c 4 Dec 2014 08:28:25 -0000 1.5
+++ patches/patch-src_discdb_c 28 Aug 2017 18:45:19 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-src_discdb_c,v 1.5 2014/12/04 08:28:25 landry Exp $
overlapping snprintf
---- src/discdb.c.orig Sat Jun 25 20:23:13 2005
-+++ src/discdb.c Thu Dec 4 09:21:33 2014
-@@ -607,9 +607,11 @@ gboolean DiscDBRead(DiscInfo *disc,DiscDBServer *serve
+Index: src/discdb.c
+--- src/discdb.c.orig
++++ src/discdb.c
+@@ -611,9 +611,11 @@ gboolean DiscDBRead(DiscInfo *disc,DiscDBServer *serve
/* Both disc title and artist have been stuffed in the title field, so the
need to be separated */
@@ -16,7 +17,7 @@
free(result);
/* Don't allow the genre to be overwritten */
-@@ -663,6 +665,7 @@ int DiscDBReadDiscData(DiscInfo *disc,DiscData *ddata,
+@@ -667,6 +669,7 @@ int DiscDBReadDiscData(DiscInfo *disc,DiscData *ddata,
FILE *discdb_data=NULL;
int index,genre;
char root_dir[256],file[256],inbuf[512];
@@ -24,7 +25,7 @@
struct stat st;
g_snprintf(root_dir,256,"%s/.cddb",getenv("HOME"));
-@@ -720,8 +723,11 @@ int DiscDBReadDiscData(DiscInfo *disc,DiscData *ddata,
+@@ -724,8 +727,11 @@ int DiscDBReadDiscData(DiscInfo *disc,DiscData *ddata,
/* Both disc title and artist have been stuffed in the title field, so the
need to be separated */
Index: patches/patch-src_grip_c
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_grip_c,v
retrieving revision 1.6
diff -u -r1.6 patch-src_grip_c
--- patches/patch-src_grip_c 17 Jan 2013 13:30:32 -0000 1.6
+++ patches/patch-src_grip_c 28 Aug 2017 18:45:19 -0000
@@ -1,146 +1,17 @@
$OpenBSD: patch-src_grip_c,v 1.6 2013/01/17 13:30:32 ajacoutot Exp $
-Remove the Help tab, it does not work with newer yelp.
-Remove bogus button that opens up a browser to a non existent page.
-Don't display a warning about being a development version.
-
---- src/grip.c.orig Sat Jun 25 20:00:55 2005
-+++ src/grip.c Thu Jan 17 14:27:54 2013
-@@ -44,11 +44,8 @@
-
- static void ReallyDie(gint reply,gpointer data);
- static void MakeStatusPage(GripInfo *ginfo);
--static void DoHelp(GtkWidget *widget,gpointer data);
--static void MakeHelpPage(GripInfo *ginfo);
- static void MakeAboutPage(GripGUI *uinfo);
- static void MakeStyles(GripGUI *uinfo);
--static void Homepage(void);
- static void LoadImages(GripGUI *uinfo);
- static void DoLoadConfig(GripInfo *ginfo);
- void DoSaveConfig(GripInfo *ginfo);
-@@ -282,7 +279,6 @@ GtkWidget *GripNew(const gchar* geometry,char *device,
- MakeRipPage(ginfo);
- MakeConfigPage(ginfo);
- MakeStatusPage(ginfo);
-- MakeHelpPage(ginfo);
- MakeAboutPage(uinfo);
- ginfo->tray_icon_made = FALSE;
- ginfo->tray_menu_sensitive = TRUE;
-@@ -317,12 +313,6 @@ GtkWidget *GripNew(const gchar* geometry,char *device,
- strcpy(ginfo->version,VERSION);
-
- sscanf(VERSION,"%d.%d.%d",&major,&minor,&point);
--
-- /* Check if we have a dev release */
-- if(minor%2) {
-- gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
-- _("This is a development version of Grip. If you encounter problems, you are encouraged to revert to the latest stable version."));
-- }
- }
-
- g_signal_connect(app, "window-state-event", G_CALLBACK(AppWindowStateCB), ginfo);
-@@ -467,72 +457,6 @@ void LogStatus(GripInfo *ginfo,char *fmt,...)
- g_free(buf);
- }
-
--static void DoHelp(GtkWidget *widget,gpointer data)
--{
-- char *section;
--
-- section=(char *)data;
--
-- gnome_help_display("grip.xml",section,NULL);
--}
--
--static void MakeHelpPage(GripInfo *ginfo)
--{
-- GtkWidget *help_page;
-- GtkWidget *button;
-- GtkWidget *vbox;
--
-- help_page=MakeNewPage(ginfo->gui_info.notebook,_("Help"));
--
-- vbox=gtk_vbox_new(FALSE,0);
-- gtk_container_border_width(GTK_CONTAINER(vbox),3);
--
-- button=gtk_button_new_with_label(_("Table Of Contents"));
-- gtk_signal_connect(GTK_OBJECT(button),"clicked",
-- GTK_SIGNAL_FUNC(DoHelp),NULL);
-- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-- gtk_widget_show(button);
--
-- button=gtk_button_new_with_label(_("Playing CDs"));
-- gtk_signal_connect(GTK_OBJECT(button),"clicked",
-- GTK_SIGNAL_FUNC(DoHelp),(gpointer)"cdplayer");
-- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-- gtk_widget_show(button);
--
-- button=gtk_button_new_with_label(_("Ripping CDs"));
-- gtk_signal_connect(GTK_OBJECT(button),"clicked",
-- GTK_SIGNAL_FUNC(DoHelp),(gpointer)"ripping");
-- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-- gtk_widget_show(button);
--
-- button=gtk_button_new_with_label(_("Configuring Grip"));
-- gtk_signal_connect(GTK_OBJECT(button),"clicked",
-- GTK_SIGNAL_FUNC(DoHelp),(gpointer)"configure");
-- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-- gtk_widget_show(button);
--
-- button=gtk_button_new_with_label(_("FAQ"));
-- gtk_signal_connect(GTK_OBJECT(button),"clicked",
-- GTK_SIGNAL_FUNC(DoHelp),(gpointer)"faq");
-- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-- gtk_widget_show(button);
--
-- button=gtk_button_new_with_label(_("Getting More Help"));
-- gtk_signal_connect(GTK_OBJECT(button),"clicked",
-- GTK_SIGNAL_FUNC(DoHelp),(gpointer)"morehelp");
-- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-- gtk_widget_show(button);
--
-- button=gtk_button_new_with_label(_("Reporting Bugs"));
-- gtk_signal_connect(GTK_OBJECT(button),"clicked",
-- GTK_SIGNAL_FUNC(DoHelp),(gpointer)"bugs");
-- gtk_box_pack_start(GTK_BOX(vbox),button,FALSE,FALSE,0);
-- gtk_widget_show(button);
--
-- gtk_container_add(GTK_CONTAINER(help_page),vbox);
-- gtk_widget_show(vbox);
--}
--
- void MakeAboutPage(GripGUI *uinfo)
- {
- GtkWidget *aboutpage;
-@@ -582,15 +506,6 @@ void MakeAboutPage(GripGUI *uinfo)
-
- hbox=gtk_hbox_new(TRUE,0);
-
-- button=gtk_button_new_with_label("http://www.nostatic.org/grip");
-- gtk_widget_set_style(button,uinfo->style_dark_grey);
-- gtk_widget_set_style(GTK_BIN(button)->child,
-- uinfo->style_dark_grey);
-- gtk_signal_connect(GTK_OBJECT(button),"clicked",
-- GTK_SIGNAL_FUNC(Homepage),NULL);
-- gtk_box_pack_start(GTK_BOX(hbox),button,FALSE,FALSE,0);
-- gtk_widget_show(button);
--
- gtk_box_pack_start(GTK_BOX(vbox2),hbox,FALSE,FALSE,0);
- gtk_widget_show(hbox);
-
-@@ -623,11 +538,6 @@ static void MakeStyles(GripGUI *uinfo)
- uinfo->style_dark_grey=MakeStyle(&gdkwhite,color_dark_grey,TRUE);
- }
-
--static void Homepage(void)
--{
-- system("gnome-moz-remote http://www.nostatic.org/grip");
--}
--
- static void LoadImages(GripGUI *uinfo)
- {
- uinfo->check_image=Loadxpm(uinfo->app,check_xpm);
-@@ -762,7 +672,7 @@ static void DoLoadConfig(GripInfo *ginfo)
+Index: src/grip.c
+--- src/grip.c.orig
++++ src/grip.c
+@@ -26,6 +26,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <sys/param.h>
++#include <sys/wait.h>
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ #include <time.h>
+@@ -773,7 +707,7 @@ static void DoLoadConfig(GripInfo *ginfo)
*ginfo->version='\0';
Index: patches/patch-src_grip_h
===================================================================
RCS file: /cvs/ports/audio/grip/patches/patch-src_grip_h,v
retrieving revision 1.3
diff -u -r1.3 patch-src_grip_h
--- patches/patch-src_grip_h 17 Jan 2013 13:30:32 -0000 1.3
+++ patches/patch-src_grip_h 28 Aug 2017 18:45:19 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-src_grip_h,v 1.3 2013/01/17 13:30:32 ajacoutot Exp $
---- src/grip.h.orig Sat Jan 29 19:34:17 2005
-+++ src/grip.h Thu Jan 17 13:44:53 2013
+Index: src/grip.h
+--- src/grip.h.orig
++++ src/grip.h
@@ -49,7 +49,7 @@
#define RRand(range) (random()%(range))
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__osf__) /* __osf__ ?? */
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__osf__) || defined(__OpenBSD__) /* __osf__ ?? */
+-#if defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__) || defined(__NetBSD__) || defined(__osf__) /* __osf__ ?? */
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__GLIBC__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__osf__) /* __osf__ ?? */
#define MAILER "/usr/sbin/sendmail -i -t"
Index: patches/patch-src_gripcfg_c
===================================================================
RCS file: patches/patch-src_gripcfg_c
diff -N patches/patch-src_gripcfg_c
--- patches/patch-src_gripcfg_c 30 Apr 2017 15:38:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gripcfg_c,v 1.1 2017/04/30 15:38:15 naddy Exp $
---- src/gripcfg.c.orig
-+++ src/gripcfg.c
-@@ -791,7 +791,7 @@ gboolean LoadRipperConfig(GripInfo *ginfo,int ripcfg)
- };
-
- #ifdef CDPAR
-- if(ripcfg==0) return;
-+ if(ripcfg==0) return 0;
- #endif
-
- sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename,
Index: patches/patch-src_id3_c
===================================================================
RCS file: patches/patch-src_id3_c
diff -N patches/patch-src_id3_c
--- patches/patch-src_id3_c 17 Jan 2013 13:30:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-src_id3_c,v 1.1 2013/01/17 13:30:32 ajacoutot Exp $
-
-buffer overflow detected when writing ID3v2 tags:
-https://bugs.gentoo.org/show_bug.cgi?id=285105
-
---- src/id3.c.orig Sat Jun 25 20:00:55 2005
-+++ src/id3.c Thu Jan 17 13:50:37 2013
-@@ -252,8 +252,8 @@ gboolean ID3v2TagFile(char *filename, char *title, cha
-
- if ( frames[ i ] ) {
- char *c_data = NULL;
-- char gen[ 5 ] = "( )";
-- char trk[ 4 ] = " ";
-+ char gen[ 6 ] = "( )"; /* max unsigned char: 255 */
-+ char trk[ 3 ] = " "; /* max CDDA tracks: 99 */
-
- switch( frameids[ i ] ) {
- case ID3FID_TITLE:
-@@ -278,12 +278,12 @@ gboolean ID3v2TagFile(char *filename, char *title, cha
-
- case ID3FID_CONTENTTYPE:
- c_data = gen;
-- sprintf( gen, "(%d)", genre ); /* XXX */
-+ snprintf( gen, 6, "(%d)", genre );
- break;
-
- case ID3FID_TRACKNUM:
- c_data = trk;
-- sprintf( trk, "%d", tracknum ); /* XXX */
-+ snprintf( trk, 3, "%d", tracknum );
- break;
-
- default:
Index: patches/patch-src_status_window_c
===================================================================
RCS file: patches/patch-src_status_window_c
diff -N patches/patch-src_status_window_c
--- patches/patch-src_status_window_c 17 Jan 2013 13:30:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_status_window_c,v 1.1 2013/01/17 13:30:32 ajacoutot Exp $
-
-Fix implicit declaration.
-
---- src/status_window.c.orig Thu Apr 15 20:21:37 2004
-+++ src/status_window.c Thu Jan 17 13:49:26 2013
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <unistd.h>
-+#include <string.h>
- #include <fcntl.h>
- #include <vte/vte.h>
- #include "status_window.h"
Index: patches/patch-src_tray_c
===================================================================
RCS file: patches/patch-src_tray_c
diff -N patches/patch-src_tray_c
--- patches/patch-src_tray_c 17 Jan 2013 13:30:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_tray_c,v 1.1 2013/01/17 13:30:32 ajacoutot Exp $
-
-Fix implicit declaration.
-
---- src/tray.c.orig Sat Jan 29 19:34:17 2005
-+++ src/tray.c Thu Jan 17 13:49:26 2013
-@@ -20,6 +20,9 @@
- * USA
- */
-
-+#include "cdplay.h"
-+#include "common.h"
-+#include "rip.h"
- #include "tray.h"
- #include "../pixmaps/rip1.xpm"
- #include "../pixmaps/menuplay.xpm"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/grip/pkg/PLIST,v
retrieving revision 1.12
diff -u -r1.12 PLIST
--- pkg/PLIST 17 Jan 2013 13:30:32 -0000 1.12
+++ pkg/PLIST 28 Aug 2017 18:45:19 -0000
@@ -1,6 +1,71 @@
@comment $OpenBSD: PLIST,v 1.12 2013/01/17 13:30:32 ajacoutot Exp $
@bin bin/grip
+@man man/man1/grip.1
share/applications/grip.desktop
+share/apps/
+share/apps/solid/
+share/apps/solid/actions/
+share/apps/solid/actions/grip-audiocd.desktop
+share/gnome/
+share/gnome/help/
+share/gnome/help/grip/
+share/gnome/help/grip/C/
+share/gnome/help/grip/C/cdconfig.png
+share/gnome/help/grip/C/cdplayer.png
+share/gnome/help/grip/C/cdplayersmall.png
+share/gnome/help/grip/C/cdscan.png
+share/gnome/help/grip/C/discdb.png
+share/gnome/help/grip/C/discdbconfig.png
+share/gnome/help/grip/C/editing.png
+share/gnome/help/grip/C/eject.png
+share/gnome/help/grip/C/encprog.png
+share/gnome/help/grip/C/ffwd.png
+share/gnome/help/grip/C/grip-logo.png
+share/gnome/help/grip/C/grip.xml
+share/gnome/help/grip/C/id3config.png
+share/gnome/help/grip/C/minmax.png
+share/gnome/help/grip/C/miscconfig.png
+share/gnome/help/grip/C/modeinterface.png
+share/gnome/help/grip/C/mp3config.png
+share/gnome/help/grip/C/mp3config2.png
+share/gnome/help/grip/C/multiartist.png
+share/gnome/help/grip/C/nexttrk.png
+share/gnome/help/grip/C/playloop.png
+share/gnome/help/grip/C/playnormal.png
+share/gnome/help/grip/C/playonce.png
+share/gnome/help/grip/C/playpause.png
+share/gnome/help/grip/C/playplaylist.png
+share/gnome/help/grip/C/playrandom.png
+share/gnome/help/grip/C/prevtrk.png
+share/gnome/help/grip/C/progtrack.png
+share/gnome/help/grip/C/proxyconfig.png
+share/gnome/help/grip/C/quit.png
+share/gnome/help/grip/C/rewind.png
+share/gnome/help/grip/C/ripconfig.png
+share/gnome/help/grip/C/ripconfig2.png
+share/gnome/help/grip/C/ripconfig3.png
+share/gnome/help/grip/C/ripping.png
+share/gnome/help/grip/C/ripprog.png
+share/gnome/help/grip/C/ripsmall.png
+share/gnome/help/grip/C/smile1.png
+share/gnome/help/grip/C/smile2.png
+share/gnome/help/grip/C/smile3.png
+share/gnome/help/grip/C/smile4.png
+share/gnome/help/grip/C/smile5.png
+share/gnome/help/grip/C/smile6.png
+share/gnome/help/grip/C/smile7.png
+share/gnome/help/grip/C/smile8.png
+share/gnome/help/grip/C/stop.png
+share/gnome/help/grip/C/trkedit.png
+share/gnome/help/grip/C/volume.png
+share/icons/hicolor/16x16/apps/grip.png
+share/icons/hicolor/22x22/apps/grip.png
+share/icons/hicolor/24x24/apps/grip.png
+share/icons/hicolor/32x32/apps/grip.png
+share/icons/hicolor/48x48/apps/grip.png
+share/icons/hicolor/64x64/apps/grip.png
+share/icons/hicolor/72x72/apps/grip.png
+share/icons/hicolor/scalable/apps/grip.svg
share/locale/be/LC_MESSAGES/grip.mo
share/locale/bg/LC_MESSAGES/grip.mo
share/locale/ca/LC_MESSAGES/grip.mo
@@ -8,20 +73,24 @@
share/locale/es/LC_MESSAGES/grip.mo
share/locale/fi/LC_MESSAGES/grip.mo
share/locale/fr/LC_MESSAGES/grip.mo
+share/locale/fur/LC_MESSAGES/grip.mo
share/locale/hu/LC_MESSAGES/grip.mo
share/locale/it/LC_MESSAGES/grip.mo
share/locale/ja/LC_MESSAGES/grip.mo
+share/locale/nb/LC_MESSAGES/grip.mo
share/locale/nl/LC_MESSAGES/grip.mo
-share/locale/pl_PL/
-share/locale/pl_PL/LC_MESSAGES/
-share/locale/pl_PL/LC_MESSAGES/grip.mo
+share/locale/pl/LC_MESSAGES/grip.mo
share/locale/pt_BR/LC_MESSAGES/grip.mo
share/locale/ru/LC_MESSAGES/grip.mo
+share/locale/sr/LC_MESSAGES/grip.mo
+share/locale/uk/LC_MESSAGES/grip.mo
+share/locale/vi/LC_MESSAGES/grip.mo
share/locale/zh_CN/LC_MESSAGES/grip.mo
share/locale/zh_HK/LC_MESSAGES/grip.mo
share/locale/zh_TW/LC_MESSAGES/grip.mo
-share/pixmaps/
-share/pixmaps/gripicon.png
+share/pixmaps/grip.png
share/pixmaps/griptray.png
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
On Wed, Aug 16, 2017 at 05:47:42PM +0200, Antoine Jacoutot wrote:
> On Mon, Aug 07, 2017 at 11:36:18AM +0200, Landry Breuil wrote:
> > Hi,
> >
> > so audio/grip got a new upstream maintainer after 12 years of abandon
> > (http://www.solbu.net/english/tag/grip.html) - lots of patches merged
> > from various linux distros. I removed the patches disabling the help
> > menu as it seems to work just fine with yelp, im just not sure which
> > RUN_DEPENDS should be set now .. antoine ?
>
> You'd better of using the x11/gnome MODULE for that port (along with
> MODGNOME_TOOLS), that would simplify things I think.
so, something like this ?
No comments:
Post a Comment