Re: grip 3.5.2

On Mon, Aug 28, 2017 at 08:46:11PM +0200, Landry Breuil wrote:
> 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 ?

Yup, looks good.

>

> 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
>