- Sync PLUGINSDIR with libxine port [1]

- Stageify and use options helpers while I'm here

PR:		ports/184024 [1]
Submitted by:	Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>

multimedia/xine/Makefile

@@ -12,24 +12,14 @@ COMMENT=	X11 multimedia player
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
+LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-# Please update libxine PLUGINSDIR as well (see below)
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
-LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
+		libpng15.so:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg \
+		libxine.so:${PORTSDIR}/multimedia/libxine
-		png15:${PORTSDIR}/graphics/png \
-		xine:${PORTSDIR}/multimedia/libxine
-RUN_DEPENDS=	update-mime-database:${PORTSDIR}/misc/shared-mime-info
-
-OPTIONS_DEFINE=	CACA AALIB LIRC CURL NLS XFT DOCS
-OPTIONS_DEFAULT=	CURL XFT
-OPTIONS_DEFINE_i386=	WIN32_CODECS
-OPTIONS_DEFAULT_i386=	WIN32_CODECS
-
-WIN32_CODECS_DESC=	Enable win32 codecs
 
 USE_XZ=		yes
 USE_XORG=	x11 xext xinerama xscrnsaver xt xtst xv xxf86vm
-USES=		gmake pkgconfig
+USES=		desktop-file-utils gmake pkgconfig shared-mime-info
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-vdr-keys \
 		--disable-nvtvsimple
@@ -39,74 +29,39 @@ INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MANLANG=	"" de es fr pl
-MAN1_EN=	aaxine.1 xine-bugreport.1 xine-check.1 xine-remote.1 xine.1
-MAN1_DE=	${MAN1_EN}
-MAN1_ES=	${MAN1_EN}
-MAN1_FR=	xine.1
-MAN1_PL=	aaxine.1 xine-remote.1 xine.1
-
 DOCSDIR=	${PREFIX}/share/doc/xine-ui
-XINE_PLUGINSDIR=	lib/xine/plugins/2.2
+XINE_PLUGINSDIR=	lib/xine/plugins/2.3
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	CACA AALIB LIRC CURL NLS XFT DOCS
-.include <bsd.port.options.mk>
+OPTIONS_DEFAULT=	CURL XFT
+OPTIONS_DEFINE_i386=	WIN32_CODECS
+OPTIONS_DEFAULT_i386=	WIN32_CODECS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MWIN32_CODECS}
+WIN32_CODECS_DESC=	Enable win32 codecs
-RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
+WIN32_CODECS_RUN_DEPENDS=	win32-codecs>=0:${PORTSDIR}/multimedia/win32-codecs
 
-CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
+NLS_USES=	gettext
-CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
+NLS_CONFIGURE_OFF=	--disable-nls
-.endif
 
-.if ${PORT_OPTIONS:MNLS}
+XFT_USE=	XORG=xft
-USES+=		gettext
+XFT_CONFIGURE_OFF=	--disable-xft
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
 
-.if ${PORT_OPTIONS:MXFT}
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
-USE_XORG+=	xft
+CURL_CONFIGURE_OFF=	--without-curl
-.else
-CONFIGURE_ARGS+=	--disable-xft
-.endif
 
-.if ${PORT_OPTIONS:MCURL}
+LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIRC_CONFIGURE_ENV=		LIRC_CFLAGS="-I${LOCALBASE}/include" \
-.else
-CONFIGURE_ARGS+=	--without-curl
-.endif
-
-.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
+LIRC_CONFIGURE_ENABLE=	lirc
-.else
-CONFIGURE_ARGS+=	--disable-lirc
-.endif
 
-.if ${PORT_OPTIONS:MCACA}
+CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
-.if !exists(${LOCALBASE}/${XINE_PLUGINSDIR}/xineplug_vo_out_caca.so)
+CACA_RUN_DEPENDS=	${LOCALBASE}/${XINE_PLUGINSDIR}/xineplug_vo_out_caca.so
-IGNORE=		libxine should be compiled with caca support
+CACA_CONFIGURE_OFF=	--without-caca
-.endif
-LIB_DEPENDS+=	caca:${PORTSDIR}/graphics/libcaca
-PLIST_SUB+=	CACA=""
-.else
-CONFIGURE_ARGS+=	--without-caca
-PLIST_SUB+=	CACA="@comment "
-.endif
 
-.if ${PORT_OPTIONS:MAALIB}
+AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
-LIB_DEPENDS+=	aa:${PORTSDIR}/graphics/aalib
+AALIB_CONFIGURE_ON=	--with-aalib
-CONFIGURE_ARGS+=	--with-aalib
+AALIB_CONFIGURE_OFF=	--without-aalib --disable-aalibtest
-PLIST_SUB+=	AALIB=""
-.else
-CONFIGURE_ARGS+=	--without-aalib --disable-aalibtest
-PLIST_SUB+=	AALIB="@comment "
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -119,14 +74,9 @@ post-patch:
 .endfor
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/README* ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xitk
-		&& ${INSTALL_DATA} README* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/src/xitk/xine-toolkit/README ${STAGEDIR}${PREFIX}/share/doc/xitk
-	@${MKDIR} ${PREFIX}/share/doc/xitk
-	cd ${WRKSRC}/src/xitk/xine-toolkit \
-		&& ${INSTALL_DATA} README ${PREFIX}/share/doc/xitk
-.endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

multimedia/xine/pkg-plist

@@ -5,6 +5,25 @@ bin/xine
 bin/xine-bugreport
 bin/xine-check
 bin/xine-remote
+man/de/man1/aaxine.1.gz
+man/de/man1/xine-bugreport.1.gz
+man/de/man1/xine-check.1.gz
+man/de/man1/xine-remote.1.gz
+man/de/man1/xine.1.gz
+man/es/man1/aaxine.1.gz
+man/es/man1/xine-bugreport.1.gz
+man/es/man1/xine-check.1.gz
+man/es/man1/xine-remote.1.gz
+man/es/man1/xine.1.gz
+man/fr/man1/xine.1.gz
+man/man1/aaxine.1.gz
+man/man1/xine-bugreport.1.gz
+man/man1/xine-check.1.gz
+man/man1/xine-remote.1.gz
+man/man1/xine.1.gz
+man/pl/man1/aaxine.1.gz
+man/pl/man1/xine-remote.1.gz
+man/pl/man1/xine.1.gz
 share/applications/xine.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README.config_en
 %%PORTDOCS%%%%DOCSDIR%%/README.cs.0.Introduction
@@ -155,5 +174,3 @@ share/pixmaps/xine.xpm
 @dirrmtry man/es
 @dirrmtry man/de/man1
 @dirrmtry man/de
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true