Index: head/audio/xmms2/Makefile =================================================================== --- head/audio/xmms2/Makefile (revision 158815) +++ head/audio/xmms2/Makefile (revision 158816) @@ -1,202 +1,198 @@ # New ports collection makefile for: xmms2 # Date created: 20 May 2005 # Whom: Alexander Botero-Lowry # # $FreeBSD$ # PORTNAME= xmms2 PORTVERSION= 0.2.d.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} 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 .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="" .else EXCLUDE+= curl PLIST_SUB+= CURL="@comment " .endif .if defined(WITH_SID) LIB_DEPENDS+= resid.[0-9]:${PORTSDIR}/audio/resid \ sidplay2.[0-9]:${PORTSDIR}/audio/libsidplay2 PLIST_SUB+= SID="" .else EXCLUDE+= sid PLIST_SUB+= SID="@comment " .endif .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) LIB_DEPENDS+= lecore.1:${PORTSDIR}/x11/ecore PLIST_SUB+= ECORE="" .else EXCLUDE+= xmmsclient-ecore PLIST_SUB+= ECORE="@comment " .endif .if defined(WITH_FLAC) LIB_DEPENDS+= FLAC.7:${PORTSDIR}/audio/flac PLIST_SUB+= FLAC="" .else EXCLUDE+= flac PLIST_SUB+= FLAC="@comment " .endif .if defined(WITH_FAAD) LIB_DEPENDS+= faad.0:${PORTSDIR}/audio/faad PLIST_SUB+= FAAD="" #EXTRA_PATCHES+= ${FILESDIR}/extraPatch-src::clients::faad::Plugin .else EXCLUDE+= faad PLIST_SUB+= FAAD="@comment " .endif .if defined(WITH_SDL) USE_SDL= sdl ttf PLIST_SUB+= SDL="" #EXTRA_PATCHES+= ${FILESDIR}/extraPatch-src::clients::sdl-vis::Program .else EXCLUDE+= sdl-vis PLIST_SUB+= SDL="@comment " .endif .if defined(WITH_MUSEPACK) LIB_DEPENDS+= mpcdec.3:${PORTSDIR}/audio/libmpcdec PLIST_SUB+= MUSEPACK="" .else EXCLUDE+= musepack PLIST_SUB+= MUSEPACK="@comment " .endif .if defined(WITH_JACK) LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack PLIST_SUB+= JACK="" .else EXCLUDE+= jack PLIST_SUB+= JACK="@comment " .endif .if defined(WITH_MODPLUG) LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug PLIST_SUB+= MODPLUG="" .else EXCLUDE+= modplug PLIST_SUB+= MODPLUG="@comment " .endif .if defined(WITH_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient PLIST_SUB+= SAMBA="" .else EXCLUDE+= samba PLIST_SUB+= SAMBA="@comment " .endif .if defined(WITH_GNOMEVFS) USE_GNOME+= gnomevfs2 PLIST_SUB+= GNOMEVFS="" .else EXCLUDE+= gnomevfs PLIST_SUB+= GNOMEVFS="@comment " .endif .if defined(WITH_FAM) USE_FAM= yes WANT_FAM_SYSTEM=gamin PLIST_SUB+= FAM="" .else EXCLUDE+= medialib-updater 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 - -.if ${OSVERSION} < 500000 -BROKEN= Does not build on FreeBSD < 5.x -.endif pre-everything:: .if defined(WITH_SAMBA) @${ECHO_MSG} "WARNING: Samba plugin is experimental and not fully working" @${ECHO_MSG} "" .endif .if defined(WITH_GNOMEVFS) @${ECHO_MSG} "WARNING: Gnome VFS plugin is experimental and not fully working" @${ECHO_MSG} "" .endif .if defined(WITH_FAM) @${ECHO_MSG} "WARNING: Fam plugin is experimental and not fully working" @${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} && \ ${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}" ${SCONS_TARGET} .if !defined(XMMS2_SLAVE) do-install: @cd ${WRKSRC} && scons install .endif .include Property changes on: head/audio/xmms2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/audio/xmms2/files/patch-src_xmms_ipc.c =================================================================== --- head/audio/xmms2/files/patch-src_xmms_ipc.c (nonexistent) +++ head/audio/xmms2/files/patch-src_xmms_ipc.c (revision 158816) @@ -0,0 +1,12 @@ +--- src/xmms/ipc.c.orig Sat Apr 1 23:59:54 2006 ++++ src/xmms/ipc.c Sun Apr 2 00:00:09 2006 +@@ -795,8 +795,8 @@ + xmms_ipc_shutdown_server(xmms_ipc_t *ipc) + { + GList *c; +- if(!ipc) return; + xmms_ipc_client_t *co; ++ if(!ipc) return; + + g_mutex_lock (ipc->mutex_lock); + g_source_remove_poll (ipc->source, ipc->pollfd); Property changes on: head/audio/xmms2/files/patch-src_xmms_ipc.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/xmms2/pkg-plist =================================================================== --- head/audio/xmms2/pkg-plist (revision 158815) +++ head/audio/xmms2/pkg-plist (revision 158816) @@ -1,83 +1,84 @@ bin/xmms2 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 include/xmms2/xmms/xmms_decoderplugin.h include/xmms2/xmms/xmms_defs.h include/xmms2/xmms/xmms_effect.h include/xmms2/xmms/xmms_effectplugin.h include/xmms2/xmms/xmms_error.h include/xmms2/xmms/xmms_ipc.h include/xmms2/xmms/xmms_log.h include/xmms2/xmms/xmms_medialib.h include/xmms2/xmms/xmms_object.h include/xmms2/xmms/xmms_output.h include/xmms2/xmms/xmms_outputplugin.h include/xmms2/xmms/xmms_plsplugins.h include/xmms2/xmms/xmms_plugin.h include/xmms2/xmms/xmms_sample.h include/xmms2/xmms/xmms_transport.h include/xmms2/xmms/xmms_transportplugin.h include/xmms2/xmmsc/xmmsc_asyncns.h include/xmms2/xmmsc/xmmsc_errorcodes.h include/xmms2/xmmsc/xmmsc_idnumbers.h include/xmms2/xmmsc/xmmsc_inline.h include/xmms2/xmmsc/xmmsc_ipc_msg.h include/xmms2/xmmsc/xmmsc_ipc_transport.h include/xmms2/xmmsc/xmmsc_sockets.h include/xmms2/xmmsc/xmmsc_stdbool.h include/xmms2/xmmsc/xmmsc_stdint.h include/xmms2/xmmsc/xmmsc_stringport.h include/xmms2/xmmsc/xmmsc_unistd.h include/xmms2/xmmsc/xmmsc_util.h include/xmms2/xmmsclient/xmmsclient-cf.h include/xmms2/xmmsclient/xmmsclient-ecore.h include/xmms2/xmmsclient/xmmsclient-glib.h include/xmms2/xmmsclient/xmmsclient-qt.h include/xmms2/xmmsclient/xmmsclient.h %%ECORE%%lib/libxmmsclient-ecore.a %%ECORE%%lib/libxmmsclient-ecore.so lib/libxmmsclient-glib.a lib/libxmmsclient-glib.so lib/libxmmsclient.a lib/libxmmsclient.so %%CURL%%lib/xmms2/libxmms_curl_http.so lib/xmms2/libxmms_diskwrite.so lib/xmms2/libxmms_eq.so %%FAAD%%lib/xmms2/libxmms_faad.so %%FLAC%%lib/xmms2/libxmms_flac.so lib/xmms2/libxmms_file.so %%GNOMEVFS%%lib/xmms2/libxmms_gnomevfs.so lib/xmms2/libxmms_html.so %%JACK%%lib/xmms2/libxmms_jack.so lib/xmms2/libxmms_m3u.so lib/xmms2/libxmms_mad.so %%MODPLUG%%lib/xmms2/libxmms_modplug.so %%MUSEPACK%%lib/xmms2/libxmms_musepack.so lib/xmms2/libxmms_null.so lib/xmms2/libxmms_oss.so lib/xmms2/libxmms_pls.so lib/xmms2/libxmms_replaygain.so %%SAMBA%%lib/xmms2/libxmms_samba.so %%SID%%lib/xmms2/libxmms_sid.so lib/xmms2/libxmms_vorbisfile.so lib/xmms2/libxmms_wave.so +libdata/pkgconfig/xmms2-client-cpp.pc libdata/pkgconfig/xmms2-client-ecore.pc libdata/pkgconfig/xmms2-client-glib.pc libdata/pkgconfig/xmms2-client.pc 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%% @dirrm lib/xmms2 @dirrm include/xmms2/xmmsclient @dirrm include/xmms2/xmmsc @dirrm include/xmms2/xmms @dirrm include/xmms2 Property changes on: head/audio/xmms2/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property