diff --git a/graphics/libxine/Makefile b/graphics/libxine/Makefile
index 817d799ab56c..45924602b567 100644
--- a/graphics/libxine/Makefile
+++ b/graphics/libxine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0.b4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +25,8 @@ LIB_DEPENDS=	avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		vorbis.2:${PORTSDIR}/audio/libvorbis \
-		ogg.4:${PORTSDIR}/audio/libogg
+		ogg.4:${PORTSDIR}/audio/libogg \
+		mng.1:${PORTSDIR}/graphics/libmng
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -61,13 +63,19 @@ PLIST_SUB+=	HAVE_ARTS="@comment "
 .endif
 
 .if ${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND)
-WANT_GNOME=	yes
 USE_GNOME+=	esound
 PLIST_SUB+=	HAVE_ESOUND=""
 .else
 PLIST_SUB+=	HAVE_ESOUND="@comment "
 .endif
 
+.if exists(${X11BASE}/libdata/pkgconfig/gnome-vfs-2.0.pc)
+LIB_DEPENDS+=	gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
+PLIST_SUB+=	HAVE_GNOMEVFS2=""
+.else
+PLIST_SUB+=	HAVE_GNOMEVFS2="@comment "
+.endif
+
 pre-everything::
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> You can enable some features by defining following variables."
diff --git a/graphics/libxine/files/patch-configure b/graphics/libxine/files/patch-configure
new file mode 100644
index 000000000000..c1537099f90e
--- /dev/null
+++ b/graphics/libxine/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Feb  9 23:46:52 2003
++++ configure	Sun Feb  9 23:47:08 2003
+@@ -17057,7 +17057,7 @@
+   fi
+   ALSA_CFLAGS="$ALSA_CFLAGS"
+ 
+-  ac_save_CPPFLAGS="$CPPLAGS"
++  ac_save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $ALSA_CFLAGS"
+   if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
diff --git a/graphics/libxine/files/patch-misc:Makefile.in b/graphics/libxine/files/patch-misc:Makefile.in
new file mode 100644
index 000000000000..ee64bf8aa1b0
--- /dev/null
+++ b/graphics/libxine/files/patch-misc:Makefile.in
@@ -0,0 +1,11 @@
+--- misc/Makefile.in.orig	Sun Feb  9 15:00:23 2003
++++ misc/Makefile.in	Sun Feb  9 15:00:41 2003
+@@ -221,7 +221,7 @@
+ 
+ bin_SCRIPTS = xine-config
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libxine.pc
+ subdir = misc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/libxine/pkg-plist b/graphics/libxine/pkg-plist
index be4d2a99f7f9..46bc9f164824 100644
--- a/graphics/libxine/pkg-plist
+++ b/graphics/libxine/pkg-plist
@@ -33,7 +33,6 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.so
 lib/libxine.so.3
-lib/pkgconfig/libxine.pc
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
 lib/xine/plugins/1.0.0/post/xineplug_post_invert.so
 lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so
@@ -101,6 +100,7 @@ lib/xine/plugins/1.0.0/xineplug_inp_cdda.so
 lib/xine/plugins/1.0.0/xineplug_inp_dvb.so
 lib/xine/plugins/1.0.0/xineplug_inp_dvd.so
 lib/xine/plugins/1.0.0/xineplug_inp_file.so
+%%HAVE_GNOMEVFS2%%lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.so
 lib/xine/plugins/1.0.0/xineplug_inp_http.so
 lib/xine/plugins/1.0.0/xineplug_inp_mms.so
 lib/xine/plugins/1.0.0/xineplug_inp_net.so
@@ -116,6 +116,7 @@ lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.so
 %%HAVE_LIBXV%%lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
+libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
 share/doc/xine/README
 share/doc/xine/README.config_en
@@ -169,12 +170,12 @@ share/xine/libxine1/fonts/serif-20.xinefont.gz
 share/xine/libxine1/fonts/serif-24.xinefont.gz
 share/xine/libxine1/fonts/serif-32.xinefont.gz
 @dirrm include/xine
-@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
 @dirrm lib/xine/plugins/1.0.0/post
 @dirrm lib/xine/plugins/1.0.0/vidix
 @dirrm lib/xine/plugins/1.0.0
 @dirrm lib/xine/plugins
 @dirrm lib/xine
+@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 @dirrm share/doc/xine/faq
 @dirrm share/doc/xine
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 817d799ab56c..45924602b567 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0.b4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -24,7 +25,8 @@ LIB_DEPENDS=	avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		vorbis.2:${PORTSDIR}/audio/libvorbis \
-		ogg.4:${PORTSDIR}/audio/libogg
+		ogg.4:${PORTSDIR}/audio/libogg \
+		mng.1:${PORTSDIR}/graphics/libmng
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -61,13 +63,19 @@ PLIST_SUB+=	HAVE_ARTS="@comment "
 .endif
 
 .if ${HAVE_GNOME:Mesound} != "" || defined(WITH_ESOUND)
-WANT_GNOME=	yes
 USE_GNOME+=	esound
 PLIST_SUB+=	HAVE_ESOUND=""
 .else
 PLIST_SUB+=	HAVE_ESOUND="@comment "
 .endif
 
+.if exists(${X11BASE}/libdata/pkgconfig/gnome-vfs-2.0.pc)
+LIB_DEPENDS+=	gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
+PLIST_SUB+=	HAVE_GNOMEVFS2=""
+.else
+PLIST_SUB+=	HAVE_GNOMEVFS2="@comment "
+.endif
+
 pre-everything::
 	@${ECHO_MSG} "===>"
 	@${ECHO_MSG} "===> You can enable some features by defining following variables."
diff --git a/multimedia/libxine/files/patch-configure b/multimedia/libxine/files/patch-configure
new file mode 100644
index 000000000000..c1537099f90e
--- /dev/null
+++ b/multimedia/libxine/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Feb  9 23:46:52 2003
++++ configure	Sun Feb  9 23:47:08 2003
+@@ -17057,7 +17057,7 @@
+   fi
+   ALSA_CFLAGS="$ALSA_CFLAGS"
+ 
+-  ac_save_CPPFLAGS="$CPPLAGS"
++  ac_save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $ALSA_CFLAGS"
+   if test "${ac_cv_header_alsa_asoundlib_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for alsa/asoundlib.h" >&5
diff --git a/multimedia/libxine/files/patch-misc:Makefile.in b/multimedia/libxine/files/patch-misc:Makefile.in
new file mode 100644
index 000000000000..ee64bf8aa1b0
--- /dev/null
+++ b/multimedia/libxine/files/patch-misc:Makefile.in
@@ -0,0 +1,11 @@
+--- misc/Makefile.in.orig	Sun Feb  9 15:00:23 2003
++++ misc/Makefile.in	Sun Feb  9 15:00:41 2003
+@@ -221,7 +221,7 @@
+ 
+ bin_SCRIPTS = xine-config
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libxine.pc
+ subdir = misc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index be4d2a99f7f9..46bc9f164824 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -33,7 +33,6 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.so
 lib/libxine.so.3
-lib/pkgconfig/libxine.pc
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
 lib/xine/plugins/1.0.0/post/xineplug_post_invert.so
 lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so
@@ -101,6 +100,7 @@ lib/xine/plugins/1.0.0/xineplug_inp_cdda.so
 lib/xine/plugins/1.0.0/xineplug_inp_dvb.so
 lib/xine/plugins/1.0.0/xineplug_inp_dvd.so
 lib/xine/plugins/1.0.0/xineplug_inp_file.so
+%%HAVE_GNOMEVFS2%%lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.so
 lib/xine/plugins/1.0.0/xineplug_inp_http.so
 lib/xine/plugins/1.0.0/xineplug_inp_mms.so
 lib/xine/plugins/1.0.0/xineplug_inp_net.so
@@ -116,6 +116,7 @@ lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.so
 %%HAVE_LIBXV%%lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
+libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
 share/doc/xine/README
 share/doc/xine/README.config_en
@@ -169,12 +170,12 @@ share/xine/libxine1/fonts/serif-20.xinefont.gz
 share/xine/libxine1/fonts/serif-24.xinefont.gz
 share/xine/libxine1/fonts/serif-32.xinefont.gz
 @dirrm include/xine
-@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
 @dirrm lib/xine/plugins/1.0.0/post
 @dirrm lib/xine/plugins/1.0.0/vidix
 @dirrm lib/xine/plugins/1.0.0
 @dirrm lib/xine/plugins
 @dirrm lib/xine
+@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 @dirrm share/doc/xine/faq
 @dirrm share/doc/xine
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true