4 files changed, 101 insertions, 114 deletions

diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile
index be3329774f22..2bcca6cce288 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	briquolo
-PORTVERSION=	0.5.6
-PORTREVISION=	3
+PORTVERSION=	0.5.7
 CATEGORIES=	games
 MASTER_SITES=	http://briquolo.free.fr/download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Breakout clone with an OpenGL 3D representation
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
@@ -20,19 +19,17 @@ USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GL=		gl
 USE_SDL=	mixer sdl ttf
-USE_GCC=	3.4+
 USE_GMAKE=	yes
+USE_GNOME=	desktopfileutils
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-
 #.if defined(WITHOUT_NLS)
+#BROKEN=	"Unsupported: wants to link against libintl anyway"
 #CONFIGURE_ARGS+=	--disable-nls
 #PLIST_SUB+=	NLS="@comment "
 #.else
@@ -40,12 +37,10 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 #.endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O3||g' ${WRKSRC}/configure
-	@${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
-		's|SDL/SDL|SDL|g'
-
 pre-install:
 	${MKDIR} ${PREFIX}/share/applications
 
+post-install:
+	@-update-desktop-database
+
 .include <bsd.port.mk>
diff --git a/games/briquolo/distinfo b/games/briquolo/distinfo
index 6657f952ac1a..bda35292e2b3 100644
--- a/games/briquolo/distinfo
+++ b/games/briquolo/distinfo
@@ -1,3 +1,3 @@
-MD5 (briquolo-0.5.6.tar.bz2) = 0c6767a4073a6ae7de298f06b81dcb10
-SHA256 (briquolo-0.5.6.tar.bz2) = e1166a0f0db4b99601dadd47062b239a1a3b9ac7dc996ea582dd8f211e113d9e
-SIZE (briquolo-0.5.6.tar.bz2) = 2559600
+MD5 (briquolo-0.5.7.tar.bz2) = e24d22d2d719d64c231d3d76f9291d6e
+SHA256 (briquolo-0.5.7.tar.bz2) = 061055dba524a784d6569fd74f3e4490db264da1356b53d68aae5523416f8f11
+SIZE (briquolo-0.5.7.tar.bz2) = 2588084
diff --git a/games/briquolo/files/patch-src-MOGL-MOGL_GenerateurParticule.h b/games/briquolo/files/patch-src-MOGL-MOGL_GenerateurParticule.h
deleted file mode 100644
index 4ed6115dab3a..000000000000
--- a/games/briquolo/files/patch-src-MOGL-MOGL_GenerateurParticule.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/MOGL/MOGL_GenerateurParticule.h.orig	Sun Oct 19 19:40:24 2003
-+++ src/MOGL/MOGL_GenerateurParticule.h	Sun Oct 19 19:40:54 2003
-@@ -22,6 +22,7 @@
- #ifndef MOGL_GENERATEURPARTICULE
- #define MOGL_GENERATEURPARTICULE
- 
-+#include <sys/types.h>
- #include <list>
- #include <sys/timeb.h>
- 
diff --git a/games/briquolo/pkg-plist b/games/briquolo/pkg-plist
index def4df1b6c0b..c4f6082dc085 100644
--- a/games/briquolo/pkg-plist
+++ b/games/briquolo/pkg-plist
@@ -1,102 +1,108 @@
 bin/briquolo
+share/applications/briquolo.desktop
 %%DATADIR%%/%%VERSION%%
-%%DATADIR%%/data/DejaVuSans.ttf
-%%DATADIR%%/data/Environment.1.png
-%%DATADIR%%/data/Environment.2.png
-%%DATADIR%%/data/Environment.3.png
-%%DATADIR%%/data/Environment.4.png
-%%DATADIR%%/data/Environment.5.png
-%%DATADIR%%/data/Environment.6.png
+%%DATADIR%%/data/brique_rebond.wav
+%%DATADIR%%/data/petite_brique.png
+%%DATADIR%%/data/brique.tri
+%%DATADIR%%/data/bonus_slow.tri
+%%DATADIR%%/data/bonus_grosplateau.png
+%%DATADIR%%/data/Shine2.bmp
+%%DATADIR%%/data/explosion2.wav
+%%DATADIR%%/data/plateau.png
 %%DATADIR%%/data/Flare1.bmp
+%%DATADIR%%/data/pierre.png
+%%DATADIR%%/data/flip.tri
+%%DATADIR%%/data/vie.ftx
+%%DATADIR%%/data/fast.png
+%%DATADIR%%/data/superpuissance.png
+%%DATADIR%%/data/breche.wav
 %%DATADIR%%/data/Flare1.png
-%%DATADIR%%/data/Flare2.bmp
-%%DATADIR%%/data/Flare3.bmp
-%%DATADIR%%/data/Flare4.bmp
-%%DATADIR%%/data/Shine1.bmp
-%%DATADIR%%/data/Shine1.png
-%%DATADIR%%/data/Shine2.bmp
-%%DATADIR%%/data/balle.png
-%%DATADIR%%/data/balle.tri
-%%DATADIR%%/data/blend.tri
-%%DATADIR%%/data/bois.png
-%%DATADIR%%/data/bonus.tri
-%%DATADIR%%/data/bonus.wav
-%%DATADIR%%/data/bonus_doubleballe.tri
-%%DATADIR%%/data/bonus_fast.tri
-%%DATADIR%%/data/bonus_gros.tri
-%%DATADIR%%/data/bonus_grosplateau.png
-%%DATADIR%%/data/bonus_grosplateau.tri
-%%DATADIR%%/data/bonus_petit.tri
+%%DATADIR%%/data/env.tri
 %%DATADIR%%/data/bonus_petitplateau.png
-%%DATADIR%%/data/bonus_petitplateau.tri
-%%DATADIR%%/data/bonus_slow.tri
-%%DATADIR%%/data/bonus_superpuissance.tri
-%%DATADIR%%/data/bonus_vuesubjective.tri
-%%DATADIR%%/data/bot_land.wav
-%%DATADIR%%/data/breche.png
-%%DATADIR%%/data/breche.wav
-%%DATADIR%%/data/brique.png
-%%DATADIR%%/data/brique.tri
-%%DATADIR%%/data/brique_breche.tri
-%%DATADIR%%/data/brique_deuxcoups.png
-%%DATADIR%%/data/brique_deuxcoups.tri
-%%DATADIR%%/data/brique_incassable.png
-%%DATADIR%%/data/brique_incassable.tri
-%%DATADIR%%/data/brique_rebond.wav
-%%DATADIR%%/data/double.png
 %%DATADIR%%/data/eau2.png
-%%DATADIR%%/data/env.tri
-%%DATADIR%%/data/explosion2.wav
-%%DATADIR%%/data/fast.png
-%%DATADIR%%/data/flame.png
-%%DATADIR%%/data/flare.bmp
 %%DATADIR%%/data/flip.png
-%%DATADIR%%/data/flip.tri
 %%DATADIR%%/data/grille.png
-%%DATADIR%%/data/gros.png
+%%DATADIR%%/data/bonus_petitplateau.tri
+%%DATADIR%%/data/tableau.tri
+%%DATADIR%%/data/flare.bmp
+%%DATADIR%%/data/plateau_droite.tri
+%%DATADIR%%/data/bonus_vuesubjective.tri
+%%DATADIR%%/data/brique.png
 %%DATADIR%%/data/herbe.png
-%%DATADIR%%/data/imageplateau.png
-%%DATADIR%%/data/mur1.png
-%%DATADIR%%/data/petit.png
-%%DATADIR%%/data/petite_brique.png
+%%DATADIR%%/data/breche.png
+%%DATADIR%%/data/superpuissance.wav
+%%DATADIR%%/data/bonus_grosplateau.tri
+%%DATADIR%%/data/bonus_doubleballe.tri
 %%DATADIR%%/data/petite_brique.tri
-%%DATADIR%%/data/pierre.png
-%%DATADIR%%/data/plateau.png
-%%DATADIR%%/data/plateau_droite.tri
+%%DATADIR%%/data/Environment.1.png
+%%DATADIR%%/data/gros.png
+%%DATADIR%%/data/Environment.6.png
+%%DATADIR%%/data/DejaVuSans.ttf
+%%DATADIR%%/data/bonus_fast.tri
+%%DATADIR%%/data/bois.png
+%%DATADIR%%/data/flame.png
+%%DATADIR%%/data/blend.tri
+%%DATADIR%%/data/vuesubjective.png
+%%DATADIR%%/data/Flare4.bmp
+%%DATADIR%%/data/Flare3.bmp
+%%DATADIR%%/data/Environment.5.png
+%%DATADIR%%/data/Environment.2.png
+%%DATADIR%%/data/mur1.png
+%%DATADIR%%/data/slow.png
+%%DATADIR%%/data/brique_deuxcoups.tri
+%%DATADIR%%/data/imageplateau.png
 %%DATADIR%%/data/plateau_gauche.tri
+%%DATADIR%%/data/brique_incassable.tri
+%%DATADIR%%/data/balle.tri
+%%DATADIR%%/data/Environment.3.png
+%%DATADIR%%/data/brique_incassable.png
+%%DATADIR%%/data/bot_land.wav
+%%DATADIR%%/data/Environment.4.png
+%%DATADIR%%/data/bonus_gros.tri
+%%DATADIR%%/data/balle.png
+%%DATADIR%%/data/Flare2.bmp
+%%DATADIR%%/data/bonus.wav
+%%DATADIR%%/data/petit.png
+%%DATADIR%%/data/bonus_petit.tri
+%%DATADIR%%/data/brique_deuxcoups.png
 %%DATADIR%%/data/plateau_milieu.tri
+%%DATADIR%%/data/bonus.tri
+%%DATADIR%%/data/double.png
+%%DATADIR%%/data/brique_breche.tri
+%%DATADIR%%/data/Shine1.png
+%%DATADIR%%/data/Shine1.bmp
 %%DATADIR%%/data/rebond.wav
-%%DATADIR%%/data/slow.png
-%%DATADIR%%/data/superpuissance.png
-%%DATADIR%%/data/superpuissance.wav
-%%DATADIR%%/data/tableau.tri
-%%DATADIR%%/data/vie.ftx
-%%DATADIR%%/data/vuesubjective.png
-%%DATADIR%%/tableau/new/001.tab
-%%DATADIR%%/tableau/new/002.tab
-%%DATADIR%%/tableau/new/003.tab
-%%DATADIR%%/tableau/new/004.tab
-%%DATADIR%%/tableau/new/005.tab
-%%DATADIR%%/tableau/new/006.tab
-%%DATADIR%%/tableau/new/007.tab
-%%DATADIR%%/tableau/new/description
-%%DATADIR%%/tableau/old/001.tab
-%%DATADIR%%/tableau/old/002.tab
-%%DATADIR%%/tableau/old/003.tab
-%%DATADIR%%/tableau/old/004.tab
-%%DATADIR%%/tableau/old/005.tab
+%%DATADIR%%/data/bonus_superpuissance.tri
+%%DATADIR%%/tableau/old/010.tab
+%%DATADIR%%/tableau/old/description
+%%DATADIR%%/tableau/old/008.tab
 %%DATADIR%%/tableau/old/006.tab
+%%DATADIR%%/tableau/old/001.tab
+%%DATADIR%%/tableau/old/016.tab
+%%DATADIR%%/tableau/old/011.tab
 %%DATADIR%%/tableau/old/007.tab
-%%DATADIR%%/tableau/old/008.tab
 %%DATADIR%%/tableau/old/009.tab
-%%DATADIR%%/tableau/old/010.tab
-%%DATADIR%%/tableau/old/011.tab
+%%DATADIR%%/tableau/old/004.tab
+%%DATADIR%%/tableau/old/003.tab
 %%DATADIR%%/tableau/old/012.tab
-%%DATADIR%%/tableau/old/013.tab
-%%DATADIR%%/tableau/old/014.tab
 %%DATADIR%%/tableau/old/015.tab
-%%DATADIR%%/tableau/old/016.tab
-%%DATADIR%%/tableau/old/description
+%%DATADIR%%/tableau/old/002.tab
+%%DATADIR%%/tableau/old/005.tab
+%%DATADIR%%/tableau/old/014.tab
+%%DATADIR%%/tableau/old/013.tab
+%%DATADIR%%/tableau/new/005.tab
+%%DATADIR%%/tableau/new/002.tab
+%%DATADIR%%/tableau/new/003.tab
+%%DATADIR%%/tableau/new/004.tab
+%%DATADIR%%/tableau/new/007.tab
+%%DATADIR%%/tableau/new/description
+%%DATADIR%%/tableau/new/001.tab
+%%DATADIR%%/tableau/new/006.tab
+@dirrm %%DATADIR%%/tableau/old
+@dirrm %%DATADIR%%/tableau/new
+@dirrm %%DATADIR%%/tableau
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
 share/pixmaps/briquolo.svg
 %%NLS%%share/locale/fr/LC_MESSAGES/briquolo.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/briquolo.mo
@@ -107,10 +113,6 @@ share/pixmaps/briquolo.svg
 %%NLS%%share/locale/pl/LC_MESSAGES/briquolo.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/briquolo.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/briquolo.mo
-@dirrm %%DATADIR%%/tableau/old
-@dirrm %%DATADIR%%/tableau/new
-@dirrm %%DATADIR%%/tableau
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%
-share/applications/briquolo.desktop
-%%NLS%%@dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/applications