4 files changed, 121 insertions, 185 deletions

diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile
index f004e001b457..1001aa9e3e88 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -6,32 +6,33 @@
 #
 
 PORTNAME=	briquolo
-PORTVERSION=	0.4.2
-PORTREVISION=	2
+PORTVERSION=	0.5
 CATEGORIES=	games
 MASTER_SITES=	http://briquolo.free.fr/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Breakout clone with an OpenGL 3D representation
 
-LIB_DEPENDS=	GUI.0:${PORTSDIR}/graphics/guilib \
-		png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
+USE_SDL=	mixer sdl
+USE_GCC=	3.4
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-USE_SDL=	mixer sdl
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+PLIST_SUB=	VERSION="${PORTVERSION}"
 
-.include <bsd.port.pre.mk>
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} \
-		${REINPLACE_CMD} -e 's|SDL/|SDL11/|g'
-	@${FIND} ${WRKSRC} -name "*.h" | ${XARGS} \
-		${REINPLACE_CMD} -e 's|SDL/|SDL11/|g'
+	@${REINPLACE_CMD} -e 's|="-Wall"|="$$CXXFLAGS"|g ; \
+		 s|-O3||g' ${WRKSRC}/configure
+	@${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|SDL/SDL|SDL|g'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/briquolo/distinfo b/games/briquolo/distinfo
index 33549c0bc87b..723aac9a7229 100644
--- a/games/briquolo/distinfo
+++ b/games/briquolo/distinfo
@@ -1,2 +1,2 @@
-MD5 (briquolo-0.4.2.tar.bz2) = 20924c27dd77f4d7308f0aaad0129197
-SIZE (briquolo-0.4.2.tar.bz2) = 1990288
+MD5 (briquolo-0.5.tar.bz2) = 43489dd256d0b91d6efe0fd6defb3c7f
+SIZE (briquolo-0.5.tar.bz2) = 2495042
diff --git a/games/briquolo/files/patch-src-MOGL-MOGL_Signal.h b/games/briquolo/files/patch-src-MOGL-MOGL_Signal.h
deleted file mode 100644
index 3458664d455d..000000000000
--- a/games/briquolo/files/patch-src-MOGL-MOGL_Signal.h
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/MOGL/MOGL_Signal.h.orig	Sat Sep 18 07:21:08 2004
-+++ src/MOGL/MOGL_Signal.h	Sat Sep 18 07:27:15 2004
-@@ -169,13 +169,13 @@
-                  */
-                 MOGL_Connexion(TypeClasse * p_Objet, TypeMethode p_Methode)
-                 {
--                  _Objet=p_Objet;
-+                  this->_Objet=p_Objet;
-                   _Methode=p_Methode;
-                 }
-                 
-                 void Emettre(TypeParam1 p_Param1)
-                 {
--                  (static_cast<TypeClasse*>(_Objet)->*_Methode)(p_Param1);
-+                  (static_cast<TypeClasse*>(this->_Objet)->*_Methode)(p_Param1);
-                 }
- 
-                 MOGL_ConnexionBaseBase *  Dupliquer(MOGL_Action * p_NouvelObjet)
-@@ -264,13 +264,13 @@
-                  */
-                 MOGL_Connexion(TypeClasse * p_Objet, TypeMethode p_Methode)
-                 {
--                  _Objet=p_Objet;
-+                  this->_Objet=p_Objet;
-                   _Methode=p_Methode;
-                 }
-                 
-                 void Emettre(TypeParam1 p_Param1, TypeParam2 p_Param2)
-                 {
--                  (static_cast<TypeClasse*>(_Objet)->*_Methode)(p_Param1, p_Param2);
-+                  (static_cast<TypeClasse*>(this->_Objet)->*_Methode)(p_Param1, p_Param2);
-                 }
- 
-                 MOGL_ConnexionBaseBase *  Dupliquer(MOGL_Action * p_NouvelObjet)
-@@ -359,13 +359,13 @@
-                  */
-                 MOGL_Connexion(TypeClasse * p_Objet, TypeMethode p_Methode)
-                 {
--                  _Objet=p_Objet;
-+                  this->_Objet=p_Objet;
-                   _Methode=p_Methode;
-                 }
-                 
-                 void Emettre(TypeParam1 p_Param1, TypeParam2 p_Param2, TypeParam3 p_Param3)
-                 {
--                  (static_cast<TypeClasse*>(_Objet)->*_Methode)(p_Param1, p_Param2, p_Param3);
-+                  (static_cast<TypeClasse*>(this->_Objet)->*_Methode)(p_Param1, p_Param2, p_Param3);
-                 }
- 
-                 MOGL_ConnexionBaseBase *  Dupliquer(MOGL_Action * p_NouvelObjet)
-@@ -454,13 +454,13 @@
-                  */
-                 MOGL_Connexion(TypeClasse * p_Objet, TypeMethode p_Methode)
-                 {
--                  _Objet=p_Objet;
-+                  this->_Objet=p_Objet;
-                   _Methode=p_Methode;
-                 }
-                 
-                 void Emettre(TypeParam1 p_Param1, TypeParam2 p_Param2, TypeParam3 p_Param3, TypeParam4 p_Param4)
-                 {
--                  (static_cast<TypeClasse*>(_Objet)->*_Methode)(p_Param1, p_Param2, p_Param3, p_Param4);
-+                  (static_cast<TypeClasse*>(this->_Objet)->*_Methode)(p_Param1, p_Param2, p_Param3, p_Param4);
-                 }
- 
-                 MOGL_ConnexionBaseBase *  Dupliquer(MOGL_Action * p_NouvelObjet)
-@@ -549,13 +549,13 @@
-                  */
-                 MOGL_Connexion(TypeClasse * p_Objet, TypeMethode p_Methode)
-                 {
--                  _Objet=p_Objet;
-+                  this->_Objet=p_Objet;
-                   _Methode=p_Methode;
-                 }
-                 
-                 void Emettre(TypeParam1 p_Param1, TypeParam2 p_Param2, TypeParam3 p_Param3, TypeParam4 p_Param4, TypeParam5 p_Param5)
-                 {
--                  (static_cast<TypeClasse*>(_Objet)->*_Methode)(p_Param1, p_Param2, p_Param3, p_Param4, p_Param5);
-+                  (static_cast<TypeClasse*>(this->_Objet)->*_Methode)(p_Param1, p_Param2, p_Param3, p_Param4, p_Param5);
-                 }
- 
-                 MOGL_ConnexionBaseBase *  Dupliquer(MOGL_Action * p_NouvelObjet)
diff --git a/games/briquolo/pkg-plist b/games/briquolo/pkg-plist
index f07d08f3cb2f..40ba1a4e3d57 100644
--- a/games/briquolo/pkg-plist
+++ b/games/briquolo/pkg-plist
@@ -1,90 +1,107 @@
 bin/briquolo
-share/briquolo/0.4.2
-share/briquolo/data/Environment.1.png
-share/briquolo/data/Environment.2.png
-share/briquolo/data/Environment.3.png
-share/briquolo/data/Environment.4.png
-share/briquolo/data/Environment.5.png
-share/briquolo/data/Environment.6.png
-share/briquolo/data/Flare1.bmp
-share/briquolo/data/Flare1.png
-share/briquolo/data/Flare2.bmp
-share/briquolo/data/Flare3.bmp
-share/briquolo/data/Flare4.bmp
-share/briquolo/data/Shine1.bmp
-share/briquolo/data/Shine1.png
-share/briquolo/data/Shine2.bmp
-share/briquolo/data/balle.png
-share/briquolo/data/balle.tri
-share/briquolo/data/bois.png
-share/briquolo/data/bonus.wav
-share/briquolo/data/bonus_doubleballe.tri
-share/briquolo/data/bonus_fast.tri
-share/briquolo/data/bonus_gros.tri
-share/briquolo/data/bonus_grosplateau.png
-share/briquolo/data/bonus_grosplateau.tri
-share/briquolo/data/bonus_petit.tri
-share/briquolo/data/bonus_petitplateau.png
-share/briquolo/data/bonus_petitplateau.tri
-share/briquolo/data/bonus_slow.tri
-share/briquolo/data/bonus_superpuissance.tri
-share/briquolo/data/bonus_vuesubjective.tri
-share/briquolo/data/breche.png
-share/briquolo/data/breche.wav
-share/briquolo/data/brique.png
-share/briquolo/data/brique.tri
-share/briquolo/data/brique_breche.tri
-share/briquolo/data/brique_deuxcoups.png
-share/briquolo/data/brique_deuxcoups.tri
-share/briquolo/data/brique_incassable.png
-share/briquolo/data/brique_incassable.tri
-share/briquolo/data/brique_rebond.wav
-share/briquolo/data/double.png
-share/briquolo/data/eau2.png
-share/briquolo/data/env.tri
-share/briquolo/data/explosion2.wav
-share/briquolo/data/fast.png
-share/briquolo/data/flare.bmp
-share/briquolo/data/grille.png
-share/briquolo/data/gros.png
-share/briquolo/data/herbe.png
-share/briquolo/data/imageplateau.png
-share/briquolo/data/mur1.png
-share/briquolo/data/petit.png
-share/briquolo/data/petite_brique.png
-share/briquolo/data/petite_brique.tri
-share/briquolo/data/petite_police.ftx
-share/briquolo/data/pierre.png
-share/briquolo/data/plateau.png
-share/briquolo/data/plateau_droite.tri
-share/briquolo/data/plateau_gauche.tri
-share/briquolo/data/plateau_milieu.tri
-share/briquolo/data/police.ftx
-share/briquolo/data/rebond.wav
-share/briquolo/data/slow.png
-share/briquolo/data/superpuissance.png
-share/briquolo/data/superpuissance.wav
-share/briquolo/data/tableau.tri
-share/briquolo/data/vie.ftx
-share/briquolo/data/vuesubjective.png
-share/briquolo/tableau/001.tab
-share/briquolo/tableau/002.tab
-share/briquolo/tableau/003.tab
-share/briquolo/tableau/004.tab
-share/briquolo/tableau/005.tab
-share/briquolo/tableau/006.tab
-share/briquolo/tableau/007.tab
-share/briquolo/tableau/008.tab
-share/briquolo/tableau/009.tab
-share/briquolo/tableau/010.tab
-share/briquolo/tableau/011.tab
-share/briquolo/tableau/012.tab
-share/briquolo/tableau/013.tab
-share/briquolo/tableau/014.tab
-share/briquolo/tableau/015.tab
-share/briquolo/tableau/016.tab
+%%DATADIR%%/%%VERSION%%
+%%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/Flare1.bmp
+%%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/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/herbe.png
+%%DATADIR%%/data/imageplateau.png
+%%DATADIR%%/data/mur1.png
+%%DATADIR%%/data/petit.png
+%%DATADIR%%/data/petite_brique.png
+%%DATADIR%%/data/petite_brique.tri
+%%DATADIR%%/data/petite_police.ftx
+%%DATADIR%%/data/pierre.png
+%%DATADIR%%/data/plateau.png
+%%DATADIR%%/data/plateau_droite.tri
+%%DATADIR%%/data/plateau_gauche.tri
+%%DATADIR%%/data/plateau_milieu.tri
+%%DATADIR%%/data/police.ftx
+%%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%%/tableau/old/006.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/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
 share/locale/fr/LC_MESSAGES/briquolo.mo
 share/locale/nl/LC_MESSAGES/briquolo.mo
-@dirrm share/briquolo/data
-@dirrm share/briquolo/tableau
-@dirrm share/briquolo
+@dirrm %%DATADIR%%/tableau/old
+@dirrm %%DATADIR%%/tableau/new
+@dirrm %%DATADIR%%/tableau
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%