3 files changed, 26 insertions, 61 deletions

diff --git a/games/fmars/Makefile b/games/fmars/Makefile
index cc405674c529..5dcd91d42418 100644
--- a/games/fmars/Makefile
+++ b/games/fmars/Makefile
@@ -5,62 +5,44 @@ PORTNAME=	fmars
 PORTVERSION=	0.0.207
 PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	http://users.v-lo.krakow.pl/~michal/
+MASTER_SITES=	http://corewar.co.uk/janeczek/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast Memory Array Redcode Simulator
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2014-03-07
-
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-
+USES=		gmake
 ALL_TARGET=	x${PORTNAME}
 
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
+OPTIONS_DEFINE=		DOCS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIMIZED_CFLAGS_CFLAGS=-fomit-frame-pointer
 
 post-patch:
-# Fix Makefile.
-	@${REINPLACE_CMD} -e 's|\($$(OPT)\)|${CFLAGS} \1| ; \
-		s|gcc|${CC}|g' \
-		${WRKSRC}/${MAKEFILE}
-
-# Enable/disable compilation optimizations.
-.if empty(PORT_OPTIONS:MOPTIMIZED_CFLAGS)
-	@${REINPLACE_CMD} -e 's|$$(OPT)||' ${WRKSRC}/${MAKEFILE}
-.endif
+	@${REINPLACE_CMD} -e \
+		's|^\(CC\) |#\1 | ; \
+		 s|^\(CFLAGS\) |#\1 | ; \
+		 s|^\(OPTS\) |#\1 | ; \
+		 s|gcc -E|$$(CC) -E|' ${WRKSRC}/Makefile
 
 do-install:
 # Program.
-	${INSTALL_PROGRAM} ${WRKSRC}/x${PORTNAME} ${PREFIX}/bin/${PORTNAME}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} x${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME})
 
 # Data.
-	${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for d in rc rc-test
-	${CP} -R ${WRKSRC}/${d} ${DATADIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
 
 # Documentation (optional).
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-
-post-install:
-# Fix permissions.
-	@${CHOWN} -R ${BINOWN}:${BINGRP} ${DATADIR}
-	@${FIND} ${DATADIR} -type f -print0 | \
-		${XARGS} -0 ${CHMOD} 644
-	@${FIND} ${DATADIR} -type d -print0 | \
-		${XARGS} -0 ${CHMOD} 755
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/fmars/files/patch-Makefile b/games/fmars/files/patch-Makefile
deleted file mode 100644
index b718230a3c8b..000000000000
--- a/games/fmars/files/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.orig	Sun May 15 12:54:02 2005
-+++ Makefile	Thu Jul  7 19:26:25 2005
-@@ -5,13 +5,12 @@
- #INDENT = indent
- 
- 
--CC = gcc
--CFLAGS = -O2 -fomit-frame-pointer -fpic -fno-strict-aliasing #-march=athlon-xp
-+CFLAGS = $(OPT)
-+OPT = -O2 -fomit-frame-pointer
- #DEBUG = -g -fno-omit-frame-pointer -O0
- 
- #options for fm_sim.c only:
- #no-crossjumping - gcc 3.3 breaks computed gotos, this seems to help a little
--OPTS = -fno-cse-follow-jumps -fno-crossjumping
- #OPTS += -fno-strict-aliasing
- 
- #CFLAGS = $(CFLAGS_OPT) -fverbose-asm -W -Wimplicit -Wparentheses -Wpointer-arith \
diff --git a/games/fmars/pkg-descr b/games/fmars/pkg-descr
index 3a3c968f5caa..0230f45941f9 100644
--- a/games/fmars/pkg-descr
+++ b/games/fmars/pkg-descr
@@ -1,14 +1,15 @@
 fmars is Fast Memory Array Redcode Simulator
 
-A specialized simulator for the game of Corewars. It's designed to be of
-particular use in automated redcode optimizers and evolvers. fmars borrows the
-idea from Martin Ankerl's qmars and pushes it to the extreme.
+A specialized simulator for the game of Corewars. It's designed to be
+of particular use in automated redcode optimizers and evolvers. fmars
+borrows the idea from Martin Ankerl's qmars and pushes it to the
+extreme.
 
-It generates source code with special case for every possible opcode/addressing
-mode combination. This allows some optimizations that aren't possible in other
-simulators.
+It generates source code with special case for every possible
+opcode/addressing mode combination. This allows some optimizations
+that aren't possible in other simulators.
 
-fmars is compatible with pMARS with an exception for p-space, which is not yet
-implemented.
+fmars is compatible with pMARS with an exception for p-space, which
+is not yet implemented.
 
-WWW: http://www.v-lo.krakow.pl/~michal/fmars.html
+WWW: http://corewar.co.uk/janeczek/