3 files changed, 38 insertions, 23 deletions

diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile
index 8ba602faeaf2..61a11bdd3c9d 100644
--- a/games/dangerdeep/Makefile
+++ b/games/dangerdeep/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	dangerdeep
-PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTVERSION=	0.2.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	dangerdeep
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Open source World War II German submarine simulation
@@ -18,15 +18,14 @@ COMMENT=	Open source World War II German submarine simulation
 BUILD_DEPENDS=	scons:${PORTSDIR}/devel/scons
 LIB_DEPENDS=	fftw3.4:${PORTSDIR}/math/fftw3 \
 		execinfo.1:${PORTSDIR}/devel/libexecinfo
+RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/maps/default.xml:${PORTSDIR}/games/dangerdeep-data
 
-USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_SDL=	sdl mixer image net
 
 MAKE_ENV=	CC="${CC}" CXX="${CXX}"
 SCONS_ARGS=	installbindir=${PREFIX}/bin installdatadir=${DATADIR}
 
-PLIST=		${WRKDIR}/pkg-plist
 PLIST_FILES=	bin/dangerdeep bin/crosssection bin/damagemodel \
 		bin/oceantest bin/portal bin/viewmodel
 PLIST_DIRS=	%%DATADIR%%
@@ -51,21 +50,11 @@ post-patch:
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} scons ${SCONS_ARGS}
 
-pre-install:
-	@${RM} -f ${PLIST}
-	@cd ${WRKSRC}/data && \
-	${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
-	${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
-
 do-install:
 	@cd ${WRKSRC}/build/freebsd && \
 		${INSTALL_PROGRAM} dangerdeep crosssection damagemodel oceantest \
 			portal viewmodel ${PREFIX}/bin
 
-	cd ${WRKSRC}/data && \
-	${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
-	${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
-
 	${INSTALL_MAN} ${WRKSRC}/doc/man/dangerdeep.6 ${PREFIX}/man/man6
 
 .if !defined(NOPORTDOCS)
diff --git a/games/dangerdeep/distinfo b/games/dangerdeep/distinfo
index ab83e66cecd4..c913d592971a 100644
--- a/games/dangerdeep/distinfo
+++ b/games/dangerdeep/distinfo
@@ -1,3 +1,3 @@
-MD5 (dangerdeep-0.1.1.tar.gz) = 7de20b4594c0fee8d3c1a281f686f943
-SHA256 (dangerdeep-0.1.1.tar.gz) = de6334c88bac6ce1463e48444e550899a61ea85cecf8929a160d07e28f502a20
-SIZE (dangerdeep-0.1.1.tar.gz) = 23831169
+MD5 (dangerdeep/dangerdeep-0.2.0.tar.gz) = 3733507e99de5afc3c4172024cdfc61b
+SHA256 (dangerdeep/dangerdeep-0.2.0.tar.gz) = ada47be2c7463ac73f0276b77bce7d5a16efc5c6316f70005af6dcf4e9908452
+SIZE (dangerdeep/dangerdeep-0.2.0.tar.gz) = 3854086
diff --git a/games/dangerdeep/files/patch-SConstruct b/games/dangerdeep/files/patch-SConstruct
index c4045dce0d1d..2bf86f0a0f89 100644
--- a/games/dangerdeep/files/patch-SConstruct
+++ b/games/dangerdeep/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	Fri Apr 14 14:13:03 2006
-+++ SConstruct	Tue Sep 12 18:18:20 2006
-@@ -77,10 +77,11 @@
+--- SConstruct	Thu Oct 12 17:14:02 2006
++++ SConstruct	Thu Oct 12 17:16:36 2006
+@@ -69,7 +69,7 @@
  	SDL_CONFIG = os.environ['SDL_CONFIG']
  	env.Replace(CC = os.environ['CC'])
  	env.Replace(CXX = os.environ['CXX'])
@@ -9,7 +9,33 @@
  	libpath = [LOCALBASE + '/lib', X11BASE + '/lib'] 
  	gllibs = ['GL', 'GLU']
  	sdllibs = ['SDL_image']
-+	extralibs = ['execinfo']
- 	cpuinfof = os.popen('sysctl -n hw.instruction_sse')
+@@ -78,7 +78,7 @@
  	cpuinfol = cpuinfof.readlines()
  	mmxsupported = False
+ 	ssesupported = False
+-        for i in cpuinfol:
++	for i in cpuinfol:
+ 		if i == '1\n':
+ 			mmxsupported = True
+ 			ssesupported = True
+@@ -89,14 +89,15 @@
+ 	                osspecificsrc += ['water_sse.cpp']
+ 	                print 'Using x86 SSE/MMX optimizations.'
+ 
+-        env.Replace(CCFLAGS = os.environ['CFLAGS'])
++	env.Replace(CCFLAGS = os.environ['CFLAGS'])
+ 	if (debug == 1):
+ 		env.Append(CCFLAGS = '-g')
+ 		env.Append(CPPDEFINES = ['DEBUG'])
+-        env.Replace(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + ' --cflags`')
+-        env.Append(LINKFLAGS = '`' + SDL_CONFIG + ' --libs`')
+-        datadir = '/usr/local/share/dangerdeep'
+-        build_dir = 'freebsd'
++	env.Replace(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + ' --cflags`')
++	env.Append(LINKFLAGS = '`' + SDL_CONFIG + ' --libs`')
++	env.Append(LIBPATH = [LOCALBASE + '/lib', X11BASE + '/lib'])
++	datadir = '/usr/local/share/dangerdeep'
++	build_dir = 'freebsd'
+ 	
+         if (os.system('grep glBindProgram ' + X11BASE + '/include/GL/gl*.h > /dev/null') == 0):
+                 gllibdirs = [X11BASE + '/lib/', '/usr/lib/', LOCALBASE + '/lib/']