Sync w/ FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9277 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 37 insertions, 15 deletions

diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 18ddc0066..4d4e42c8b 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
 # $FreeBSD$
-#    $MCom: ports/audio/beast/Makefile,v 1.3 2007/05/02 12:13:54 ahze Exp $
+#
 
 PORTNAME=	beast
 PORTVERSION=	0.6.6
@@ -33,6 +33,12 @@ CONFIGURE_ARGS=	--disable-debug \
 MAN1=		beast.1 bsesh.1 sfidl.1
 MAN3=		beast-gxk.3 bse-procs.3 bse-structs.3 bse.3 sfi.3
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 700042
+BROKEN=		Does not compile with GCC 4.2
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|$${libdir}/ladspa|${LOCALBASE}/lib/ladspa|; \
 		/FLAGS=/ s/(-g|-ggdb3|-pipe|-O2|-ftracer|-finline-functions|-fno-keep-static-consts)//; \
@@ -42,4 +48,4 @@ post-patch:
 		${WRKSRC}/bse/Makefile.in \
 		${WRKSRC}/bse/zintern/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index e24dc970a..51905d152 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	easytag
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -32,4 +32,11 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GTK" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.if defined(WITH_WAVPACK)
+LIB_DEPENDS+=		wavpack.1:${PORTSDIR}/audio/wavpack
+CONFIGURE_ARGS+=	--enable-wavpack
+.else
+CONFIGURE_ARGS+=	--disable-wavpack
+.endif
+
 .include <bsd.port.mk>
diff --git a/audio/easytag-devel/distinfo b/audio/easytag-devel/distinfo
index c5aeac2c2..efbf60955 100644
--- a/audio/easytag-devel/distinfo
+++ b/audio/easytag-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (easytag-2.0.tar.bz2) = af37a0a34e4d0808aabb7a24cffc75ee
-SHA256 (easytag-2.0.tar.bz2) = 3935a1100c6afc499a263cbaf063ab422bd7b5b4099b1d3d869021ba9a063500
-SIZE (easytag-2.0.tar.bz2) = 2889829
+MD5 (easytag-2.1.tar.bz2) = a585cb9e400ba460ec1801856ea5e90f
+SHA256 (easytag-2.1.tar.bz2) = 8903771d33795d0e65c2ee6e7f09709c280cc1ae5878c20a201d7a4b06ff57e5
+SIZE (easytag-2.1.tar.bz2) = 2924032
diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile
index 1bbcd10fc..9a5070ffd 100644
--- a/audio/gnomoradio/Makefile
+++ b/audio/gnomoradio/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Jean-Yves Lefort <jylefort@brutele.be>
 #
 # $FreeBSD$
-#    $MCom: ports/audio/gnomoradio/Makefile,v 1.3 2007/05/02 14:20:48 ahze Exp $
+#
 
 PORTNAME=		gnomoradio
 PORTVERSION=		0.15.1
@@ -26,14 +26,20 @@ USE_XLIB=		yes
 USE_GCC=		3.4+
 USE_GNOME=		gnomehack gnomeprefix
 USE_AUTOTOOLS=		libtool:15
-USE_LDCONFIG=	yes
+USE_LDCONFIG=		yes
 LIBTOOLFLAGS=		--tag=CXX
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 700042
+BROKEN=		Broken with gcc 4.2
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|CCLD = $$(CC)|CCLD = $$(CXX)|; \
 		s|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/roboradio/mp3/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/libao/files/patch-Makefile.in b/audio/libao/files/patch-Makefile.in
index 71fbe45f4..493ebf83c 100644
--- a/audio/libao/files/patch-Makefile.in
+++ b/audio/libao/files/patch-Makefile.in
@@ -1,3 +1,6 @@
+
+$FreeBSD$
+
 --- Makefile.in.orig	2007-07-14 18:06:32.000000000 -0400
 +++ Makefile.in	2007-07-14 18:06:52.000000000 -0400
 @@ -225,7 +225,7 @@ target_alias = @target_alias@
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 9ee0c9029..a158765ce 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.79 2007/06/10 18:49:50 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.80 2007/07/05 01:57:57 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
@@ -111,7 +111,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if !defined(WITHOUT_IPOD)
-LIB_DEPENDS+=	gpod.1:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+=	gpod.2:${PORTSDIR}/audio/libgpod
 CONFIGURE_ARGS+=--with-ipod
 PLIST_SUB+=	IPOD=""
 .else
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9ee0c9029..a158765ce 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.79 2007/06/10 18:49:50 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.80 2007/07/05 01:57:57 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.10.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
@@ -111,7 +111,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if !defined(WITHOUT_IPOD)
-LIB_DEPENDS+=	gpod.1:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+=	gpod.2:${PORTSDIR}/audio/libgpod
 CONFIGURE_ARGS+=--with-ipod
 PLIST_SUB+=	IPOD=""
 .else