Date: 25 Jan 2006 19:09:12 -0800 From: "Jason E. Hale" <bsdkaffee@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92340: [UPDATE] audio/libmusicbrainz: update to version 2.1.2, take maintainership Message-ID: <BAY101-DAV3F163ABB37A8ACA55E1F0A7150@phx.gbl> Resent-Message-ID: <200601260310.k0Q3A3it062194@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92340
>Category: ports
>Synopsis: [UPDATE] audio/libmusicbrainz: update to version 2.1.2, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 26 03:10:02 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jason E. Hale
>Release: FreeBSD 6.0-RELEASE-p2 i386
>Organization:
none
>Environment:
System: FreeBSD 6.0-RELEASE-p2 #0: Sun Jan 15 02:05:35 EST 2006 i386
>Description:
o Upgrade audio/libmusicbrainz to version 2.1.2, currently at version 2.1.1
o Port currently has no maintainer, take maintainership
o Make portlint happy
-Add an additional MASTER_SITES
-Remove deprecated USE_REINPLACE
-Make CONFLICTS more specific
>How-To-Repeat:
o Apply the patch supplied in the Fix section.
o Remove the following files from the ports directory:
libmusicbrainz/files/patch-examples_getalbum.c (patch applied upstream)
libmusicbrainz/files/patch-ltmain.sh (no need to patch this, we are using libtool from ports)
libmusicbrainz/files/patch-mb_freebsd.cpp (patch applied upstream)
libmusicbrainz/files (no patches left, remove files directory)
>Fix:
--- libmusicbrainz.diff begins here ---
diff -ruN libmusicbrainz.orig/Makefile libmusicbrainz/Makefile
--- libmusicbrainz.orig/Makefile Wed Jan 25 01:06:44 2006
+++ libmusicbrainz/Makefile Wed Jan 25 15:01:18 2006
@@ -6,27 +6,26 @@
#
PORTNAME= libmusicbrainz
-PORTVERSION= 2.1.1
+PORTVERSION= 2.1.2
CATEGORIES= audio
-MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/
+MASTER_SITES= ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
+ ftp://ftp.au.musicbrainz.org/pub/musicbrainz/
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= bsdkaffee@gmail.com
COMMENT= 2nd generation incarnation of the CD Index - audio metadata
LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2
-CONFLICTS= musicbrainz-*
+CONFLICTS= musicbrainz-1.*
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_REINPLACE= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
INSTALLS_SHLIB= yes
post-patch:
- @${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
- s|^CXXFLAGS=|#CXXFLAGS=|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.mk>
diff -ruN libmusicbrainz.orig/distinfo libmusicbrainz/distinfo
--- libmusicbrainz.orig/distinfo Wed Jan 25 01:06:44 2006
+++ libmusicbrainz/distinfo Wed Jan 25 01:14:46 2006
@@ -1,3 +1,3 @@
-MD5 (libmusicbrainz-2.1.1.tar.gz) = 4f753d93a85cf413e00f1394b8cbd269
-SHA256 (libmusicbrainz-2.1.1.tar.gz) = a40ae7bfe8d2a3ba54c3850282a181e953bfc31b2ec274f0db7cf81f96a8f56b
-SIZE (libmusicbrainz-2.1.1.tar.gz) = 528162
+MD5 (libmusicbrainz-2.1.2.tar.gz) = 88d35af903665fecbdee77eb6d5e6cdd
+SHA256 (libmusicbrainz-2.1.2.tar.gz) = f40f0318e8c8f7eee802de91ee8a9b5673c0f28a15527883bd20826e74dff54c
+SIZE (libmusicbrainz-2.1.2.tar.gz) = 504432
diff -ruN libmusicbrainz.orig/files/patch-examples_getalbum.c libmusicbrainz/files/patch-examples_getalbum.c
--- libmusicbrainz.orig/files/patch-examples_getalbum.c Wed Jan 25 01:06:44 2006
+++ libmusicbrainz/files/patch-examples_getalbum.c Wed Dec 31 19:00:00 1969
@@ -1,20 +0,0 @@
---- examples/getalbum.c.orig Wed Mar 17 00:05:57 2004
-+++ examples/getalbum.c Wed Mar 17 00:06:35 2004
-@@ -30,7 +30,7 @@
- {
- musicbrainz_t o;
- char error[256], data[256], temp[256], *args[2];
-- int ret, numTracks, trackNum, i, isMultipleArtist = 0;
-+ int ret, numTracks, numDates, trackNum, i, isMultipleArtist = 0;
-
- if (argc < 2)
- {
-@@ -141,7 +141,7 @@
- if (mb_GetResultData(o, MBE_AlbumGetAmazonCoverartURL, data, 256))
- printf("CoverartURL: %s\n", data);
-
-- int numDates = mb_GetResultInt(o, MBE_AlbumGetNumReleaseDates);
-+ numDates = mb_GetResultInt(o, MBE_AlbumGetNumReleaseDates);
- for(i = 1; i <= numDates; i++)
- {
- // Select the first release date
diff -ruN libmusicbrainz.orig/files/patch-ltmain.sh libmusicbrainz/files/patch-ltmain.sh
--- libmusicbrainz.orig/files/patch-ltmain.sh Wed Jan 25 01:06:44 2006
+++ libmusicbrainz/files/patch-ltmain.sh Wed Dec 31 19:00:00 1969
@@ -1,25 +0,0 @@
---- ltmain.sh.orig Thu Aug 23 07:47:42 2001
-+++ ltmain.sh Tue Dec 11 22:07:52 2001
-@@ -2408,6 +2408,9 @@
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false ; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -ruN libmusicbrainz.orig/files/patch-mb_freebsd.cpp libmusicbrainz/files/patch-mb_freebsd.cpp
--- libmusicbrainz.orig/files/patch-mb_freebsd.cpp Wed Jan 25 01:06:44 2006
+++ libmusicbrainz/files/patch-mb_freebsd.cpp Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- osdep/mb_freebsd.cpp.orig Tue Jul 10 00:22:07 2001
-+++ osdep/mb_freebsd.cpp Wed Aug 14 01:48:18 2002
-@@ -34,6 +34,8 @@
- #include <fcntl.h>
- #include <assert.h>
-
-+#include <netinet/in.h>
-+
- #include "mb.h"
- #include "diskid.h"
- #include "config.h"
diff -ruN libmusicbrainz.orig/pkg-descr libmusicbrainz/pkg-descr
--- libmusicbrainz.orig/pkg-descr Wed Jan 25 01:06:44 2006
+++ libmusicbrainz/pkg-descr Wed Jan 25 14:54:36 2006
@@ -4,6 +4,4 @@
data collected on the Musicbrainz server is made available to the
public under the OpenContent license.
-WWW: http://www.musicbrainz.org/
-
-Roman Shterenzon <roman@xpert.com>
+WWW: http://musicbrainz.org/
--- libmusicbrainz.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BAY101-DAV3F163ABB37A8ACA55E1F0A7150>