1 files changed, 31 insertions, 58 deletions

diff --git a/devel/asmx/Makefile b/devel/asmx/Makefile
index b9d9ab351f83..fb0bd543f1d3 100644
--- a/devel/asmx/Makefile
+++ b/devel/asmx/Makefile
@@ -3,15 +3,20 @@
 
 PORTNAME=	asmx
 PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://xi6.com/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-CPU macro assembler for many major 8-bit and 16-bit CPUs
 
-OPTIONS_DEFINE=	1802 6502 6809 68HC11 68HC16 8051 8085 F8 Z80 DOCS
-OPTIONS_DEFAULT=	1802 6502 6809 68HC11 68HC16 8051 8085 F8 Z80
+USES=		zip
+NO_WRKSUBDIR=	yes
+
+PORTDOCS=	README.txt
+
+OPTIONS_DEFINE=	1802 6502 6809 68HC11 68HC16 68000 8051 8085 F8 Z80 DOCS
+OPTIONS_DEFAULT=1802 6502 6809 68HC11 68HC16 68000 8051 8085 F8 Z80
 
 1802_DESC=	RCA 1802
 6502_DESC=	MOS Technology 6502, 65C02 and 6502
@@ -24,63 +29,29 @@ OPTIONS_DEFAULT=	1802 6502 6809 68HC11 68HC16 8051 8085 F8 Z80
 F8_DESC=	Fairchild F8
 Z80_DESC=	Zilog Z-80 and Nintendo Gameboy Z-80 variant
 
-USES=		zip
-NO_WRKSUBDIR=	yes
-
-PORTDOCS=	README.txt
+1802_ALL_TARGET=	asmx-1802
+1802_PLIST_FILES=	bin/asmx-1802
+6502_ALL_TARGET=	asmx-6502
+6502_PLIST_FILES=	bin/asmx-6502
+6809_ALL_TARGET=	asmx-6809
+6809_PLIST_FILES=	bin/asmx-6809
+68HC11_ALL_TARGET=	asmx-68hc11
+68HC11_PLIST_FILES=	bin/asmx-68hc11
+68HC16_ALL_TARGET=	asmx-68hc16
+68HC16_PLIST_FILES=	bin/asmx-68hc16
+68000_ALL_TARGET=	asmx-68k
+68000_PLIST_FILES=	bin/asmx-68k
+8051_ALL_TARGET=	asmx-8051
+8051_PLIST_FILES=	bin/asmx-8051
+8085_ALL_TARGET=	asmx-8085
+8085_PLIST_FILES=	bin/asmx-8085
+F8_ALL_TARGET=		asmx-f8
+F8_PLIST_FILES=		bin/asmx-f8
+Z80_ALL_TARGET=		asmx-z80
+Z80_PLIST_FILES=	bin/asmx-z80
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:M1802}
-ALL_TARGET+=	asmx-1802
-PLIST_FILES+=	bin/asmx-1802
-.endif
-
-.if ${PORT_OPTIONS:M6502}
-ALL_TARGET+=	asmx-6502
-PLIST_FILES+=	bin/asmx-6502
-.endif
-
-.if ${PORT_OPTIONS:M6809}
-ALL_TARGET+=	asmx-6809
-PLIST_FILES+=	bin/asmx-6809
-.endif
-
-.if ${PORT_OPTIONS:M68HC11}
-ALL_TARGET+=	asmx-68hc11
-PLIST_FILES+=	bin/asmx-68hc11
-.endif
-
-.if ${PORT_OPTIONS:M68HC16}
-ALL_TARGET+=	asmx-68hc16
-PLIST_FILES+=	bin/asmx-68hc16
-.endif
-
-.if ${PORT_OPTIONS:M68000}
-ALL_TARGET+=	asmx-68k
-PLIST_FILES+=	bin/asmx-68k
-.endif
-
-.if ${PORT_OPTIONS:M8051}
-ALL_TARGET+=	asmx-8051
-PLIST_FILES+=	bin/asmx-8051
-.endif
-
-.if ${PORT_OPTIONS:M8085}
-ALL_TARGET+=	asmx-8085
-PLIST_FILES+=	bin/asmx-8085
-.endif
-
-.if ${PORT_OPTIONS:MF8}
-ALL_TARGET+=	asmx-f8
-PLIST_FILES+=	bin/asmx-f8
-.endif
-
-.if ${PORT_OPTIONS:MZ80}
-ALL_TARGET+=	asmx-z80
-PLIST_FILES+=	bin/asmx-z80
-.endif
-
 post-patch:
 	@${ECHO_CMD} >> ${WRKSRC}/asmguts.h
 
@@ -93,7 +64,9 @@ do-install:
 .for f in ${ALL_TARGET}
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>