- Complete repocopy of games/bos to games/boswars.

- Update to version 2.3 (first version released after the project was renamed).

PR:		ports/110633
Submitted by:	alepulver (myself)

4 files changed, 118 insertions, 25 deletions

diff --git a/games/boswars/Makefile b/games/boswars/Makefile
index b7f0a2fc514b..379caf165561 100644
--- a/games/boswars/Makefile
+++ b/games/boswars/Makefile
@@ -5,28 +5,52 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bos
-PORTVERSION=	2.0.1
+PORTNAME=	boswars
+PORTVERSION=	2.3
 CATEGORIES=	games
 MASTER_SITES=	http://www.boswars.org/releases/
-DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	A real-time strategy game
 
-RUN_DEPENDS=	stratagus:${PORTSDIR}/games/stratagus
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		theora.2:${PORTSDIR}/multimedia/libtheora \
+		vorbis.3:${PORTSDIR}/audio/libvorbis
 
-NO_WRKSUBDIR=	yes
+USE_LUA=	5.0
+USE_SDL=	sdl
+USE_SCONS=	yes
+CPPPATH=	${LOCALBASE}/include ${LUA_INCDIR}
+LIBPATH=	${LOCALBASE}/lib ${LUA_LIBDIR}
+CFLAGS+=	-DSTRATAGUS_LIB_PATH='"\"${DATADIR}\""'
 
-do-build:
-	@(${ECHO_CMD} "#!${SH}"; \
-	  ${ECHO_CMD} 'exec stratagus -d ${DATADIR} "$$@"') \
-	  > ${WRKDIR}/${PORTNAME}
+OPTIONS=	GL "Enable OpenGL support" on \
+		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_GL)
+USE_GL=		yes
+SCONS_ARGS+=	opengl=1
+CPPPATH+=	${X11BASE}/include
+LIBPATH+=	${X11BASE}/lib
+.endif
+
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+SCONS_ARGS+=	optimized_cflags=1
+.endif
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	cd ${WRKSRC}/data.bos && \
-		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+.for f in campaigns graphics languages maps scripts sounds units video
+	${CP} -R ${WRKSRC}/${f} ${DATADIR}
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.txt ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc ${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/boswars/distinfo b/games/boswars/distinfo
index a4bd92b7e66d..84621cd164c1 100644
--- a/games/boswars/distinfo
+++ b/games/boswars/distinfo
@@ -1,3 +1,3 @@
-MD5 (bos_2_0_1.tar.gz) = f6a63249642c399d438f9ea46a210714
-SHA256 (bos_2_0_1.tar.gz) = 35bff244678c540837e72ea43615efa5d3a031857ad1cb2de75dc80860e5706f
-SIZE (bos_2_0_1.tar.gz) = 50605731
+MD5 (boswars-2.3-src.tar.gz) = ad3415bd91f5ac05fda41247dc76ff07
+SHA256 (boswars-2.3-src.tar.gz) = 09206df851374c548f12918a022cd54bb0f199bf3902bd3b604175e0997db81d
+SIZE (boswars-2.3-src.tar.gz) = 45656754
diff --git a/games/boswars/files/patch-SConstruct b/games/boswars/files/patch-SConstruct
new file mode 100644
index 000000000000..8d0d02dac9fa
--- /dev/null
+++ b/games/boswars/files/patch-SConstruct
@@ -0,0 +1,38 @@
+--- ./SConstruct.orig	Sun Mar  4 10:14:23 2007
++++ ./SConstruct	Mon Apr  9 11:15:01 2007
+@@ -33,12 +33,12 @@
+ 
+ def DefineOptions(filename, args):
+    opts = Options(filename, args)
+-   opts.Add('CPPPATH', 'Additional preprocessor paths')
++   opts.Add('CPPPATH', 'Additional preprocessor paths', Split(''))
+    opts.Add('CPPFLAGS', 'Additional preprocessor flags')
+    opts.Add('CPPDEFINES', 'defined constants', Split(''))
+-   opts.Add('LIBPATH', 'Additional library paths')
++   opts.Add('LIBPATH', 'Additional library paths', Split(''))
+    opts.Add('LIBS', 'Additional libraries')
+-   opts.Add('CCFLAGS', 'C Compiler flags', Split(ccflags))
++   opts.Add('CCFLAGS', 'C Compiler flags', Split(''))
+    opts.Add('LINKFLAGS', 'Linker Compiler flags')
+    opts.Add('CC', 'C Compiler')
+    opts.Add('CXX', 'C++ Compiler')
+@@ -52,6 +52,9 @@
+ opts = DefineOptions("build_options.py", ARGUMENTS)
+ env = Environment(ENV = {'PATH':os.environ['PATH']}) # for an unknown reason Environment(options=opts) doesnt work well
+ opts.Update(env) # Needed as Environment(options=opts) doesnt seem to work
++env['CCFLAGS'] = Split(ccflags) + Split(env['CCFLAGS'])
++env['CPPPATH'] = Split(env['CPPPATH'])
++env['LIBPATH'] = Split(env['LIBPATH'])
+ Help(opts.GenerateHelpText(env))
+ optionsChanged = True
+ if os.path.exists('build_options.py'):
+@@ -144,9 +147,6 @@
+      Exit(1)
+   if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'):
+      print 'Did not find the zlib library or headers, exiting!'
+-     Exit(1)
+-  if not conf.CheckLib('dl'):
+-     print 'Did not find dl library or header which is needed on some systems for lua. Exiting!'
+      Exit(1)
+   if not CheckLuaLib(env, conf):
+      print 'Did not find required lua library. Exiting!'
diff --git a/games/boswars/pkg-plist b/games/boswars/pkg-plist
index 89177bc7aafe..7deb5d4102e7 100644
--- a/games/boswars/pkg-plist
+++ b/games/boswars/pkg-plist
@@ -1,8 +1,4 @@
-bin/bos
-%%DATADIR%%/CHANGELOG
-%%DATADIR%%/COPYRIGHT.txt
-%%DATADIR%%/LICENSE.txt
-%%DATADIR%%/README.txt
+bin/boswars
 %%DATADIR%%/campaigns/elites/campaign.lua
 %%DATADIR%%/campaigns/elites/level01.smp
 %%DATADIR%%/campaigns/elites/level01.sms
@@ -103,13 +99,16 @@ bin/bos
 %%DATADIR%%/graphics/ui/rosace1.png
 %%DATADIR%%/graphics/ui/x_startpoint.png
 %%DATADIR%%/languages/bg.po
+%%DATADIR%%/languages/bos-da.po
 %%DATADIR%%/languages/bos-de.po
 %%DATADIR%%/languages/bos-en.po
 %%DATADIR%%/languages/bos-fi.po
 %%DATADIR%%/languages/bos-fr.po
 %%DATADIR%%/languages/bos.pot
+%%DATADIR%%/languages/da.po
 %%DATADIR%%/languages/de.po
 %%DATADIR%%/languages/en.po
+%%DATADIR%%/languages/engine.pot
 %%DATADIR%%/languages/fi.po
 %%DATADIR%%/languages/fr.po
 %%DATADIR%%/languages/genpot.sh
@@ -210,6 +209,8 @@ bin/bos
 %%DATADIR%%/maps/wetlands01/wetlands01.png
 %%DATADIR%%/maps/wetlands01/wetlands01.sms
 %%DATADIR%%/scripts/ai.lua
+%%DATADIR%%/scripts/ais/passive.lua
+%%DATADIR%%/scripts/ais/rush.lua
 %%DATADIR%%/scripts/anim.lua
 %%DATADIR%%/scripts/bos.lua
 %%DATADIR%%/scripts/buttons.lua
@@ -547,8 +548,38 @@ bin/bos
 %%DATADIR%%/units/vehiclefactory/vehicle_factory_i.png
 %%DATADIR%%/units/vehiclefactory/vehicle_factory_s.png
 %%DATADIR%%/units/vehiclefactory/vehiclefactory.lua
-%%DATADIR%%/video/bos_intro.ogg
-%%DATADIR%%/video/stratagus_intro.ogg
+%%DATADIR%%/video/boswars_intro.ogg
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/doc/README-SDL.txt
+%%PORTDOCS%%%%DOCSDIR%%/doc/development.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/gpl.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/guichan-copyright.txt
+%%PORTDOCS%%%%DOCSDIR%%/doc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/install.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/media.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/ai.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/config.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/findlua.py
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/game.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/magic.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/makeindex.py
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/mappresentation.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/mapsetup.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/research.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/savegame.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/showindex.py
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/sound.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/tileset.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/triggers.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/ui.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/scripts/unittype.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/stratagus-changelog.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc/scripts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/video
 @dirrm %%DATADIR%%/units/vehiclefactory
 @dirrm %%DATADIR%%/units/vault
@@ -594,8 +625,8 @@ bin/bos
 @dirrm %%DATADIR%%/scripts/tilesets
 @dirrm %%DATADIR%%/scripts/menus/ingame
 @dirrm %%DATADIR%%/scripts/menus
+@dirrm %%DATADIR%%/scripts/ais
 @dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/music
 @dirrm %%DATADIR%%/maps/wetlands01
 @dirrm %%DATADIR%%/maps/tutorial
 @dirrm %%DATADIR%%/maps/river