From b08a5a69e5cb47e60c0d6cc4cca6480992937b24 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Fri, 11 Jun 2010 20:05:57 +0000
Subject: [PATCH] Remove sparc64-specific patch now that it switched to gcc4.
 From Brad.

---
 audio/xmms/Makefile                                |  9 ++-------
 audio/xmms/patches/gcc-Input_mpg123_Makefile_am    | 14 --------------
 multimedia/transcode/Makefile                      |  8 ++------
 .../patches/gcc-filter_yuvdenoise_Makefile_am      | 12 ------------
 4 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 audio/xmms/patches/gcc-Input_mpg123_Makefile_am
 delete mode 100644 multimedia/transcode/patches/gcc-filter_yuvdenoise_Makefile_am

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 82118458a13..400ae16890c 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2010/04/20 23:43:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.68 2010/06/11 20:05:57 landry Exp $
 
 COMMENT-main=		Multimedia player for the X Window System
 COMMENT-vorbis=		Ogg Vorbis input plugin for XMMS
@@ -12,7 +12,7 @@ DISTNAME=		xmms-${VERSION}
 PKGNAME-main=		xmms-${VERSION}p7
 PKGNAME-vorbis=		xmms-vorbis-${VERSION}p1
 PKGNAME-mikmod=		xmms-mikmod-${VERSION}p2
-PKGNAME-mp3=		xmms-mp3-${VERSION}p2
+PKGNAME-mp3=		xmms-mp3-${VERSION}p3
 SHARED_LIBS=		xmms	4.2
 CATEGORIES=		audio
 HOMEPAGE=		http://www.xmms.org
@@ -34,11 +34,6 @@ MASTER_SITES=		${HOMEPAGE}/files/$V/ \
 
 MULTI_PACKAGES=		-main -vorbis -mikmod -mp3
 
-# gcc/3.3.5 ICEs randomly
-.if ${MACHINE_ARCH} == "sparc64"
-PATCH_LIST=	patch-* gcc-*
-.endif
-
 WANTLIB-main=		${WANTLIB} GL ICE c Xxf86vm SM pthread sndio
 
 MODULES=		devel/gettext
diff --git a/audio/xmms/patches/gcc-Input_mpg123_Makefile_am b/audio/xmms/patches/gcc-Input_mpg123_Makefile_am
deleted file mode 100644
index 02393b69cdd..00000000000
--- a/audio/xmms/patches/gcc-Input_mpg123_Makefile_am
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: gcc-Input_mpg123_Makefile_am,v 1.1 2009/06/14 10:06:08 sthen Exp $
---- Input/mpg123/Makefile.am.orig	Fri Jun 12 15:58:20 2009
-+++ Input/mpg123/Makefile.am	Fri Jun 12 15:59:27 2009
-@@ -53,3 +53,10 @@ libmpg123_la_SOURCES = $(COMMON_SRC) $(EXTRA_SRC)
- libmpg123_la_LDFLAGS = @PLUGIN_LDFLAGS@
- libmpg123_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ @Z_LIBS@ $(top_builddir)/libxmms/libxmms.la
- INCLUDES = @GTK_CFLAGS@ @ARCH_DEFINES@ -I$(top_builddir)/intl -I$(top_srcdir)
-+
-+layer3.lo: layer3.c
-+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -O0 -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(LTCOMPILE) -O0 -c -o $@ $<
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 34baf256a16..4790b2d12ec 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.30 2010/05/26 22:18:22 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.31 2010/06/11 20:06:50 landry Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	video stream processing tools
 
 DISTNAME=	transcode-1.1.5
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_BERLIOS:=tcforge/}
 EXTRACT_SUFX=	.tar.bz2
@@ -30,10 +30,6 @@ PKG_ARGS+=	-Di386=1
 PKG_ARGS+=	-Di386=0
 .endif
 
-.if ${MACHINE_ARCH} == "sparc64"
-PATCH_LIST=	patch-* gcc-*
-.endif
-
 MODULES=	converters/libiconv
 LIB_DEPENDS=	SDL.>=2::devel/sdl \
 		a52::audio/liba52 \
diff --git a/multimedia/transcode/patches/gcc-filter_yuvdenoise_Makefile_am b/multimedia/transcode/patches/gcc-filter_yuvdenoise_Makefile_am
deleted file mode 100644
index 0c3e887837b..00000000000
--- a/multimedia/transcode/patches/gcc-filter_yuvdenoise_Makefile_am
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: gcc-filter_yuvdenoise_Makefile_am,v 1.1 2010/01/11 08:49:27 jakemsr Exp $
---- filter/yuvdenoise/Makefile.am.orig	Sat Feb 21 06:34:02 2009
-+++ filter/yuvdenoise/Makefile.am	Fri Dec 25 02:57:18 2009
-@@ -5,6 +5,8 @@ AM_CPPFLAGS = \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/src
- 
-+CFLAGS = -O0 -Wall
-+
- pkgdir = $(MOD_PATH)
- 
- pkg_LTLIBRARIES = \