Date: Sun, 13 Aug 2006 00:10:10 -0400 (EDT) From: Alexander Botero-Lowry <alex@foxybanana.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: alex@foxybanana.com Subject: ports/101956: [PATCH] audio/xmms2: support mDNSResponder, respect DESTDIR Message-ID: <200608130410.k7D4AAnt022325@Laptop.mine.box> Resent-Message-ID: <200608130420.k7D4KFrL094993@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101956
>Category: ports
>Synopsis: [PATCH] audio/xmms2: support mDNSResponder, respect DESTDIR
>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 Aug 13 04:20:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alexander Botero-Lowry
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD Laptop.mine.box 6.1-STABLE FreeBSD 6.1-STABLE #1: Mon Jul 10 22:43:23 CDT 2006
>Description:
- Respect DESTDIR (pass INSTALLDIR to scons since xmms2 implements this)
- Fix plist for mdns-avahi
- add support for mdns-dnssd, and make it the default mDNS for xmms2 on FreeBSD
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- xmms2-0.2.d.6.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 16 Jul 2006 04:15:32 -0000 1.14
+++ Makefile 13 Aug 2006 04:07:49 -0000
@@ -25,7 +25,7 @@
USE_PYTHON_BUILD= yes
USE_BZIP2= yes
USE_SCONS= yes
-SCONS_ARGS= EXCLUDE="${EXCLUDE}"
+SCONS_ARGS= INSTALLDIR=${DESTDIR} EXCLUDE="${EXCLUDE}"
.if !defined(XMMS2_SLAVE)
USE_GNOME= glib20
@@ -50,7 +50,8 @@
MMS "Support to playback streams via MMS" off \
SAMBA "Support to playback files via SMB" off \
FAM "Support to update Media Library on file change" off \
- MDNS "Support to announce XMMS2d via mDNS" off #\
+ MDNS_AVAHI "Support to announce XMMS2d via mDNS (Avahi)" off \
+ MDNS_APPLE "Support to announce XMMS2d via mDNS (Apple)" on #\
# SDL "Support for visualization" on \
# JACK "Support to output via the Jack output server" off
.endif
@@ -180,12 +181,20 @@
PLIST_SUB+= FAM="@comment "
.endif
-.if defined(WITH_MDNS)
+.if defined(WITH_MDNS_AVAHI)
LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi
-PLIST_SUB+= MDNS=""
+PLIST_SUB+= MDNS_AVAHI=""
.else
-EXCLUDE+= mdns
-PLIST_SUB+= MDNS="@comment "
+EXCLUDE+= avahi
+PLIST_SUB+= MDNS_AVAHI="@comment "
+.endif
+
+.if !defined (WITHOUT_MDNS_APPLE)
+LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder
+PLIST_SUB+= MDNS_APPLE=""
+.else
+EXCLUDE+= dns_sd
+PLIST_SUB+= MDNS_APPLE="@comment "
.endif
.endif
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/xmms2/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist 7 Jul 2006 08:20:24 -0000 1.7
+++ pkg-plist 13 Aug 2006 04:07:49 -0000
@@ -2,7 +2,9 @@
bin/xmms2-et
bin/xmms2-launcher
%%FAM%%bin/xmms2-mlib-updater
-%%MDNS%%bin/xmms2-mdns-avahi
+%%MDNS_AVAHI%%bin/xmms2-find-avahi
+%%MDNS_AVAHI%%bin/xmms2-mdns-avahi
+%%MDNS_APPLE%%bin/xmms2-mdns-dnssd
bin/xmms2d
include/xmms2/xmms/xmms_config.h
include/xmms2/xmms/xmms_defs.h
--- xmms2-0.2.d.6.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?200608130410.k7D4AAnt022325>