Index: head/audio/grip/Makefile =================================================================== --- head/audio/grip/Makefile (revision 453216) +++ head/audio/grip/Makefile (revision 453217) @@ -1,63 +1,69 @@ # Created by: kbyanc@posi.net # $FreeBSD$ # $MCom: ports/audio/grip/Makefile,v 1.4 2007/05/19 21:35:57 marcus Exp $ PORTNAME= grip -PORTVERSION= 3.3.1 -PORTREVISION= 8 +PORTVERSION= 3.6.1 CATEGORIES= audio -MASTER_SITES= SF +MASTER_SITES= SF/grip/${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= GTK front-end to external cd rippers and audio encoders -LIB_DEPENDS= libid3.so:audio/id3lib \ - libcurl.so:ftp/curl +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -USE_XORG= x11 +LIB_DEPENDS= libcurl.so:ftp/curl \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libid3.so:audio/id3lib \ + libpopt.so:devel/popt + USES= gmake libtool pathfix pkgconfig -USE_GNOME= gnomeprefix libgnomeui vte +USE_XORG= ice sm x11 xext +USE_GNOME= cairo gdkpixbuf2 gnomeprefix libgnomeui vte GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--disable-werror CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= CDPARANOIA CDDA2WAV LAME VORBIS FAAC FLAC NLS OPTIONS_DEFAULT= CDPARANOIA VORBIS .if !defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= LAME .endif OPTIONS_SUB= yes CDPARANOIA_LIB_DEPENDS= libcdda_paranoia.so:audio/cdparanoia CDPARANOIA_CONFIGURE_ENABLE= cdpar CDDA2WAV_RUN_DEPENDS= cdda2wav:sysutils/cdrtools FAAC_RUN_DEPENDS= faac:audio/faac FLAC_RUN_DEPENDS= flac:audio/flac LAME_RUN_DEPENDS= lame:audio/lame VORBIS_RUN_DEPENDS= ogg123:audio/vorbis-tools NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls .if defined(WITH_CDROM_DEVICE) DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} .else -DEFAULT_CDROM_DEVICE=/dev/acd0 +DEFAULT_CDROM_DEVICE=/dev/cd0 .endif -pre-everything:: +pre-everything: .if !defined(WITH_CDROM_DEVICE) @${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}" @${ECHO_MSG} "===> Define WITH_CDROM_DEVICE if you want to change the default" @${ECHO_MSG} "===> For example, 'make WITH_CDROM_DEVICE=\"/dev/somedevice\"'" .endif post-patch: @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \ ${WRKSRC}/src/grip.c @${REINPLACE_CMD} -e 's|{"xingmp3enc","-B %b -Q %w","mp3"},||; \ s|{"l3enc","-br %b %w %m","mp3"},|{"faac","--no-midside -w -q 100 --artist %a --album %d --track %t --title %n --year %y --genre %g -b %b %w -o %m", "m4a"},|' \ ${WRKSRC}/src/gripcfg.c .include Index: head/audio/grip/distinfo =================================================================== --- head/audio/grip/distinfo (revision 453216) +++ head/audio/grip/distinfo (revision 453217) @@ -1,2 +1,3 @@ -SHA256 (grip-3.3.1.tar.gz) = d46394a1062ed066f9c633b010fd1059e63d9ed791bbb7a85bc6567cf0fd66fd -SIZE (grip-3.3.1.tar.gz) = 812562 +TIMESTAMP = 1509251514 +SHA256 (grip-3.6.1.tar.gz) = 88a7a1193de74ce65968106a1b48b62a3171aaeabb1a5edae9d0308e901d5e28 +SIZE (grip-3.6.1.tar.gz) = 958967 Index: head/audio/grip/files/patch-src_gripcfg.c =================================================================== --- head/audio/grip/files/patch-src_gripcfg.c (revision 453216) +++ head/audio/grip/files/patch-src_gripcfg.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/gripcfg.c.orig 2005-06-25 18:00:55 UTC -+++ src/gripcfg.c -@@ -791,7 +791,7 @@ gboolean LoadRipperConfig(GripInfo *ginf - }; - - #ifdef CDPAR -- if(ripcfg==0) return; -+ if(ripcfg==0) return (0); - #endif - - sprintf(buf,"%s/%s-%s",getenv("HOME"),ginfo->config_filename, Property changes on: head/audio/grip/files/patch-src_gripcfg.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/grip/files/patch-src_cdplay.c =================================================================== --- head/audio/grip/files/patch-src_cdplay.c (nonexistent) +++ head/audio/grip/files/patch-src_cdplay.c (revision 453217) @@ -0,0 +1,10 @@ +--- src/cdplay.c.orig 2017-10-29 05:14:46 UTC ++++ src/cdplay.c +@@ -20,6 +20,7 @@ + * USA + */ + ++#include + #include "cdplay.h" + #include "grip.h" + #include "config.h" Property changes on: head/audio/grip/files/patch-src_cdplay.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/grip/files/patch-src_grip.c =================================================================== --- head/audio/grip/files/patch-src_grip.c (nonexistent) +++ head/audio/grip/files/patch-src_grip.c (revision 453217) @@ -0,0 +1,10 @@ +--- src/grip.c.orig 2017-10-29 05:14:15 UTC ++++ src/grip.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include "grip.h" + #include + #include "discdb.h" Property changes on: head/audio/grip/files/patch-src_grip.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/grip/files/patch-src_tray.c =================================================================== --- head/audio/grip/files/patch-src_tray.c (revision 453216) +++ head/audio/grip/files/patch-src_tray.c (revision 453217) @@ -1,10 +1,10 @@ ---- src/tray.c.orig 2005-01-29 18:34:17 UTC +--- src/tray.c.orig 2017-07-31 21:04:11 UTC +++ src/tray.c -@@ -20,6 +20,7 @@ - * USA +@@ -21,6 +21,7 @@ */ + #include "cdplay.h" +#include "common.h" #include "tray.h" - #include "../pixmaps/rip1.xpm" - #include "../pixmaps/menuplay.xpm" + #include "rip.h" + #include "uihelper.h" Index: head/audio/grip/pkg-plist =================================================================== --- head/audio/grip/pkg-plist (revision 453216) +++ head/audio/grip/pkg-plist (revision 453217) @@ -1,69 +1,84 @@ bin/grip +man/man1/grip.1.gz share/applications/grip.desktop +share/apps/solid/actions/grip-audiocd.desktop 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.xml 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/pixmaps/gripicon.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 +%%NLS%%share/locale/be/LC_MESSAGES/grip.mo +%%NLS%%share/locale/bg/LC_MESSAGES/grip.mo +%%NLS%%share/locale/ca/LC_MESSAGES/grip.mo +%%NLS%%share/locale/de/LC_MESSAGES/grip.mo +%%NLS%%share/locale/es/LC_MESSAGES/grip.mo +%%NLS%%share/locale/fi/LC_MESSAGES/grip.mo +%%NLS%%share/locale/fr/LC_MESSAGES/grip.mo +%%NLS%%share/locale/fur/LC_MESSAGES/grip.mo +%%NLS%%share/locale/hu/LC_MESSAGES/grip.mo +%%NLS%%share/locale/it/LC_MESSAGES/grip.mo +%%NLS%%share/locale/ja/LC_MESSAGES/grip.mo +%%NLS%%share/locale/nb/LC_MESSAGES/grip.mo +%%NLS%%share/locale/nl/LC_MESSAGES/grip.mo +%%NLS%%share/locale/pl/LC_MESSAGES/grip.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/grip.mo +%%NLS%%share/locale/ru/LC_MESSAGES/grip.mo +%%NLS%%share/locale/sr/LC_MESSAGES/grip.mo +%%NLS%%share/locale/uk/LC_MESSAGES/grip.mo +%%NLS%%share/locale/vi/LC_MESSAGES/grip.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/grip.mo +%%NLS%%share/locale/zh_HK/LC_MESSAGES/grip.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/grip.mo +share/pixmaps/grip.png share/pixmaps/griptray.png -%%NLS%%share/locale/be/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/bg/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/ca/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/de/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/es/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/fi/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/fr/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/hu/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/it/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/ja/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/nl/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/pl_PL/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/ru/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/zh_HK/LC_MESSAGES/grip-2.2.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo