3 files changed, 28 insertions, 40 deletions

diff --git a/games/pmars-sdl/Makefile b/games/pmars-sdl/Makefile
index 3cb7ff160bb4..52c90cdaf354 100644
--- a/games/pmars-sdl/Makefile
+++ b/games/pmars-sdl/Makefile
@@ -1,24 +1,18 @@
-# New ports collection makefile for:	pmars-sdl
-# Date created:				30 Jul 2005
-# Whom:					Alejandro Pulver <alejandro@varnet.biz>
-#
+# Created by: Alejandro Pulver <alejandro@varnet.biz>
 # $FreeBSD$
-#
 
 PORTNAME=	pmars
 PORTVERSION=	0.9.2
 PORTREVISION=	5
 CATEGORIES=	games
-MASTER_SITES=	http://www.cs.helsinki.fi/u/jpihlaja/cw/pmars-sdl/
+MASTER_SITES=	http://corewar.co.uk/pihlaja/pmars-sdl/
 PKGNAMESUFFIX=	-sdl
 DISTNAME=	${PORTNAME}-${PORTVERSION}-5
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Port of pMARS using the Simple Directmedia Library
 
-USE_SDL=	sdl
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+LICENSE=	GPLv2 # (or later)
 
 OPTIONS_DEFINE=	ICWS94 OPTIMIZED_CFLAGS PERMUTATE SMALLMEM
 OPTIONS_DEFAULT=	ICWS94 OPTIMIZED_CFLAGS PERMUTATE
@@ -26,7 +20,10 @@ ICWS94_DESC=	Enable ICWS'94 support
 PERMUTATE_DESC=	Enable the -P switch
 SMALLMEM_DESC=	Use 16-bit addresses (smaller)
 
-MAKE_ARGS+=	CFLAGS+="${CFLAGS}" \
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+
+USE_SDL=	sdl
+MAKE_ARGS=	CFLAGS+="${CFLAGS}" \
 		CFLAGS+="-fno-builtin" \
 		CFLAGS+="`${SDL_CONFIG} --cflags`" \
 		LIB+="`${SDL_CONFIG} --libs`" \
@@ -52,8 +49,16 @@ MAKE_ARGS+=	CFLAGS+="-DPERMUTATE"
 MAKE_ARGS+=	CFLAGS+="-DSMALLMEM"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^CC|#CC| ; \
+		 s|^CFLAGS|#CFLAGS| ; \
+		 s|^LFLAGS|#LFLAGS| ; \
+		 s|@$$(CC)|$$(CC)| ; \
+		 /strip/d' ${WRKSRC}/${MAKEFILE}
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
-		${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
+		${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX})
 
 .include <bsd.port.mk>
diff --git a/games/pmars-sdl/files/patch-Makefile b/games/pmars-sdl/files/patch-Makefile
deleted file mode 100644
index fe62f828d963..000000000000
--- a/games/pmars-sdl/files/patch-Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig	Thu May  1 10:09:46 2003
-+++ Makefile	Mon Jul 18 09:49:02 2005
-@@ -1,5 +1,4 @@
- # generic UNIX makefile
--CC = gcc			# req. for linux
- #CC = cc				# if you don't have gcc
- # Configuration options:
- #
-@@ -18,8 +17,6 @@
- # (8)   -DSDLGRAPHX     1                   SDL graphics (generic)
- 
- #DBG = -g -W -Wall -pg
--CFLAGS = -O4 -fomit-frame-pointer $(DBG) -DSERVER -DEXT94 -DPERMUTATE $(INC)
--LFLAGS = -x
- # LIB = -lcurses -ltermlib		# enable this one for curses display
- # LIB = -lvgagl -lvga			# enable this one for Linux/SVGA
- # LIB = -L/usr/X11R6/lib -lX11		# enable this one for X11
diff --git a/games/pmars-sdl/pkg-descr b/games/pmars-sdl/pkg-descr
index 1658b1d20b99..d102d91581ab 100644
--- a/games/pmars-sdl/pkg-descr
+++ b/games/pmars-sdl/pkg-descr
@@ -1,17 +1,17 @@
-Port of pMARS using the Simple Directmedia Library. Currently the port is in
-beta testing stage testing and bug reports/feature requests are more than
-welcome. The latest release is version 0.9.2-5.
+Port of pMARS using the Simple Directmedia Library. Currently the port
+is in beta testing stage testing and bug reports/feature requests are
+more than welcome.
 
 Features/fixes:
 
-* Environment sensitive. Now looks for macro files in the directory specified
-  by the environment variable PMARSHOME if they are not found in the current
-  directory.
+* Environment sensitive. Now looks for macro files in the directory
+  specified by the environment variable PMARSHOME if they are not
+  found in the current directory.
 * Both Win32 and X11 supported.
 * Command line history using Shift-Up and Shift-Down keys.
-* Rewrote text display and screen update routines for faster text panels (for
-  slow computers like mine.)
-* BIG core cells for those tiny cores. (Choose a display mode larger than 2,
-  e.g. -v 134.)
+* Rewrote text display and screen update routines for faster text
+  panels (for slow computers like mine.)
+* BIG core cells for those tiny cores. (Choose a display mode larger
+  than 2, e.g. -v 134.)
 
-WWW: http://www.cs.helsinki.fi/u/jpihlaja/cw/pmars-sdl/
+WWW: http://corewar.co.uk/pihlaja/pmars-sdl/