diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2006-12-13 12:41:35 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2006-12-13 12:41:35 +0000 |
| commit | 64e068d25c1370f67d2f0d779ac1719f9bc5d137 (patch) | |
| tree | e8e79d2b112a29862848aa733e4b3f9387c78d2e /audio/xmms2 | |
| parent | 68ee2dd59c7dc7173d1688b825cc1c5a70f097c1 (diff) | |
| download | ports-64e068d25c1370f67d2f0d779ac1719f9bc5d137.tar.gz ports-64e068d25c1370f67d2f0d779ac1719f9bc5d137.zip | |
Update the ftp/curl port to 7.16.0.
Bump PORTREVISION of all dependent ports.
Fix the build errors in the few ports that still use the long deprecated,
and now obsoleted, cURL options.
Thanks to everyone who took the time to look over the patch!
Discussed on: -ports
Notes
Notes:
svn path=/head/; revision=179653
Diffstat (limited to 'audio/xmms2')
| -rw-r--r-- | audio/xmms2/Makefile | 11 | ||||
| -rw-r--r-- | audio/xmms2/pkg-plist | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/audio/xmms2/Makefile b/audio/xmms2/Makefile index 69e9a283f9f2..abd113f89a5c 100644 --- a/audio/xmms2/Makefile +++ b/audio/xmms2/Makefile @@ -7,6 +7,7 @@ PORTNAME?= xmms2 PORTVERSION= 0.2.d.8 +PORTREVISION= 1 DISTVERSION= 0.2DrHouse CATEGORIES?= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -77,7 +78,7 @@ EXCLUDE+= python ruby java xmmsclient-ecore xmmsclient++ xmmsclient++-glib .if !defined(XMMS2_SLAVE) .if !defined(WITHOUT_CURL) -LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= curl.4:${PORTSDIR}/ftp/curl PLIST_SUB+= CURL="" .else EXCLUDE+= curl @@ -91,7 +92,7 @@ LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl PLIST_SUB+= LASTFM="" .else EXCLUDE+= lastfm lastfmeta -PLIST_SUB+= LASTMFM="@comment " +PLIST_SUB+= LASTFM="@comment " .endif .if defined(WITH_SID) @@ -229,6 +230,9 @@ PLIST_SUB+= AO="@comment " .endif .if defined(WITH_MDNS_AVAHI) +.if defined(WITH_MDNS_APPLE) +BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both +.endif LIB_DEPENDS+= avahi-core:${PORTSDIR}/net/avahi PLIST_SUB+= MDNS_AVAHI="" .else @@ -237,6 +241,9 @@ PLIST_SUB+= MDNS_AVAHI="@comment " .endif .if !defined (WITHOUT_MDNS_APPLE) +.if defined(WITH_MDNS_AVAHI) +BROKEN= You may choose either MDNS_APPLE or MDNS_AVAHI, but not both +.endif LIB_DEPENDS+= dns_sd:${PORTSDIR}/net/mDNSResponder PLIST_SUB+= MDNS_APPLE="" .else diff --git a/audio/xmms2/pkg-plist b/audio/xmms2/pkg-plist index 5f10e60691bc..73060e12259a 100644 --- a/audio/xmms2/pkg-plist +++ b/audio/xmms2/pkg-plist @@ -101,7 +101,8 @@ 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 +%%MDNS_AVAHI%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh +%%MDNS_APPLE%%%%DATADIR%%/scripts/startup.d/xmms2-mdns-launcher.sh @dirrm %%DATADIR%%/scripts/startup.d @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%% |