diff options
| -rw-r--r-- | audio/rhythmbox-devel/Makefile | 10 | ||||
| -rw-r--r-- | audio/rhythmbox-devel/files/patch-configure | 13 | ||||
| -rw-r--r-- | audio/rhythmbox/Makefile | 10 | ||||
| -rw-r--r-- | audio/rhythmbox/files/patch-configure | 13 |
4 files changed, 38 insertions, 8 deletions
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile index 895354708..2db751fe8 100644 --- a/audio/rhythmbox-devel/Makefile +++ b/audio/rhythmbox-devel/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.37 2005/10/17 14:39:32 marcus Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.38 2005/10/17 18:19:37 marcus Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9 @@ -60,9 +61,14 @@ USE_GSTREAMER+= faad .endif .if defined(WITH_DAAP) -CONFIGURE_ARGS+= --enable-daap +CONFIGURE_ARGS+= --enable-daap --with-mdns=howl LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup \ howl.0:${PORTSDIR}/net/howl +.else +.if exists(${LOCALBASE}/lib/libhowl.a) +LIB_DEPENDS+= howl.0:${PORTSDIR}/net/howl +.endif +CONFIGURE_ARGS+= --disable-daap .endif pre-everything:: diff --git a/audio/rhythmbox-devel/files/patch-configure b/audio/rhythmbox-devel/files/patch-configure index 9c31cedaa..5a263fd6f 100644 --- a/audio/rhythmbox-devel/files/patch-configure +++ b/audio/rhythmbox-devel/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Mon Oct 17 10:21:14 2005 -+++ configure Mon Oct 17 10:22:47 2005 +--- configure.orig Sun Oct 23 10:47:35 2005 ++++ configure Sun Oct 23 11:03:22 2005 @@ -21603,7 +21603,7 @@ enable_hal02=yes fi @@ -45,3 +45,12 @@ # Extract the first word of "gst-inspect-0.8", so it can be a program name with args. set dummy gst-inspect-0.8; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 +@@ -24866,7 +24866,7 @@ + exec_prefix=$exec_prefix_save + + +-DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" ++DBUS_SERVICES_DIR="$PREFIX/share/dbus-1/services" + + + cat >>confdefs.h <<_ACEOF diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 895354708..2db751fe8 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.37 2005/10/17 14:39:32 marcus Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.38 2005/10/17 18:19:37 marcus Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9 @@ -60,9 +61,14 @@ USE_GSTREAMER+= faad .endif .if defined(WITH_DAAP) -CONFIGURE_ARGS+= --enable-daap +CONFIGURE_ARGS+= --enable-daap --with-mdns=howl LIB_DEPENDS+= soup-2.2.8:${PORTSDIR}/devel/libsoup \ howl.0:${PORTSDIR}/net/howl +.else +.if exists(${LOCALBASE}/lib/libhowl.a) +LIB_DEPENDS+= howl.0:${PORTSDIR}/net/howl +.endif +CONFIGURE_ARGS+= --disable-daap .endif pre-everything:: diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure index 9c31cedaa..5a263fd6f 100644 --- a/audio/rhythmbox/files/patch-configure +++ b/audio/rhythmbox/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Mon Oct 17 10:21:14 2005 -+++ configure Mon Oct 17 10:22:47 2005 +--- configure.orig Sun Oct 23 10:47:35 2005 ++++ configure Sun Oct 23 11:03:22 2005 @@ -21603,7 +21603,7 @@ enable_hal02=yes fi @@ -45,3 +45,12 @@ # Extract the first word of "gst-inspect-0.8", so it can be a program name with args. set dummy gst-inspect-0.8; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 +@@ -24866,7 +24866,7 @@ + exec_prefix=$exec_prefix_save + + +-DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" ++DBUS_SERVICES_DIR="$PREFIX/share/dbus-1/services" + + + cat >>confdefs.h <<_ACEOF |