1 files changed, 28 insertions, 25 deletions

diff --git a/devel/asmx/Makefile b/devel/asmx/Makefile
index e8c999add94b..90290963b882 100644
--- a/devel/asmx/Makefile
+++ b/devel/asmx/Makefile
@@ -20,65 +20,68 @@ ALL_TARGET=
 
 PORTDOCS=	README.txt
 
-OPTIONS=	1802 "RCA 1802" On \
-		6502 "MOS Technology 6502, 65C02 and 6502" On \
-		6809 "Motorola 6809" On \
-		68HC11 "Motorola 6800/6801/68HC11 and Hitachi 6303" On \
-		68HC16 "Motorola 68HC16" On \
-		68000 "Motorola 68000/68010" On \
-		8051 "Intel 8051" On \
-		8085 "Intel 8080 and 8085" On \
-		F8 "Fairchild F8" On \
-		Z80 "Zilog Z-80 and Nintendo Gameboy Z-80 variant" On
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_1802)
+OPTIONS_DEFINE=	1802 6502 6809 68HC11 68HC16 8051 8085 F8 Z80 DOCS
+OPTIONS_DEFAULT=	1802 6502 6809 68HC11 68HC16 8051 8085 F8 Z80
+
+1802_DESC=	RCA 1802
+6502_DESC=	MOS Technology 6502, 65C02 and 6502
+6809_DESC=	Motorola 6809
+68HC11_DESC=	Motorola 6800/6801/68HC11 and Hitachi 6303
+68HC16_DESC=	Motorola 68HC16
+68000_DESC=	Motorola 68000/68010
+8051_DESC=	Intel 8051
+8085_DESC=	Intel 8080 and 8085
+F8_DESC=	Fairchild F8
+Z80_DESC=	Zilog Z-80 and Nintendo Gameboy Z-80 variant
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:M1802}
 ALL_TARGET+=	asmx-1802
 PLIST_FILES+=	bin/asmx-1802
 .endif
 
-.if defined(WITH_6502)
+.if ${PORT_OPTIONS:M6502}
 ALL_TARGET+=	asmx-6502
 PLIST_FILES+=	bin/asmx-6502
 .endif
 
-.if defined(WITH_6809)
+.if ${PORT_OPTIONS:M6809}
 ALL_TARGET+=	asmx-6809
 PLIST_FILES+=	bin/asmx-6809
 .endif
 
-.if defined(WITH_68HC11)
+.if ${PORT_OPTIONS:M68HC11}
 ALL_TARGET+=	asmx-68hc11
 PLIST_FILES+=	bin/asmx-68hc11
 .endif
 
-.if defined(WITH_68HC16)
+.if ${PORT_OPTIONS:M68HC16}
 ALL_TARGET+=	asmx-68hc16
 PLIST_FILES+=	bin/asmx-68hc16
 .endif
 
-.if defined(WITH_68000)
+.if ${PORT_OPTIONS:M68000}
 ALL_TARGET+=	asmx-68k
 PLIST_FILES+=	bin/asmx-68k
 .endif
 
-.if defined(WITH_8051)
+.if ${PORT_OPTIONS:M8051}
 ALL_TARGET+=	asmx-8051
 PLIST_FILES+=	bin/asmx-8051
 .endif
 
-.if defined(WITH_8085)
+.if ${PORT_OPTIONS:M8085}
 ALL_TARGET+=	asmx-8085
 PLIST_FILES+=	bin/asmx-8085
 .endif
 
-.if defined(WITH_F8)
+.if ${PORT_OPTIONS:MF8}
 ALL_TARGET+=	asmx-f8
 PLIST_FILES+=	bin/asmx-f8
 .endif
 
-.if defined(WITH_Z80)
+.if ${PORT_OPTIONS:MZ80}
 ALL_TARGET+=	asmx-z80
 PLIST_FILES+=	bin/asmx-z80
 .endif
@@ -93,9 +96,9 @@ do-install:
 .for f in ${ALL_TARGET}
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin/
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>