svn commit: r348518 - in head/graphics/flasm: . files

[Emanuel Haupt]

Author: ehaupt
Date: Tue Mar 18 07:46:07 2014
New Revision: 348518
URL: http://svnweb.freebsd.org/changeset/ports/348518
QAT: https://qat.redports.org/buildarchive/r348518/

Log:
  - Support staging
  - Respect CC and hence fix build with clang
  - Respect CFLAGS

Added:
  head/graphics/flasm/files/patch-Makefile   (contents, props changed)
Modified:
  head/graphics/flasm/Makefile
  head/graphics/flasm/files/patch-unflasm.c

Modified: head/graphics/flasm/Makefile
==============================================================================
--- head/graphics/flasm/Makefile	Tue Mar 18 07:42:43 2014	(r348517)
+++ head/graphics/flasm/Makefile	Tue Mar 18 07:46:07 2014	(r348518)
@@ -11,13 +11,14 @@ DISTNAME=	flasm16src
 MAINTAINER=	kuriyama at 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>

Added: head/graphics/flasm/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/flasm/files/patch-Makefile	Tue Mar 18 07:46:07 2014	(r348518)
@@ -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

Modified: head/graphics/flasm/files/patch-unflasm.c
==============================================================================
--- head/graphics/flasm/files/patch-unflasm.c	Tue Mar 18 07:42:43 2014	(r348517)
+++ head/graphics/flasm/files/patch-unflasm.c	Tue Mar 18 07:46:07 2014	(r348518)
@@ -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 @@
  			}