Subject: Split up audio/rhythmbox (xine version)
To: None <tech-pkg@NetBSD.org>
From: Leonard Schmidt <lems@gmx.net>
List: tech-pkg
Date: 07/17/2005 20:00:56
--/NkBOFFp2J2Af1nK
Content-Type: multipart/mixed; boundary="qMm9M+Fa2AknHoGS"
Content-Disposition: inline


--qMm9M+Fa2AknHoGS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello,

I split up the audio/rhythmbox package into audio/rhythmbox and
audio/rhythmbox-xine. A similar package is multimedia/totem.

Regards,
Leonard

--qMm9M+Fa2AknHoGS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="rhythmbox-xine.diff"

--- /dev/null	2005-07-17 18:11:10.000000000 +0000
+++ rhythmbox-xine/DESCR	2005-07-17 15:29:22.000000000 +0000
@@ -0,0 +1,12 @@
+Rhythmbox is an integrated music management application, originally inspired
+by Apple's iTunes.  It is free software, designed to work well under the GNOME
+Desktop, and is based on the powerful GStreamer media framework.
+
+Rhythmbox has a number of features, including:
+* Easy to use music browser.
+* Searching and sorting.
+* Comprehensive audio format support through GStreamer.
+* Internet Radio support.
+* Playlists.
+
+This package is built using the xine backend.
--- /dev/null	2005-07-17 18:11:10.000000000 +0000
+++ rhythmbox-xine/Makefile	2005-07-17 15:45:59.000000000 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $
+#
+
+.include "../../audio/rhythmbox/Makefile.common"
+
+PKGNAME=	${DISTNAME:S/-/-xine-/}
+
+COMMENT+=	(using xine)
+
+CONFLICTS+=	rhythmbox-[0-9]*
+
+CONFIGURE_ARGS+=	--with-player=xine
+
+.include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

--qMm9M+Fa2AknHoGS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="rhythmbox_split.diff"
Content-Transfer-Encoding: quoted-printable

Index: DESCR
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/audio/rhythmbox/DESCR,v
retrieving revision 1.1.1.1
diff -u -u -r1.1.1.1 DESCR
--- DESCR	24 Jan 2004 17:44:36 -0000	1.1.1.1
+++ DESCR	17 Jul 2005 17:46:46 -0000
@@ -8,3 +8,5 @@
 * Comprehensive audio format support through GStreamer.
 * Internet Radio support.
 * Playlists.
+
+This package is built using the GStreamer backend.
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/audio/rhythmbox/Makefile,v
retrieving revision 1.25
diff -u -u -r1.25 Makefile
--- Makefile	1 Jun 2005 18:02:38 -0000	1.25
+++ Makefile	17 Jul 2005 17:46:46 -0000
@@ -1,16 +1,12 @@
 # $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $
 #
=20
-DISTNAME=3D	rhythmbox-0.8.8
-CATEGORIES=3D	audio gnome
-MASTER_SITES=3D	${MASTER_SITE_GNOME:=3Dsources/rhythmbox/0.8/}
-EXTRACT_SUFX=3D	.tar.bz2
+.include "Makefile.common"
=20
-MAINTAINER=3D	jmmv@NetBSD.org
-HOMEPAGE=3D	http://www.rhythmbox.org/
-COMMENT=3D	Music management application for GNOME
+COMMENT+=3D	(using GStreamer)
+
+CONFLICTS=3D	rhythmbox-xine-[0-9]*
=20
-BUILD_USES_MSGFMT=3D	YES
 DEPENDS+=3D		gst-plugins-esound>=3D0.8.1:../../audio/gst-plugins-esound
 DEPENDS+=3D		gst-plugins-gnomevfs>=3D0.8.1:../../sysutils/gst-plugins-gnom=
evfs
 DEPENDS+=3D		gst-plugins-mad>=3D0.8.1:../../audio/gst-plugins-mad
@@ -19,30 +15,6 @@
 BUILDLINK_DEPENDS.gstreamer+=3D	gstreamer>=3D0.8.1
 BUILDLINK_DEPENDS.gst-plugins+=3D	gst-plugins>=3D0.8.1
=20
-GNU_CONFIGURE=3D		YES
-USE_DIRS+=3D		gnome2-1.5
-USE_TOOLS+=3D		gmake
-USE_LIBTOOL=3D		YES
-USE_PKGLOCALEDIR=3D	YES
-
-PKGCONFIG_OVERRIDE=3D	data/rhythmbox.pc.in
-
-GCONF2_SCHEMAS=3D		rhythmbox.schemas
-
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../multimedia/gstreamer/buildlink3.mk"
 .include "../../multimedia/gst-plugins/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- /dev/null	2005-07-17 19:50:12.000000000 +0000
+++ Makefile.common	2005-07-17 19:38:57.000000000 +0000
@@ -0,0 +1,43 @@
+# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:38 jlam Exp $
+#
+
+DISTNAME=3D	rhythmbox-0.8.8
+CATEGORIES=3D	audio gnome
+MASTER_SITES=3D	${MASTER_SITE_GNOME:=3Dsources/rhythmbox/0.8/}
+EXTRACT_SUFX=3D	.tar.bz2
+
+MAINTAINER=3D	jmmv@NetBSD.org
+HOMEPAGE=3D	http://www.rhythmbox.org/
+COMMENT=3D	Music management application for GNOME
+
+DISTINFO_FILE=3D	${.CURDIR}/../../audio/rhythmbox/distinfo
+PATCHDIR=3D	${.CURDIR}/../../audio/rhythmbox/patches
+PLIST_SRC=3D	${.CURDIR}/../../audio/rhythmbox/PLIST
+
+BUILD_USES_MSGFMT=3D	YES
+
+GNU_CONFIGURE=3D		YES
+USE_DIRS+=3D		gnome2-1.5
+USE_TOOLS+=3D		gmake
+USE_LIBTOOL=3D		YES
+USE_PKGLOCALEDIR=3D	YES
+
+PKGCONFIG_OVERRIDE=3D	data/rhythmbox.pc.in
+
+GCONF2_SCHEMAS=3D		rhythmbox.schemas
+
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libid3tag/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gtk2/buildlink3.mk"

--qMm9M+Fa2AknHoGS--

--/NkBOFFp2J2Af1nK
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)

iD8DBQFC2rj4effumNo0U88RAhgKAJ9PTAaUzGGFTH00Cag006sb6cV0LgCfUWdI
Bm19DZ+R2vlx8tnA80i7IRw=
=lLON
-----END PGP SIGNATURE-----

--/NkBOFFp2J2Af1nK--