Date: Sat, 1 Apr 2006 22:14:09 -0800 (PST) From: Alexander Botero-Lowry <alex@foxybanana.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: alex@foxybanana.com Subject: ports/95216: [PATCH] audio/xmms2: Lots of cleanup Message-ID: <200604020614.k326E92q064507@Laptop.mine.box> Resent-Message-ID: <200604020620.k326KE93000727@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95216
>Category: ports
>Synopsis: [PATCH] audio/xmms2: Lots of cleanup
>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 Apr 02 06:20:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alexander Botero-Lowry
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD Laptop.mine.box 6.0-STABLE FreeBSD 6.0-STABLE #1: Tue Feb 7 19:06:16 PST
>Description:
Lots of general cleanup, especially to unbreak things for the slaveports
- unbreak sdl-vis
- make it so slaves don't need to have the dependencies required for xmms2d
Added file(s):
- files/patch-src_clients_sdl-vis_sdl-vis.c
- files/patch-src_xmms_Program
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- xmms2-0.2.d.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/Makefile
--- /usr/ports/audio/xmms2/Makefile Sat Apr 1 00:34:22 2006
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/Makefile Sat Apr 1 20:37:29 2006
@@ -2,7 +2,7 @@
# Date created: 20 May 2005
# Whom: Alexander Botero-Lowry <alex@foxybanana.com>
#
-# $FreeBSD: ports/audio/xmms2/Makefile,v 1.5 2006/04/01 03:48:17 edwin Exp $
+# $FreeBSD: ports/audio/xmms2/Makefile,v 1.4 2006/03/07 01:14:46 tmclaugh Exp $
#
PORTNAME= xmms2
@@ -13,9 +13,11 @@
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
+BUILD_DEPENDS+= scons:${PORTSDIR}/devel/scons
.if !defined(XMMS2_SLAVE)
LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
vorbis.3:${PORTSDIR}/audio/libvorbis
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c
--- /usr/ports/audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_clients_sdl-vis_sdl-vis.c Sat Apr 1 20:37:29 2006
@@ -0,0 +1,13 @@
+--- 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>
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/files/patch-src_xmms_Program /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_xmms_Program
--- /usr/ports/audio/xmms2/files/patch-src_xmms_Program Wed Dec 31 16:00:00 1969
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/files/patch-src_xmms_Program Sat Apr 1 20:37:29 2006
@@ -0,0 +1,17 @@
+--- 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)
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/pkg-plist /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/pkg-plist
--- /usr/ports/audio/xmms2/pkg-plist Sat Apr 1 00:34:22 2006
+++ /usr/local/tinderbox/portstrees/FreeBSD/ports/audio/xmms2/pkg-plist Sat Apr 1 20:37:29 2006
@@ -45,9 +45,6 @@
lib/libxmmsclient-glib.so
lib/libxmmsclient.a
lib/libxmmsclient.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/xmmsclient.so
-%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient_glib.so
-%%RUBY%%%%RUBY_SITELIBDIR%%/xmmsclient.so
%%CURL%%lib/xmms2/libxmms_curl_http.so
lib/xmms2/libxmms_diskwrite.so
lib/xmms2/libxmms_eq.so
--- xmms2-0.2.d.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604020614.k326E92q064507>