- Update to 0.99.8

PR:		187291
Submitted by:	ports fury

3 files changed, 34 insertions, 53 deletions

diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 4cb060b30ab8..0bc25f79ba5a 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xine
-PORTVERSION=	0.99.7
-PORTREVISION=	2
+PORTVERSION=	0.99.8
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION}
 DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
@@ -12,18 +11,18 @@ COMMENT=	X11 multimedia player
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png \
 		libxine.so:${PORTSDIR}/multimedia/libxine
 
 USE_XZ=		yes
+USES=		desktop-file-utils gmake iconv pkgconfig readline \
+		shared-mime-info
 USE_XORG=	x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
-USES=		desktop-file-utils gmake pkgconfig shared-mime-info readline \
-		iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vdr-keys \
-		--disable-nvtvsimple
+		--disable-nvtvsimple \
+		--disable-rpath
 MAKE_ENV=	V=1
 INSTALLS_ICONS=	yes
 
@@ -33,51 +32,43 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 DOCSDIR=	${PREFIX}/share/doc/xine-ui
 XINE_PLUGINSDIR=	lib/xine/plugins/2.3
 
-OPTIONS_DEFINE=	CACA AALIB LIRC CURL NLS XFT DOCS
+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
-
-WIN32_CODECS_DESC=	Enable win32 codecs
-WIN32_CODECS_RUN_DEPENDS=	win32-codecs>=0:${PORTSDIR}/multimedia/win32-codecs
-
-NLS_USES=	gettext
-NLS_CONFIGURE_OFF=	--disable-nls
-
-XFT_USE=	XORG=xft
-XFT_CONFIGURE_OFF=	--disable-xft
+OPTIONS_SUB=		yes
 
+AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_CONFIGURE_WITH=	aalib
+CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_RUN_DEPENDS=	${LOCALBASE}/${XINE_PLUGINSDIR}/xineplug_vo_out_caca.so:${PORTSDIR}/multimedia/libxine
+CACA_CONFIGURE_WITH=	caca
 CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-CURL_CONFIGURE_OFF=	--without-curl
-
+CURL_CONFIGURE_WITH=	curl
 LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
-LIRC_CONFIGURE_ENV=		LIRC_CFLAGS="-I${LOCALBASE}/include" \
+LIRC_CONFIGURE_ENV=	LIRC_CFLAGS="-I${LOCALBASE}/include" \
 			LIRC_LIBS="-L${LOCALBASE}/libs -llirc_client"
 LIRC_CONFIGURE_ENABLE=	lirc
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+WIN32_CODECS_DESC=	Enable win32 codecs
+WIN32_CODECS_RUN_DEPENDS=\
+			win32-codecs>0:${PORTSDIR}/multimedia/win32-codecs
+XFT_USE=		XORG=xft
+XFT_CONFIGURE_ENABLE=	xft
 
-CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
-CACA_RUN_DEPENDS=	${LOCALBASE}/${XINE_PLUGINSDIR}/xineplug_vo_out_caca.so:${PORTSDIR}/multimedia/libxine
-CACA_CONFIGURE_OFF=	--without-caca
+.include <bsd.port.options.mk>
 
-AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
-AALIB_CONFIGURE_ON=	--with-aalib
-AALIB_CONFIGURE_OFF=	--without-aalib --disable-aalibtest
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+
+.if empty(ICONV_CONFIGURE_ARG)
+CONFIGURE_ARGS+=	--without-libiconv-prefix
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/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:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/README* ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xitk
-	${INSTALL_DATA} ${WRKSRC}/src/xitk/xine-toolkit/README ${STAGEDIR}${PREFIX}/share/doc/xitk
 
 .include <bsd.port.mk>
diff --git a/multimedia/xine/distinfo b/multimedia/xine/distinfo
index 74db3add6737..f389036b5eb9 100644
--- a/multimedia/xine/distinfo
+++ b/multimedia/xine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xine-ui-0.99.7.tar.xz) = 9d8cdfd1c5c84251d6978765b059adf57099ff6c447f3e4b59066c8563f66bc4
-SIZE (xine-ui-0.99.7.tar.xz) = 1752328
+SHA256 (xine-ui-0.99.8.tar.xz) = 1ac5a9fc8dbf81f12a8677108bf2b623e70d7adbb83b83912b9cdf00bc78b2a7
+SIZE (xine-ui-0.99.8.tar.xz) = 1758372
diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist
index 753cc23579a1..5f7ccf6943fc 100644
--- a/multimedia/xine/pkg-plist
+++ b/multimedia/xine/pkg-plist
@@ -153,18 +153,8 @@ share/pixmaps/xine.xpm
 @dirrm %%DATADIR%%/skins/xinetic
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/oxine
-@dirrmtry %%DATADIR%%
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-%%PORTDOCS%%@dirrmtry share/doc/xitk
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm share/doc/xitk
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry man/pl/man1
 @dirrmtry man/pl