5 files changed, 135 insertions, 57 deletions

diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index d333923ff4e7..59fb7e9f068d 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -6,34 +6,60 @@
 #
 
 PORTNAME=	0verkill
-PORTVERSION=	0.15
+PORTVERSION=	0.16
 CATEGORIES=	games
 MASTER_SITES=	http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-HAS_CONFIGURE=	YES
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+
+.if defined(WITHOUT_X11)
+PLIST_SUB=	X11="@comment "
+.else
+USE_XPM=	yes
+CONFIGURE_ARGS+=	--with-x
+PLIST_SUB=	X11=""
+.endif
+
+pre-everything::
+.if !defined(WITHOUT_X11)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you want to compile without X11 support,"
+	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITHOUT_X11=yes\""
+	@${ECHO_MSG}
+.endif
 
 post-patch:
-	${SED} "s|@PREFIX@|${PREFIX}|g" ${WRKSRC}/cfg.h > ${WRKSRC}/cfg.h.done
-	${MV} ${WRKSRC}/cfg.h.done ${WRKSRC}/cfg.h
-	${SED} "s|grx/|${PREFIX}/share/0verkill/grx/|g" ${WRKSRC}/data/sprites.dat \
-		> ${WRKSRC}/data/sprites.dat.done
-	${MV} ${WRKSRC}/data/sprites.dat.done ${WRKSRC}/data/sprites.dat
+	@${REINPLACE_CMD} -e 's|data/|${DATADIR}/data|g' ${WRKSRC}/cfg.h
+	@${REINPLACE_CMD} -e 's|grx/|${DATADIR}/grx/|g' ${WRKSRC}/data/sprites.dat
+	@${REINPLACE_CMD} -e 's|-O3 ||g ; \
+		 s|gcc |\$$\(CC\) |g' ${WRKSRC}/Makefile.in
 
 do-install:
-	${MKDIR} ${PREFIX}/share/0verkill \
-		${PREFIX}/share/doc/0verkill ${PREFIX}/share/0verkill/data \
-		${PREFIX}/share/0verkill/grx
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} 0verkill ${PREFIX}/bin
-	cd ${WRKSRC} && for f in avi bot editor server test_server; do \
-		${INSTALL_PROGRAM} $$f ${PREFIX}/bin/0verkill-$$f; \
-	done
-	cd ${WRKSRC}/data && ${INSTALL_DATA} banner.dat dynamic.dat room.dat \
-		sprites.dat ${PREFIX}/share/0verkill/data
-	${INSTALL_DATA} ${WRKSRC}/grx/* ${PREFIX}/share/0verkill/grx
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} AUTHORS README.html avi.txt \
-		bot.txt doc.html ${PREFIX}/share/doc/0verkill
+	${INSTALL_PROGRAM} ${WRKSRC}/0verkill ${PREFIX}/bin
+.for file in avi bot editor server test_server
+	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin/0verkill-${file}
+.endfor
+.if !defined(WITHOUT_X11)
+	${INSTALL_PROGRAM} ${WRKSRC}/x0verkill ${PREFIX}/bin
+.for file in avi editor
+	${INSTALL_PROGRAM} ${WRKSRC}/x${file} ${PREFIX}/bin/x0verkill-${file}
+.endfor
+.endif
+	@${MKDIR} ${DATADIR}/data
+.for file in banner.dat level.dat sprites.dat
+	${INSTALL_DATA} ${WRKSRC}/data/${file} ${DATADIR}/data
+.endfor
+	@${MKDIR} ${DATADIR}/grx
+	${INSTALL_DATA} ${WRKSRC}/grx/* ${DATADIR}/grx
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS README.html avi.txt bot.txt doc.html 
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/0verkill/distinfo b/games/0verkill/distinfo
index 05f041f47fa0..3e2284829da3 100644
--- a/games/0verkill/distinfo
+++ b/games/0verkill/distinfo
@@ -1 +1 @@
-MD5 (0verkill-0.15.tgz) = d71c48c82ca3a6c6196727e1ce8e8a70
+MD5 (0verkill-0.16.tgz) = 814097fc21a82723a40ec8ae5dd792a7
diff --git a/games/0verkill/files/patch-aa b/games/0verkill/files/patch-aa
deleted file mode 100644
index 5cf221b5da31..000000000000
--- a/games/0verkill/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
---- cfg.h.orig	Mon Jan 22 17:33:36 2001
-+++ cfg.h
-@@ -16,10 +16,10 @@
- #define DEFAULT_FONT_NAME "-misc-fixed-bold-r-normal-*-13-*-*-*-c-*-iso8859-*"
- 
- 
--#define SPRITES_FILE "data/sprites.dat"
--#define DATA_FILE "data/room.dat"
--#define DYNAMIC_DATA_FILE "data/dynamic.dat"
--#define BANNER_FILE "data/banner.dat"
-+#define SPRITES_FILE "@PREFIX@/share/0verkill/data/sprites.dat"
-+#define DATA_FILE "@PREFIX@/share/0verkill/data/room.dat"
-+#define DYNAMIC_DATA_FILE "@PREFIX@/share/0verkill/data/dynamic.dat"
-+#define BANNER_FILE "@PREFIX@/share/0verkill/data/banner.dat"
- #define CFG_FILE ".0verkill"
- 
- #define AREA_X 1000
diff --git a/games/0verkill/files/patch-ab b/games/0verkill/files/patch-ab
deleted file mode 100644
index d3733ed912c8..000000000000
--- a/games/0verkill/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
---- Makefile.in.orig	Thu Dec 21 11:48:18 2000
-+++ Makefile.in
-@@ -1,4 +1,4 @@
--CFLAGS=-O3 @CFLAGS@ @X_CFLAGS@ -Wall -W -Wstrict-prototypes -Wno-parentheses -fomit-frame-pointer 
-+CFLAGS=@CFLAGS@ @X_CFLAGS@ -Wall -W -Wstrict-prototypes -Wno-parentheses -fomit-frame-pointer 
- #-malign-functions=0
- LDFLAGS=@LDFLAGS@
- LIBS=@LIBS@ 
diff --git a/games/0verkill/pkg-plist b/games/0verkill/pkg-plist
index 36df9f517e30..a0f92431366a 100644
--- a/games/0verkill/pkg-plist
+++ b/games/0verkill/pkg-plist
@@ -4,28 +4,38 @@ bin/0verkill-bot
 bin/0verkill-editor
 bin/0verkill-server
 bin/0verkill-test_server
+%%X11%%bin/x0verkill
+%%X11%%bin/x0verkill-avi
+%%X11%%bin/x0verkill-editor
 share/0verkill/data/banner.dat
-share/0verkill/data/dynamic.dat
-share/0verkill/data/room.dat
+share/0verkill/data/level.dat
 share/0verkill/data/sprites.dat
-share/doc/0verkill/AUTHORS
-share/doc/0verkill/README.html
-share/doc/0verkill/avi.txt
-share/doc/0verkill/bot.txt
-share/doc/0verkill/doc.html
 share/0verkill/grx/0verkill.avi
+share/0verkill/grx/ackermann.avi
+share/0verkill/grx/altar.avi
 share/0verkill/grx/ammo.avi
+share/0verkill/grx/anthrax.avi
 share/0verkill/grx/armor.avi
 share/0verkill/grx/barrel.avi
 share/0verkill/grx/barrel_fire.avi
 share/0verkill/grx/bedna.avi
 share/0verkill/grx/bedna_v.avi
+share/0verkill/grx/bednarek.avi
 share/0verkill/grx/beer.avi
+share/0verkill/grx/beran.avi
+share/0verkill/grx/bici.avi
+share/0verkill/grx/biohazard.avi
 share/0verkill/grx/blood.avi
 share/0verkill/grx/bulge.avi
 share/0verkill/grx/bullet.avi
+share/0verkill/grx/bus.avi
+share/0verkill/grx/camel.avi
 share/0verkill/grx/cartridge.avi
 share/0verkill/grx/chain1.avi
+share/0verkill/grx/chain2.avi
+share/0verkill/grx/chain3.avi
+share/0verkill/grx/closed.avi
+share/0verkill/grx/cloud.avi
 share/0verkill/grx/corpse1.avi
 share/0verkill/grx/corpse2.avi
 share/0verkill/grx/corpse3.avi
@@ -58,12 +68,18 @@ share/0verkill/grx/corpse_girl_E.avi
 share/0verkill/grx/corpse_girl_F.avi
 share/0verkill/grx/corpse_girl_univ.avi
 share/0verkill/grx/corpse_univ.avi
+share/0verkill/grx/cowboys.avi
+share/0verkill/grx/dekl.avi
+share/0verkill/grx/domecek.avi
 share/0verkill/grx/door.avi
 share/0verkill/grx/dope.avi
 share/0verkill/grx/dvirka.avi
 share/0verkill/grx/erectus.avi
 share/0verkill/grx/fan.avi
+share/0verkill/grx/favo.avi
 share/0verkill/grx/footboard.avi
+share/0verkill/grx/forum.avi
+share/0verkill/grx/gentlemen.avi
 share/0verkill/grx/girl1.avi
 share/0verkill/grx/girl2.avi
 share/0verkill/grx/girl3.avi
@@ -85,7 +101,12 @@ share/0verkill/grx/grave2.avi
 share/0verkill/grx/grave3.avi
 share/0verkill/grx/grenade.avi
 share/0verkill/grx/grenades.avi
+share/0verkill/grx/guitarist1.avi
+share/0verkill/grx/guitarist2.avi
+share/0verkill/grx/guitarist3.avi
 share/0verkill/grx/gun.avi
+share/0verkill/grx/hajzl.avi
+share/0verkill/grx/hajzlik.avi
 share/0verkill/grx/hellslime.avi
 share/0verkill/grx/hero1.avi
 share/0verkill/grx/hero2.avi
@@ -103,29 +124,69 @@ share/0verkill/grx/heroD.avi
 share/0verkill/grx/heroE.avi
 share/0verkill/grx/heroF.avi
 share/0verkill/grx/hero_univ.avi
+share/0verkill/grx/heute.avi
 share/0verkill/grx/hit.avi
 share/0verkill/grx/hlina.avi
 share/0verkill/grx/hook.avi
+share/0verkill/grx/humpolec.avi
+share/0verkill/grx/kamelky.avi
 share/0verkill/grx/kanal.avi
+share/0verkill/grx/klesani.avi
+share/0verkill/grx/koleje.avi
+share/0verkill/grx/kotel.avi
+share/0verkill/grx/kotelna.avi
+share/0verkill/grx/kotelnik.avi
 share/0verkill/grx/koubek.avi
+share/0verkill/grx/krovi.avi
 share/0verkill/grx/ladder.avi
+share/0verkill/grx/ladies.avi
 share/0verkill/grx/lamp1.avi
 share/0verkill/grx/lamp2.avi
 share/0verkill/grx/lamp3.avi
+share/0verkill/grx/lava.avi
+share/0verkill/grx/lava1.avi
+share/0verkill/grx/lava2.avi
+share/0verkill/grx/lebzhnaty.avi
+share/0verkill/grx/links.avi
+share/0verkill/grx/liqory.avi
 share/0verkill/grx/make_hero
+share/0verkill/grx/mar.avi
 share/0verkill/grx/medikit.avi
+share/0verkill/grx/melasa.avi
 share/0verkill/grx/mess.avi
 share/0verkill/grx/mess1.avi
 share/0verkill/grx/mess2.avi
 share/0verkill/grx/mess3.avi
 share/0verkill/grx/mess4.avi
+share/0verkill/grx/metro.avi
 share/0verkill/grx/noise.avi
+share/0verkill/grx/nosmoking.avi
+share/0verkill/grx/ohrada.avi
 share/0verkill/grx/okno.avi
+share/0verkill/grx/para.avi
+share/0verkill/grx/perm.avi
+share/0verkill/grx/petice.avi
+share/0verkill/grx/pi.avi
+share/0verkill/grx/pillar.avi
 share/0verkill/grx/pipe.avi
 share/0verkill/grx/pipe1.avi
+share/0verkill/grx/pipe2.avi
+share/0verkill/grx/pipe3.avi
+share/0verkill/grx/pipe4.avi
+share/0verkill/grx/pivrnec.avi
+share/0verkill/grx/podium.avi
 share/0verkill/grx/podlaha.avi
 share/0verkill/grx/prkno.avi
+share/0verkill/grx/pruhonice.avi
+share/0verkill/grx/pub.avi
+share/0verkill/grx/pumping.avi
+share/0verkill/grx/pytlak.avi
 share/0verkill/grx/radioactive.avi
+share/0verkill/grx/raid.avi
+share/0verkill/grx/raidrekl.avi
+share/0verkill/grx/rampa.avi
+share/0verkill/grx/reklama.avi
+share/0verkill/grx/rg6.avi
 share/0verkill/grx/rifle.avi
 share/0verkill/grx/rocket.avi
 share/0verkill/grx/rough.avi
@@ -150,20 +211,40 @@ share/0verkill/grx/skull.avi
 share/0verkill/grx/slug.avi
 share/0verkill/grx/smoker.avi
 share/0verkill/grx/sshell.avi
+share/0verkill/grx/stone.avi
+share/0verkill/grx/stone1.avi
+share/0verkill/grx/stone2.avi
+share/0verkill/grx/stone3.avi
+share/0verkill/grx/stone_steps_l.avi
+share/0verkill/grx/stone_steps_r.avi
+share/0verkill/grx/sugar.avi
+share/0verkill/grx/svab.avi
 share/0verkill/grx/swing_lamp.avi
+share/0verkill/grx/tabule.avi
 share/0verkill/grx/tnt.avi
 share/0verkill/grx/toadstool.avi
 share/0verkill/grx/traverza.avi
 share/0verkill/grx/traverza1.avi
 share/0verkill/grx/traverza2.avi
+share/0verkill/grx/u_kuceru.avi
+share/0verkill/grx/uhli.avi
 share/0verkill/grx/uzi.avi
+share/0verkill/grx/vetrak.avi
+share/0verkill/grx/waltr.avi
 share/0verkill/grx/water.avi
 share/0verkill/grx/zabradli.avi
+share/0verkill/grx/zarivka.avi
 share/0verkill/grx/zebrik2.avi
 share/0verkill/grx/zed.avi
 share/0verkill/grx/zed2.avi
 share/0verkill/grx/zed3.avi
-@dirrm share/doc/0verkill
+share/0verkill/grx/zpevak.avi
+%%PORTDOCS%%share/doc/0verkill/AUTHORS
+%%PORTDOCS%%share/doc/0verkill/README.html
+%%PORTDOCS%%share/doc/0verkill/avi.txt
+%%PORTDOCS%%share/doc/0verkill/bot.txt
+%%PORTDOCS%%share/doc/0verkill/doc.html
+%%PORTDOCS%%@dirrm share/doc/0verkill
 @dirrm share/0verkill/grx
 @dirrm share/0verkill/data
 @dirrm share/0verkill