1 files changed, 52 insertions, 41 deletions

diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 055b9a07e5c5..9eab177b9eae 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.99.6
-PORTREVISION=	7
+PORTVERSION=	0.99.7
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
@@ -15,24 +14,33 @@ DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X11 multimedia player
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 # Please update libxine PLUGINSDIR as well (see below)
-LIB_DEPENDS=	xine.2:${PORTSDIR}/multimedia/libxine \
-		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		png15:${PORTSDIR}/graphics/png \
+		xine:${PORTSDIR}/multimedia/libxine
 RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
+OPTIONS_DEFINE=	CACA AALIB LIRC CURL WIN32_CODECS NLS XFT DOCS
+OPTIONS_DEFAULT=CURL WIN32_CODECS XFT
+WIN32_CODECS_DESC=	Enable win32 codecs (for i386 only)
+
 USE_XZ=		yes
-USE_XORG=	x11 xt xtst xv xinerama xxf86vm
+USE_XORG=	x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-vdr-keys
-CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		THREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-vdr-keys \
+		--disable-nvtvsimple
+MAKE_ENV=	V=1
+INSTALLS_ICONS=	yes
+MAKE_JOBS_SAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_JOBS_SAFE=	yes
 
 MANLANG=	"" de es fr pl
 MAN1_EN=	aaxine.1 xine-bugreport.1 xine-check.1 xine-remote.1 xine.1
@@ -41,21 +49,13 @@ MAN1_ES=	${MAN1_EN}
 MAN1_FR=	xine.1
 MAN1_PL=	aaxine.1 xine-remote.1 xine.1
 
-OPTIONS=	CACA "Enable libcaca output" off \
-		AALIB "Enable aalib output" off \
-		LIRC "Enable lirc support" off \
-		CURL "Enable curl support" on \
-		WIN32_CODECS "Enable win32 codecs (for i386 only)" on \
-		NLS "Enable Native Language Support" on \
-		XFT "Enable Xft support" on
-
 DOCSDIR=	${PREFIX}/share/doc/xine-ui
 XINE_PLUGINSDIR=	lib/xine/plugins/2.1
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-.if !defined(WITHOUT_WIN32_CODECS)
+.if ${PORT_OPTIONS:MWIN32_CODECS}
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
@@ -63,63 +63,74 @@ CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .endif
 .endif
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_XFT)
+.if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
 .else
 CONFIGURE_ARGS+=	--disable-xft
 .endif
 
-.if !defined(WITHOUT_CURL)
-LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+.if ${PORT_OPTIONS:MCURL}
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
 
-.if defined(WITH_LIRC)
-LIB_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
-CONFIGURE_ARGS+=	--enable-lirc
+.if ${PORT_OPTIONS:MLIRC}
+LIB_DEPENDS+=	lirc_client:${PORTSDIR}/comms/lirc
 CONFIGURE_ENV+=		LIRC_CFLAGS="-I${LOCALBASE}/include" \
 			LIRC_LIBS="-L${LOCALBASE}/libs -llirc_client"
+CONFIGURE_ARGS+=	--enable-lirc
 .else
 CONFIGURE_ARGS+=	--disable-lirc
 .endif
 
-.if defined(WITH_CACA)
+.if ${PORT_OPTIONS:MCACA}
 .if !exists(${LOCALBASE}/${XINE_PLUGINSDIR}/xineplug_vo_out_caca.so)
 IGNORE=		libxine should be compiled with caca support
 .endif
-LIB_DEPENDS+=	caca.0:${PORTSDIR}/graphics/libcaca
-PLIST_SUB+=	WITH_CACA=""
+LIB_DEPENDS+=	caca:${PORTSDIR}/graphics/libcaca
+PLIST_SUB+=	CACA=""
 .else
-PLIST_SUB+=	WITH_CACA="@comment "
 CONFIGURE_ARGS+=	--without-caca
+PLIST_SUB+=	CACA="@comment "
 .endif
 
-.if defined(WITH_AALIB)
-LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
-PLIST_SUB+=	WITH_AALIB=""
+.if ${PORT_OPTIONS:MAALIB}
+LIB_DEPENDS+=	aa:${PORTSDIR}/graphics/aalib
 CONFIGURE_ARGS+=	--with-aalib
+PLIST_SUB+=	AALIB=""
 .else
-PLIST_SUB+=	WITH_AALIB="@comment "
 CONFIGURE_ARGS+=	--without-aalib --disable-aalibtest
+PLIST_SUB+=	AALIB="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
-		s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' ${WRKSRC}/src/xitk/download.c
+		'/THREAD_LIBS/s|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|<string.h>|<strings.h>|' ${WRKSRC}/src/aaui/main.c
+.for file in doc/Makefile.in src/xitk/xine-toolkit/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|: install-docsDATA|:|' ${WRKSRC}/${file}
+.endfor
 
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/doc \
+		&& ${INSTALL_DATA} README* ${DOCSDIR}
+	@${MKDIR} ${PREFIX}/share/doc/xitk
+	cd ${WRKSRC}/src/xitk/xine-toolkit \
+		&& ${INSTALL_DATA} README ${PREFIX}/share/doc/xitk
+.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>