5 files changed, 71 insertions, 16 deletions

diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile
index 16cc5054d4ca..a952d666f90f 100644
--- a/graphics/xine/Makefile
+++ b/graphics/xine/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=		xine
-PORTVERSION=		0.3.1
+PORTVERSION=		0.3.2
 CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		http://xine.sourceforge.net/files/
+DISTNAME=		${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=		roman@xpert.com
 
@@ -17,6 +17,10 @@ USE_LIBTOOL=		yes
 USE_X_PREFIX=		yes
 USE_IMLIB=		yes
 
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+MAN1=			xine.1
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/graphics/xine/distinfo b/graphics/xine/distinfo
index c96f77f4d37f..71bf4843b8ed 100644
--- a/graphics/xine/distinfo
+++ b/graphics/xine/distinfo
@@ -1 +1 @@
-MD5 (xine-0.3.1.tar.gz) = 167a8a50913770043900747df4c62be5
+MD5 (xine_0.3.2.tar.gz) = a5c1327f4178876de315cd0a68941087
diff --git a/graphics/xine/files/patch-configure b/graphics/xine/files/patch-configure
index 5cc14ea7b825..95493da66d77 100644
--- a/graphics/xine/files/patch-configure
+++ b/graphics/xine/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Sun Nov 26 01:19:21 2000
-+++ configure	Sun Nov 26 01:19:54 2000
-@@ -3789,7 +3789,7 @@
+--- configure.orig	Mon Dec 18 16:37:06 2000
++++ configure	Mon Dec 18 16:38:13 2000
+@@ -3855,7 +3855,7 @@
+ 
+ 
+ NDEBUG_CFLAGS="-fomit-frame-pointer"
+-COMMON_CFLAGS="-Wall -O3 -static -funroll-loops -finline-functions -funroll-all-loops -D_FILE_OFFSET_BITS=64"
++COMMON_CFLAGS="-Wall $CFLAGS -static -funroll-loops -finline-functions -funroll-all-loops -D_FILE_OFFSET_BITS=64"
  
  case $host in
    i386-*-freebsd*)
--    GLOBAL_CFLAGS="$GLOBAL_CFLAGS $CFLAGS $ALSA_CFLAGS -Wall -static -fomit-frame-pointer -funroll-loops -finline-functions -O3 -D_REENTRANT -malign-double -funroll-all-loops"
-+    GLOBAL_CFLAGS="$GLOBAL_CFLAGS $CFLAGS -Wall -static -fomit-frame-pointer -funroll-loops -finline-functions -D_REENTRANT -malign-double -funroll-all-loops"
-     cat >> confdefs.h <<\EOF
- #define __i386__ 1
- EOF
diff --git a/graphics/xine/files/patch-fr b/graphics/xine/files/patch-fr
new file mode 100644
index 000000000000..32a90beff66f
--- /dev/null
+++ b/graphics/xine/files/patch-fr
@@ -0,0 +1,11 @@
+--- doc/man/Makefile.in.orig	Mon Dec 18 17:16:45 2000
++++ doc/man/Makefile.in	Mon Dec 18 17:16:58 2000
+@@ -99,7 +99,7 @@
+ XINE_SKINDIR = @XINE_SKINDIR@
+ XINE_SUB = @XINE_SUB@
+ 
+-SUBDIRS = en fr
++SUBDIRS = en
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/graphics/xine/pkg-plist b/graphics/xine/pkg-plist
index fd969d52ca67..bba061613a0e 100644
--- a/graphics/xine/pkg-plist
+++ b/graphics/xine/pkg-plist
@@ -1,34 +1,74 @@
-lib/xine/plugins/input_file.so
+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
+share/doc/xine/FAQ
+share/doc/xine/README
+share/doc/xine/bug_report_form
+share/xine/skins/default/arrowdn.png
+share/xine/skins/default/arrowup.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/letters.png
 share/xine/skins/default/next.png
 share/xine/skins/default/pause.png
 share/xine/skins/default/play.png
 share/xine/skins/default/prev.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/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/eject.png
+share/xine/skins/lcd/fastb.png
+share/xine/skins/lcd/fastf.png
+share/xine/skins/lcd/fullsc.png
+share/xine/skins/lcd/letters.png
+share/xine/skins/lcd/next.png
+share/xine/skins/lcd/pause.png
+share/xine/skins/lcd/play.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/skinconfig
+share/xine/skins/lcd/skip.png
+share/xine/skins/lcd/slider_bg.png
+share/xine/skins/lcd/slider_pad.png
+share/xine/skins/lcd/stop.png
+share/xine/skins/metal/arrowdn.png
+share/xine/skins/metal/arrowup.png
 share/xine/skins/metal/bg.png
 share/xine/skins/metal/button.png
 share/xine/skins/metal/close.png
 share/xine/skins/metal/eject.png
 share/xine/skins/metal/exit.png
+share/xine/skins/metal/fullsc.png
 share/xine/skins/metal/letters.png
 share/xine/skins/metal/next.png
 share/xine/skins/metal/pause.png
 share/xine/skins/metal/play.png
 share/xine/skins/metal/prev.png
+share/xine/skins/metal/skinconfig
+share/xine/skins/metal/slider_bg.png
+share/xine/skins/metal/slider_pad.png
+share/xine/skins/metal/slider_v.png
 share/xine/skins/metal/stop.png
 share/xine/skins/xine_logo.png
-bin/xine
+@dirrm lib/xine/plugins
+@dirrm lib/xine
+@dirrm share/doc/xine
 @dirrm share/xine/skins/default
+@dirrm share/xine/skins/lcd
 @dirrm share/xine/skins/metal
 @dirrm share/xine/skins
 @dirrm share/xine
-@dirrm lib/xine/plugins
-@dirrm lib/xine