Sync w/ FreeBSD ports and reset $FreeBSD$ keyword.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9281 df743ca5-7f9a-e211-a948-0013205c9059

13 files changed, 32 insertions, 16 deletions

diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index 449f7b957..bb7dd9a29 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -14,8 +14,8 @@ MASTER_SITES=	http://ftp.vin.bg.ac.yu/linux/mmedia/xmps/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X MPEG Player System - a media player with a very nice GUI
 
+USE_GETTEXT=	yes
 USE_SDL=	sdl
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -25,7 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+BROKEN=		Does not compile on !i386
 .endif
 
 post-patch:
@@ -33,6 +33,11 @@ post-patch:
 		s|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		 's|-lpthread|${PTHREAD_LIBS}|g'
+		's|-lpthread|${PTHREAD_LIBS}|g'
+# Fixes for GCC 4.2
+	@${REINPLACE_CMD} -e 's|X" (mem)|m" (mem)|' \
+		${WRKSRC}/codecs/video/mpeg3/mmx.h
+	@${REINPLACE_CMD} -e '42,44s|^static ||' \
+		${WRKSRC}/codecs/video/mpeg3/slice.c
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/xmps/files/patch-aa b/multimedia/xmps/files/patch-aa
index d1375f07e..afe3d5cbc 100644
--- a/multimedia/xmps/files/patch-aa
+++ b/multimedia/xmps/files/patch-aa
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-aa,v 1.4 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- configure.orig	Sun Feb  4 21:49:31 2001
 +++ configure	Sun Feb  4 21:52:15 2001
@@ -38,7 +38,7 @@ $FreeBSD: ports/multimedia/xmps/files/patch-aa,v 1.4 2001/02/04 22:01:32 sobomax
    
  
 -CFLAGS="$CFLAGS `gtk-config --cflags` -Wall -Werror"
-+CFLAGS="$CFLAGS `$GTK_CONFIG --cflags` -Wall -Werror"
++CFLAGS="$CFLAGS `$GTK_CONFIG --cflags` -Wall"
  
  
  VIDEO_ADDON_PLUGIN_DIR=addons/video
diff --git a/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c b/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c
index b2d828dae..a7c921fe6 100644
--- a/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c
+++ b/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-codecs::audio::ac3::ac3_codec.c,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- codecs/audio/ac3/ac3_codec.c.orig	Mon Nov 20 21:41:18 2000
 +++ codecs/audio/ac3/ac3_codec.c	Sun Feb  4 23:18:46 2001
diff --git a/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c b/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c
index 2c769f57f..9f2576ac8 100644
--- a/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c
+++ b/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-codecs::audio::ac3::coeff.c,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- codecs/audio/ac3/coeff.c	2001/02/04 21:17:23	1.1
 +++ codecs/audio/ac3/coeff.c	2001/02/04 21:17:55
diff --git a/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c b/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c
index 0c39f00b3..e629e1847 100644
--- a/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c
+++ b/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-codecs::audio::ac3::exponent.c,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- codecs/audio/ac3/exponent.c	2001/02/04 21:17:23	1.1
 +++ codecs/audio/ac3/exponent.c	2001/02/04 21:18:06
diff --git a/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in b/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in
index 2a01bfc4b..574682583 100644
--- a/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in
+++ b/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-codecs::video::flx::Makefile.in,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- codecs/video/flx/Makefile.in.orig	Sat Jan 20 01:53:42 2001
 +++ codecs/video/flx/Makefile.in	Sun Feb  4 22:55:34 2001
diff --git a/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h b/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h
index ec33d2ab6..26d3a0411 100644
--- a/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h
+++ b/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h
@@ -1,8 +1,19 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-codecs::video::flx::flx_codec.h,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- codecs/video/flx/flx_codec.h.orig	Wed Nov  1 20:46:14 2000
 +++ codecs/video/flx/flx_codec.h	Sun Feb  4 22:55:34 2001
+@@ -33,8 +33,8 @@
+ #include "config.h"
+ #endif
+ 
+-#define ReadU16(tmp1, tmp2) (Uint16)*(tmp1) = ((Uint8)*(tmp2+1)<<8)+(Uint8)*(tmp2);
+-#define ReadU32(tmp1, tmp2) (Uint32)*(tmp1) = (((((((Uint8)*(tmp2+3)<<8)+((Uint8)*(tmp2+2)))<<8)+((Uint8)*(tmp2+1)))<<8)+(Uint8)*(tmp2));
++#define ReadU16(tmp1, tmp2) *(tmp1) = (Uint16)((Uint8)*(tmp2+1)<<8)+(Uint8)*(tmp2)
++#define ReadU32(tmp1, tmp2) *(tmp1) = (Uint32)(((((((Uint8)*(tmp2+3)<<8)+((Uint8)*(tmp2+2)))<<8)+((Uint8)*(tmp2+1)))<<8)+(Uint8)*(tmp2))
+ 
+ /*
+  * includes : local
 @@ -52,7 +52,7 @@
  #include <stdlib.h>
  #include <string.h>
diff --git a/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h b/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h
index a14c179c8..c1a1fdae7 100644
--- a/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h
+++ b/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-gui::skinned::xmps_skin_browser.h,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- gui/skinned/xmps_skin_browser.h.orig	Thu Nov 23 16:06:40 2000
 +++ gui/skinned/xmps_skin_browser.h	Sun Feb  4 22:55:34 2001
diff --git a/multimedia/xmps/files/patch-libxmps::Makefile.in b/multimedia/xmps/files/patch-libxmps::Makefile.in
index 1f82fb687..7fae58513 100644
--- a/multimedia/xmps/files/patch-libxmps::Makefile.in
+++ b/multimedia/xmps/files/patch-libxmps::Makefile.in
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-libxmps::Makefile.in,v 1.2 2001/04/02 09:12:43 sobomax Exp $
+$FreeBSD$
 
 --- libxmps/Makefile.in.orig	Sun Feb  4 23:01:50 2001
 +++ libxmps/Makefile.in	Sun Feb  4 23:02:33 2001
diff --git a/multimedia/xmps/files/patch-libxmpsutils::Makefile.in b/multimedia/xmps/files/patch-libxmpsutils::Makefile.in
index ab4bb483c..4810f38c2 100644
--- a/multimedia/xmps/files/patch-libxmpsutils::Makefile.in
+++ b/multimedia/xmps/files/patch-libxmpsutils::Makefile.in
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-libxmpsutils::Makefile.in,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- libxmpsutils/Makefile.in	2001/02/04 21:00:58	1.1
 +++ libxmpsutils/Makefile.in	2001/02/04 21:01:11
diff --git a/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h b/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h
index 7c0b87c2f..44e9c9aaa 100644
--- a/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h
+++ b/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-renderers::audio::sdl::sdl_audio_renderer.h,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- renderers/audio/sdl/sdl_audio_renderer.h.orig	Fri Nov  3 21:41:37 2000
 +++ renderers/audio/sdl/sdl_audio_renderer.h	Sun Feb  4 22:55:34 2001
diff --git a/multimedia/xmps/files/patch-src::Makefile.in b/multimedia/xmps/files/patch-src::Makefile.in
index d385881d3..c450f02f7 100644
--- a/multimedia/xmps/files/patch-src::Makefile.in
+++ b/multimedia/xmps/files/patch-src::Makefile.in
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-src::Makefile.in,v 1.2 2001/04/02 09:12:43 sobomax Exp $
+$FreeBSD$
 
 --- src/Makefile.in.orig	Sat Jan 20 01:53:55 2001
 +++ src/Makefile.in	Sun Feb  4 22:55:34 2001
diff --git a/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c b/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c
index be5bc3931..ebc186470 100644
--- a/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c
+++ b/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c
@@ -1,5 +1,5 @@
 
-$FreeBSD: ports/multimedia/xmps/files/patch-system::mpeg3::mpeg3io.c,v 1.1 2001/02/04 22:01:32 sobomax Exp $
+$FreeBSD$
 
 --- system/mpeg3/mpeg3io.c.orig	Fri Nov  3 21:41:37 2000
 +++ system/mpeg3/mpeg3io.c	Sun Feb  4 22:55:34 2001