diff -urN /usr/ports/games/glaxium/Makefile games/glaxium/Makefile
--- /usr/ports/games/glaxium/Makefile	Sun May 27 12:22:35 2007
+++ games/glaxium/Makefile	Sun Jun 17 02:31:02 2007
@@ -15,29 +15,25 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An OpenGL based space-ship "shoot-em-up" game
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut \
-		png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+USE_GNOME=	gnometarget
+USE_SDL=	sdl mixer
+USE_GL=		glut
 USE_GMAKE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 GNU_CONFIGURE=	yes
-USE_GL=		yes
-USE_SDL=	sdl mixer
 ALL_TARGET=	${PORTNAME}
 
 MAN6=		glaxium.6
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|/usr/X11R6|${X11BASE}|g; \
-		s|\$datadir/games/glaxium|\$datadir/glaxium|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -i '' -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g; \
+		 s|/games/glaxium|/glaxium|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|gcc -g -o|$$(CC) -o|g ; \
+		 s|/games/glaxium|/glaxium|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|Scratcher:: Scratcher|Scratcher|g' \
+		${WRKSRC}/scratcher.hpp
+	@${REINPLACE_CMD} -e 's|TankFire::TankFire|TankFire|g' \
+		${WRKSRC}/tank.hpp
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/games/glaxium/files/patch-Makefile.in games/glaxium/files/patch-Makefile.in
--- /usr/ports/games/glaxium/files/patch-Makefile.in	Tue Jan 24 03:05:05 2006
+++ games/glaxium/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
@@ -1,16 +0,0 @@
---- Makefile.in.orig
-+++ Makefile.in
-@@ -15,11 +15,11 @@
- 
- GLAXIUM_INSTALLDIR=$(bindir)
- DATA_DIRS=samples textures
--GLAXIUM_HOME=$(datadir)/games/glaxium
-+GLAXIUM_HOME=$(datadir)/glaxium
- MAN_DIR=$(mandir)
- 
- glaxium : $(OBJ)
--	gcc -g -o glaxium $(OBJ) $(LIB)
-+	$(CC) -g -o glaxium $(OBJ) $(LIB)
- 
- 
- 
diff -urN /usr/ports/games/glaxium/files/patch-configure.in games/glaxium/files/patch-configure.in
--- /usr/ports/games/glaxium/files/patch-configure.in	Tue Jan 24 03:05:05 2006
+++ games/glaxium/files/patch-configure.in	Thu Jan  1 09:00:00 1970
@@ -1,22 +0,0 @@
---- configure.in.orig
-+++ configure.in
-@@ -10,8 +10,8 @@
- dnl Check for SDL
- AM_PATH_SDL(1.1.5, , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
- 
--LIBS="$LIBS -L/usr/X11R6/lib $SDL_LIBS"
--CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include $SDL_CFLAGS"
-+LIBS="$LIBS -L%%X11BASE%%/lib $SDL_LIBS"
-+CPPFLAGS="$CPPFLAGS -I%%X11BASE%%/include $SDL_CFLAGS"
- 
- AC_CHECK_HEADER(SDL.h,  , echo "No SDL.h header... cannot do anything !";exit 12 )
- 
-@@ -41,7 +41,7 @@
- AC_EGREP_HEADER(PFNGLBINDPROGRAMNVPROC, GL/glext.h,  ,echo "Glaxium won't compile: get a newer version of your openGL header GL/glext.h at <http://oss.sgi.com/projects/ogl-sample/registry/>";exit 12)
- 
- dnl Expand DATADIR
--FC_EXPAND_DIR(DATADIR, "$datadir/games/glaxium")
-+FC_EXPAND_DIR(DATADIR, "$datadir/glaxium")
- AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR")
- 
- AC_OUTPUT(Makefile)