- Support staging

- Respect CC and hence fix build with clang
- Respect CFLAGS

3 files changed, 17 insertions, 6 deletions

diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index 3dc64cf49786..f16fc5591928 100644
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@@ -11,13 +11,14 @@ DISTNAME=	flasm16src
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Command line assembler/disassembler of flash actionscript bytecode
 
-PLIST_FILES=	bin/flasm
 USES=		bison dos2unix gmake zip
-NO_WRKSUBDIR=	YES
+NO_WRKSUBDIR=	yes
+
+PLIST_FILES=	bin/flasm
+
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
 
-NO_STAGE=	yes
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/flasm ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/flasm ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/graphics/flasm/files/patch-Makefile b/graphics/flasm/files/patch-Makefile
new file mode 100644
index 000000000000..e3eb048d20d7
--- /dev/null
+++ b/graphics/flasm/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- ./Makefile.orig	2014-03-18 08:44:13.925827724 +0100
++++ ./Makefile	2014-03-18 08:44:31.479832342 +0100
+@@ -1,6 +1,5 @@
+ UNAME = $(shell uname)
+-CC = gcc
+-CFLAGS = -g -Wall -O2
++CC ?= gcc
+ LIBS = -lz
+ OFILES = util.o keywords.o flasm.o unflasm.o lex.yy.o assembler.tab.o
+ GARBAGE = assembler.tab.* lex.yy.c memwatch.o gmon.out memwatch.log core
diff --git a/graphics/flasm/files/patch-unflasm.c b/graphics/flasm/files/patch-unflasm.c
index 209a39b8baef..c9651eff858b 100644
--- a/graphics/flasm/files/patch-unflasm.c
+++ b/graphics/flasm/files/patch-unflasm.c
@@ -1,5 +1,5 @@
---- unflasm.c.orig	2007-06-10 03:40:47.000000000 +0900
-+++ unflasm.c	2010-07-22 12:09:29.000000000 +0900
+--- ./unflasm.c.orig	2014-03-18 08:44:06.055828097 +0100
++++ ./unflasm.c	2014-03-18 08:44:06.060828422 +0100
 @@ -1012,29 +1012,11 @@
  			}