- Update chromium to 0.9.13.2. See NEWS for full list of changes.

Approved by:	miwi (mentor)

22 files changed, 272 insertions, 646 deletions

diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index d4cc0e0d1976..8ec8b3c7ef64 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -6,43 +6,54 @@
 #
 
 PORTNAME=	chromium
-PORTVERSION=	0.9.12
-PORTREVISION=	6
+PORTVERSION=	0.9.13.2
 CATEGORIES=	games
-MASTER_SITES=	http://www.reptilelabour.com/software/files/chromium/ \
-		http://www.amdmi3.ru/distfiles/
-DISTFILES=	${PORTNAME}-src-${PORTVERSION}.tar.gz \
-		${PORTNAME}-data-${PORTVERSION}.tar.gz
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	chromium-bsu
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	An arcade-style, top-scrolling space shooter
 
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
-		smpeg.1:${PORTSDIR}/multimedia/smpeg \
-		openal.0:${PORTSDIR}/audio/openal \
-		alut.1:${PORTSDIR}/audio/freealut
+LIB_DEPENDS=	glpng.1:${PORTSDIR}/graphics/glpng \
+		ftgl.2:${PORTSDIR}/graphics/ftgl \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+
+GNU_CONFIGURE=	yes
+USE_GL=		gl glu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+PORTDOCS=	*
+
+MAN6=		chromium.6
+
+OPTIONS=	SDL_MIXER "Use SDL_mixer instead of openal for audio" off \
+		GLUT	"Use GLUT instead of SDL for video" off
 
-USE_GL=		glu
-USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/Chromium-0.9
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GLUT)
+USE_GL+=	glut
+CONFIGURE_ARGS+=--disable-sdl
+.else
+USE_SDL+=	sdl
+CONFIGURE_ARGS+=--disable-glut
+.endif
+
+.if defined(WITH_SDL_MIXER)
+USE_SDL+=	mixer
+CONFIGURE_ARGS+=--disable-openal
+.else
+LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal \
+		alut.1:${PORTSDIR}/audio/freealut
+CONFIGURE_ARGS+=--disable-sdlmixer
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lopenal|& -lalut|g' \
-			  -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src-setup/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/support/glpng/src/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin
-	${MKDIR} ${DATADIR}/data
-	(cd ${WRKSRC}/data && \
-		${TAR} -c -f - --exclude "*CVS*" --exclude "*xvpics*" png fonts wav) | \
-		(cd ${DATADIR}/data && ${TAR} -x -f - )
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/data/doc && ${TAR} -c -f - --exclude "*CVS*" *) | \
-		(cd ${DOCSDIR} && ${TAR} -x -f - )
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/SUBDIRS/ s|doc||' ${WRKSRC}/data/Makefile.in
 .endif
+	@${REINPLACE_CMD} -e '/^bindir=.*games/ d; /^datadir=.*games/ d' \
+		${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/chromium-bsu/distinfo b/games/chromium-bsu/distinfo
index fcce1803a67e..7f94adcea896 100644
--- a/games/chromium-bsu/distinfo
+++ b/games/chromium-bsu/distinfo
@@ -1,6 +1,3 @@
-MD5 (chromium-src-0.9.12.tar.gz) = 969883f2f20f10cd6cdb380582f130c4
-SHA256 (chromium-src-0.9.12.tar.gz) = a4a2c929dfd462a9281d8c0dae485c70362140e038f532608550f6528b6ab745
-SIZE (chromium-src-0.9.12.tar.gz) = 640283
-MD5 (chromium-data-0.9.12.tar.gz) = 173fdf76f1e4d7496142cd5662456a73
-SHA256 (chromium-data-0.9.12.tar.gz) = 749d10bcedeff7a82701da97701f9d31b4a057dfa84f33e197085ac71975b195
-SIZE (chromium-data-0.9.12.tar.gz) = 1111134
+MD5 (chromium-0.9.13.2.tar.gz) = 47882369584e32ac1243aa514db7be0c
+SHA256 (chromium-0.9.13.2.tar.gz) = 07ad301239205e6c4aabb3601288f07082aeb40da4858103c5aa80a78c19ff5a
+SIZE (chromium-0.9.13.2.tar.gz) = 1494299
diff --git a/games/chromium-bsu/files/patch-Makefile.no-setup b/games/chromium-bsu/files/patch-Makefile.no-setup
deleted file mode 100644
index c155f9f3c855..000000000000
--- a/games/chromium-bsu/files/patch-Makefile.no-setup
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/Makefile.no-setup.orig	Fri Mar 14 20:45:01 2003
-+++ scripts/Makefile.no-setup	Fri Mar 14 20:45:07 2003
-@@ -1,5 +1,4 @@
- SUPPORT_DIRS	=	 \
--			./support/openal/ \
- 			./support/glpng/src
- 
- CHROMIUM_DIRS	=	\
diff --git a/games/chromium-bsu/files/patch-NCString.cpp b/games/chromium-bsu/files/patch-NCString.cpp
deleted file mode 100644
index f1c98cd4a8f9..000000000000
--- a/games/chromium-bsu/files/patch-NCString.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/NCString.cpp.orig	Fri Mar 14 19:57:50 2003
-+++ src/NCString.cpp	Fri Mar 14 20:06:44 2003
-@@ -5,6 +5,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <limits.h>
-+#include <stdarg.h>
- 
- /**
-  * ctor
-@@ -1055,7 +1056,7 @@
- uint NCString::toULong(const char *str, bool *ok)
- {
- 	int n;
--	ulong tmp = 0;
-+	unsigned long tmp = 0;
- 	if(str)
- 	{
- 		n = sscanf(str, "%lu", &tmp);
diff --git a/games/chromium-bsu/files/patch-glpng-src-Makefile b/games/chromium-bsu/files/patch-glpng-src-Makefile
deleted file mode 100644
index 2ed9b3ce3d47..000000000000
--- a/games/chromium-bsu/files/patch-glpng-src-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- support/glpng/src/Makefile.orig	Fri Mar 14 20:53:54 2003
-+++ support/glpng/src/Makefile	Fri Mar 14 20:54:26 2003
-@@ -7,10 +7,6 @@
- 
- ####### Compiler, tools and options
- 
--CC	=	gcc
--CXX	=	g++
--CFLAGS	=	-pipe -O2
--CXXFLAGS=	-pipe -O2
- INCPATH	=	-I../include -I/usr/include -I/usr/X11R6/include
- AR	=	ar cqs
- RANLIB	=	
diff --git a/games/chromium-bsu/files/patch-main.cpp b/games/chromium-bsu/files/patch-main.cpp
deleted file mode 100644
index 721801210fe7..000000000000
--- a/games/chromium-bsu/files/patch-main.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/main.cpp.orig	Fri Mar 14 21:01:12 2003
-+++ src/main.cpp	Fri Mar 14 21:01:12 2003
-@@ -109,10 +109,6 @@
- 		}
- 	}
- 	
--#ifdef PKGDATADIR
--	strcpy(dataDir, PKGDATADIR);
--	strcat(dataDir, "/data");
--#else	
- 	char *chromData = getenv("CHROMIUM_DATA");
- 	if(chromData)
- 		strcpy(dataDir, chromData);
-@@ -121,7 +117,7 @@
- 		#ifdef macintosh
- 		strcpy(dataDir, "::data");	
- 		#else
--		strcpy(dataDir, "../data");	
-+		strcpy(dataDir, CHROMIUM_DATA_DIR);	
- 		#endif
- 		fprintf(stderr, "!!\n");
- 		fprintf(stderr, "!! WARNING - CHROMIUM_DATA environment variable is not set!\n");
-@@ -131,7 +127,6 @@
- 		fprintf(stderr, "!! 		  (using %s)\n", dataDir);
- 		fprintf(stderr, "!!\n");
- 	}
--#endif
- 
- 	srand(time(NULL));
- 	
diff --git a/games/chromium-bsu/files/patch-src-AudioOpenAL.cpp b/games/chromium-bsu/files/patch-src-AudioOpenAL.cpp
deleted file mode 100644
index 5965504f08a7..000000000000
--- a/games/chromium-bsu/files/patch-src-AudioOpenAL.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/AudioOpenAL.cpp.orig	Thu Mar 30 15:34:34 2006
-+++ src/AudioOpenAL.cpp	Thu Mar 30 16:32:00 2006
-@@ -153,13 +153,8 @@
- 
- 		checkError("AudioOpenAL::~Audio()");
- 
--		#ifdef _WIN32
- 		if(context_id)
- 			alcDestroyContext((ALCcontext*)context_id);
--		#else
--		if(context_id)
--			alcDestroyContext(context_id);
--		#endif
- 		
- 		fprintf(stderr, "done.\n");
- 	}
-@@ -200,7 +195,7 @@
- 	ALCdevice *dev;
- 	dev = alcOpenDevice( NULL );
- 	context_id = alcCreateContext(dev, NULL);
--	alcMakeContextCurrent(context_id);
-+	alcMakeContextCurrent((ALCcontext*)context_id);
- #endif
- #endif
- 
-@@ -310,7 +305,7 @@
- 				
- 	//-- check AttenuationScale extension
- 	alAttenuationScale = (void (*)(ALfloat param))
--						alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI");
-+						alGetProcAddress((ALchar *)"alAttenuationScale_LOKI");
- 	if(alAttenuationScale == NULL) 
- 		fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n");
- 	else
-@@ -318,9 +313,9 @@
- 	
- 	//-- check Audio Channel extension
- 	alcGetAudioChannel = (float (*)(ALuint channel))
--						alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI");
-+						alGetProcAddress((const ALchar *)"alcGetAudioChannel_LOKI");
- 	alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume))
--						alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI");
-+						alGetProcAddress((const ALchar *)"alcSetAudioChannel_LOKI");
- #ifdef CD_VOLUME
- 	if(alcGetAudioChannel)
- 		origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI);
-@@ -328,10 +323,10 @@
- 	
- 	//-- check MP3 extension
- 	alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint))
--		alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI");
-+		alGetProcAddress((const ALchar *)"alutLoadMP3_LOKI");
- 	//-- check Ogg/Vorbis extension
- 	alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint))
--		alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI");
-+		alGetProcAddress((const ALchar *)"alutLoadVorbis_LOKI");
- 
- #endif //_WIN32
- }
-@@ -471,6 +466,7 @@
- 	ALsizei size, freq, bits;
- 	ALenum format;
- 	ALvoid *data;
-+	ALboolean loop;
- 
- 	for(i = 0; i < NumSoundTypes; i++)
- 	{
-@@ -481,7 +477,7 @@
- 		else
- 		{
- #ifndef _WIN32
--			alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq);
-+			alutLoadWAVFile((ALbyte*)dataLoc(fileNames[i]), &format, &data, &size, &freq, &loop);
- 			alBufferData (buffer[i], format, data, size, freq);
- 			free(data);
- #else //_WIN32
diff --git a/games/chromium-bsu/files/patch-src-MainGLUT.cpp b/games/chromium-bsu/files/patch-src-MainGLUT.cpp
new file mode 100644
index 000000000000..7e9f4e4bb8dc
--- /dev/null
+++ b/games/chromium-bsu/files/patch-src-MainGLUT.cpp
@@ -0,0 +1,13 @@
+--- src/MainGLUT.cpp.orig	2008-03-15 13:42:48.000000000 +0300
++++ src/MainGLUT.cpp	2008-07-11 00:45:02.000000000 +0400
+@@ -5,6 +5,10 @@
+  * it and/or use it and/or modify it under the terms of the 
+  * "Artistic License" 
+  */
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include "MainGLUT.h"
+ 
+ #ifdef USE_GLUT
diff --git a/games/chromium-bsu/files/patch-src-Makefile b/games/chromium-bsu/files/patch-src-Makefile
deleted file mode 100644
index b984ee7513a9..000000000000
--- a/games/chromium-bsu/files/patch-src-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/Makefile.orig	Mon May 21 22:25:50 2001
-+++ src/Makefile	Fri Mar 14 20:56:28 2003
-@@ -8,12 +8,10 @@
- include ../config.mak
- ####### Compiler, tools and options
- 
--CC	=	gcc
--CXX	=	g++
--CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
--CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
-+CFLAGS	+=	$(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -DAUDIO_OPENAL -D_REENTRANT
-+CXXFLAGS+=	$(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -DAUDIO_OPENAL -D_REENTRANT
- INCPATH	=	-I../support/include -I../support/glpng/include -I/usr/X11R6/include
--LINK	=	g++
-+LINK	=	${CXX}
- LFLAGS	=	
- LIBS	=	$(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS)
- MOC	=	$(QTDIR)/bin/moc
diff --git a/games/chromium-bsu/pkg-plist b/games/chromium-bsu/pkg-plist
index e112bf1c25ea..efa6b9f05c70 100644
--- a/games/chromium-bsu/pkg-plist
+++ b/games/chromium-bsu/pkg-plist
@@ -1,93 +1,81 @@
 bin/chromium
-%%DATADIR%%/data/png/check.png
-%%DATADIR%%/data/png/chrome.jpg
-%%DATADIR%%/data/png/darken.png
-%%DATADIR%%/data/png/elect.png
-%%DATADIR%%/data/png/electric.png
-%%DATADIR%%/data/png/enemy00.png
-%%DATADIR%%/data/png/enemy01-extra.png
-%%DATADIR%%/data/png/enemy01-rot.png
-%%DATADIR%%/data/png/enemy01.png
-%%DATADIR%%/data/png/enemy02.png
-%%DATADIR%%/data/png/enemy03-extra.png
-%%DATADIR%%/data/png/enemy03.png
-%%DATADIR%%/data/png/enemy04.png
-%%DATADIR%%/data/png/enemy05.png
-%%DATADIR%%/data/png/enemy06.png
-%%DATADIR%%/data/png/enemyAmmo00.png
-%%DATADIR%%/data/png/enemyAmmo01.png
-%%DATADIR%%/data/png/enemyAmmo02.png
-%%DATADIR%%/data/png/enemyAmmo03.png
-%%DATADIR%%/data/png/enemyAmmo04.png
-%%DATADIR%%/data/png/enemyAmmoExplo00.png
-%%DATADIR%%/data/png/enemyAmmoExplo01.png
-%%DATADIR%%/data/png/enemyAmmoExplo02.png
-%%DATADIR%%/data/png/enemyAmmoExplo03.png
-%%DATADIR%%/data/png/enemyAmmoExplo04.png
-%%DATADIR%%/data/png/enemyExplo.png
-%%DATADIR%%/data/png/explo.png
-%%DATADIR%%/data/png/glitter.png
-%%DATADIR%%/data/png/gndBaseSea.png
-%%DATADIR%%/data/png/gndMetalBase00.png
-%%DATADIR%%/data/png/gndMetalBase01.png
-%%DATADIR%%/data/png/gndMetalBase02.png
-%%DATADIR%%/data/png/gndMetalBlip.png
-%%DATADIR%%/data/png/hero.png
-%%DATADIR%%/data/png/heroAmmo00.png
-%%DATADIR%%/data/png/heroAmmo01.png
-%%DATADIR%%/data/png/heroAmmo02.png
-%%DATADIR%%/data/png/heroAmmoExplo00.png
-%%DATADIR%%/data/png/heroAmmoExplo01.png
-%%DATADIR%%/data/png/heroAmmoExplo02.png
-%%DATADIR%%/data/png/heroExplo00.png
-%%DATADIR%%/data/png/heroAmmoFlash00.png
-%%DATADIR%%/data/png/heroAmmoFlash01.png
-%%DATADIR%%/data/png/heroAmmoFlash02.png
-%%DATADIR%%/data/png/heroExplo01.png
-%%DATADIR%%/data/png/heroExplo02.png
-%%DATADIR%%/data/png/heroShields.png
-%%DATADIR%%/data/png/heroSuper.png
-%%DATADIR%%/data/png/life.png
-%%DATADIR%%/data/png/menu_back.png
-%%DATADIR%%/data/png/powerUpAmmo.png
-%%DATADIR%%/data/png/powerUpShield.png
-%%DATADIR%%/data/png/powerUpTex.png
-%%DATADIR%%/data/png/reflect-blend.png
-%%DATADIR%%/data/png/reflect-gnd.png
-%%DATADIR%%/data/png/reflect.png
-%%DATADIR%%/data/png/shields.png
-%%DATADIR%%/data/png/stat-top.png
-%%DATADIR%%/data/png/statBar.png
-%%DATADIR%%/data/png/superBomb.png
-%%DATADIR%%/data/png/useFocus.png
-%%DATADIR%%/data/png/useItem00.png
-%%DATADIR%%/data/png/useItem01.png
-%%DATADIR%%/data/png/cursor.png
-%%DATADIR%%/data/png/menu_updown.png
-%%DATADIR%%/data/fonts/space.txf
-%%DATADIR%%/data/fonts/space.txf.small
-%%DATADIR%%/data/wav/boom.wav
-%%DATADIR%%/data/wav/exploBig.wav
-%%DATADIR%%/data/wav/exploPop.wav
-%%DATADIR%%/data/wav/exploStd.wav
-%%DATADIR%%/data/wav/life_add.wav
-%%DATADIR%%/data/wav/life_lose.wav
-%%DATADIR%%/data/wav/music_game.wav
-%%DATADIR%%/data/wav/music_menu.wav
-%%DATADIR%%/data/wav/power.wav
-%%PORTDOCS%%%%DOCSDIR%%/info.htm
-%%PORTDOCS%%%%DOCSDIR%%/faq.htm
-%%PORTDOCS%%%%DOCSDIR%%/images/heroAmmo00.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/heroAmmo01.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/heroAmmo02.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/powerUp00.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/powerUp01.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/powerUp02.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/useItem00.jpg
-@dirrm %%DATADIR%%/data/png
-@dirrm %%DATADIR%%/data/fonts
-@dirrm %%DATADIR%%/data/wav
-@dirrm %%DATADIR%%/data
+share/applications/chromium.desktop
+%%DATADIR%%/png/check.png
+%%DATADIR%%/png/chrome.jpg
+%%DATADIR%%/png/cursor.png
+%%DATADIR%%/png/darken.png
+%%DATADIR%%/png/elect.png
+%%DATADIR%%/png/electric.png
+%%DATADIR%%/png/enemy00.png
+%%DATADIR%%/png/enemy01-extra.png
+%%DATADIR%%/png/enemy01-rot.png
+%%DATADIR%%/png/enemy01.png
+%%DATADIR%%/png/enemy02.png
+%%DATADIR%%/png/enemy03-extra.png
+%%DATADIR%%/png/enemy03.png
+%%DATADIR%%/png/enemy04.png
+%%DATADIR%%/png/enemy05.png
+%%DATADIR%%/png/enemy06.png
+%%DATADIR%%/png/enemyAmmo00.png
+%%DATADIR%%/png/enemyAmmo01.png
+%%DATADIR%%/png/enemyAmmo02.png
+%%DATADIR%%/png/enemyAmmo03.png
+%%DATADIR%%/png/enemyAmmo04.png
+%%DATADIR%%/png/enemyAmmoExplo00.png
+%%DATADIR%%/png/enemyAmmoExplo01.png
+%%DATADIR%%/png/enemyAmmoExplo02.png
+%%DATADIR%%/png/enemyAmmoExplo03.png
+%%DATADIR%%/png/enemyAmmoExplo04.png
+%%DATADIR%%/png/enemyExplo.png
+%%DATADIR%%/png/explo.png
+%%DATADIR%%/png/glitter.png
+%%DATADIR%%/png/gndBaseSea.png
+%%DATADIR%%/png/gndMetalBase00.png
+%%DATADIR%%/png/gndMetalBase01.png
+%%DATADIR%%/png/gndMetalBase02.png
+%%DATADIR%%/png/gndMetalBlip.png
+%%DATADIR%%/png/hero.png
+%%DATADIR%%/png/heroAmmo00.png
+%%DATADIR%%/png/heroAmmo01.png
+%%DATADIR%%/png/heroAmmo02.png
+%%DATADIR%%/png/heroAmmoExplo00.png
+%%DATADIR%%/png/heroAmmoExplo01.png
+%%DATADIR%%/png/heroAmmoExplo02.png
+%%DATADIR%%/png/heroAmmoFlash00.png
+%%DATADIR%%/png/heroAmmoFlash01.png
+%%DATADIR%%/png/heroAmmoFlash02.png
+%%DATADIR%%/png/heroExplo00.png
+%%DATADIR%%/png/heroExplo01.png
+%%DATADIR%%/png/heroExplo02.png
+%%DATADIR%%/png/heroShields.png
+%%DATADIR%%/png/heroSuper.png
+%%DATADIR%%/png/life.png
+%%DATADIR%%/png/menu_back.png
+%%DATADIR%%/png/menu_updown.png
+%%DATADIR%%/png/powerUpAmmo.png
+%%DATADIR%%/png/powerUpShield.png
+%%DATADIR%%/png/powerUpTex.png
+%%DATADIR%%/png/reflect-blend.png
+%%DATADIR%%/png/reflect-gnd.png
+%%DATADIR%%/png/reflect.png
+%%DATADIR%%/png/shields.png
+%%DATADIR%%/png/stat-top.png
+%%DATADIR%%/png/statBar.png
+%%DATADIR%%/png/superBomb.png
+%%DATADIR%%/png/useFocus.png
+%%DATADIR%%/png/useItem00.png
+%%DATADIR%%/png/useItem01.png
+%%DATADIR%%/wav/boom.wav
+%%DATADIR%%/wav/exploBig.wav
+%%DATADIR%%/wav/exploPop.wav
+%%DATADIR%%/wav/exploStd.wav
+%%DATADIR%%/wav/life_add.wav
+%%DATADIR%%/wav/life_lose.wav
+%%DATADIR%%/wav/music_game.wav
+%%DATADIR%%/wav/music_menu.wav
+%%DATADIR%%/wav/power.wav
+share/pixmaps/chromium.png
+@dirrm %%DATADIR%%/wav
+@dirrm %%DATADIR%%/png
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/games/chromium-bsu/scripts/configure b/games/chromium-bsu/scripts/configure
deleted file mode 100644
index 71a956abd488..000000000000
--- a/games/chromium-bsu/scripts/configure
+++ /dev/null
@@ -1,32 +0,0 @@
-
-SDL_CONFIG=sdl-config
-SMPEG_CONFIG=smpeg-config
-OPENAL_CONFIG_OPTS="./configure  --enable-sdl --enable-smpeg --enable-vorbis"
-SDL_LIBS="\`\$(SDL_CONFIG) --libs\`"
-SDL_CFLAGS="\`\$(SDL_CONFIG) --cflags\` -DUSE_SDL"
-SMPEG_LIBS="\`\$(SMPEG_CONFIG) --libs\`"
-SMPEG_CFLAGS="\`\$(SMPEG_CONFIG) --cflags\`"
-GL_LIBS="-lglpng -lGL -lGLU -lm"
-AL_LIBS="-L${LOCALBASE}/lib -lopenal -lalut" 
-AL_CFLAGS="-I${LOCALBASE}/include"
-PKG_CFLAGS="-DPKGDATADIR=\\\"$PREFIX/share/chromium\\\""
-
-CONFIGFILE=${WRKSRC}/config.mak
-
-echo "OPENAL_CONFIG_OPTS = $OPENAL_CONFIG_OPTS" > ${CONFIGFILE}
-echo ""                               >> ${CONFIGFILE}
-echo "SDL_CONFIG   = $SDL_CONFIG"     >> ${CONFIGFILE}
-echo "SMPEG_CONFIG = $SMPEG_CONFIG"   >> ${CONFIGFILE}
-echo ""                               >> ${CONFIGFILE}
-echo "AL_CFLAGS    = $AL_CFLAGS"      >> ${CONFIGFILE}
-echo "SDL_CFLAGS   = $SDL_CFLAGS"     >> ${CONFIGFILE}
-echo "SMPEG_CFLAGS = $SMPEG_CFLAGS"   >> ${CONFIGFILE}
-echo "PKG_CFLAGS   = $PKG_CFLAGS"     >> ${CONFIGFILE}
-echo ""                               >> ${CONFIGFILE}
-echo "GL_LIBS      = $GL_LIBS"        >> ${CONFIGFILE}
-echo "AL_LIBS      = $AL_LIBS"        >> ${CONFIGFILE}
-echo "SDL_LIBS     = $SDL_LIBS"       >> ${CONFIGFILE}
-echo "SMPEG_LIBS   = $SMPEG_LIBS"     >> ${CONFIGFILE}
-echo "VORBIS_LIBS  = $VORBIS_LIBS"    >> ${CONFIGFILE}
-
-cp -f ${WRKSRC}/scripts/Makefile.no-setup ${WRKSRC}/Makefile
diff --git a/games/chromium/Makefile b/games/chromium/Makefile
index d4cc0e0d1976..8ec8b3c7ef64 100644
--- a/games/chromium/Makefile
+++ b/games/chromium/Makefile
@@ -6,43 +6,54 @@
 #
 
 PORTNAME=	chromium
-PORTVERSION=	0.9.12
-PORTREVISION=	6
+PORTVERSION=	0.9.13.2
 CATEGORIES=	games
-MASTER_SITES=	http://www.reptilelabour.com/software/files/chromium/ \
-		http://www.amdmi3.ru/distfiles/
-DISTFILES=	${PORTNAME}-src-${PORTVERSION}.tar.gz \
-		${PORTNAME}-data-${PORTVERSION}.tar.gz
+MASTER_SITES=	SF
+MASTER_SITE_SUBDIR=	chromium-bsu
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	An arcade-style, top-scrolling space shooter
 
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
-		smpeg.1:${PORTSDIR}/multimedia/smpeg \
-		openal.0:${PORTSDIR}/audio/openal \
-		alut.1:${PORTSDIR}/audio/freealut
+LIB_DEPENDS=	glpng.1:${PORTSDIR}/graphics/glpng \
+		ftgl.2:${PORTSDIR}/graphics/ftgl \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+
+GNU_CONFIGURE=	yes
+USE_GL=		gl glu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+PORTDOCS=	*
+
+MAN6=		chromium.6
+
+OPTIONS=	SDL_MIXER "Use SDL_mixer instead of openal for audio" off \
+		GLUT	"Use GLUT instead of SDL for video" off
 
-USE_GL=		glu
-USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/Chromium-0.9
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GLUT)
+USE_GL+=	glut
+CONFIGURE_ARGS+=--disable-sdl
+.else
+USE_SDL+=	sdl
+CONFIGURE_ARGS+=--disable-glut
+.endif
+
+.if defined(WITH_SDL_MIXER)
+USE_SDL+=	mixer
+CONFIGURE_ARGS+=--disable-openal
+.else
+LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal \
+		alut.1:${PORTSDIR}/audio/freealut
+CONFIGURE_ARGS+=--disable-sdlmixer
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lopenal|& -lalut|g' \
-			  -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src-setup/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/support/glpng/src/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin
-	${MKDIR} ${DATADIR}/data
-	(cd ${WRKSRC}/data && \
-		${TAR} -c -f - --exclude "*CVS*" --exclude "*xvpics*" png fonts wav) | \
-		(cd ${DATADIR}/data && ${TAR} -x -f - )
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}/data/doc && ${TAR} -c -f - --exclude "*CVS*" *) | \
-		(cd ${DOCSDIR} && ${TAR} -x -f - )
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/SUBDIRS/ s|doc||' ${WRKSRC}/data/Makefile.in
 .endif
+	@${REINPLACE_CMD} -e '/^bindir=.*games/ d; /^datadir=.*games/ d' \
+		${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/chromium/distinfo b/games/chromium/distinfo
index fcce1803a67e..7f94adcea896 100644
--- a/games/chromium/distinfo
+++ b/games/chromium/distinfo
@@ -1,6 +1,3 @@
-MD5 (chromium-src-0.9.12.tar.gz) = 969883f2f20f10cd6cdb380582f130c4
-SHA256 (chromium-src-0.9.12.tar.gz) = a4a2c929dfd462a9281d8c0dae485c70362140e038f532608550f6528b6ab745
-SIZE (chromium-src-0.9.12.tar.gz) = 640283
-MD5 (chromium-data-0.9.12.tar.gz) = 173fdf76f1e4d7496142cd5662456a73
-SHA256 (chromium-data-0.9.12.tar.gz) = 749d10bcedeff7a82701da97701f9d31b4a057dfa84f33e197085ac71975b195
-SIZE (chromium-data-0.9.12.tar.gz) = 1111134
+MD5 (chromium-0.9.13.2.tar.gz) = 47882369584e32ac1243aa514db7be0c
+SHA256 (chromium-0.9.13.2.tar.gz) = 07ad301239205e6c4aabb3601288f07082aeb40da4858103c5aa80a78c19ff5a
+SIZE (chromium-0.9.13.2.tar.gz) = 1494299
diff --git a/games/chromium/files/patch-Makefile.no-setup b/games/chromium/files/patch-Makefile.no-setup
deleted file mode 100644
index c155f9f3c855..000000000000
--- a/games/chromium/files/patch-Makefile.no-setup
+++ /dev/null
@@ -1,8 +0,0 @@
---- scripts/Makefile.no-setup.orig	Fri Mar 14 20:45:01 2003
-+++ scripts/Makefile.no-setup	Fri Mar 14 20:45:07 2003
-@@ -1,5 +1,4 @@
- SUPPORT_DIRS	=	 \
--			./support/openal/ \
- 			./support/glpng/src
- 
- CHROMIUM_DIRS	=	\
diff --git a/games/chromium/files/patch-NCString.cpp b/games/chromium/files/patch-NCString.cpp
deleted file mode 100644
index f1c98cd4a8f9..000000000000
--- a/games/chromium/files/patch-NCString.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/NCString.cpp.orig	Fri Mar 14 19:57:50 2003
-+++ src/NCString.cpp	Fri Mar 14 20:06:44 2003
-@@ -5,6 +5,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <limits.h>
-+#include <stdarg.h>
- 
- /**
-  * ctor
-@@ -1055,7 +1056,7 @@
- uint NCString::toULong(const char *str, bool *ok)
- {
- 	int n;
--	ulong tmp = 0;
-+	unsigned long tmp = 0;
- 	if(str)
- 	{
- 		n = sscanf(str, "%lu", &tmp);
diff --git a/games/chromium/files/patch-glpng-src-Makefile b/games/chromium/files/patch-glpng-src-Makefile
deleted file mode 100644
index 2ed9b3ce3d47..000000000000
--- a/games/chromium/files/patch-glpng-src-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- support/glpng/src/Makefile.orig	Fri Mar 14 20:53:54 2003
-+++ support/glpng/src/Makefile	Fri Mar 14 20:54:26 2003
-@@ -7,10 +7,6 @@
- 
- ####### Compiler, tools and options
- 
--CC	=	gcc
--CXX	=	g++
--CFLAGS	=	-pipe -O2
--CXXFLAGS=	-pipe -O2
- INCPATH	=	-I../include -I/usr/include -I/usr/X11R6/include
- AR	=	ar cqs
- RANLIB	=	
diff --git a/games/chromium/files/patch-main.cpp b/games/chromium/files/patch-main.cpp
deleted file mode 100644
index 721801210fe7..000000000000
--- a/games/chromium/files/patch-main.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/main.cpp.orig	Fri Mar 14 21:01:12 2003
-+++ src/main.cpp	Fri Mar 14 21:01:12 2003
-@@ -109,10 +109,6 @@
- 		}
- 	}
- 	
--#ifdef PKGDATADIR
--	strcpy(dataDir, PKGDATADIR);
--	strcat(dataDir, "/data");
--#else	
- 	char *chromData = getenv("CHROMIUM_DATA");
- 	if(chromData)
- 		strcpy(dataDir, chromData);
-@@ -121,7 +117,7 @@
- 		#ifdef macintosh
- 		strcpy(dataDir, "::data");	
- 		#else
--		strcpy(dataDir, "../data");	
-+		strcpy(dataDir, CHROMIUM_DATA_DIR);	
- 		#endif
- 		fprintf(stderr, "!!\n");
- 		fprintf(stderr, "!! WARNING - CHROMIUM_DATA environment variable is not set!\n");
-@@ -131,7 +127,6 @@
- 		fprintf(stderr, "!! 		  (using %s)\n", dataDir);
- 		fprintf(stderr, "!!\n");
- 	}
--#endif
- 
- 	srand(time(NULL));
- 	
diff --git a/games/chromium/files/patch-src-AudioOpenAL.cpp b/games/chromium/files/patch-src-AudioOpenAL.cpp
deleted file mode 100644
index 5965504f08a7..000000000000
--- a/games/chromium/files/patch-src-AudioOpenAL.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
---- src/AudioOpenAL.cpp.orig	Thu Mar 30 15:34:34 2006
-+++ src/AudioOpenAL.cpp	Thu Mar 30 16:32:00 2006
-@@ -153,13 +153,8 @@
- 
- 		checkError("AudioOpenAL::~Audio()");
- 
--		#ifdef _WIN32
- 		if(context_id)
- 			alcDestroyContext((ALCcontext*)context_id);
--		#else
--		if(context_id)
--			alcDestroyContext(context_id);
--		#endif
- 		
- 		fprintf(stderr, "done.\n");
- 	}
-@@ -200,7 +195,7 @@
- 	ALCdevice *dev;
- 	dev = alcOpenDevice( NULL );
- 	context_id = alcCreateContext(dev, NULL);
--	alcMakeContextCurrent(context_id);
-+	alcMakeContextCurrent((ALCcontext*)context_id);
- #endif
- #endif
- 
-@@ -310,7 +305,7 @@
- 				
- 	//-- check AttenuationScale extension
- 	alAttenuationScale = (void (*)(ALfloat param))
--						alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI");
-+						alGetProcAddress((ALchar *)"alAttenuationScale_LOKI");
- 	if(alAttenuationScale == NULL) 
- 		fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n");
- 	else
-@@ -318,9 +313,9 @@
- 	
- 	//-- check Audio Channel extension
- 	alcGetAudioChannel = (float (*)(ALuint channel))
--						alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI");
-+						alGetProcAddress((const ALchar *)"alcGetAudioChannel_LOKI");
- 	alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume))
--						alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI");
-+						alGetProcAddress((const ALchar *)"alcSetAudioChannel_LOKI");
- #ifdef CD_VOLUME
- 	if(alcGetAudioChannel)
- 		origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI);
-@@ -328,10 +323,10 @@
- 	
- 	//-- check MP3 extension
- 	alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint))
--		alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI");
-+		alGetProcAddress((const ALchar *)"alutLoadMP3_LOKI");
- 	//-- check Ogg/Vorbis extension
- 	alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint))
--		alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI");
-+		alGetProcAddress((const ALchar *)"alutLoadVorbis_LOKI");
- 
- #endif //_WIN32
- }
-@@ -471,6 +466,7 @@
- 	ALsizei size, freq, bits;
- 	ALenum format;
- 	ALvoid *data;
-+	ALboolean loop;
- 
- 	for(i = 0; i < NumSoundTypes; i++)
- 	{
-@@ -481,7 +477,7 @@
- 		else
- 		{
- #ifndef _WIN32
--			alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq);
-+			alutLoadWAVFile((ALbyte*)dataLoc(fileNames[i]), &format, &data, &size, &freq, &loop);
- 			alBufferData (buffer[i], format, data, size, freq);
- 			free(data);
- #else //_WIN32
diff --git a/games/chromium/files/patch-src-MainGLUT.cpp b/games/chromium/files/patch-src-MainGLUT.cpp
new file mode 100644
index 000000000000..7e9f4e4bb8dc
--- /dev/null
+++ b/games/chromium/files/patch-src-MainGLUT.cpp
@@ -0,0 +1,13 @@
+--- src/MainGLUT.cpp.orig	2008-03-15 13:42:48.000000000 +0300
++++ src/MainGLUT.cpp	2008-07-11 00:45:02.000000000 +0400
+@@ -5,6 +5,10 @@
+  * it and/or use it and/or modify it under the terms of the 
+  * "Artistic License" 
+  */
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include "MainGLUT.h"
+ 
+ #ifdef USE_GLUT
diff --git a/games/chromium/files/patch-src-Makefile b/games/chromium/files/patch-src-Makefile
deleted file mode 100644
index b984ee7513a9..000000000000
--- a/games/chromium/files/patch-src-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/Makefile.orig	Mon May 21 22:25:50 2001
-+++ src/Makefile	Fri Mar 14 20:56:28 2003
-@@ -8,12 +8,10 @@
- include ../config.mak
- ####### Compiler, tools and options
- 
--CC	=	gcc
--CXX	=	g++
--CFLAGS	=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
--CXXFLAGS=	-pipe $(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -O2 -DOLD_OPENAL -DAUDIO_OPENAL -D_REENTRANT
-+CFLAGS	+=	$(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -DAUDIO_OPENAL -D_REENTRANT
-+CXXFLAGS+=	$(PKG_CFLAGS) $(AL_CFLAGS) $(SDL_CFLAGS) $(SMPEG_CFLAGS) -DAUDIO_OPENAL -D_REENTRANT
- INCPATH	=	-I../support/include -I../support/glpng/include -I/usr/X11R6/include
--LINK	=	g++
-+LINK	=	${CXX}
- LFLAGS	=	
- LIBS	=	$(SUBLIBS) -L../support/glpng/lib -L/usr/lib -L/usr/X11R6/lib -L/usr/local/lib $(GL_LIBS) $(AL_LIBS) $(SDL_LIBS) $(SMPEG_LIBS) $(VORBIS_LIBS)
- MOC	=	$(QTDIR)/bin/moc
diff --git a/games/chromium/pkg-plist b/games/chromium/pkg-plist
index e112bf1c25ea..efa6b9f05c70 100644
--- a/games/chromium/pkg-plist
+++ b/games/chromium/pkg-plist
@@ -1,93 +1,81 @@
 bin/chromium
-%%DATADIR%%/data/png/check.png
-%%DATADIR%%/data/png/chrome.jpg
-%%DATADIR%%/data/png/darken.png
-%%DATADIR%%/data/png/elect.png
-%%DATADIR%%/data/png/electric.png
-%%DATADIR%%/data/png/enemy00.png
-%%DATADIR%%/data/png/enemy01-extra.png
-%%DATADIR%%/data/png/enemy01-rot.png
-%%DATADIR%%/data/png/enemy01.png
-%%DATADIR%%/data/png/enemy02.png
-%%DATADIR%%/data/png/enemy03-extra.png
-%%DATADIR%%/data/png/enemy03.png
-%%DATADIR%%/data/png/enemy04.png
-%%DATADIR%%/data/png/enemy05.png
-%%DATADIR%%/data/png/enemy06.png
-%%DATADIR%%/data/png/enemyAmmo00.png
-%%DATADIR%%/data/png/enemyAmmo01.png
-%%DATADIR%%/data/png/enemyAmmo02.png
-%%DATADIR%%/data/png/enemyAmmo03.png
-%%DATADIR%%/data/png/enemyAmmo04.png
-%%DATADIR%%/data/png/enemyAmmoExplo00.png
-%%DATADIR%%/data/png/enemyAmmoExplo01.png
-%%DATADIR%%/data/png/enemyAmmoExplo02.png
-%%DATADIR%%/data/png/enemyAmmoExplo03.png
-%%DATADIR%%/data/png/enemyAmmoExplo04.png
-%%DATADIR%%/data/png/enemyExplo.png
-%%DATADIR%%/data/png/explo.png
-%%DATADIR%%/data/png/glitter.png
-%%DATADIR%%/data/png/gndBaseSea.png
-%%DATADIR%%/data/png/gndMetalBase00.png
-%%DATADIR%%/data/png/gndMetalBase01.png
-%%DATADIR%%/data/png/gndMetalBase02.png
-%%DATADIR%%/data/png/gndMetalBlip.png
-%%DATADIR%%/data/png/hero.png
-%%DATADIR%%/data/png/heroAmmo00.png
-%%DATADIR%%/data/png/heroAmmo01.png
-%%DATADIR%%/data/png/heroAmmo02.png
-%%DATADIR%%/data/png/heroAmmoExplo00.png
-%%DATADIR%%/data/png/heroAmmoExplo01.png
-%%DATADIR%%/data/png/heroAmmoExplo02.png
-%%DATADIR%%/data/png/heroExplo00.png
-%%DATADIR%%/data/png/heroAmmoFlash00.png
-%%DATADIR%%/data/png/heroAmmoFlash01.png
-%%DATADIR%%/data/png/heroAmmoFlash02.png
-%%DATADIR%%/data/png/heroExplo01.png
-%%DATADIR%%/data/png/heroExplo02.png
-%%DATADIR%%/data/png/heroShields.png
-%%DATADIR%%/data/png/heroSuper.png
-%%DATADIR%%/data/png/life.png
-%%DATADIR%%/data/png/menu_back.png
-%%DATADIR%%/data/png/powerUpAmmo.png
-%%DATADIR%%/data/png/powerUpShield.png
-%%DATADIR%%/data/png/powerUpTex.png
-%%DATADIR%%/data/png/reflect-blend.png
-%%DATADIR%%/data/png/reflect-gnd.png
-%%DATADIR%%/data/png/reflect.png
-%%DATADIR%%/data/png/shields.png
-%%DATADIR%%/data/png/stat-top.png
-%%DATADIR%%/data/png/statBar.png
-%%DATADIR%%/data/png/superBomb.png
-%%DATADIR%%/data/png/useFocus.png
-%%DATADIR%%/data/png/useItem00.png
-%%DATADIR%%/data/png/useItem01.png
-%%DATADIR%%/data/png/cursor.png
-%%DATADIR%%/data/png/menu_updown.png
-%%DATADIR%%/data/fonts/space.txf
-%%DATADIR%%/data/fonts/space.txf.small
-%%DATADIR%%/data/wav/boom.wav
-%%DATADIR%%/data/wav/exploBig.wav
-%%DATADIR%%/data/wav/exploPop.wav
-%%DATADIR%%/data/wav/exploStd.wav
-%%DATADIR%%/data/wav/life_add.wav
-%%DATADIR%%/data/wav/life_lose.wav
-%%DATADIR%%/data/wav/music_game.wav
-%%DATADIR%%/data/wav/music_menu.wav
-%%DATADIR%%/data/wav/power.wav
-%%PORTDOCS%%%%DOCSDIR%%/info.htm
-%%PORTDOCS%%%%DOCSDIR%%/faq.htm
-%%PORTDOCS%%%%DOCSDIR%%/images/heroAmmo00.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/heroAmmo01.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/heroAmmo02.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/powerUp00.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/powerUp01.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/powerUp02.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/useItem00.jpg
-@dirrm %%DATADIR%%/data/png
-@dirrm %%DATADIR%%/data/fonts
-@dirrm %%DATADIR%%/data/wav
-@dirrm %%DATADIR%%/data
+share/applications/chromium.desktop
+%%DATADIR%%/png/check.png
+%%DATADIR%%/png/chrome.jpg
+%%DATADIR%%/png/cursor.png
+%%DATADIR%%/png/darken.png
+%%DATADIR%%/png/elect.png
+%%DATADIR%%/png/electric.png
+%%DATADIR%%/png/enemy00.png
+%%DATADIR%%/png/enemy01-extra.png
+%%DATADIR%%/png/enemy01-rot.png
+%%DATADIR%%/png/enemy01.png
+%%DATADIR%%/png/enemy02.png
+%%DATADIR%%/png/enemy03-extra.png
+%%DATADIR%%/png/enemy03.png
+%%DATADIR%%/png/enemy04.png
+%%DATADIR%%/png/enemy05.png
+%%DATADIR%%/png/enemy06.png
+%%DATADIR%%/png/enemyAmmo00.png
+%%DATADIR%%/png/enemyAmmo01.png
+%%DATADIR%%/png/enemyAmmo02.png
+%%DATADIR%%/png/enemyAmmo03.png
+%%DATADIR%%/png/enemyAmmo04.png
+%%DATADIR%%/png/enemyAmmoExplo00.png
+%%DATADIR%%/png/enemyAmmoExplo01.png
+%%DATADIR%%/png/enemyAmmoExplo02.png
+%%DATADIR%%/png/enemyAmmoExplo03.png
+%%DATADIR%%/png/enemyAmmoExplo04.png
+%%DATADIR%%/png/enemyExplo.png
+%%DATADIR%%/png/explo.png
+%%DATADIR%%/png/glitter.png
+%%DATADIR%%/png/gndBaseSea.png
+%%DATADIR%%/png/gndMetalBase00.png
+%%DATADIR%%/png/gndMetalBase01.png
+%%DATADIR%%/png/gndMetalBase02.png
+%%DATADIR%%/png/gndMetalBlip.png
+%%DATADIR%%/png/hero.png
+%%DATADIR%%/png/heroAmmo00.png
+%%DATADIR%%/png/heroAmmo01.png
+%%DATADIR%%/png/heroAmmo02.png
+%%DATADIR%%/png/heroAmmoExplo00.png
+%%DATADIR%%/png/heroAmmoExplo01.png
+%%DATADIR%%/png/heroAmmoExplo02.png
+%%DATADIR%%/png/heroAmmoFlash00.png
+%%DATADIR%%/png/heroAmmoFlash01.png
+%%DATADIR%%/png/heroAmmoFlash02.png
+%%DATADIR%%/png/heroExplo00.png
+%%DATADIR%%/png/heroExplo01.png
+%%DATADIR%%/png/heroExplo02.png
+%%DATADIR%%/png/heroShields.png
+%%DATADIR%%/png/heroSuper.png
+%%DATADIR%%/png/life.png
+%%DATADIR%%/png/menu_back.png
+%%DATADIR%%/png/menu_updown.png
+%%DATADIR%%/png/powerUpAmmo.png
+%%DATADIR%%/png/powerUpShield.png
+%%DATADIR%%/png/powerUpTex.png
+%%DATADIR%%/png/reflect-blend.png
+%%DATADIR%%/png/reflect-gnd.png
+%%DATADIR%%/png/reflect.png
+%%DATADIR%%/png/shields.png
+%%DATADIR%%/png/stat-top.png
+%%DATADIR%%/png/statBar.png
+%%DATADIR%%/png/superBomb.png
+%%DATADIR%%/png/useFocus.png
+%%DATADIR%%/png/useItem00.png
+%%DATADIR%%/png/useItem01.png
+%%DATADIR%%/wav/boom.wav
+%%DATADIR%%/wav/exploBig.wav
+%%DATADIR%%/wav/exploPop.wav
+%%DATADIR%%/wav/exploStd.wav
+%%DATADIR%%/wav/life_add.wav
+%%DATADIR%%/wav/life_lose.wav
+%%DATADIR%%/wav/music_game.wav
+%%DATADIR%%/wav/music_menu.wav
+%%DATADIR%%/wav/power.wav
+share/pixmaps/chromium.png
+@dirrm %%DATADIR%%/wav
+@dirrm %%DATADIR%%/png
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/games/chromium/scripts/configure b/games/chromium/scripts/configure
deleted file mode 100644
index 71a956abd488..000000000000
--- a/games/chromium/scripts/configure
+++ /dev/null
@@ -1,32 +0,0 @@
-
-SDL_CONFIG=sdl-config
-SMPEG_CONFIG=smpeg-config
-OPENAL_CONFIG_OPTS="./configure  --enable-sdl --enable-smpeg --enable-vorbis"
-SDL_LIBS="\`\$(SDL_CONFIG) --libs\`"
-SDL_CFLAGS="\`\$(SDL_CONFIG) --cflags\` -DUSE_SDL"
-SMPEG_LIBS="\`\$(SMPEG_CONFIG) --libs\`"
-SMPEG_CFLAGS="\`\$(SMPEG_CONFIG) --cflags\`"
-GL_LIBS="-lglpng -lGL -lGLU -lm"
-AL_LIBS="-L${LOCALBASE}/lib -lopenal -lalut" 
-AL_CFLAGS="-I${LOCALBASE}/include"
-PKG_CFLAGS="-DPKGDATADIR=\\\"$PREFIX/share/chromium\\\""
-
-CONFIGFILE=${WRKSRC}/config.mak
-
-echo "OPENAL_CONFIG_OPTS = $OPENAL_CONFIG_OPTS" > ${CONFIGFILE}
-echo ""                               >> ${CONFIGFILE}
-echo "SDL_CONFIG   = $SDL_CONFIG"     >> ${CONFIGFILE}
-echo "SMPEG_CONFIG = $SMPEG_CONFIG"   >> ${CONFIGFILE}
-echo ""                               >> ${CONFIGFILE}
-echo "AL_CFLAGS    = $AL_CFLAGS"      >> ${CONFIGFILE}
-echo "SDL_CFLAGS   = $SDL_CFLAGS"     >> ${CONFIGFILE}
-echo "SMPEG_CFLAGS = $SMPEG_CFLAGS"   >> ${CONFIGFILE}
-echo "PKG_CFLAGS   = $PKG_CFLAGS"     >> ${CONFIGFILE}
-echo ""                               >> ${CONFIGFILE}
-echo "GL_LIBS      = $GL_LIBS"        >> ${CONFIGFILE}
-echo "AL_LIBS      = $AL_LIBS"        >> ${CONFIGFILE}
-echo "SDL_LIBS     = $SDL_LIBS"       >> ${CONFIGFILE}
-echo "SMPEG_LIBS   = $SMPEG_LIBS"     >> ${CONFIGFILE}
-echo "VORBIS_LIBS  = $VORBIS_LIBS"    >> ${CONFIGFILE}
-
-cp -f ${WRKSRC}/scripts/Makefile.no-setup ${WRKSRC}/Makefile