Date: Tue, 28 Mar 2006 23:16:14 -0800 (PST) From: Alexander Botero-Lowry <alex@foxybanana.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: alex@foxybanana.com Subject: ports/95066: [PATCH] audio/xmms2: update to 0.2.d.4 Message-ID: <200603290716.k2T7GE1J022532@Laptop.mine.box> Resent-Message-ID: <200603290720.k2T7KCVM057638@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95066
>Category: ports
>Synopsis: [PATCH] audio/xmms2: update to 0.2.d.4
>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: Wed Mar 29 07:20:11 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:
- Update to 0.2.d.4
- add mdns client
- Break the bindings out into slave-ports (ruby-xmms2, java-xmms2, py-xmms2)
Consider this a meta-pr for the other three new port submissions.
Port maintainer (alex@foxybanana.com) is cc'd.
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/home/alex/xmms2/Makefile
--- /usr/ports/audio/xmms2/Makefile Tue Mar 7 00:55:12 2006
+++ /usr/home/alex/xmms2/Makefile Tue Mar 28 23:14:24 2006
@@ -6,33 +6,43 @@
#
PORTNAME= xmms2
-PORTVERSION= 0.2.d.3
+PORTVERSION= 0.2.d.4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-0.2DrCox
+DISTNAME= ${PORTNAME}-0.2DrDolittle
MAINTAINER= alex@foxybanana.com
COMMENT= Rewrite of xmms as a client/server system (developer release)
BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons
+.if !defined(XMMS2_SLAVE)
LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \
vorbis.3:${PORTSDIR}/audio/libvorbis
+.endif
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_PYTHON_BUILD= yes
USE_BZIP2= yes
+
+.if !defined(XMMS2_SLAVE)
USE_GNOME= glib20
USE_SQLITE= 3
+
INSTALLS_SHLIB= yes
+.endif
+.if !defined(XMMS2_SLAVE)
MAN1= xmms2.1
MAN8= xmms2d.8
MANCOMPRESSED= yes
+.endif
DATADIR= share/xmms2
+SCONS_TARGET?=
+
.if defined(WITH_CURL)
LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl
PLIST_SUB+= CURL=""
@@ -50,21 +60,14 @@
PLIST_SUB+= SID="@comment "
.endif
-.if defined(WITH_PYTHON_BINDINGS)
-BUILD_DEPENDS+= pyrex:${PORTSDIR}/devel/pyrex
-USE_PYTHON_RUN= yes
-PLIST_SUB+= PYTHON=""
-.else
-EXCLUDE+= python
-PLIST_SUB+= PYTHON="@comment "
-.endif
-
-.if defined(WITH_RUBY_BINDINGS)
-USE_RUBY= yes
-PLIST_SUB+= RUBY=""
-.else
-EXCLUDE+= ruby
-PLIST_SUB+= RUBY="@comment "
+.if defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "python"
+EXCLUDE+= ruby java
+.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "ruby"
+EXCLUDE+= python java
+.elif defined(XMMS2_SLAVE) && ${XMMS2_SLAVE} == "java"
+EXCLUDE+= ruby python
+.elif !defined(XMMS2_SLAVE)
+EXCLUDE+= python ruby java
.endif
.if defined(WITH_ECORE)
@@ -150,6 +153,14 @@
PLIST_SUB+= FAM="@comment "
.endif
+.if defined(WITH_MDNS)
+LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi
+PLIST_SUB+= MDNS=""
+.else
+EXCLUDE+= mdns
+PLIST_SUB+= MDNS="@comment "
+.endif
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
@@ -170,14 +181,19 @@
@${ECHO_MSG} ""
.endif
+# Nasty fulhack here to deal with java port. We're dealing with this issue
+# in xmms2 upstream land, so it hopefully won't be a problem next release.
+
do-build:
cd ${WRKSRC} && \
- scons CC=${CC} LINKFLAGS="${LDFLAGS}" CCFLAGS="${CFLAGS}" \
+ ${SETENV} JAVA_HOME=${JAVA_HOME} scons CC=${CC} LINKFLAGS="${LDFLAGS}" CCFLAGS="${CFLAGS}" \
LIBPATH=${LOCALBASE}/lib CPPPATH=${LOCALBASE}/include \
PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig EXCLUDE="${EXCLUDE}" \
- PREFIX="${PREFIX}"
+ PREFIX="${PREFIX}" ${SCONS_TARGET}
+.if !defined(XMMS2_SLAVE)
do-install:
@cd ${WRKSRC} && scons install
+.endif
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/distinfo /usr/home/alex/xmms2/distinfo
--- /usr/ports/audio/xmms2/distinfo Tue Mar 7 00:55:12 2006
+++ /usr/home/alex/xmms2/distinfo Mon Mar 27 23:19:58 2006
@@ -1,3 +1,3 @@
-MD5 (xmms2-0.2DrCox.tar.bz2) = b93b26d7c71c686595ad4bf1e212e95d
-SHA256 (xmms2-0.2DrCox.tar.bz2) = 8827ef77829e37212b0e09fa577d9147cb34a7fbc1cf8c1df6f01894cef78d75
-SIZE (xmms2-0.2DrCox.tar.bz2) = 951819
+SHA256 (xmms2-0.2DrDolittle.tar.bz2) = 896b3a63a2c0141c278a8ab0203f11ce8594e64e3bea9129db52388c00672535
+MD5 (xmms2-0.2DrDolittle.tar.bz2) = 93daf53d21d198d8e05bf4de37976d7a
+SIZE (xmms2-0.2DrDolittle.tar.bz2) = 965031
diff -ruN --exclude=CVS /usr/ports/audio/xmms2/pkg-plist /usr/home/alex/xmms2/pkg-plist
--- /usr/ports/audio/xmms2/pkg-plist Tue Mar 7 00:55:12 2006
+++ /usr/home/alex/xmms2/pkg-plist Mon Mar 27 23:28:32 2006
@@ -2,6 +2,7 @@
bin/xmms2-et
bin/xmms2-launcher
%%FAM%%bin/xmms2-mlib-updater
+%%MDNS%%bin/xmms2-mdns-avahi
bin/xmms2d
include/xmms2/xmms/xmms_config.h
include/xmms2/xmms/xmms_decoder.h
@@ -74,6 +75,7 @@
libdata/pkgconfig/xmms2-plugin.pc
%%DATADIR%%/mind.in.a.box-lament_snipplet.ogg
%%DATADIR%%/scripts/startup.d/xmms2-et-launcher.sh
+%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh
@dirrm %%DATADIR%%/scripts/startup.d
@dirrm %%DATADIR%%/scripts
@dirrm %%DATADIR%%
--- 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?200603290716.k2T7GE1J022532>