diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile
index 557f3a9409e..0be7e4a9d12 100644
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2011/05/27 19:08:20 naddy Exp $
+# $OpenBSD: Makefile,v 1.9 2011/07/11 12:13:03 jasper Exp $
 
 COMMENT=	LZMA compression and decompression tools
 
 DISTNAME=	xz-5.0.3
+REVISION=	0
 SHARED_LIBS=	lzma                 1.0      # .5.3
 CATEGORIES=	archivers
 
@@ -18,13 +19,12 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${HOMEPAGE}
 
-MODULES=	devel/gettext gcc3
-MODGCC3_ARCHES=	sparc
+MODULES=	devel/gettext
 
 WANTLIB=	c
 
 USE_LIBTOOL=	Yes
-USE_GROFF =	Yes
+USE_GROFF=	Yes
 SEPARATE_BUILD=	simple
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
diff --git a/audio/scmpc/Makefile b/audio/scmpc/Makefile
index 11acb0be381..3e6195146a6 100644
--- a/audio/scmpc/Makefile
+++ b/audio/scmpc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/05/15 14:56:50 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2011/07/11 12:13:03 jasper Exp $
 
 COMMENT=		client for MPD to submit tracks to Last.fm
 CATEGORIES=		audio
@@ -16,11 +16,6 @@ WANTLIB += c confuse curl glib-2.0
 
 MASTER_SITES=		https://github.com/downloads/cmende/scmpc/
 
-# XXX: Still needed?
-#MODULES=		gcc3
-#MODGCC3_ARCHES= 	sparc
-#MODGCC3_LANGS=		c
-
 MODULES+=		devel/gettext
 
 CONFIGURE_STYLE=	gnu
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index d1761883a8d..faddad12562 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2011/03/03 21:40:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2011/07/11 12:13:03 jasper Exp $
 
 COMMENT=		Gameboy Advance emulator
 
 VERSION=		1.7.2
 DISTNAME=		VisualBoyAdvance-src-${VERSION}
 PKGNAME=		vba-${VERSION}
-REVISION=		8
+REVISION=		9
 CATEGORIES=		emulators
 
 HOMEPAGE=		http://vba.ngemu.com/
@@ -28,10 +28,6 @@ WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vba/}
 
-MODULES=		gcc3
-MODGCC3_ARCHES=         sparc
-MODGCC3_LANGS=          c c++
-
 VMEM_WARNING=		Yes
 
 MODULES+=		devel/gettext
diff --git a/misc/memcached/Makefile b/misc/memcached/Makefile
index 0fec5326e04..f51197e430e 100644
--- a/misc/memcached/Makefile
+++ b/misc/memcached/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/19 07:23:12 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2011/07/11 12:13:03 jasper Exp $
 
 COMMENT=	distributed memory object caching system
 
 DISTNAME=	memcached-1.4.5
+REVISION=	0
 CATEGORIES=	misc
 
 HOMEPAGE=	http://www.danga.com/memcached/
@@ -16,9 +17,6 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c event pthread
 
-MODULES=		gcc3
-MODGCC3_ARCHES=		sparc
-
 MASTER_SITES=		http://memcached.googlecode.com/files/
 MASTER_SITES0=		${HOMEPAGE}/dist/
 
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index c31d303f669..ed4daf3af01 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2011/06/24 20:10:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2011/07/11 12:13:03 jasper Exp $
 
 COMMENT=	free H264/AVC encoder
 
 V=		20110225
 DISTNAME=	x264-snapshot-${V}-2245
 PKGNAME=	x264-${V}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=	.tar.bz2
@@ -23,9 +23,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=	c m pthread
 
-MODULES=	gcc3
-MODGCC3_ARCHES=	sparc
-
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= simple
 CONFIGURE_ENV=	API=${LIBx264_VERSION}
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index fc2a461f2c0..0de9bb817a4 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2011/07/06 23:56:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2011/07/11 12:13:03 jasper Exp $
 
 COMMENT-main=		OLSR routing daemon
 COMMENT-gui=		OLSR routing daemon GUI
@@ -9,9 +9,9 @@ DISTNAME=		olsrd-${VERSION}
 PKGNAME-main=		olsrd-${VERSION}
 PKGNAME-gui=		olsrd-gui-${VERSION}
 PKGNAME-plugins=	olsrd-plugins-${VERSION}
-REVISION-main=		1
-REVISION-gui=		2
-REVISION-plugins=	1
+REVISION-main=		2
+REVISION-gui=		3
+REVISION-plugins=	2
 
 CATEGORIES=	net
 
@@ -50,8 +50,7 @@ USE_GMAKE=	Yes
 USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
-MODULES=	gcc3 devel/gettext
-MODGCC3_ARCHES=	sparc
+MODULES=	devel/gettext
 
 ALL_TARGET=	build_all
 MAKE_FLAGS=	DEBUG=0
diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index 1f3f9d45c6f..e2e167d241c 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2011/03/14 09:15:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2011/07/11 12:13:03 jasper Exp $
 
 COMMENT=		modular webapplication server for C++
 
 DISTNAME=		tntnet-1.6.2
-REVISION=		1
+REVISION=		2
 CATEGORIES=		www devel
 
 HOMEPAGE=		http://www.tntnet.org/
@@ -29,10 +29,6 @@ MASTER_SITES=		${HOMEPAGE}download/
 
 MODULES=		converters/libiconv
 
-MODULES+=		gcc3
-MODGCC3_ARCHES= 	sparc
-MODGCC3_LANGS=		c++
-
 BUILD_DEPENDS=		archivers/zip
 LIB_DEPENDS= 		devel/cxxtools