5 files changed, 15 insertions, 14 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 6804caab7880..c46fdaaf1d3f 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,11 +7,12 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0.r4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-1-rc4
+DISTNAME=	${PORTNAME}-lib-1-rc4a
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
@@ -38,6 +39,7 @@ USE_GL=		yes
 USE_SDL=	sdl
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 850ffc974da3..988b869ee092 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,2 +1,2 @@
-MD5 (xine-lib-1-rc4.tar.gz) = 0ab4da35964044369768c90f931ce2c2
-SIZE (xine-lib-1-rc4.tar.gz) = 6788315
+MD5 (xine-lib-1-rc4a.tar.gz) = 2890e4359b31eb1b276ef3cf9aa97cc8
+SIZE (xine-lib-1-rc4a.tar.gz) = 6939989
diff --git a/multimedia/libxine/files/patch-src:liba52:Makefile.in b/multimedia/libxine/files/patch-src:liba52:Makefile.in
index cc3b60ceefc3..8ab80343b941 100644
--- a/multimedia/libxine/files/patch-src:liba52:Makefile.in
+++ b/multimedia/libxine/files/patch-src:liba52:Makefile.in
@@ -1,6 +1,6 @@
---- src/liba52/Makefile.in.orig	Sun Nov  9 11:41:01 2003
-+++ src/liba52/Makefile.in	Sun Nov  9 11:46:09 2003
-@@ -255,25 +255,13 @@
+--- src/liba52/Makefile.in.orig	Sun May 16 11:30:04 2004
++++ src/liba52/Makefile.in	Sun May 16 11:31:08 2004
+@@ -400,25 +400,13 @@
  lib_LTLIBRARIES = xineplug_decode_a52.la
  
  xineplug_decode_a52_la_SOURCES = \
@@ -24,10 +24,10 @@
 -	tables.h
 -
 -subdir = src/liba52
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
-@@ -281,8 +269,7 @@
+@@ -427,8 +415,7 @@
  
  xineplug_decode_a52_la_DEPENDENCIES = \
  	$(top_builddir)/src/xine-engine/libxine.la
@@ -36,4 +36,4 @@
 +am_xineplug_decode_a52_la_OBJECTS = crc.lo xine_decoder.lo
  xineplug_decode_a52_la_OBJECTS = $(am_xineplug_decode_a52_la_OBJECTS)
  
- DEFS = @DEFS@
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/multimedia/libxine/files/patch-src:libmad:Makefile.in b/multimedia/libxine/files/patch-src:libmad:Makefile.in
index 041e72d5a00f..004e0a43dcb0 100644
--- a/multimedia/libxine/files/patch-src:libmad:Makefile.in
+++ b/multimedia/libxine/files/patch-src:libmad:Makefile.in
@@ -1,6 +1,6 @@
---- src/libmad/Makefile.in.orig	Sun Jan  5 19:01:05 2003
-+++ src/libmad/Makefile.in	Sun Jan  5 19:07:10 2003
-@@ -210,42 +210,12 @@
+--- src/libmad/Makefile.in.orig	Sun May 16 11:32:08 2004
++++ src/libmad/Makefile.in	Sun May 16 11:32:44 2004
+@@ -403,42 +403,12 @@
  
  lib_LTLIBRARIES = xineplug_decode_mad.la
  
@@ -42,6 +42,6 @@
 -	version.h
 -
 -subdir = src/libmad
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index d468e06aff36..6feca5f4f352 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -126,7 +126,6 @@ lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
 libdata/pkgconfig/libxine.pc
 share/aclocal/xine.m4
 %%DOCSDIR%%/README
-%%DOCSDIR%%/README.config_en
 %%DOCSDIR%%/README.dvb
 %%DOCSDIR%%/README.dxr3
 %%DOCSDIR%%/README.freebsd