Attachment #34418 for bug #55931

View | Details | Raw Unified | Return to bug 55931
Collapse All | Expand All




#

PORTNAME=	gl-117
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

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

.include <bsd.port.mk>

Line 1 Link Here

(-)games/gl-117/distinfo (-1 / +1 lines)
1	MD5 (gl-117-0.9.tar.gz) = 5038d2a4e26e0ac8cac195644dc16111	1	MD5 (gl-117-1.0-src.tar.gz) = 65e85024396341c1e99018b24b2339fa




--- 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;}




--- src/common.h.orig	Sun Aug 24 12:13:07 2003
+++ src/common.h	Sun Aug 24 12:13:24 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__




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

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

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/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

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

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/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

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/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

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

Return to bug 55931

Lines 7-44 Link Here

(-)games/gl-117/Makefile (-23 / +5 lines)
7	#	7	#
8		8
9	PORTNAME= gl-117	9	PORTNAME= gl-117
10	PORTVERSION= 0.9	10	PORTVERSION= 1.0
11	CATEGORIES= games	11	CATEGORIES= games
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
		14	EXTRACT_SUFX= -src.tar.gz
14		15
15	MAINTAINER= erik@smluc.org	16	MAINTAINER= erik@smluc.org
16	COMMENT= An OpenGL & SDL action flight simulator	17	COMMENT= An OpenGL & SDL action flight simulator
17		18
18	LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer\	19	LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
19	glut.3:${PORTSDIR}/graphics/Mesa3
20
21	SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
22		20
		21	WRKSRC= ${WRKDIR}/${DISTNAME}-src
		22	USE_SDL= yes
23	USE_MESA= yes	23	USE_MESA= yes
24	USE_REINPLACE= yes
25	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
26	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
28
29	CPPFLAGS= `${SDL_CONFIG} --cflags` -I${X11BASE}/include
30	LDFLAGS= `${SDL_CONFIG} --libs` -L${X11BASE}/lib
31
32	post-patch:
33	.for file in configure src/audio.h src/glland.h src/main.h src/net.h
34	@${REINPLACE_CMD} -e 's\|^CPPFLAGS="-D\|CPPFLAGS="\$$CPPFLAGS -D\|g ; \
35	s\|SDL/\|\|g ; \
36	s\|-lSDL \|-lSDL-1.1 \|g ; \
37	s\|-lSDLmain\|-lSDLmain-1.1\|g' ${WRKSRC}/${file}
38	.endfor
39	@cd ${WRKSRC}/src \
40	&& ${MV} loader_tga.cpp loader_tga.cpp.bak \
41	&& ${TR} -d '\015' < loader_tga.cpp.bak > loader_tga.cpp
42	@${REINPLACE_CMD} -e 's!"SDL/!"SDL11/!g' ${WRKSRC}/src/common.h
43		25
44	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Line 0 Link Here

(-)games/gl-117/files/patch-configure (+240 lines)
		1	--- configure.orig Fri Aug 22 08:07:20 2003
		2	+++ configure Sun Aug 24 12:25:25 2003
		3	@@ -5602,7 +5602,7 @@
		4	path=""
		5	for tmp in /usr/local /usr/X11R6 /usr $with_sdl_dir
		6	do
		7	- if test -f $tmp/include/SDL/SDL.h ; then
		8	+ if test -f $tmp/include/SDL11/SDL.h ; then
		9	path=$tmp
		10	fi
		11	done
		12	@@ -5612,8 +5612,8 @@
		13	else
		14	echo "$as_me:$LINENO: result: $path" >&5
		15	echo "${ECHO_T}$path" >&6
		16	- CPPFLAGS="$CPPFLAGS -I$path/include"
		17	- CXXFLAGS="$CXXFLAGS -I$path/include"
		18	+ CPPFLAGS="$CPPFLAGS -I$path/include/SDL11"
		19	+ CXXFLAGS="$CXXFLAGS -I$path/include/SDL11"
		20	LIBS="$LIBS -L$path/lib"
		21	fi
		22
		23	@@ -6280,8 +6280,8 @@
		24
		25
		26	if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
		27	- echo "$as_me:$LINENO: checking for SDL/SDL.h" >&5
		28	-echo $ECHO_N "checking for SDL/SDL.h... $ECHO_C" >&6
		29	+ echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5
		30	+echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6
		31	if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
		32	echo $ECHO_N "(cached) $ECHO_C" >&6
		33	fi
		34	@@ -6289,8 +6289,8 @@
		35	echo "${ECHO_T}$ac_cv_header_SDL_SDL_h" >&6
		36	else
		37	# Is the header compilable?
		38	-echo "$as_me:$LINENO: checking SDL/SDL.h usability" >&5
		39	-echo $ECHO_N "checking SDL/SDL.h usability... $ECHO_C" >&6
		40	+echo "$as_me:$LINENO: checking SDL11/SDL.h usability" >&5
		41	+echo $ECHO_N "checking SDL11/SDL.h usability... $ECHO_C" >&6
		42	cat >conftest.$ac_ext <<_ACEOF
		43	#line $LINENO "configure"
		44	/* confdefs.h. */
		45	@@ -6299,7 +6299,7 @@
		46	cat >>conftest.$ac_ext <<_ACEOF
		47	/* end confdefs.h. */
		48	$ac_includes_default
		49	-#include <SDL/SDL.h>
		50	+#include <SDL11/SDL.h>
		51	_ACEOF
		52	rm -f conftest.$ac_objext
		53	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
		54	@@ -6325,8 +6325,8 @@
		55	echo "${ECHO_T}$ac_header_compiler" >&6
		56
		57	# Is the header present?
		58	-echo "$as_me:$LINENO: checking SDL/SDL.h presence" >&5
		59	-echo $ECHO_N "checking SDL/SDL.h presence... $ECHO_C" >&6
		60	+echo "$as_me:$LINENO: checking SDL11/SDL.h presence" >&5
		61	+echo $ECHO_N "checking SDL11/SDL.h presence... $ECHO_C" >&6
		62	cat >conftest.$ac_ext <<_ACEOF
		63	#line $LINENO "configure"
		64	/* confdefs.h. */
65	@@ -6334,7 +6334,7 @@
66	cat confdefs.h >>conftest.$ac_ext
67	cat >>conftest.$ac_ext <<_ACEOF
68	/* end confdefs.h. */
69	-#include <SDL/SDL.h>
70	+#include <SDL11/SDL.h>
71	_ACEOF
72	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
73	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
74	@@ -6367,10 +6367,10 @@
75	# So? What about this header?
76	case $ac_header_compiler:$ac_header_preproc in
77	yes:no )
78	- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5
79	-echo "$as_me: WARNING: SDL/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
80	- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&5
81	-echo "$as_me: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&2;}
82	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&5
83	+echo "$as_me: WARNING: SDL11/SDL.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
84	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&5
85	+echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&2;}
86	(
87	cat <<\_ASBOX
88	## ------------------------------------ ##
89	@@ -6381,12 +6381,12 @@
90	sed "s/^/$as_me: WARNING: /" >&2
91	;;
92	no:yes )
93	- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: present but cannot be compiled" >&5
94	-echo "$as_me: WARNING: SDL/SDL.h: present but cannot be compiled" >&2;}
95	- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: check for missing prerequisite headers?" >&5
96	-echo "$as_me: WARNING: SDL/SDL.h: check for missing prerequisite headers?" >&2;}
97	- { echo "$as_me:$LINENO: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&5
98	-echo "$as_me: WARNING: SDL/SDL.h: proceeding with the preprocessor's result" >&2;}
99	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: present but cannot be compiled" >&5
100	+echo "$as_me: WARNING: SDL11/SDL.h: present but cannot be compiled" >&2;}
101	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: check for missing prerequisite headers?" >&5
102	+echo "$as_me: WARNING: SDL11/SDL.h: check for missing prerequisite headers?" >&2;}
103	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&5
104	+echo "$as_me: WARNING: SDL11/SDL.h: proceeding with the preprocessor's result" >&2;}
105	(
106	cat <<\_ASBOX
107	## ------------------------------------ ##
108	@@ -6397,8 +6397,8 @@
109	sed "s/^/$as_me: WARNING: /" >&2
110	;;
111	esac
112	-echo "$as_me:$LINENO: checking for SDL/SDL.h" >&5
113	-echo $ECHO_N "checking for SDL/SDL.h... $ECHO_C" >&6
114	+echo "$as_me:$LINENO: checking for SDL11/SDL.h" >&5
115	+echo $ECHO_N "checking for SDL11/SDL.h... $ECHO_C" >&6
116	if test "${ac_cv_header_SDL_SDL_h+set}" = set; then
117	echo $ECHO_N "(cached) $ECHO_C" >&6
118	else
119	@@ -6420,8 +6420,8 @@
120
121
122	if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
123	- echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
124	-echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
125	+ echo "$as_me:$LINENO: checking for SDL11/SDL_mixer.h" >&5
126	+echo $ECHO_N "checking for SDL11/SDL_mixer.h... $ECHO_C" >&6
127	if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
128	echo $ECHO_N "(cached) $ECHO_C" >&6
129	fi
130	@@ -6429,8 +6429,8 @@
131	echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6
132	else
133	# Is the header compilable?
134	-echo "$as_me:$LINENO: checking SDL/SDL_mixer.h usability" >&5
135	-echo $ECHO_N "checking SDL/SDL_mixer.h usability... $ECHO_C" >&6
136	+echo "$as_me:$LINENO: checking SDL11/SDL_mixer.h usability" >&5
137	+echo $ECHO_N "checking SDL11/SDL_mixer.h usability... $ECHO_C" >&6
138	cat >conftest.$ac_ext <<_ACEOF
139	#line $LINENO "configure"
140	/* confdefs.h. */
141	@@ -6439,7 +6439,7 @@
142	cat >>conftest.$ac_ext <<_ACEOF
143	/* end confdefs.h. */
144	$ac_includes_default
145	-#include <SDL/SDL_mixer.h>
146	+#include <SDL11/SDL_mixer.h>
147	_ACEOF
148	rm -f conftest.$ac_objext
149	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
150	@@ -6465,8 +6465,8 @@
151	echo "${ECHO_T}$ac_header_compiler" >&6
152
153	# Is the header present?
154	-echo "$as_me:$LINENO: checking SDL/SDL_mixer.h presence" >&5
155	-echo $ECHO_N "checking SDL/SDL_mixer.h presence... $ECHO_C" >&6
156	+echo "$as_me:$LINENO: checking SDL11/SDL_mixer.h presence" >&5
157	+echo $ECHO_N "checking SDL11/SDL_mixer.h presence... $ECHO_C" >&6
158	cat >conftest.$ac_ext <<_ACEOF
159	#line $LINENO "configure"
160	/* confdefs.h. */
161	@@ -6474,7 +6474,7 @@
162	cat confdefs.h >>conftest.$ac_ext
163	cat >>conftest.$ac_ext <<_ACEOF
164	/* end confdefs.h. */
165	-#include <SDL/SDL_mixer.h>
166	+#include <SDL11/SDL_mixer.h>
167	_ACEOF
168	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
169	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
170	@@ -6507,10 +6507,10 @@
171	# So? What about this header?
172	case $ac_header_compiler:$ac_header_preproc in
173	yes:no )
174	- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5
175	-echo "$as_me: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
176	- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
177	-echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
178	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5
179	+echo "$as_me: WARNING: SDL11/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
180	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&5
181	+echo "$as_me: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
182	(
183	cat <<\_ASBOX
184	## ------------------------------------ ##
185	@@ -6521,12 +6521,12 @@
186	sed "s/^/$as_me: WARNING: /" >&2
187	;;
188	no:yes )
189	- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&5
190	-echo "$as_me: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&2;}
191	- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&5
192	-echo "$as_me: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&2;}
193	- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
194	-echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
195	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: present but cannot be compiled" >&5
196	+echo "$as_me: WARNING: SDL11/SDL_mixer.h: present but cannot be compiled" >&2;}
197	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: check for missing prerequisite headers?" >&5
198	+echo "$as_me: WARNING: SDL11/SDL_mixer.h: check for missing prerequisite headers?" >&2;}
199	+ { echo "$as_me:$LINENO: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&5
200	+echo "$as_me: WARNING: SDL11/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
201	(
202	cat <<\_ASBOX
203	## ------------------------------------ ##
204	@@ -6537,8 +6537,8 @@
205	sed "s/^/$as_me: WARNING: /" >&2
206	;;
207	esac
208	-echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
209	-echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
210	+echo "$as_me:$LINENO: checking for SDL11/SDL_mixer.h" >&5
211	+echo $ECHO_N "checking for SDL11/SDL_mixer.h... $ECHO_C" >&6
212	if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
213	echo $ECHO_N "(cached) $ECHO_C" >&6
214	else
215	@@ -6743,13 +6743,13 @@
216	echo "$as_me: WARNING: GLUT not found - please install GLUT or MesaGLUT" >&2;}
217	fi
218
219	-echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
220	-echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6
221	+echo "$as_me:$LINENO: checking for SDL_Init in -lSDL-1.1" >&5
222	+echo $ECHO_N "checking for SDL_Init in -lSDL-1.1... $ECHO_C" >&6
223	if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then
224	echo $ECHO_N "(cached) $ECHO_C" >&6
225	else
226	ac_check_lib_save_LIBS=$LIBS
227	-LIBS="-lSDL -lpthread $LIBS"
228	+LIBS="-lSDL-1.1 -pthread $LIBS"
229	cat >conftest.$ac_ext <<_ACEOF
230	#line $LINENO "configure"
231	/* confdefs.h. */
232	@@ -6798,7 +6798,7 @@
233	echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5
234	echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6
235	if test $ac_cv_lib_SDL_SDL_Init = yes; then
236	- LIBS="$LIBS -lSDL -lSDLmain"
237	+ LIBS="$LIBS -lSDL-1.1 -lSDLmain-1.1"
238	else
239	{ echo "$as_me:$LINENO: WARNING: SDL not found - please install SDL" >&5
240	echo "$as_me: WARNING: SDL not found - please install SDL" >&2;}

Line 0 Link Here

(-)games/gl-117/files/patch-src_common.h (+38 lines)
	1	--- src/common.h.orig Sun Aug 24 12:13:07 2003
	2	+++ src/common.h Sun Aug 24 12:13:24 2003
	3	@@ -22,13 +22,13 @@
	4	// APPLE path is different (thanks Minami)
	5	#ifdef __APPLE__
	6	#include <GLUT/glut.h>
	7	-#include "SDL/SDL.h"
	8	-#include "SDL/SDL_thread.h"
	9	+#include "SDL.h"
	10	+#include "SDL_thread.h"
	11	#ifdef HAVE_SDL_MIXER
	12	-#include "SDL/SDL_mixer.h"
	13	+#include "SDL_mixer.h"
	14	#endif
	15	#ifdef HAVE_SDL_NET
	16	-#include "SDL/SDL_net.h"
	17	+#include "SDL_net.h"
	18	#endif
	19	#endif
	20	#ifndef __APPLE__
	21	@@ -36,13 +36,13 @@
	22	#include <GL/glut.h>
	23	#else
	24	#include <GL/glut.h>
	25	-#include "SDL/SDL.h"
	26	-#include "SDL/SDL_thread.h"
	27	+#include "SDL.h"
	28	+#include "SDL_thread.h"
	29	#ifdef HAVE_SDL_MIXER
	30	-#include "SDL/SDL_mixer.h"
	31	+#include "SDL_mixer.h"
	32	#endif
	33	#ifdef HAVE_SDL_NET
	34	-#include "SDL/SDL_net.h"
	35	+#include "SDL_net.h"
	36	#endif
	37	#endif
	38	#endif // __APPLE__

Lines 6-11 Link Here

(-)games/gl-117/pkg-plist (-9 / +17 lines)
6	share/gl-117/models/cannon2.3ds	6	share/gl-117/models/cannon2.3ds
7	share/gl-117/models/chaff1.3ds	7	share/gl-117/models/chaff1.3ds
8	share/gl-117/models/container1.3ds	8	share/gl-117/models/container1.3ds
		9	share/gl-117/models/depot1.3ds
9	share/gl-117/models/egg.3ds	10	share/gl-117/models/egg.3ds
10	share/gl-117/models/fig1.3ds	11	share/gl-117/models/fig1.3ds
11	share/gl-117/models/fig2.3ds	12	share/gl-117/models/fig2.3ds
Lines 25-35 Link Here
25	share/gl-117/models/gl-14c.3ds	26	share/gl-117/models/gl-14c.3ds
26	share/gl-117/models/gl-14d.3ds	27	share/gl-117/models/gl-14d.3ds
27	share/gl-117/models/gl-15.3ds	28	share/gl-117/models/gl-15.3ds
28	share/gl-117/models/gl-15e.3ds
29	share/gl-117/models/gl-16.3ds	29	share/gl-117/models/gl-16.3ds
30	share/gl-117/models/gl-21.3ds	30	share/gl-117/models/gl-21.3ds
31	share/gl-117/models/gl-21b.3ds	31	share/gl-117/models/gl-21b.3ds
32	share/gl-117/models/gl-29.3ds	32	share/gl-117/models/gl-29.3ds
		33	share/gl-117/models/gl-50.3ds
33	share/gl-117/models/hall1.3ds	34	share/gl-117/models/hall1.3ds
34	share/gl-117/models/hall2.3ds	35	share/gl-117/models/hall2.3ds
35	share/gl-117/models/mine1.3ds	36	share/gl-117/models/mine1.3ds
Lines 45-58 Link Here
45	share/gl-117/models/pickup1.3ds	46	share/gl-117/models/pickup1.3ds
46	share/gl-117/models/pickup2.3ds	47	share/gl-117/models/pickup2.3ds
47	share/gl-117/models/radar.3ds	48	share/gl-117/models/radar.3ds
		49	share/gl-117/models/rubble.3ds
48	share/gl-117/models/ship1.3ds	50	share/gl-117/models/ship1.3ds
49	share/gl-117/models/ship2.3ds	51	share/gl-117/models/ship2.3ds
50	share/gl-117/models/tank1.3ds	52	share/gl-117/models/tank1.3ds
51	share/gl-117/models/tank2.3ds	53	share/gl-117/models/tank2.3ds
52	share/gl-117/models/tent1.3ds	54	share/gl-117/models/tent1.3ds
53	share/gl-117/models/tent4.3ds	55	share/gl-117/models/tent4.3ds
54	share/gl-117/models/transp1.3ds	56	share/gl-117/models/transp2.3ds
		57	share/gl-117/models/transp4.3ds
		58	share/gl-117/models/trsam.3ds
55	share/gl-117/models/truck1.3ds	59	share/gl-117/models/truck1.3ds
		60	share/gl-117/models/truck2.3ds
56	share/gl-117/music/ambient.s3m	61	share/gl-117/music/ambient.s3m
57	share/gl-117/music/dark.s3m	62	share/gl-117/music/dark.s3m
58	share/gl-117/music/electro.s3m	63	share/gl-117/music/electro.s3m
Lines 83-88 Link Here
83	share/gl-117/textures/clouds3.tga	88	share/gl-117/textures/clouds3.tga
84	share/gl-117/textures/cross.tga	89	share/gl-117/textures/cross.tga
85	share/gl-117/textures/cross2.tga	90	share/gl-117/textures/cross2.tga
		91	share/gl-117/textures/depot_fr.tga
86	share/gl-117/textures/earth.tga	92	share/gl-117/textures/earth.tga
87	share/gl-117/textures/egg_chec.tga	93	share/gl-117/textures/egg_chec.tga
88	share/gl-117/textures/flare1.tga	94	share/gl-117/textures/flare1.tga
Lines 101-111 Link Here
101	share/gl-117/textures/gl-21_ch.tga	107	share/gl-117/textures/gl-21_ch.tga
102	share/gl-117/textures/gl-21b_c.tga	108	share/gl-117/textures/gl-21b_c.tga
103	share/gl-117/textures/gl-29_ch.tga	109	share/gl-117/textures/gl-29_ch.tga
		110	share/gl-117/textures/gl-50_ch.tga
104	share/gl-117/textures/glitter.tga	111	share/gl-117/textures/glitter.tga
105	share/gl-117/textures/grass1.tga	112	share/gl-117/textures/grass1.tga
106	share/gl-117/textures/gravel1.tga	113	share/gl-117/textures/gravel1.tga
107	share/gl-117/textures/hall1_ch.tga	114	share/gl-117/textures/hall1b_g.tga
108	share/gl-117/textures/hall2_ch.tga	115	share/gl-117/textures/hall2b_c.tga
109	share/gl-117/textures/medals.tga	116	share/gl-117/textures/medals.tga
110	share/gl-117/textures/moon1.tga	117	share/gl-117/textures/moon1.tga
111	share/gl-117/textures/oilrig_c.tga	118	share/gl-117/textures/oilrig_c.tga
Lines 119-133 Link Here
119	share/gl-117/textures/redstone2.tga	126	share/gl-117/textures/redstone2.tga
120	share/gl-117/textures/rocks1.tga	127	share/gl-117/textures/rocks1.tga
121	share/gl-117/textures/sand1.tga	128	share/gl-117/textures/sand1.tga
122	share/gl-117/textures/ship1_fr.tga
123	share/gl-117/textures/ship2_fr.tga	129	share/gl-117/textures/ship2_fr.tga
		130	share/gl-117/textures/ship_fra.tga
124	share/gl-117/textures/smoke1.tga	131	share/gl-117/textures/smoke1.tga
125	share/gl-117/textures/smoke2.tga	132	share/gl-117/textures/smoke2.tga
126	share/gl-117/textures/smoke3.tga	133	share/gl-117/textures/smoke3.tga
127	share/gl-117/textures/sun2.tga	134	share/gl-117/textures/sun2.tga
128	share/gl-117/textures/tent1_no.tga	135	share/gl-117/textures/tent1_no.tga
129	share/gl-117/textures/tent4_fr.tga	136	share/gl-117/textures/tent4_fr.tga
130	share/gl-117/textures/transp1_.tga	137	share/gl-117/textures/transp2_.tga
		138	share/gl-117/textures/transp4_.tga
131	share/gl-117/textures/tree1.tga	139	share/gl-117/textures/tree1.tga
132	share/gl-117/textures/tree2.tga	140	share/gl-117/textures/tree2.tga
133	share/gl-117/textures/tree3.tga	141	share/gl-117/textures/tree3.tga
Lines 137-144 Link Here
137	share/gl-117/textures/treeu3.tga	145	share/gl-117/textures/treeu3.tga
138	share/gl-117/textures/treeu4.tga	146	share/gl-117/textures/treeu4.tga
139	share/gl-117/textures/water1.tga	147	share/gl-117/textures/water1.tga
140	@dirrm share/gl-117/textures
141	@dirrm share/gl-117/sounds
142	@dirrm share/gl-117/music
143	@dirrm share/gl-117/models	148	@dirrm share/gl-117/models
		149	@dirrm share/gl-117/music
		150	@dirrm share/gl-117/sounds
		151	@dirrm share/gl-117/textures
144	@dirrm share/gl-117	152	@dirrm share/gl-117