Attachment #63920 for bug #95216

View | Details | Raw Unified | Return to bug 95216
Collapse All | Expand All




# Date created:				20 May 2005
# Whom:				  	Alexander Botero-Lowry <alex@foxybanana.com>
#
# $FreeBSD: ports/audio/xmms2/Makefile,v 1.4 2006/03/07 01:14:46 tmclaugh Exp $
#

PORTNAME=	xmms2

DISTNAME=	${PORTNAME}-0.2DrDolittle

MAINTAINER=	alex@foxybanana.com
.if !defined(XMMS2_SLAVE)
COMMENT=	Rewrite of xmms as a client/server system (developer release)
.endif

BUILD_DEPENDS+=	scons:${PORTSDIR}/devel/scons
.if !defined(XMMS2_SLAVE)
LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
		vorbis.3:${PORTSDIR}/audio/libvorbis




--- src/clients/sdl-vis/sdl-vis.c	Mon Mar 27 11:34:45 2006
+++ src/clients/sdl-vis/sdl-vis.c.orig	Sat Apr  1 18:21:01 2006
@@ -27,8 +27,8 @@
 #define FFT_BITS 10
 #define FFT_LEN (1<<FFT_BITS)
 
-#include <SDL/SDL.h>
-#include <SDL/SDL_ttf.h>
+#include <SDL.h>
+#include <SDL_ttf.h>
 #include <glib.h>
 #include <math.h>
 #include <stdlib.h>




--- src/xmms/Program.orig	Sat Apr  1 17:55:42 2006
+++ src/xmms/Program	Sat Apr  1 17:55:56 2006
@@ -29,10 +29,10 @@
 	env.Append(LIBS=['xmmsipc'])
 	env.Append(LIBS=["xmmssocket"])
 	env.Append(CPPPATH=["#src/includepriv"])
-	env.pkgconfig("glib-2.0 >= 2.6.0", fail=True)
-	env.pkgconfig("gmodule-2.0", fail=True)
-	env.pkgconfig("gthread-2.0", fail=True)
-	env.pkgconfig("sqlite3", fail=True)
+	env.pkgconfig("glib-2.0 >= 2.6.0")
+	env.pkgconfig("gmodule-2.0")
+	env.pkgconfig("gthread-2.0")
+	env.pkgconfig("sqlite3")
 	
 	if env.platform != 'win32':
 		env.checklib("m", "sin", fail=True)

Lines 45-53 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/pkg-plist (-3 lines)
45	lib/libxmmsclient-glib.so	45	lib/libxmmsclient-glib.so
46	lib/libxmmsclient.a	46	lib/libxmmsclient.a
47	lib/libxmmsclient.so	47	lib/libxmmsclient.so
48	%%PYTHON%%%%PYTHON_SITELIBDIR%%/xmmsclient.so
49	%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient_glib.so
50	%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient.so
51	%%CURL%%lib/xmms2/libxmms_curl_http.so	48	%%CURL%%lib/xmms2/libxmms_curl_http.so
52	lib/xmms2/libxmms_diskwrite.so	49	lib/xmms2/libxmms_diskwrite.so
53	lib/xmms2/libxmms_eq.so	50	lib/xmms2/libxmms_eq.so

Return to bug 95216

Lines 2-8 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/Makefile (-2 / +4 lines)
2	# Date created: 20 May 2005	2	# Date created: 20 May 2005
3	# Whom: Alexander Botero-Lowry <alex@foxybanana.com>	3	# Whom: Alexander Botero-Lowry <alex@foxybanana.com>
4	#	4	#
5	# $FreeBSD: ports/audio/xmms2/Makefile,v 1.5 2006/04/01 03:48:17 edwin Exp $	5	# $FreeBSD: ports/audio/xmms2/Makefile,v 1.4 2006/03/07 01:14:46 tmclaugh Exp $
6	#	6	#
7		7
8	PORTNAME= xmms2	8	PORTNAME= xmms2
Lines 13-21 Link Here
13	DISTNAME= ${PORTNAME}-0.2DrDolittle	13	DISTNAME= ${PORTNAME}-0.2DrDolittle
14		14
15	MAINTAINER= alex@foxybanana.com	15	MAINTAINER= alex@foxybanana.com
		16	.if !defined(XMMS2_SLAVE)
16	COMMENT= Rewrite of xmms as a client/server system (developer release)	17	COMMENT= Rewrite of xmms as a client/server system (developer release)
		18	.endif
17		19
18	BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons	20	BUILD_DEPENDS+= scons:${PORTSDIR}/devel/scons
19	.if !defined(XMMS2_SLAVE)	21	.if !defined(XMMS2_SLAVE)
20	LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \	22	LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
21	vorbis.3:${PORTSDIR}/audio/libvorbis	23	vorbis.3:${PORTSDIR}/audio/libvorbis

Line 0 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c (+13 lines)
	1	--- src/clients/sdl-vis/sdl-vis.c Mon Mar 27 11:34:45 2006
	2	+++ src/clients/sdl-vis/sdl-vis.c.orig Sat Apr 1 18:21:01 2006
	3	@@ -27,8 +27,8 @@
	4	#define FFT_BITS 10
	5	#define FFT_LEN (1<<FFT_BITS)
	6
	7	-#include <SDL/SDL.h>
	8	-#include <SDL/SDL_ttf.h>
	9	+#include <SDL.h>
	10	+#include <SDL_ttf.h>
	11	#include <glib.h>
	12	#include <math.h>
	13	#include <stdlib.h>

Line 0 Link Here

(-)/usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_xmms_Program (+17 lines)
	1	--- src/xmms/Program.orig Sat Apr 1 17:55:42 2006
	2	+++ src/xmms/Program Sat Apr 1 17:55:56 2006
	3	@@ -29,10 +29,10 @@
	4	env.Append(LIBS=['xmmsipc'])
	5	env.Append(LIBS=["xmmssocket"])
	6	env.Append(CPPPATH=["#src/includepriv"])
	7	- env.pkgconfig("glib-2.0 >= 2.6.0", fail=True)
	8	- env.pkgconfig("gmodule-2.0", fail=True)
	9	- env.pkgconfig("gthread-2.0", fail=True)
	10	- env.pkgconfig("sqlite3", fail=True)
	11	+ env.pkgconfig("glib-2.0 >= 2.6.0")
	12	+ env.pkgconfig("gmodule-2.0")
	13	+ env.pkgconfig("gthread-2.0")
	14	+ env.pkgconfig("sqlite3")
	15
	16	if env.platform != 'win32':
	17	env.checklib("m", "sin", fail=True)