4 files changed, 95 insertions, 139 deletions

diff --git a/games/wrogue/Makefile b/games/wrogue/Makefile
index f70453888101..4b9a04ea2064 100644
--- a/games/wrogue/Makefile
+++ b/games/wrogue/Makefile
@@ -2,12 +2,12 @@
 # Date created:		2007-02-26
 # Whom:			Martin Tournoij <carpetsmoker@xs4all.nl>
 #
+# $Carpetsmoker: ports/games/wrogue/Makefile,v 1.3 2007/09/09 13:32:49 carpetsmoker Exp $
 # $FreeBSD$
 #
 
 PORTNAME=	wrogue
-PORTVERSION=	0.7.5
-PORTREVISION=	1
+DISTVERSION=	0.7.7b
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	todoom
@@ -23,11 +23,6 @@ ALL_TARGET=	release
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKDIR}
 
-SUB_FILES=	unix.mak
-SUB_LIST=	WRKSRC=${WRKSRC}
-
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|-march=i586||; \
 		s|gcc|${CC}|; \
@@ -35,6 +30,23 @@ post-patch:
 	${WRKSRC}/src/unix.mak
 
 	@${REINPLACE_CMD} -e "s|\./data/|${DATADIR}/|" \
-		${WRKSRC}/src/unix/be_unix.c
-
-.include <bsd.port.post.mk>
+		${WRKSRC}/src/platform/unix/pl_unix.c
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wrogue ${PREFIX}/bin
+	${MKDIR} ${DATADIR} ${DATADIR}/engine ${DATADIR}/scenario
+.for dir in engine/config engine/desc engine/graphics engine/help \
+	engine/psybolts scenario/careers scenario/info scenario/npcs \
+	scenario/objects scenario/race scenario/terrain scenario/user scenario/world
+	${MKDIR} ${DATADIR}/${dir}
+	${INSTALL_DATA} ${WRKSRC}/data/${dir}/* ${DATADIR}/${dir}
+.endfor
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for doc in changes.txt license.txt sc_guide.txt
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/games/wrogue/distinfo b/games/wrogue/distinfo
index 820839b38723..ae19e07b14a8 100644
--- a/games/wrogue/distinfo
+++ b/games/wrogue/distinfo
@@ -1,3 +1,3 @@
-MD5 (wrogue-0.7.5.tar.bz2) = 98b0cd2edee02ecea1364c14d995941e
-SHA256 (wrogue-0.7.5.tar.bz2) = a2738a9c349a861e49f995fa44db046ce4173b51d8647b79ebebddbcaa6d167e
-SIZE (wrogue-0.7.5.tar.bz2) = 321711
+MD5 (wrogue-0.7.7b.tar.bz2) = 928d1e7bcf4531f15b7473d9e29d0544
+SHA256 (wrogue-0.7.7b.tar.bz2) = 07153d3c7c75278d5642685aabff66e8a72e07c5a4462e68827fc630828dac08
+SIZE (wrogue-0.7.7b.tar.bz2) = 328556
diff --git a/games/wrogue/files/unix.mak.in b/games/wrogue/files/unix.mak.in
deleted file mode 100644
index 1db19b59ecd2..000000000000
--- a/games/wrogue/files/unix.mak.in
+++ /dev/null
@@ -1,65 +0,0 @@
-INSTALL_DATA=/usr/bin/install -o root -g wheel -m 444
-INSTALL_PROGRAM=/usr/bin/install -o root -g wheel -m 555
-WRKSRC=%%WRKSRC%%
-DATADIR=%%DATADIR%%
-PREFIX=%%PREFIX%%
-
-install:
-	mkdir -p ${DATADIR} ${DATADIR}/charact ${DATADIR}/config ${DATADIR}/graphics \
-	  ${DATADIR}/terrain ${DATADIR}/objects ${DATADIR}/text ${DATADIR}/user ${DATADIR}/world
-
-	${INSTALL_PROGRAM} ${WRKSRC}/wrogue ${PREFIX}/bin/wrogue
-
-	${INSTALL_DATA} ${WRKSRC}/data/charact/a_career.rdb ${DATADIR}/charact/a_career.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/charact/aliens.rdb ${DATADIR}/charact/aliens.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/charact/b_career.rdb ${DATADIR}/charact/b_career.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/charact/beasts.rdb ${DATADIR}/charact/beasts.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/charact/chaos.rdb ${DATADIR}/charact/chaos.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/charact/human_f.nam ${DATADIR}/charact/human_f.nam
-	${INSTALL_DATA} ${WRKSRC}/data/charact/human_m.nam ${DATADIR}/charact/human_m.nam
-	${INSTALL_DATA} ${WRKSRC}/data/charact/imperium.rdb ${DATADIR}/charact/imperium.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/charact/perks.rdb ${DATADIR}/charact/perks.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/charact/rebels.rdb ${DATADIR}/charact/rebels.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/config/keys.rdb ${DATADIR}/config/keys.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/config/options.rdb ${DATADIR}/config/options.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/graphics/back.bmp ${DATADIR}/graphics/back.bmp
-	${INSTALL_DATA} ${WRKSRC}/data/graphics/cursor.bmp ${DATADIR}/graphics/cursor.bmp
-	${INSTALL_DATA} ${WRKSRC}/data/graphics/icon.bmp ${DATADIR}/graphics/icon.bmp
-	${INSTALL_DATA} ${WRKSRC}/data/graphics/logo.bmp ${DATADIR}/graphics/logo.bmp
-	${INSTALL_DATA} ${WRKSRC}/data/graphics/symbols.bmp ${DATADIR}/graphics/symbols.bmp
-	${INSTALL_DATA} ${WRKSRC}/data/objects/armours.rdb ${DATADIR}/objects/armours.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/objects/ccw.rdb ${DATADIR}/objects/ccw.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/objects/drugs.rdb ${DATADIR}/objects/drugs.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/objects/env.rdb ${DATADIR}/objects/env.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/objects/misc.rdb ${DATADIR}/objects/misc.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/objects/psybolts.rdb ${DATADIR}/objects/psybolts.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/objects/rcw.rdb ${DATADIR}/objects/rcw.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/terrain/terrain.rdb ${DATADIR}/terrain/terrain.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/text/advance.txt ${DATADIR}/text/advance.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/combat.txt ${DATADIR}/text/combat.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/credits.txt ${DATADIR}/text/credits.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/evoke.txt ${DATADIR}/text/evoke.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/hints.txt ${DATADIR}/text/hints.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/intro.txt ${DATADIR}/text/intro.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/macro.txt ${DATADIR}/text/macro.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/modes.txt ${DATADIR}/text/modes.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/movement.txt ${DATADIR}/text/movement.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/objects.txt ${DATADIR}/text/objects.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/parties.txt ${DATADIR}/text/parties.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/powers.txt ${DATADIR}/text/powers.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/stats.txt ${DATADIR}/text/stats.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/status.txt ${DATADIR}/text/status.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/tactics.txt ${DATADIR}/text/tactics.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/terrain.txt ${DATADIR}/text/terrain.txt
-	${INSTALL_DATA} ${WRKSRC}/data/text/timing.txt ${DATADIR}/text/timing.txt
-	${INSTALL_DATA} ${WRKSRC}/data/user/keep.me ${DATADIR}/user/keep.me
-	${INSTALL_DATA} ${WRKSRC}/data/world/aship.rdb ${DATADIR}/world/aship.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/dcave.rdb ${DATADIR}/world/dcave.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/fdoom.rdb ${DATADIR}/world/fdoom.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/h_cruor.rdb ${DATADIR}/world/h_cruor.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/h_melkor.rdb ${DATADIR}/world/h_melkor.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/lcave.rdb ${DATADIR}/world/lcave.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/mcave.rdb ${DATADIR}/world/mcave.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/scave.rdb ${DATADIR}/world/scave.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/wcave.rdb ${DATADIR}/world/wcave.rdb
-	${INSTALL_DATA} ${WRKSRC}/data/world/world.rdb ${DATADIR}/world/world.rdb
diff --git a/games/wrogue/pkg-plist b/games/wrogue/pkg-plist
index 91a50c048168..34c4dc8720ea 100644
--- a/games/wrogue/pkg-plist
+++ b/games/wrogue/pkg-plist
@@ -1,63 +1,72 @@
 bin/wrogue
-%%DATADIR%%/charact/a_career.rdb
-%%DATADIR%%/charact/aliens.rdb
-%%DATADIR%%/charact/b_career.rdb
-%%DATADIR%%/charact/beasts.rdb
-%%DATADIR%%/charact/chaos.rdb
-%%DATADIR%%/charact/human_f.nam
-%%DATADIR%%/charact/human_m.nam
-%%DATADIR%%/charact/imperium.rdb
-%%DATADIR%%/charact/perks.rdb
-%%DATADIR%%/charact/rebels.rdb
-%%DATADIR%%/config/keys.rdb
-%%DATADIR%%/config/options.rdb
-%%DATADIR%%/graphics/back.bmp
-%%DATADIR%%/graphics/cursor.bmp
-%%DATADIR%%/graphics/icon.bmp
-%%DATADIR%%/graphics/logo.bmp
-%%DATADIR%%/graphics/symbols.bmp
-%%DATADIR%%/objects/armours.rdb
-%%DATADIR%%/objects/ccw.rdb
-%%DATADIR%%/objects/drugs.rdb
-%%DATADIR%%/objects/env.rdb
-%%DATADIR%%/objects/misc.rdb
-%%DATADIR%%/objects/psybolts.rdb
-%%DATADIR%%/objects/rcw.rdb
-%%DATADIR%%/terrain/terrain.rdb
-%%DATADIR%%/text/advance.txt
-%%DATADIR%%/text/combat.txt
-%%DATADIR%%/text/credits.txt
-%%DATADIR%%/text/evoke.txt
-%%DATADIR%%/text/hints.txt
-%%DATADIR%%/text/intro.txt
-%%DATADIR%%/text/macro.txt
-%%DATADIR%%/text/modes.txt
-%%DATADIR%%/text/movement.txt
-%%DATADIR%%/text/objects.txt
-%%DATADIR%%/text/parties.txt
-%%DATADIR%%/text/powers.txt
-%%DATADIR%%/text/stats.txt
-%%DATADIR%%/text/status.txt
-%%DATADIR%%/text/tactics.txt
-%%DATADIR%%/text/terrain.txt
-%%DATADIR%%/text/timing.txt
-%%DATADIR%%/user/keep.me
-%%DATADIR%%/world/aship.rdb
-%%DATADIR%%/world/dcave.rdb
-%%DATADIR%%/world/fdoom.rdb
-%%DATADIR%%/world/h_cruor.rdb
-%%DATADIR%%/world/h_melkor.rdb
-%%DATADIR%%/world/lcave.rdb
-%%DATADIR%%/world/mcave.rdb
-%%DATADIR%%/world/scave.rdb
-%%DATADIR%%/world/wcave.rdb
-%%DATADIR%%/world/world.rdb
-@dirrm %%DATADIR%%/charact
-@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%/graphics
-@dirrm %%DATADIR%%/objects
-@dirrm %%DATADIR%%/terrain
-@dirrm %%DATADIR%%/text
-@dirrm %%DATADIR%%/user
-@dirrm %%DATADIR%%/world
+%%PORTDOCS%%%%DOCSDIR%%/changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/sc_guide.txt
+%%DATADIR%%/engine/config/keys.rdb
+%%DATADIR%%/engine/config/options.rdb
+%%DATADIR%%/engine/desc/charflag.rdb
+%%DATADIR%%/engine/desc/ob_attr.rdb
+%%DATADIR%%/engine/desc/perks.rdb
+%%DATADIR%%/engine/desc/powers.rdb
+%%DATADIR%%/engine/desc/tr_attr.rdb
+%%DATADIR%%/engine/graphics/back.bmp
+%%DATADIR%%/engine/graphics/cursor.bmp
+%%DATADIR%%/engine/graphics/icon.bmp
+%%DATADIR%%/engine/graphics/symbols.bmp
+%%DATADIR%%/engine/help/advance.txt
+%%DATADIR%%/engine/help/combat.txt
+%%DATADIR%%/engine/help/credits.txt
+%%DATADIR%%/engine/help/evoke.txt
+%%DATADIR%%/engine/help/macro.txt
+%%DATADIR%%/engine/help/modes.txt
+%%DATADIR%%/engine/help/morale.txt
+%%DATADIR%%/engine/help/movement.txt
+%%DATADIR%%/engine/help/parties.txt
+%%DATADIR%%/engine/help/rating.txt
+%%DATADIR%%/engine/help/stats.txt
+%%DATADIR%%/engine/help/tactics.txt
+%%DATADIR%%/engine/help/timing.txt
+%%DATADIR%%/engine/psybolts/psybolts.rdb
+%%DATADIR%%/scenario/careers/careers.rdb
+%%DATADIR%%/scenario/info/intro.txt
+%%DATADIR%%/scenario/info/scenario.rdb
+%%DATADIR%%/scenario/npcs/aliens.rdb
+%%DATADIR%%/scenario/npcs/beasts.rdb
+%%DATADIR%%/scenario/npcs/chaos.rdb
+%%DATADIR%%/scenario/npcs/deco.wca
+%%DATADIR%%/scenario/npcs/doomb.wca
+%%DATADIR%%/scenario/npcs/imperium.rdb
+%%DATADIR%%/scenario/npcs/rand_npc.wca
+%%DATADIR%%/scenario/npcs/rebels.rdb
+%%DATADIR%%/scenario/npcs/schweitz.wca
+%%DATADIR%%/scenario/objects/atad.rdb
+%%DATADIR%%/scenario/objects/bio.rdb
+%%DATADIR%%/scenario/objects/chaos.rdb
+%%DATADIR%%/scenario/objects/env.rdb
+%%DATADIR%%/scenario/objects/imperium.rdb
+%%DATADIR%%/scenario/objects/nimrod.rdb
+%%DATADIR%%/scenario/objects/ratkin.rdb
+%%DATADIR%%/scenario/race/female.nam
+%%DATADIR%%/scenario/race/male.nam
+%%DATADIR%%/scenario/race/race.rdb
+%%DATADIR%%/scenario/terrain/terrain.rdb
+%%DATADIR%%/scenario/user/keep.me
+%%DATADIR%%/scenario/world/h_cruor.wca
+%%DATADIR%%/scenario/world/world.rdb
+@dirrm %%DATADIR%%/scenario/world
+@dirrm %%DATADIR%%/scenario/user
+@dirrm %%DATADIR%%/scenario/terrain
+@dirrm %%DATADIR%%/scenario/race
+@dirrm %%DATADIR%%/scenario/objects
+@dirrm %%DATADIR%%/scenario/npcs
+@dirrm %%DATADIR%%/scenario/info
+@dirrm %%DATADIR%%/scenario/careers
+@dirrm %%DATADIR%%/scenario
+@dirrm %%DATADIR%%/engine/psybolts
+@dirrm %%DATADIR%%/engine/help
+@dirrm %%DATADIR%%/engine/graphics
+@dirrm %%DATADIR%%/engine/desc
+@dirrm %%DATADIR%%/engine/config
+@dirrm %%DATADIR%%/engine
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%