[Maintainer Update] games/gl-117 0.9 -> 1.0

	reshmeat blurb:
	This release adds three more missions to the campaign. It
	provides more realistic physics (optional), a new fighter,
	some visual improvements, and adjustments concerning almost
	everything. Some important bugfixes have been made.

PR:		ports/55931
Submitted by:	Erik Greenwald <erik@smluc.org>

5 files changed, 304 insertions, 33 deletions

diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index aa6d7898bed8..2f5475e4f6b9 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -7,38 +7,23 @@
 #
 
 PORTNAME=	gl-117
-PORTVERSION=	0.9
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	erik@smluc.org
 COMMENT=	An OpenGL & SDL action flight simulator
 
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer\
-		glut.3:${PORTSDIR}/graphics/Mesa3
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
+LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 
+WRKSRC=		${WRKDIR}/${DISTNAME}-src
+USE_SDL=	yes
 USE_MESA=	yes
-USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-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/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
-	@cd ${WRKSRC}/src \
-		&& ${MV} loader_tga.cpp loader_tga.cpp.bak \
-		&& ${TR} -d '\015' < loader_tga.cpp.bak > loader_tga.cpp
-		@${REINPLACE_CMD} -e 's!"SDL/!"SDL11/!g' ${WRKSRC}/src/common.h
+CONFIGURE_ARGS=	--x-include=${X11BASE}/include \
+		--x-libraries=${X11BASE}/lib \
+		--with-opengl-dir=${X11BASE}
 
 .include <bsd.port.mk>
diff --git a/games/gl-117/distinfo b/games/gl-117/distinfo
index 52c1644a1ce2..8b709c4714c1 100644
--- a/games/gl-117/distinfo
+++ b/games/gl-117/distinfo
@@ -1 +1 @@
-MD5 (gl-117-0.9.tar.gz) = 5038d2a4e26e0ac8cac195644dc16111
+MD5 (gl-117-1.0-src.tar.gz) = 65e85024396341c1e99018b24b2339fa
diff --git a/games/gl-117/files/patch-configure b/games/gl-117/files/patch-configure
new file mode 100644
index 000000000000..bcb67501feb0
--- /dev/null
+++ b/games/gl-117/files/patch-configure
@@ -0,0 +1,240 @@
+--- configure.orig	Fri Aug 22 08:07:20 2003
++++ configure	Sun Aug 24 12:25:25 2003
+@@ -5602,7 +5602,7 @@
+  path=""
+  for tmp in /usr/local /usr/X11R6 /usr $with_sdl_dir
+  do
+-  if test -f $tmp/include/SDL/SDL.h ; then
++  if test -f $tmp/include/SDL11/SDL.h ; then
+    path=$tmp
+   fi
+  done
+@@ -5612,8 +5612,8 @@
+  else
+   echo "$as_me:$LINENO: result: $path" >&5
+ echo "${ECHO_T}$path" >&6
+-  CPPFLAGS="$CPPFLAGS -I$path/include"
+-  CXXFLAGS="$CXXFLAGS -I$path/include"
++  CPPFLAGS="$CPPFLAGS -I$path/include/SDL11"
++  CXXFLAGS="$CXXFLAGS -I$path/include/SDL11"
+   LIBS="$LIBS -L$path/lib"
+  fi
+ 
+@@ -6280,8 +6280,8 @@
+ 
+ 
+ if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for SDL/SDL.h" >&5
+-echo $ECHO_N "checking for SDL/SDL.h... $ECHO_C" >&6
++  echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5
++echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6
+ if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+@@ -6289,8 +6289,8 @@
+ echo "${ECHO_T}$ac_cv_header_SDL_SDL_h" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking SDL/SDL.h usability" >&5
+-echo $ECHO_N "checking SDL/SDL.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking SDL11/SDL.h usability" >&5
++echo $ECHO_N "checking SDL11/SDL.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -6299,7 +6299,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -6325,8 +6325,8 @@
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking SDL/SDL.h presence" >&5
+-echo $ECHO_N "checking SDL/SDL.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking SDL11/SDL.h presence" >&5
++echo $ECHO_N "checking SDL11/SDL.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -6334,7 +6334,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -6367,10 +6367,10 @@
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+   yes:no )
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: SDL/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -6381,12 +6381,12 @@
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+   no:yes )
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: SDL/SDL.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: SDL/SDL.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: SDL11/SDL.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: SDL11/SDL.h: check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -6397,8 +6397,8 @@
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for SDL/SDL.h" >&5
+-echo $ECHO_N "checking for SDL/SDL.h... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5
++echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6
+ if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -6420,8 +6420,8 @@
+ 
+ 
+ if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
+-echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
++  echo "$as_me:$LINENO: checking for SDL11/SDL_mixer.h" >&5
++echo $ECHO_N "checking for SDL11/SDL_mixer.h... $ECHO_C" >&6
+ if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+@@ -6429,8 +6429,8 @@
+ echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking SDL/SDL_mixer.h usability" >&5
+-echo $ECHO_N "checking SDL/SDL_mixer.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking SDL11/SDL_mixer.h usability" >&5
++echo $ECHO_N "checking SDL11/SDL_mixer.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -6439,7 +6439,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <SDL/SDL_mixer.h>
++#include <SDL11/SDL_mixer.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -6465,8 +6465,8 @@
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking SDL/SDL_mixer.h presence" >&5
+-echo $ECHO_N "checking SDL/SDL_mixer.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking SDL11/SDL_mixer.h presence" >&5
++echo $ECHO_N "checking SDL11/SDL_mixer.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -6474,7 +6474,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <SDL/SDL_mixer.h>
++#include <SDL11/SDL_mixer.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -6507,10 +6507,10 @@
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+   yes:no )
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: SDL11/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -6521,12 +6521,12 @@
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+   no:yes )
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: SDL11/SDL_mixer.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: SDL11/SDL_mixer.h: check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -6537,8 +6537,8 @@
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
+-echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for SDL11/SDL_mixer.h" >&5
++echo $ECHO_N "checking for SDL11/SDL_mixer.h... $ECHO_C" >&6
+ if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -6743,13 +6743,13 @@
+ echo "$as_me: WARNING: GLUT not found - please install GLUT or MesaGLUT" >&2;}
+ fi
+ 
+-echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
+-echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for SDL_Init in -lSDL-1.1" >&5
++echo $ECHO_N "checking for SDL_Init in -lSDL-1.1... $ECHO_C" >&6
+ if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lSDL -lpthread $LIBS"
++LIBS="-lSDL-1.1 -pthread $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -6798,7 +6798,7 @@
+ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5
+ echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6
+ if test $ac_cv_lib_SDL_SDL_Init = yes; then
+-  LIBS="$LIBS -lSDL -lSDLmain"
++  LIBS="$LIBS -lSDL-1.1 -lSDLmain-1.1"
+ else
+   { echo "$as_me:$LINENO: WARNING: SDL not found - please install SDL" >&5
+ echo "$as_me: WARNING: SDL not found - please install SDL" >&2;}
diff --git a/games/gl-117/files/patch-src_common.h b/games/gl-117/files/patch-src_common.h
new file mode 100644
index 000000000000..c1941bb6e3d0
--- /dev/null
+++ b/games/gl-117/files/patch-src_common.h
@@ -0,0 +1,38 @@
+--- src/common.h.orig	Fri Aug 22 06:07:09 2003
++++ src/common.h	Thu Sep  4 05:31:40 2003
+@@ -22,13 +22,13 @@
+ // APPLE path is different (thanks Minami)

+ #ifdef __APPLE__

+ #include <GLUT/glut.h>

+-#include "SDL/SDL.h"

+-#include "SDL/SDL_thread.h"

++#include "SDL.h"

++#include "SDL_thread.h"

+ #ifdef HAVE_SDL_MIXER

+-#include "SDL/SDL_mixer.h"

++#include "SDL_mixer.h"

+ #endif

+ #ifdef HAVE_SDL_NET

+-#include "SDL/SDL_net.h"

++#include "SDL_net.h"

+ #endif

+ #endif

+ #ifndef __APPLE__

+@@ -36,13 +36,13 @@
+ #include <GL/glut.h>

+ #else

+ #include <GL/glut.h>

+-#include "SDL/SDL.h"

+-#include "SDL/SDL_thread.h"

++#include "SDL.h"

++#include "SDL_thread.h"

+ #ifdef HAVE_SDL_MIXER

+-#include "SDL/SDL_mixer.h"

++#include "SDL_mixer.h"

+ #endif

+ #ifdef HAVE_SDL_NET

+-#include "SDL/SDL_net.h"

++#include "SDL_net.h"

+ #endif

+ #endif

+ #endif // __APPLE__

diff --git a/games/gl-117/pkg-plist b/games/gl-117/pkg-plist
index 64d816531300..fc396fa2fc6b 100644
--- a/games/gl-117/pkg-plist
+++ b/games/gl-117/pkg-plist
@@ -6,6 +6,7 @@ share/gl-117/models/cannon1.3ds
 share/gl-117/models/cannon2.3ds
 share/gl-117/models/chaff1.3ds
 share/gl-117/models/container1.3ds
+share/gl-117/models/depot1.3ds
 share/gl-117/models/egg.3ds
 share/gl-117/models/fig1.3ds
 share/gl-117/models/fig2.3ds
@@ -25,11 +26,11 @@ share/gl-117/models/gl-14b.3ds
 share/gl-117/models/gl-14c.3ds
 share/gl-117/models/gl-14d.3ds
 share/gl-117/models/gl-15.3ds
-share/gl-117/models/gl-15e.3ds
 share/gl-117/models/gl-16.3ds
 share/gl-117/models/gl-21.3ds
 share/gl-117/models/gl-21b.3ds
 share/gl-117/models/gl-29.3ds
+share/gl-117/models/gl-50.3ds
 share/gl-117/models/hall1.3ds
 share/gl-117/models/hall2.3ds
 share/gl-117/models/mine1.3ds
@@ -45,14 +46,18 @@ share/gl-117/models/oilrig.3ds
 share/gl-117/models/pickup1.3ds
 share/gl-117/models/pickup2.3ds
 share/gl-117/models/radar.3ds
+share/gl-117/models/rubble.3ds
 share/gl-117/models/ship1.3ds
 share/gl-117/models/ship2.3ds
 share/gl-117/models/tank1.3ds
 share/gl-117/models/tank2.3ds
 share/gl-117/models/tent1.3ds
 share/gl-117/models/tent4.3ds
-share/gl-117/models/transp1.3ds
+share/gl-117/models/transp2.3ds
+share/gl-117/models/transp4.3ds
+share/gl-117/models/trsam.3ds
 share/gl-117/models/truck1.3ds
+share/gl-117/models/truck2.3ds
 share/gl-117/music/ambient.s3m
 share/gl-117/music/dark.s3m
 share/gl-117/music/electro.s3m
@@ -83,6 +88,7 @@ share/gl-117/textures/clouds2.tga
 share/gl-117/textures/clouds3.tga
 share/gl-117/textures/cross.tga
 share/gl-117/textures/cross2.tga
+share/gl-117/textures/depot_fr.tga
 share/gl-117/textures/earth.tga
 share/gl-117/textures/egg_chec.tga
 share/gl-117/textures/flare1.tga
@@ -101,11 +107,12 @@ share/gl-117/textures/gl-16_ch.tga
 share/gl-117/textures/gl-21_ch.tga
 share/gl-117/textures/gl-21b_c.tga
 share/gl-117/textures/gl-29_ch.tga
+share/gl-117/textures/gl-50_ch.tga
 share/gl-117/textures/glitter.tga
 share/gl-117/textures/grass1.tga
 share/gl-117/textures/gravel1.tga
-share/gl-117/textures/hall1_ch.tga
-share/gl-117/textures/hall2_ch.tga
+share/gl-117/textures/hall1b_g.tga
+share/gl-117/textures/hall2b_c.tga
 share/gl-117/textures/medals.tga
 share/gl-117/textures/moon1.tga
 share/gl-117/textures/oilrig_c.tga
@@ -119,15 +126,16 @@ share/gl-117/textures/redsand1.tga
 share/gl-117/textures/redstone2.tga
 share/gl-117/textures/rocks1.tga
 share/gl-117/textures/sand1.tga
-share/gl-117/textures/ship1_fr.tga
 share/gl-117/textures/ship2_fr.tga
+share/gl-117/textures/ship_fra.tga
 share/gl-117/textures/smoke1.tga
 share/gl-117/textures/smoke2.tga
 share/gl-117/textures/smoke3.tga
 share/gl-117/textures/sun2.tga
 share/gl-117/textures/tent1_no.tga
 share/gl-117/textures/tent4_fr.tga
-share/gl-117/textures/transp1_.tga
+share/gl-117/textures/transp2_.tga
+share/gl-117/textures/transp4_.tga
 share/gl-117/textures/tree1.tga
 share/gl-117/textures/tree2.tga
 share/gl-117/textures/tree3.tga
@@ -137,8 +145,8 @@ share/gl-117/textures/treeu2.tga
 share/gl-117/textures/treeu3.tga
 share/gl-117/textures/treeu4.tga
 share/gl-117/textures/water1.tga
-@dirrm share/gl-117/textures
-@dirrm share/gl-117/sounds
-@dirrm share/gl-117/music
 @dirrm share/gl-117/models
+@dirrm share/gl-117/music
+@dirrm share/gl-117/sounds
+@dirrm share/gl-117/textures
 @dirrm share/gl-117