From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 7 22:00:24 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6CC33106566B for ; Wed, 7 Mar 2012 22:00:24 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2BC538FC12 for ; Wed, 7 Mar 2012 22:00:24 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q27M0OTv056889 for ; Wed, 7 Mar 2012 22:00:24 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q27M0O1W056888; Wed, 7 Mar 2012 22:00:24 GMT (envelope-from gnats) Resent-Date: Wed, 7 Mar 2012 22:00:24 GMT Resent-Message-Id: <201203072200.q27M0O1W056888@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Jason E. Hale" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE777106564A for ; Wed, 7 Mar 2012 21:58:55 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 60B7A8FC0C for ; Wed, 7 Mar 2012 21:58:55 +0000 (UTC) Received: by vbmv11 with SMTP id v11so7401464vbm.13 for ; Wed, 07 Mar 2012 13:58:54 -0800 (PST) Received: by 10.52.67.199 with SMTP id p7mr5967642vdt.75.1331157534365; Wed, 07 Mar 2012 13:58:54 -0800 (PST) Received: from mocha.verizon.net (c-71-61-40-68.hsd1.oh.comcast.net. [71.61.40.68]) by mx.google.com with ESMTPS id w6sm38665657vdj.4.2012.03.07.13.58.53 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 07 Mar 2012 13:58:53 -0800 (PST) Message-Id: <4f57da1d.4625340a.655a.579c@mx.google.com> Date: Wed, 07 Mar 2012 13:58:53 -0800 (PST) From: "Jason E. Hale" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: marcus@FreeBSD.org Subject: ports/165839: [PATCH] audio/rhythmbox: Remove audio/libmusicbrainz dependency X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2012 22:00:24 -0000 >Number: 165839 >Category: ports >Synopsis: [PATCH] audio/rhythmbox: Remove audio/libmusicbrainz dependency >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 07 22:00:23 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Jason E. Hale >Release: FreeBSD 9.0-RELEASE i386 >Organization: none >Environment: System: FreeBSD mocha.verizon.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Thu Jan 19 11:42:41 EST 2012 Jason@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA9 i386 >Description: - Remove the audio/libmusicbrainz dependency from audio/rhythmbox as the MusicBrainz RDF webservice is no longer functional - audio/libmusicbrainz3 will be used instead >How-To-Repeat: - Use attached diff >Fix: --- 2012-03-07-rhythmbox.diff begins here --- diff -ruN rhythmbox.orig/Makefile rhythmbox/Makefile --- rhythmbox.orig/Makefile 2012-03-05 14:24:53.000000000 -0500 +++ rhythmbox/Makefile 2012-03-07 16:29:24.000000000 -0500 @@ -8,7 +8,7 @@ PORTNAME= rhythmbox PORTVERSION= 0.12.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,8 +17,7 @@ COMMENT= Audio player for GNOME BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ - musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ +LIB_DEPENDS= musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ id3tag.0:${PORTSDIR}/audio/libid3tag \ totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ diff -ruN rhythmbox.orig/files/patch-configure rhythmbox/files/patch-configure --- rhythmbox.orig/files/patch-configure 2012-03-05 14:24:53.000000000 -0500 +++ rhythmbox/files/patch-configure 2012-03-07 16:27:51.000000000 -0500 @@ -1,6 +1,83 @@ ---- configure.orig 2009-03-21 13:56:32.000000000 -0400 -+++ configure 2009-03-21 13:57:17.000000000 -0400 -@@ -20763,7 +20763,7 @@ else +--- ./configure.orig 2010-03-28 05:06:14.000000000 -0400 ++++ ./configure 2012-03-07 16:27:36.000000000 -0500 +@@ -15627,76 +15627,7 @@ + have_musicbrainz3=yes + fi + +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MUSICBRAINZ" >&5 +-$as_echo_n "checking for MUSICBRAINZ... " >&6; } +- +-if test -n "$PKG_CONFIG"; then +- if test -n "$MUSICBRAINZ_CFLAGS"; then +- pkg_cv_MUSICBRAINZ_CFLAGS="$MUSICBRAINZ_CFLAGS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQS\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_MUSICBRAINZ_CFLAGS=`$PKG_CONFIG --cflags "libmusicbrainz >= $MUSICBRAINZ_REQS" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then +- if test -n "$MUSICBRAINZ_LIBS"; then +- pkg_cv_MUSICBRAINZ_LIBS="$MUSICBRAINZ_LIBS" +- else +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQS\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_MUSICBRAINZ_LIBS=`$PKG_CONFIG --libs "libmusicbrainz >= $MUSICBRAINZ_REQS" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- fi +-else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS"` +- else +- MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$MUSICBRAINZ_PKG_ERRORS" >&5 +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- have_musicbrainz=no +-elif test $pkg_failed = untried; then + have_musicbrainz=no +-else +- MUSICBRAINZ_CFLAGS=$pkg_cv_MUSICBRAINZ_CFLAGS +- MUSICBRAINZ_LIBS=$pkg_cv_MUSICBRAINZ_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- have_musicbrainz=yes +-fi + + + +@@ -18954,7 +18885,7 @@ fi --- 2012-03-07-rhythmbox.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: