4 files changed, 103 insertions, 68 deletions

diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index 9aa7c45ba8b4..08cc6daf07e8 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -6,25 +6,30 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.4.3
+PORTVERSION=	0.9.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xine
-#DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
 
-MAINTAINER=	roman@xpert.com
+MAINTAINER=	nobutaka@nobutaka.com
 
-USE_LIBTOOL=	yes
+LIB_DEPENDS=	xine.0:${PORTSDIR}/graphics/libxine \
+		aa.1:${PORTSDIR}/graphics/aalib \
+		png.4:${PORTSDIR}/graphics/png
+
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 CONFIGURE_ARGS+=	--with-w32-path=${LOCALBASE}/lib/win32
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-MAN1=		xine.1
+MANLANG=	"" fr
+MAN1=		aaxine.1 xine.1
 
 post-install:
+	@${CP} ${PREFIX}/man/man1/aaxine.1 ${PREFIX}/man/fr/man1/aaxine.1
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/multimedia/xine/distinfo b/multimedia/xine/distinfo
index 4f24a82eb086..1f4e5264a5fe 100644
--- a/multimedia/xine/distinfo
+++ b/multimedia/xine/distinfo
@@ -1 +1 @@
-MD5 (xine-0.4.3.tar.gz) = 60b57bcbac37a03f459ea75e5e589b3b
+MD5 (xine-ui-0.9.1.tar.gz) = 3338fde9ed8d8881a6318bf6117e1923
diff --git a/multimedia/xine/files/patch-fr b/multimedia/xine/files/patch-fr
deleted file mode 100644
index 8457a6ab9996..000000000000
--- a/multimedia/xine/files/patch-fr
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/man/Makefile.in.orig	Wed Jan 10 13:07:05 2001
-+++ doc/man/Makefile.in	Thu Jan 11 10:39:40 2001
-@@ -100,7 +100,7 @@
- XINE_SUB = @XINE_SUB@
- w32_path = @w32_path@
- 
--SUBDIRS = fr en
-+SUBDIRS = en
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/multimedia/xine/pkg-plist b/multimedia/xine/pkg-plist
index bfafa5a35538..ef35eff1c3e2 100644
--- a/multimedia/xine/pkg-plist
+++ b/multimedia/xine/pkg-plist
@@ -1,66 +1,48 @@
+bin/aaxine
 bin/xine
-lib/xine/plugins/input_dvd.so
-lib/xine/plugins/input_file.so
-lib/xine/plugins/input_net.so
-lib/xine/plugins/input_stdin_fifo.so
-lib/xine/plugins/input_vcd.so
-share/doc/xine/FAQ
-share/doc/xine/README
-share/doc/xine/README.freebsd
-share/doc/xine/README.syncfb
-share/doc/xine/bug_report_form
+share/doc/xine-ui/FAQ
+share/doc/xine-ui/FAQ_es
+share/doc/xine-ui/FAQ_fr
+share/doc/xine-ui/FAQ_it
+share/doc/xine-ui/README.freebsd
+share/doc/xine-ui/README.irix
+share/doc/xine-ui/README.solaris
+share/doc/xine-ui/README.syncfb
+share/doc/xine-ui/bug_report_form
 share/idl/xine.idl
-share/xine/skins/default/arrowdn.png
-share/xine/skins/default/arrowdn2.png
-share/xine/skins/default/arrowup.png
-share/xine/skins/default/arrowup2.png
-share/xine/skins/default/bg.png
-share/xine/skins/default/button.png
-share/xine/skins/default/close.png
-share/xine/skins/default/eject.png
-share/xine/skins/default/exit.png
-share/xine/skins/default/fullsc.png
-share/xine/skins/default/largebtn.png
-share/xine/skins/default/left.png
-share/xine/skins/default/letters.png
-share/xine/skins/default/next.png
-share/xine/skins/default/pause.png
-share/xine/skins/default/pl_bg.png
-share/xine/skins/default/pl_btn.png
-share/xine/skins/default/pl_itembtn.png
-share/xine/skins/default/pl_slidpad.png
-share/xine/skins/default/pl_slidv.png
-share/xine/skins/default/play.png
-share/xine/skins/default/prev.png
-share/xine/skins/default/right.png
-share/xine/skins/default/skinconfig
-share/xine/skins/default/slider_bg.png
-share/xine/skins/default/slider_pad.png
-share/xine/skins/default/slider_v.png
-share/xine/skins/default/smallbtn.png
-share/xine/skins/default/stop.png
 share/xine/skins/lcd/arrowdn.png
 share/xine/skins/lcd/arrowup.png
 share/xine/skins/lcd/bg.png
 share/xine/skins/lcd/close.png
+share/xine/skins/lcd/ctl_bg.png
 share/xine/skins/lcd/eject.png
 share/xine/skins/lcd/fastb.png
 share/xine/skins/lcd/fastf.png
 share/xine/skins/lcd/fullsc.png
 share/xine/skins/lcd/largebtn.png
 share/xine/skins/lcd/letters.png
+share/xine/skins/lcd/mrl.png
+share/xine/skins/lcd/mrl_bg.png
 share/xine/skins/lcd/next.png
 share/xine/skins/lcd/pause.png
 share/xine/skins/lcd/pl_bg.png
 share/xine/skins/lcd/pl_btn.png
+share/xine/skins/lcd/pl_delete.png
+share/xine/skins/lcd/pl_deleteall.png
+share/xine/skins/lcd/pl_inputtxt.png
 share/xine/skins/lcd/pl_itembtn.png
+share/xine/skins/lcd/pl_movedown.png
+share/xine/skins/lcd/pl_moveup.png
+share/xine/skins/lcd/pl_play.png
 share/xine/skins/lcd/pl_slidpad.png
 share/xine/skins/lcd/pl_slidv.png
 share/xine/skins/lcd/play.png
+share/xine/skins/lcd/playlist.png
 share/xine/skins/lcd/power.png
 share/xine/skins/lcd/prev.png
 share/xine/skins/lcd/ptdn.png
 share/xine/skins/lcd/ptup.png
+share/xine/skins/lcd/setup.png
 share/xine/skins/lcd/skinconfig
 share/xine/skins/lcd/skip.png
 share/xine/skins/lcd/slider_bg.png
@@ -80,16 +62,25 @@ share/xine/skins/metal/fullsc.png
 share/xine/skins/metal/largebtn.png
 share/xine/skins/metal/left.png
 share/xine/skins/metal/letters.png
+share/xine/skins/metal/mrl.png
 share/xine/skins/metal/next.png
 share/xine/skins/metal/pause.png
 share/xine/skins/metal/pl_bg.png
 share/xine/skins/metal/pl_btn.png
+share/xine/skins/metal/pl_delete.png
+share/xine/skins/metal/pl_deleteall.png
+share/xine/skins/metal/pl_inputtxt.png
 share/xine/skins/metal/pl_itembtn.png
+share/xine/skins/metal/pl_movedown.png
+share/xine/skins/metal/pl_moveup.png
+share/xine/skins/metal/pl_play.png
 share/xine/skins/metal/pl_slidpad.png
 share/xine/skins/metal/pl_slidv.png
 share/xine/skins/metal/play.png
+share/xine/skins/metal/playlist.png
 share/xine/skins/metal/prev.png
 share/xine/skins/metal/right.png
+share/xine/skins/metal/setup.png
 share/xine/skins/metal/skinconfig
 share/xine/skins/metal/slider_bg.png
 share/xine/skins/metal/slider_pad.png
@@ -106,30 +97,80 @@ share/xine/skins/pitt/fastf.png
 share/xine/skins/pitt/fullsc.png
 share/xine/skins/pitt/largebtn.png
 share/xine/skins/pitt/letters.png
+share/xine/skins/pitt/mrl.png
 share/xine/skins/pitt/next.png
 share/xine/skins/pitt/pause.png
 share/xine/skins/pitt/pl_bg.png
 share/xine/skins/pitt/pl_btn.png
+share/xine/skins/pitt/pl_delete.png
+share/xine/skins/pitt/pl_deleteall.png
+share/xine/skins/pitt/pl_inputtxt.png
 share/xine/skins/pitt/pl_itembtn.png
+share/xine/skins/pitt/pl_movedown.png
+share/xine/skins/pitt/pl_moveup.png
+share/xine/skins/pitt/pl_play.png
 share/xine/skins/pitt/pl_slidpad.png
 share/xine/skins/pitt/pl_slidv.png
 share/xine/skins/pitt/play.png
+share/xine/skins/pitt/playlist.png
 share/xine/skins/pitt/power.png
 share/xine/skins/pitt/prev.png
 share/xine/skins/pitt/ptdn.png
 share/xine/skins/pitt/ptup.png
+share/xine/skins/pitt/setup.png
 share/xine/skins/pitt/skinconfig
 share/xine/skins/pitt/slider_bg.png
 share/xine/skins/pitt/slider_pad.png
 share/xine/skins/pitt/smallbtn.png
 share/xine/skins/pitt/stop.png
-share/xine/skins/xine_logo.png
-@dirrm share/xine/skins/pitt
-@dirrm share/xine/skins/metal
+share/xine/skins/xinetic/BigArrowDown.png
+share/xine/skins/xinetic/BigArrowUp.png
+share/xine/skins/xinetic/CtlBg.png
+share/xine/skins/xinetic/CtlBtn.png
+share/xine/skins/xinetic/CtlDismiss.png
+share/xine/skins/xinetic/CtlDummy.png
+share/xine/skins/xinetic/CtlReset.png
+share/xine/skins/xinetic/CtlSave.png
+share/xine/skins/xinetic/Letters.png
+share/xine/skins/xinetic/MainAutoButton.png
+share/xine/skins/xinetic/MainBg.png
+share/xine/skins/xinetic/MainClose.png
+share/xine/skins/xinetic/MainEject.png
+share/xine/skins/xinetic/MainFastB.png
+share/xine/skins/xinetic/MainFastF.png
+share/xine/skins/xinetic/MainFullScreen.png
+share/xine/skins/xinetic/MainNext.png
+share/xine/skins/xinetic/MainPause.png
+share/xine/skins/xinetic/MainPlay.png
+share/xine/skins/xinetic/MainPower.png
+share/xine/skins/xinetic/MainPrev.png
+share/xine/skins/xinetic/MainStop.png
+share/xine/skins/xinetic/MrlBg.png
+share/xine/skins/xinetic/MrlBtn.png
+share/xine/skins/xinetic/MrlDismiss.png
+share/xine/skins/xinetic/MrlSelect.png
+share/xine/skins/xinetic/Onglet.png
+share/xine/skins/xinetic/PlBg.png
+share/xine/skins/xinetic/PlBtn.png
+share/xine/skins/xinetic/PlDelete.png
+share/xine/skins/xinetic/PlDeleteAll.png
+share/xine/skins/xinetic/PlDismiss.png
+share/xine/skins/xinetic/PlInputTxt.png
+share/xine/skins/xinetic/PlItemBtn.png
+share/xine/skins/xinetic/PlMoveDn.png
+share/xine/skins/xinetic/PlMoveUp.png
+share/xine/skins/xinetic/PlPlay.png
+share/xine/skins/xinetic/SliderHBg.png
+share/xine/skins/xinetic/SliderHPad.png
+share/xine/skins/xinetic/SliderVBg.png
+share/xine/skins/xinetic/SliderVPad.png
+share/xine/skins/xinetic/SmallArrowDown.png
+share/xine/skins/xinetic/SmallArrowUp.png
+share/xine/skins/xinetic/skinconfig
 @dirrm share/xine/skins/lcd
-@dirrm share/xine/skins/default
-@dirrm share/xine/skins
-@dirrm share/xine
-@dirrm share/doc/xine
-@dirrm lib/xine/plugins
-@dirrm lib/xine
+@dirrm share/xine/skins/metal
+@dirrm share/xine/skins/pitt
+@dirrm share/xine/skins/xinetic
+@unexec rmdir %D/share/xine/skins 2>/dev/null || true
+@unexec rmdir %D/share/xine 2>/dev/null || true
+@dirrm share/doc/xine-ui