diff -urN /usr/ports/emulators/cpmemu/Makefile emulators/cpmemu/Makefile --- /usr/ports/emulators/cpmemu/Makefile 2013-11-06 22:06:16.000000000 +0900 +++ emulators/cpmemu/Makefile 2013-12-31 00:00:00.000000000 +0900 @@ -18,5 +18,13 @@ ONLY_FOR_ARCHS= i386 -NO_STAGE= yes -.include +USES= compiler + +.include + +.if ${COMPILER_TYPE} == "clang" +USE_BINUTILS= yes +CPPFLAGS+= -no-integrated-as +.endif + +.include diff -urN /usr/ports/emulators/cpmemu/files/patch-ab emulators/cpmemu/files/patch-ab --- /usr/ports/emulators/cpmemu/files/patch-ab 2013-11-06 22:06:16.000000000 +0900 +++ emulators/cpmemu/files/patch-ab 2013-12-31 00:00:00.000000000 +0900 @@ -21,14 +21,14 @@ +CC ?= gcc -CFLAGS = -O2 -pipe -ansi -Wall \ -+CFLAGS += -ansi -Wall \ ++CFLAGS += $(CPPFLAGS) -ansi -Wall \ -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align \ -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes \ -Wnested-externs -Wwrite-strings \ -DCPMLIBDIR=\"$(CPMLIBDIR)\" -LDFLAGS = -s -+LDFLAGS += -s ++#LDFLAGS = -s OBJS = single.o z80emu.o em.o io.o bios.o \ commands.o running.o main.o disneu.o disz80.o low.o @@ -44,9 +44,10 @@ install: all - install -m 511 cpm $(BINDIR) -+ ${BSD_INSTALL_PROGRAM} cpm $(BINDIR)/cpmemu -+ ${BSD_INSTALL_PROGRAM} format $(BINDIR)/cpmformat - -mkdir $(CPMLIBDIR) +- -mkdir $(CPMLIBDIR) - chmod 755 $(CPMLIBDIR) - install -m 444 z80-binaries/* $(CPMLIBDIR) -+ ${BSD_INSTALL_DATA} z80-binaries/* $(CPMLIBDIR) ++ ${BSD_INSTALL_PROGRAM} cpm $(DESTDIR)$(BINDIR)/cpmemu ++ ${BSD_INSTALL_PROGRAM} format $(DESTDIR)$(BINDIR)/cpmformat ++ -mkdir $(DESTDIR)$(CPMLIBDIR) ++ ${BSD_INSTALL_DATA} z80-binaries/* $(DESTDIR)$(CPMLIBDIR)