5 files changed, 105 insertions, 136 deletions

diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 29a680d0f568..8e5e7fc43496 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	corewars
-PORTVERSION=	0.9.12
-PORTREVISION=	1
+PORTVERSION=	0.9.13
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,18 +15,15 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simulation game where the goal is to crash each other's programs
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gnometarget gtk12
 GNU_CONFIGURE=	yes
-MAKE_ENV=	FREEBSD_CFLAGS="${CFLAGS}"
 
-MAN6=		corewars.6
+MAN6=		corewars.6 corewars-cmd.6
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing README in ${PREFIX}/share/doc/corewars."
-	@${ECHO_MSG} "===>   Please read it before playing."
-	@${MKDIR} ${PREFIX}/share/doc/corewars && ${CHMOD} a+rx ${PREFIX}/share/doc/corewars
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/corewars
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/corewars/distinfo b/games/corewars/distinfo
index 3ff1d6bccb66..f19ff081098c 100644
--- a/games/corewars/distinfo
+++ b/games/corewars/distinfo
@@ -1,2 +1,2 @@
-MD5 (corewars-0.9.12.tar.gz) = 3420dcf9c03927c8b3905a31c36a1cf3
-SIZE (corewars-0.9.12.tar.gz) = 163214
+MD5 (corewars-0.9.13.tar.gz) = 0a0b8067533b83a96488109ee265f664
+SIZE (corewars-0.9.13.tar.gz) = 203874
diff --git a/games/corewars/files/patch-aa b/games/corewars/files/patch-aa
deleted file mode 100644
index b0d970bb2201..000000000000
--- a/games/corewars/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Tue Mar 21 12:36:18 2000
-+++ src/Makefile.in	Tue Mar 21 12:37:19 2000
-@@ -116,7 +116,7 @@
- LEXLIB = @LEXLIB@
- YLWRAP = $(srcdir)/ylwrap
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(FREEBSD_CFLAGS)
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in lex-cw.c \
diff --git a/games/corewars/files/patch-ab b/games/corewars/files/patch-ab
deleted file mode 100644
index 19710222e7bb..000000000000
--- a/games/corewars/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.orig	Fri Mar 31 16:14:55 2000
-+++ configure	Fri Mar 31 16:15:45 2000
-@@ -2311,13 +2311,6 @@
-  COREWARSCMD=corewars-cmd
- else
-   echo "$ac_t""no" 1>&6
--echo "configure: warning: 
--
--   ********************************************************************************
--   *** glibc >= 2.1 not installed - cannot build command line client without it ***
--   ***                        (but this is ok if you want the GTK+ client only) ***
--   ********************************************************************************
--" 1>&2
- fi
- done
- 
diff --git a/games/corewars/pkg-plist b/games/corewars/pkg-plist
index 12f6bc4287c2..fe7baea31b3a 100644
--- a/games/corewars/pkg-plist
+++ b/games/corewars/pkg-plist
@@ -1,99 +1,99 @@
 bin/corewars
-share/corewars/abez.cw
-share/corewars/agent.cw
-share/corewars/backwalker.cw
-share/corewars/backspawner.cw
-share/corewars/bb1.cw
-share/corewars/bb2.cw
-share/corewars/bb3.cw
-share/corewars/betterback.cw
-share/corewars/blackhole.cw
-share/corewars/bomb.cw
-share/corewars/bombagent.cw
-share/corewars/bomberbomber.cw
-share/corewars/capture.cw
-share/corewars/cascade.cw
-share/corewars/clone.cw
-share/corewars/copy.cw
-share/corewars/copymachine.cw
-share/corewars/copymachinem.cw
-share/corewars/copytest.cw
-share/corewars/crazymonkeys.cw
-share/corewars/death_angles.cw
-share/corewars/devil.cw
-share/corewars/devilhook.cw
-share/corewars/dwarf.cw
-share/corewars/erase.cw
-share/corewars/erase2.cw
-share/corewars/erase3.cw
-share/corewars/expander.cw
-share/corewars/first.cw
-share/corewars/forkbomb.cw
-share/corewars/forker.cw
-share/corewars/gemini.cw
-share/corewars/giant_imp.cw
-share/corewars/harmless.cw
-share/corewars/helper.cw
-share/corewars/hidebomb.cw
-share/corewars/hitchhiker.cw
-share/corewars/immortal.cw
-share/corewars/imp-killer-cascade.cw
-share/corewars/imp_commander.cw
-share/corewars/impgrabber.cw
-share/corewars/impkiller1.cw
-share/corewars/impkiller2.cw
-share/corewars/impkiller3.cw
-share/corewars/impkiller4.cw
-share/corewars/impkiller5.cw
-share/corewars/incubator.cw
-share/corewars/incubator2.cw
-share/corewars/inverter.cw
-share/corewars/jumpback.cw
-share/corewars/jumpback2.cw
-share/corewars/jumpup.cw
-share/corewars/killmover.cw
-share/corewars/killmover2.cw
-share/corewars/lethal.cw
-share/corewars/lhwMultiHopper.cw
-share/corewars/lhwShootingMother2.cw
-share/corewars/lizard.cw
-share/corewars/mod4_dwarf.cw
-share/corewars/monkeys.cw
-share/corewars/mover.cw
-share/corewars/mover2.cw
-share/corewars/parasito1.cw
-share/corewars/parasito2.cw
-share/corewars/parasito3.cw
-share/corewars/parasito4.cw
-share/corewars/pongmissile.cw
-share/corewars/pongmissile2.cw
-share/corewars/pongmissile3.cw
-share/corewars/quadwalker.cw
-share/corewars/random.cw
-share/corewars/runaway.cw
-share/corewars/runningcopy.cw
-share/corewars/searchanddestroy.cw
-share/corewars/searchanddestroy2.cw
-share/corewars/shooter.cw
-share/corewars/steal.cw
-share/corewars/steal2.cw
-share/corewars/suicidal.cw
-share/corewars/survival.cw
-share/corewars/takeover.cw
-share/corewars/teleporter.cw
-share/corewars/teleporter2.cw
-share/corewars/throwncatch.cw
-share/corewars/trine.cw
-share/corewars/walker.cw
-share/corewars/xcopy.cw
-share/corewars/baselineplus.red
-share/corewars/gate.red
-share/corewars/imp.red
-share/corewars/impspiral.red
-share/corewars/incendiarybomb.red
-share/corewars/safetyinnumbers.red
-share/corewars/silk.red
-share/corewars/wintermute.red
-share/doc/corewars/README
-@dirrm share/corewars
-@dirrm share/doc/corewars
+%%DATADIR%%/abez.cw
+%%DATADIR%%/agent.cw
+%%DATADIR%%/backspawner.cw
+%%DATADIR%%/backwalker.cw
+%%DATADIR%%/baselineplus.red
+%%DATADIR%%/bb1.cw
+%%DATADIR%%/bb2.cw
+%%DATADIR%%/bb3.cw
+%%DATADIR%%/betterback.cw
+%%DATADIR%%/blackhole.cw
+%%DATADIR%%/bomb.cw
+%%DATADIR%%/bombagent.cw
+%%DATADIR%%/bomberbomber.cw
+%%DATADIR%%/capture.cw
+%%DATADIR%%/cascade.cw
+%%DATADIR%%/clone.cw
+%%DATADIR%%/copy.cw
+%%DATADIR%%/copymachine.cw
+%%DATADIR%%/copymachinem.cw
+%%DATADIR%%/copytest.cw
+%%DATADIR%%/crazymonkeys.cw
+%%DATADIR%%/death_angles.cw
+%%DATADIR%%/devil.cw
+%%DATADIR%%/devilhook.cw
+%%DATADIR%%/dwarf.cw
+%%DATADIR%%/erase.cw
+%%DATADIR%%/erase2.cw
+%%DATADIR%%/erase3.cw
+%%DATADIR%%/expander.cw
+%%DATADIR%%/first.cw
+%%DATADIR%%/forkbomb.cw
+%%DATADIR%%/forker.cw
+%%DATADIR%%/gate.red
+%%DATADIR%%/gemini.cw
+%%DATADIR%%/giant_imp.cw
+%%DATADIR%%/harmless.cw
+%%DATADIR%%/helper.cw
+%%DATADIR%%/hidebomb.cw
+%%DATADIR%%/hitchhiker.cw
+%%DATADIR%%/immortal.cw
+%%DATADIR%%/imp-killer-cascade.cw
+%%DATADIR%%/imp.red
+%%DATADIR%%/imp_commander.cw
+%%DATADIR%%/impgrabber.cw
+%%DATADIR%%/impkiller1.cw
+%%DATADIR%%/impkiller2.cw
+%%DATADIR%%/impkiller3.cw
+%%DATADIR%%/impkiller4.cw
+%%DATADIR%%/impkiller5.cw
+%%DATADIR%%/impspiral.red
+%%DATADIR%%/incendiarybomb.red
+%%DATADIR%%/incubator.cw
+%%DATADIR%%/incubator2.cw
+%%DATADIR%%/inverter.cw
+%%DATADIR%%/jumpback.cw
+%%DATADIR%%/jumpback2.cw
+%%DATADIR%%/jumpup.cw
+%%DATADIR%%/killmover.cw
+%%DATADIR%%/killmover2.cw
+%%DATADIR%%/lethal.cw
+%%DATADIR%%/lhwMultiHopper.cw
+%%DATADIR%%/lhwShootingMother2.cw
+%%DATADIR%%/lizard.cw
+%%DATADIR%%/mod4_dwarf.cw
+%%DATADIR%%/monkeys.cw
+%%DATADIR%%/mover.cw
+%%DATADIR%%/mover2.cw
+%%DATADIR%%/parasito1.cw
+%%DATADIR%%/parasito2.cw
+%%DATADIR%%/parasito3.cw
+%%DATADIR%%/parasito4.cw
+%%DATADIR%%/pongmissile.cw
+%%DATADIR%%/pongmissile2.cw
+%%DATADIR%%/pongmissile3.cw
+%%DATADIR%%/quadwalker.cw
+%%DATADIR%%/random.cw
+%%DATADIR%%/runaway.cw
+%%DATADIR%%/runningcopy.cw
+%%DATADIR%%/safetyinnumbers.red
+%%DATADIR%%/searchanddestroy.cw
+%%DATADIR%%/searchanddestroy2.cw
+%%DATADIR%%/shooter.cw
+%%DATADIR%%/silk.red
+%%DATADIR%%/steal.cw
+%%DATADIR%%/steal2.cw
+%%DATADIR%%/suicidal.cw
+%%DATADIR%%/survival.cw
+%%DATADIR%%/takeover.cw
+%%DATADIR%%/teleporter.cw
+%%DATADIR%%/teleporter2.cw
+%%DATADIR%%/throwncatch.cw
+%%DATADIR%%/trine.cw
+%%DATADIR%%/walker.cw
+%%DATADIR%%/wintermute.red
+%%DATADIR%%/xcopy.cw
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%