ports/155977: [MAINTAINER] audio/libdiscid: Fix library version number

Jason E. Hale bsdkaffee at gmail.com
Sun Mar 27 21:00:23 UTC 2011 

>Number:         155977
>Category:       ports
>Synopsis:       [MAINTAINER] audio/libdiscid: Fix library version number
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 27 21:00:23 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jason E. Hale
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
none 
>Environment:
System: FreeBSD mocha.verizon.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Tue Feb 22 19:19:42 EST 2011 root at mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA8 i386


	
>Description:
audio/libdiscid:
- Use Gnome's ltverhack to fix the shared library version number
- Add LICENSE
- Add a patch to fix a compiler warning
- Bump PORTREVSIONS on dependent ports and fix library version number
- While here add LICENSE to audio/py-musicbrainz2 (also my port)

Ports affected:
- audio/kaudiocreator
- audio/libmusicbrainz3
- audio/p5-MusicBrainz-DiscID
- audio/picard
- audio/py-musicbrainz2
- audio/xmms2

	
>How-To-Repeat:
Use attached diffs.

Added files:
files/patch-src__disc_freebsd.c

	
>Fix:

	

--- libdiscid.diff begins here ---
diff -ruN libdiscid.orig/Makefile libdiscid/Makefile
--- libdiscid.orig/Makefile	2011-03-27 07:47:23.000000000 -0400
+++ libdiscid/Makefile	2011-03-27 08:33:03.000000000 -0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	libdiscid
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://users.musicbrainz.org/~matt/ \
 		${MASTER_SITE_GENTOO}
@@ -16,13 +17,12 @@
 COMMENT=	A library for creating MusicBrainz DiscIDs
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
+USE_AUTOTOOLS=	libtool
+USE_GNOME=	ltverhack gnomehack pkgconfig
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN libdiscid.orig/files/patch-src__disc_freebsd.c libdiscid/files/patch-src__disc_freebsd.c
--- libdiscid.orig/files/patch-src__disc_freebsd.c	1969-12-31 19:00:00.000000000 -0500
+++ libdiscid/files/patch-src__disc_freebsd.c	2011-03-27 08:21:14.000000000 -0400
@@ -0,0 +1,10 @@
+--- ./src/disc_freebsd.c.orig	2011-03-27 08:20:45.000000000 -0400
++++ ./src/disc_freebsd.c	2011-03-27 08:21:02.000000000 -0400
+@@ -33,6 +33,7 @@
+ #include <sys/cdio.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <netinet/in.h>
+ 
+ 
+ #include "discid/discid_private.h"
diff -ruN libdiscid.orig/pkg-plist libdiscid/pkg-plist
--- libdiscid.orig/pkg-plist	2011-03-27 07:47:23.000000000 -0400
+++ libdiscid/pkg-plist	2011-03-27 07:55:44.000000000 -0400
@@ -2,6 +2,6 @@
 lib/libdiscid.a
 lib/libdiscid.la
 lib/libdiscid.so
-lib/libdiscid.so.2
+lib/libdiscid.so.0
 libdata/pkgconfig/libdiscid.pc
 @dirrm include/discid
--- libdiscid.diff ends here ---

--- kaudiocreator.diff begins here ---
diff -ruN kaudiocreator.orig/Makefile kaudiocreator/Makefile
--- kaudiocreator.orig/Makefile	2011-03-27 08:48:09.000000000 -0400
+++ kaudiocreator/Makefile	2011-03-27 08:48:24.000000000 -0400
@@ -6,7 +6,7 @@
 
 PORTNAME=	kaudiocreator
 PORTVERSION=	1.2.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio kde
 MASTER_SITES=	http://kde-look.org/CONTENT/content-files/
 DISTNAME=	107645-${PORTNAME}-${PORTVERSION}
--- kaudiocreator.diff ends here ---

--- libmusicbrainz3.diff begins here ---
diff -ruN libmusicbrainz3.orig/Makefile libmusicbrainz3/Makefile
--- libmusicbrainz3.orig/Makefile	2011-03-27 08:45:57.000000000 -0400
+++ libmusicbrainz3/Makefile	2011-03-27 08:47:39.000000000 -0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	libmusicbrainz3
 PORTVERSION=	3.0.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 		http://uk.musicbrainz.org/pub/musicbrainz/ \
--- libmusicbrainz3.diff ends here ---

--- p5-MusicBrainz-DiscID.diff begins here ---
diff -ruN p5-MusicBrainz-DiscID.orig/Makefile p5-MusicBrainz-DiscID/Makefile
--- p5-MusicBrainz-DiscID.orig/Makefile	2011-03-27 08:42:03.000000000 -0400
+++ p5-MusicBrainz-DiscID/Makefile	2011-03-27 08:42:49.000000000 -0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	MusicBrainz-DiscID
 PORTVERSION=	0.03
+PORTREVISION=	1
 CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,7 +16,7 @@
 COMMENT=	Perl interface for the MusicBrainz libdiscid library
 
 BUILD_DEPENDS=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod
-LIB_DEPENDS=	discid.2:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	discid.0:${PORTSDIR}/audio/libdiscid
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GNOME=	pkgconfig
--- p5-MusicBrainz-DiscID.diff ends here ---

--- picard.diff begins here ---
diff -ruN picard.orig/Makefile picard/Makefile
--- picard.orig/Makefile	2011-03-27 08:34:01.000000000 -0400
+++ picard/Makefile	2011-03-27 08:34:55.000000000 -0400
@@ -7,6 +7,7 @@
 
 PORTNAME=	picard
 PORTVERSION=	0.13
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
@@ -18,7 +19,7 @@
 
 LIB_DEPENDS=	ofa.0:${PORTSDIR}/audio/libofa \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		discid.2:${PORTSDIR}/audio/libdiscid
+		discid.0:${PORTSDIR}/audio/libdiscid
 RUN_DEPENDS=	py*-mutagen>=0:${PORTSDIR}/audio/py-mutagen \
 		py*-qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
 		py*-qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
@@ -34,8 +35,6 @@
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|libdiscid.so.0|libdiscid.so.2|g' \
-		${WRKSRC}/picard/disc.py
 	@${REINPLACE_CMD} -e "s|'picard.plugins',|'picard.plugins', 'picard.plugins.lastfm', 'picard.plugins.replaygain',|" \
 		${WRKSRC}/setup.py
 	@${CP} -R ${WRKSRC}/contrib/plugins/ ${WRKSRC}/picard/plugins
--- picard.diff ends here ---

--- py-musicbrainz2.diff begins here ---
diff -ruN py-musicbrainz2.orig/Makefile py-musicbrainz2/Makefile
--- py-musicbrainz2.orig/Makefile	2011-03-27 08:36:14.000000000 -0400
+++ py-musicbrainz2/Makefile	2011-03-27 08:40:23.000000000 -0400
@@ -6,6 +6,7 @@
 
 PORTNAME=	musicbrainz2
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/ \
 		http://uk.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/ \
@@ -17,10 +18,13 @@
 MAINTAINER=	bsdkaffee at gmail.com
 COMMENT=	Next Generation Python bindings for MusicBrainz
 
-LIB_DEPENDS=	discid.2:${PORTSDIR}/audio/libdiscid
+LIB_DEPENDS=	discid.0:${PORTSDIR}/audio/libdiscid
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	python-musicbrainz2
 
+LICENSE=	BSD
+LICENSE_FILE=	COPYING.txt
+
 .include <bsd.port.mk>
--- py-musicbrainz2.diff ends here ---

--- xmms2.diff begins here ---
diff -ruN xmms2.orig/Makefile xmms2/Makefile
--- xmms2.orig/Makefile	2011-03-27 08:53:58.000000000 -0400
+++ xmms2/Makefile	2011-03-27 08:54:27.000000000 -0400
@@ -7,6 +7,7 @@
 
 PORTNAME?=	xmms2
 PORTVERSION=	0.7
+PORTREVISION=	1
 DISTVERSIONSUFFIX=DrNo
 CATEGORIES?=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
@@ -123,7 +124,7 @@
 
 .if !defined(WITHOUT_CDDA)
 LIB_DEPENDS+=	cdio.12:${PORTSDIR}/sysutils/libcdio \
-		discid.2:${PORTSDIR}/audio/libdiscid
+		discid.0:${PORTSDIR}/audio/libdiscid
 PLIST_SUB+=	CDDA=""
 .else
 EXCLUDE+=	--without-plugins="cdda"
--- xmms2.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list