2 files changed, 24 insertions, 37 deletions

diff --git a/emulators/jzintv/Makefile b/emulators/jzintv/Makefile
index 968ac6b9d75b..8db0b055adad 100644
--- a/emulators/jzintv/Makefile
+++ b/emulators/jzintv/Makefile
@@ -24,6 +24,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
 
 OPTIONS_DEFINE=	TOOLS
+OPTIONS_SUB=	yes
 TOOLS_DESC=	Install additional tools
 
 TOOLS=	as1600 bin2rom cgc_update crc32 dasm0256 dasm1600 dasm1600o dis1600 \
@@ -32,14 +33,6 @@ TOOLS=	as1600 bin2rom cgc_update crc32 dasm0256 dasm1600 dasm1600o dis1600 \
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MTOOLS}
-PLIST_SUB+=	PL_TOOLS=""
-.else
-PLIST_SUB+=	PL_TOOLS="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} '288s|/usr/local/share/jzintv|${DATADIR}|' ${BUILD_WRKSRC}/config.h
 	@${CP} ${BUILD_WRKSRC}/Makefile.freebsd ${BUILD_WRKSRC}/Makefile
@@ -52,18 +45,12 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/rom
 	${INSTALL_DATA} ${WRKSRC}/rom/*.rom ${STAGEDIR}${DATADIR}/rom/
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/jzintv ${STAGEDIR}${PREFIX}/bin/jzintv
-.if ${PORT_OPTIONS:MTOOLS}
 .for tool in ${TOOLS}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${tool} ${STAGEDIR}${PREFIX}/bin/jzintv-${tool}
 .endfor
-.endif
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc)
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/jzintv/pkg-plist b/emulators/jzintv/pkg-plist
index a6240f1ada89..cdac22b518af 100644
--- a/emulators/jzintv/pkg-plist
+++ b/emulators/jzintv/pkg-plist
@@ -4,28 +4,28 @@ bin/jzintv
 %%DATADIR%%/rom/joy_diag.rom
 @dirrm %%DATADIR%%/rom
 @dirrm %%DATADIR%%
-%%PL_TOOLS%%bin/jzintv-as1600
-%%PL_TOOLS%%bin/jzintv-cgc_update
-%%PL_TOOLS%%bin/jzintv-crc32
-%%PL_TOOLS%%bin/jzintv-dasm1600
-%%PL_TOOLS%%bin/jzintv-dis1600
-%%PL_TOOLS%%bin/jzintv-frombit_r
-%%PL_TOOLS%%bin/jzintv-gms2rom
-%%PL_TOOLS%%bin/jzintv-imvtoppm
-%%PL_TOOLS%%bin/jzintv-rom2bin
-%%PL_TOOLS%%bin/jzintv-show_grom
-%%PL_TOOLS%%bin/jzintv-tobit
-%%PL_TOOLS%%bin/jzintv-tobit_r
-%%PL_TOOLS%%bin/jzintv-bin2rom
-%%PL_TOOLS%%bin/jzintv-dasm0256
-%%PL_TOOLS%%bin/jzintv-dasm1600o
-%%PL_TOOLS%%bin/jzintv-frombit
-%%PL_TOOLS%%bin/jzintv-fromhex
-%%PL_TOOLS%%bin/jzintv-imvtogif
-%%PL_TOOLS%%bin/jzintv-rom_merge
-%%PL_TOOLS%%bin/jzintv-split_rom
-%%PL_TOOLS%%bin/jzintv-tobit_f
-%%PL_TOOLS%%bin/jzintv-tohex
+%%TOOLS%%bin/jzintv-as1600
+%%TOOLS%%bin/jzintv-cgc_update
+%%TOOLS%%bin/jzintv-crc32
+%%TOOLS%%bin/jzintv-dasm1600
+%%TOOLS%%bin/jzintv-dis1600
+%%TOOLS%%bin/jzintv-frombit_r
+%%TOOLS%%bin/jzintv-gms2rom
+%%TOOLS%%bin/jzintv-imvtoppm
+%%TOOLS%%bin/jzintv-rom2bin
+%%TOOLS%%bin/jzintv-show_grom
+%%TOOLS%%bin/jzintv-tobit
+%%TOOLS%%bin/jzintv-tobit_r
+%%TOOLS%%bin/jzintv-bin2rom
+%%TOOLS%%bin/jzintv-dasm0256
+%%TOOLS%%bin/jzintv-dasm1600o
+%%TOOLS%%bin/jzintv-frombit
+%%TOOLS%%bin/jzintv-fromhex
+%%TOOLS%%bin/jzintv-imvtogif
+%%TOOLS%%bin/jzintv-rom_merge
+%%TOOLS%%bin/jzintv-split_rom
+%%TOOLS%%bin/jzintv-tobit_f
+%%TOOLS%%bin/jzintv-tohex
 %%PORTDOCS%%%%DOCSDIR%%/doc/tech/ecs.html
 %%PORTDOCS%%%%DOCSDIR%%/doc/tech/images/sp0256_cpu.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/tech/images/cart_top.png