From 3259de09a46c11d7df36c5d01b75979fdff3b301 Mon Sep 17 00:00:00 2001
From: Xiangfu Liu <xiangfu@sharism.cc>
Date: Mon, 17 Jan 2011 13:21:00 +0800
Subject: [PATCH] pmars: fix compile error, remove static CC ... in Makefile

---
 pmars/Makefile                                    |  8 ++------
 .../001-remove-static-define-in-makefile.patch    | 15 +++++++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pmars/Makefile b/pmars/Makefile
index 1ed0d0c..b3a24c1 100644
--- a/pmars/Makefile
+++ b/pmars/Makefile
@@ -16,8 +16,8 @@ define Package/pmars
 	TITLE:=Pmars
 	SECTION:=games
 	CATEGORY:=Games
-	DEPENDS:=@BROKEN
-	URL:=
+	DEPENDS:=+libncurses
+	URL:=http://corewar.co.uk/pmars/
 endef
 PKG_BUILD_DIR:=$(BUILD_DIR)/pmars-$(PKG_VERSION)
 define Package/pmars/description
@@ -29,10 +29,6 @@ TARGET_LDFLAGS+= \
 
 MAKE_FLAGS += -C src
 
-define Package/pmars/Build/Compile
-	$(call Build/Compile/Default)
-endef
-
 define Package/pmars/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pmars $(1)/usr/bin/
diff --git a/pmars/patches/001-remove-static-define-in-makefile.patch b/pmars/patches/001-remove-static-define-in-makefile.patch
index 455abc4..ab4d374 100644
--- a/pmars/patches/001-remove-static-define-in-makefile.patch
+++ b/pmars/patches/001-remove-static-define-in-makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/src/Makefile b/src/Makefile
-index 99c00bb..17a51ed 100644
+index 99c00bb..0630be1 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -1,5 +1,5 @@
@@ -9,7 +9,7 @@ index 99c00bb..17a51ed 100644
  #CC = cc				# if you don't have gcc
  # Configuration options:
  #
-@@ -16,11 +16,11 @@ CC = gcc			# req. for linux
+@@ -16,11 +16,12 @@ CC = gcc			# req. for linux
  # (6)   -DXWINGRAPHX    1                   X-Windows graphics (UNIX)
  # (7)   -DPERMUTATE                         enables -P switch
  
@@ -17,19 +17,22 @@ index 99c00bb..17a51ed 100644
 +CFLAGS := $(CFLAGS) -O -DEXT94 -DPERMUTATE -DCURSESGRAPHX
  LFLAGS = -x
 -# LIB = -lcurses -ltermlib		# enable this one for curses display
-+LIB = -lncurses -ltermlib		# enable this one for curses display
++# LIB = -lncurses -ltermlib		# enable this one for curses display
++LIB = -lncurses
  # LIB = -lvgagl -lvga			# enable this one for Linux/SVGA
 -LIB = -L/usr/X11R6/lib -lX11		# enable this one for X11
 +# LIB = -L/usr/X11R6/lib -lX11		# enable this one for X11
  
  .SUFFIXES: .o .c .c~ .man .doc .6
  MAINFILE = pmars
-@@ -38,7 +38,7 @@ flags:
+@@ -37,8 +38,8 @@ flags:
+ 
  $(MAINFILE): $(OBJ1) $(OBJ2) $(OBJ3)
  	@echo Linking $(MAINFILE)
- 	@$(CC) -o $(MAINFILE) $(OBJ1) $(OBJ2) $(OBJ3) $(LIB)
+-	@$(CC) -o $(MAINFILE) $(OBJ1) $(OBJ2) $(OBJ3) $(LIB)
 -	@strip $(MAINFILE)
-+	@$(STRIP) $(MAINFILE)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(MAINFILE) $(OBJ1) $(OBJ2) $(OBJ3) $(LIB)
++	$(STRIP) $(MAINFILE)
  	@echo done
  
  token.o asm.o disasm.o: asm.h