Remove option to build the XMMS plugin, which will instead be spun

off into its proper port audio/xmms-flac.

audio/flac/Makefile

@@ -7,44 +7,29 @@
 
 PORTNAME=	flac
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	${MASTER_SITE_DEBIAN}
-PATCH_SITE_SUBDIR=	pool/main/f/${PORTNAME}
-PATCHFILES=	${PORTNAME}_${PORTVERSION}-3.diff.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Free lossless audio codec
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
 		ogg.4:${PORTSDIR}/audio/libogg
 
-.if defined(WITH_XMMS)
-# We don't build with id3lib support, because of C++ related build
-# problems.  Detection is disabled by patch-configure.
-BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS+=	xmms.3:${PORTSDIR}/multimedia/xmms
-PLIST_SUB=	XMMS=""
-.else
-CONFIGURE_ENV+=	XMMS_CONFIG=/usr/bin/false	# must be absolute path
-PLIST_SUB=	XMMS="@comment "
-.endif
-
 .if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-CONFIGURE_ARGS+=--enable-sse --enable-3dnow \
+CONFIGURE_ARGS=	--enable-sse --enable-3dnow \
 		--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}"
-CONFIGURE_ENV+=	CPPFLAGS="-I${WRKSRC}/include"
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include" \
+		XMMS_CONFIG=/usr/bin/false      # must be absolute path
 
 .if defined(NOPORTDOCS)
 MAKE_ENV=	DOC=""

audio/flac/distinfo

@@ -1,2 +1 @@
 MD5 (flac-1.1.0.tar.gz) = 19b456a27b5fcf502c76cc33f33e1490
-MD5 (flac_1.1.0-3.diff.gz) = 28443cf10cbc7fc29ddfa5df48474b06

audio/flac/pkg-plist

@@ -278,5 +278,3 @@ share/aclocal/libOggFLAC.m4
 @dirrm include/OggFLAC
 @dirrm include/FLAC++
 @dirrm include/FLAC
-%%XMMS%%@cwd %%X11BASE%%
-%%XMMS%%lib/xmms/Input/libxmms-flac.so