From 8fa657d249329dddd2c0ea80d5828cff0755c06b Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Thu, 15 May 2014 10:45:20 +0000
Subject: - Remove USE_XORG=xt. - Leave WIN32_CODECS option off by default to
 get an official package. - Remove iconv configure argument. 
 ICONV_CONFIGURE_ARG is always empty.

---
 multimedia/xine/Makefile | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'multimedia/xine')

diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 64884bd7adcd..accc2dab1917 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.99.8
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
@@ -17,7 +18,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 
 USES=		desktop-file-utils gmake iconv pkgconfig readline \
 		shared-mime-info tar:xz
-USE_XORG=	x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
+USE_XORG=	x11 xext xinerama xscrnsaver xtst xv xxf86vm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vdr-keys \
 		--disable-nvtvsimple \
@@ -34,7 +35,6 @@ XINE_PLUGINSDIR=	lib/xine/plugins/2.3
 OPTIONS_DEFINE=		AALIB CACA CURL DOCS LIRC NLS XFT
 OPTIONS_DEFAULT=	CURL XFT
 OPTIONS_DEFINE_i386=	WIN32_CODECS
-OPTIONS_DEFAULT_i386=	WIN32_CODECS
 OPTIONS_SUB=		yes
 
 AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
@@ -62,10 +62,6 @@ XFT_CONFIGURE_ENABLE=	xft
 LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 .endif
 
-.if empty(ICONV_CONFIGURE_ARG)
-CONFIGURE_ARGS+=	--without-libiconv-prefix
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|<string.h>|<strings.h>|' ${WRKSRC}/src/aaui/main.c
-- 
cgit