Update to version 0.6.5

PR: 42036
Submitted by:	 MAINTAINER

3 files changed, 30 insertions, 15 deletions

diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index 37f1f8b..eaf3f7d 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -7,26 +7,33 @@
 #
 
 PORTNAME=	gl-117
-PORTVERSION=	0.6
+PORTVERSION=	0.6.5
 CATEGORIES=	games
-MASTER_SITES=	http://home.t-online.de/home/Primetime./gl-117/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12 \
-		SDL_mixer:${PORTSDIR}/audio/sdl_mixer
+LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
+		SDL-1.1.4:${PORTSDIR}/devel/sdl12
+
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
-USE_REINPLACE=	yes
 USE_MESA=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut -lstdc++"
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+CPPFLAGS=	`${SDL_CONFIG} --cflags` -I${X11BASE}/include
+LDFLAGS=	`${SDL_CONFIG} --libs` -L${X11BASE}/lib
 
 post-patch:
-.for file in configure src/audio.h src/main.h src/net.h
-	@${REINPLACE_CMD} -e "s|SDL/|SDL11/|g" -e "s|-lSDL |-lSDL-1.1 |g" \
-		-e "s|-lSDLmain|-lSDLmain-1.1|g" ${WRKSRC}/${file}
+.for file in configure src/audio.h src/glland.h src/main.h src/net.h
+	@${REINPLACE_CMD} -e 's|^CPPFLAGS="-D|CPPFLAGS="\$$CPPFLAGS -D|g ; \
+		 s|SDL/||g ; \
+		 s|-lSDL |-lSDL-1.1 |g ; \
+		 s|-lSDLmain|-lSDLmain-1.1|g' ${WRKSRC}/${file}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/gl-117/distinfo b/games/gl-117/distinfo
index 880271d..a52b8dd 100644
--- a/games/gl-117/distinfo
+++ b/games/gl-117/distinfo
@@ -1 +1 @@
-MD5 (gl-117-0.6.tar.gz) = 5248f8c6dfcf1a1c4ff4990a4d90c976
+MD5 (gl-117-0.6.5.tar.gz) = 882a70b0ddcbd8b4e9f0e220860f6ca3
diff --git a/games/gl-117/pkg-plist b/games/gl-117/pkg-plist
index d936d6b..30c4b47 100644
--- a/games/gl-117/pkg-plist
+++ b/games/gl-117/pkg-plist
@@ -1,4 +1,6 @@
 bin/gl-117
+share/gl-117/models/aster1.3ds
+share/gl-117/models/base1.3ds
 share/gl-117/models/cannon1.3ds
 share/gl-117/models/cannon2.3ds
 share/gl-117/models/container1.3ds
@@ -47,6 +49,8 @@ share/gl-117/sounds/hit1.wav
 share/gl-117/sounds/missile1.wav
 share/gl-117/sounds/plane1.wav
 share/gl-117/sounds/thunder1.wav
+share/gl-117/textures/aster1_n.tga
+share/gl-117/textures/base1_no.tga
 share/gl-117/textures/cactus1.tga
 share/gl-117/textures/cross.tga
 share/gl-117/textures/cross2.tga
@@ -55,11 +59,15 @@ share/gl-117/textures/fig1_fra.tga
 share/gl-117/textures/fig2_fra.tga
 share/gl-117/textures/fig3_fra.tga
 share/gl-117/textures/fig4_fra.tga
+share/gl-117/textures/fig5_fra.tga
 share/gl-117/textures/fig6_fra.tga
 share/gl-117/textures/fig7_fra.tga
 share/gl-117/textures/fig8_noi.tga
 share/gl-117/textures/fig9_noi.tga
 share/gl-117/textures/flare1.tga
+share/gl-117/textures/flare2.tga
+share/gl-117/textures/flare3.tga
+share/gl-117/textures/flare4.tga
 share/gl-117/textures/font1.tga
 share/gl-117/textures/font2.tga
 share/gl-117/textures/gl-117_c.tga
@@ -86,8 +94,8 @@ share/gl-117/textures/tree4.tga
 share/gl-117/textures/walls_co.tga
 share/gl-117/textures/water1.tga
 share/gl-117/textures/water2.tga
-@dirrm share/gl-117/models
-@dirrm share/gl-117/music
-@dirrm share/gl-117/sounds
 @dirrm share/gl-117/textures
+@dirrm share/gl-117/sounds
+@dirrm share/gl-117/music
+@dirrm share/gl-117/models
 @dirrm share/gl-117