Date: Tue, 31 Oct 2017 08:29:06 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453217 - in head/audio/grip: . files Message-ID: <201710310829.v9V8T63o056296@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Tue Oct 31 08:29:06 2017 New Revision: 453217 URL: https://svnweb.freebsd.org/changeset/ports/453217 Log: audio/grip: Update to 3.6.1 - Change default device to /dev/cd0 to match FreeBSD default from 10.0 - Fix master sites as the distfile fetch was failing - Correct depends and USE_ flags (pet stage QA) - Bypass build warnings which were previously present but were being promoted to errors with this update Added: head/audio/grip/files/patch-src_cdplay.c (contents, props changed) head/audio/grip/files/patch-src_grip.c (contents, props changed) Deleted: head/audio/grip/files/patch-src_gripcfg.c Modified: head/audio/grip/Makefile head/audio/grip/distinfo head/audio/grip/files/patch-src_tray.c head/audio/grip/pkg-plist Modified: head/audio/grip/Makefile ============================================================================== --- head/audio/grip/Makefile Tue Oct 31 06:32:46 2017 (r453216) +++ head/audio/grip/Makefile Tue Oct 31 08:29:06 2017 (r453217) @@ -3,21 +3,27 @@ # $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 @@ -43,10 +49,10 @@ 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" Modified: head/audio/grip/distinfo ============================================================================== --- head/audio/grip/distinfo Tue Oct 31 06:32:46 2017 (r453216) +++ head/audio/grip/distinfo Tue Oct 31 08:29:06 2017 (r453217) @@ -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 Added: head/audio/grip/files/patch-src_cdplay.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/grip/files/patch-src_cdplay.c Tue Oct 31 08:29:06 2017 (r453217) @@ -0,0 +1,10 @@ +--- src/cdplay.c.orig 2017-10-29 05:14:46 UTC ++++ src/cdplay.c +@@ -20,6 +20,7 @@ + * USA + */ + ++#include <sys/wait.h> + #include "cdplay.h" + #include "grip.h" + #include "config.h" Added: head/audio/grip/files/patch-src_grip.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/grip/files/patch-src_grip.c Tue Oct 31 08:29:06 2017 (r453217) @@ -0,0 +1,10 @@ +--- src/grip.c.orig 2017-10-29 05:14:15 UTC ++++ src/grip.c +@@ -29,6 +29,7 @@ + #include <gdk/gdkx.h> + #include <X11/Xlib.h> + #include <time.h> ++#include <sys/wait.h> + #include "grip.h" + #include <libgnomeui/gnome-window-icon.h> + #include "discdb.h" Modified: head/audio/grip/files/patch-src_tray.c ============================================================================== --- head/audio/grip/files/patch-src_tray.c Tue Oct 31 06:32:46 2017 (r453216) +++ head/audio/grip/files/patch-src_tray.c Tue Oct 31 08:29:06 2017 (r453217) @@ -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" Modified: head/audio/grip/pkg-plist ============================================================================== --- head/audio/grip/pkg-plist Tue Oct 31 06:32:46 2017 (r453216) +++ head/audio/grip/pkg-plist Tue Oct 31 08:29:06 2017 (r453217) @@ -1,5 +1,7 @@ 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 @@ -10,8 +12,8 @@ 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 @@ -48,22 +50,35 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710310829.v9V8T63o056296>