Rename all 10,000 games/ patch-xy patches to reflect the files they modify.

231 files changed, 77 insertions, 92 deletions

diff --git a/games/3dc/files/patch-aa b/games/3dc/files/patch-Makefile
index 791668f..791668f 100644
--- a/games/3dc/files/patch-aa
+++ b/games/3dc/files/patch-Makefile
diff --git a/games/3dc/files/patch-ab b/games/3dc/files/patch-include_machine.h
index 8342b7c..8342b7c 100644
--- a/games/3dc/files/patch-ab
+++ b/games/3dc/files/patch-include_machine.h
diff --git a/games/KnightCap/files/patch-aa b/games/KnightCap/files/patch-Makefile
index 3a4bc2c..3a4bc2c 100644
--- a/games/KnightCap/files/patch-aa
+++ b/games/KnightCap/files/patch-Makefile
diff --git a/games/KnightCap/files/patch-ab b/games/KnightCap/files/patch-knightcap.c
index 01dba41..01dba41 100644
--- a/games/KnightCap/files/patch-ab
+++ b/games/KnightCap/files/patch-knightcap.c
diff --git a/games/acm/files/patch-03 b/games/acm/files/patch-configure
index 79dd7dd..79dd7dd 100644
--- a/games/acm/files/patch-03
+++ b/games/acm/files/patch-configure
diff --git a/games/acm/files/patch-09 b/games/acm/files/patch-dis_lib_xdr_var_array.c
index d0ce1c2..d0ce1c2 100644
--- a/games/acm/files/patch-09
+++ b/games/acm/files/patch-dis_lib_xdr_var_array.c
diff --git a/games/acm/files/patch-07 b/games/acm/files/patch-dis_server_sites.c
index 47a96da..47a96da 100644
--- a/games/acm/files/patch-07
+++ b/games/acm/files/patch-dis_server_sites.c
diff --git a/games/acm/files/patch-04 b/games/acm/files/patch-dis_test_Makefile.in
index 229d8a8..229d8a8 100644
--- a/games/acm/files/patch-04
+++ b/games/acm/files/patch-dis_test_Makefile.in
diff --git a/games/acm/files/patch-01 b/games/acm/files/patch-src_Makefile.in
index 0e8b044..0e8b044 100644
--- a/games/acm/files/patch-01
+++ b/games/acm/files/patch-src_Makefile.in
diff --git a/games/acm/files/patch-02 b/games/acm/files/patch-src_acm.man
index 46cc789..46cc789 100644
--- a/games/acm/files/patch-02
+++ b/games/acm/files/patch-src_acm.man
diff --git a/games/acm/files/patch-06 b/games/acm/files/patch-src_chaser.c
index 3401ced..3401ced 100644
--- a/games/acm/files/patch-06
+++ b/games/acm/files/patch-src_chaser.c
diff --git a/games/acm/files/patch-08 b/games/acm/files/patch-src_interpolate.h
index 8eb76ed..8eb76ed 100644
--- a/games/acm/files/patch-08
+++ b/games/acm/files/patch-src_interpolate.h
diff --git a/games/acm/files/patch-05 b/games/acm/files/patch-src_main.c
index 580ff93..580ff93 100644
--- a/games/acm/files/patch-05
+++ b/games/acm/files/patch-src_main.c
diff --git a/games/antipolix/files/patch-aa b/games/antipolix/files/patch-Imakefile
index 6d3422d..6d3422d 100644
--- a/games/antipolix/files/patch-aa
+++ b/games/antipolix/files/patch-Imakefile
diff --git a/games/antipolix/files/patch-ab b/games/antipolix/files/patch-client.c
index 1dc899b..1dc899b 100644
--- a/games/antipolix/files/patch-ab
+++ b/games/antipolix/files/patch-client.c
diff --git a/games/antipolix/files/patch-ac b/games/antipolix/files/patch-creation.c
index b55890d..b55890d 100644
--- a/games/antipolix/files/patch-ac
+++ b/games/antipolix/files/patch-creation.c
diff --git a/games/antipolix/files/patch-ad b/games/antipolix/files/patch-messages.c
index f2b4925..f2b4925 100644
--- a/games/antipolix/files/patch-ad
+++ b/games/antipolix/files/patch-messages.c
diff --git a/games/antipolix/files/patch-ae b/games/antipolix/files/patch-server.c
index a1c2285..a1c2285 100644
--- a/games/antipolix/files/patch-ae
+++ b/games/antipolix/files/patch-server.c
diff --git a/games/awele/Makefile b/games/awele/Makefile
index b7f5026..75ef3af 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -7,14 +7,13 @@ PORTREVISION=	4
 CATEGORIES=	games tk
 MASTER_SITES=	XCONTRIB/games
 DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	African board game
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		imake tk
+USES=		imake tk tar:tgz
 USE_XORG=	x11
 MAKE_ARGS=	AWELE_DIR=${STAGEDIR}${PREFIX}/bin
 
diff --git a/games/awele/files/patch-aa b/games/awele/files/patch-Imakefile
index cf14711..cf14711 100644
--- a/games/awele/files/patch-aa
+++ b/games/awele/files/patch-Imakefile
diff --git a/games/awele/files/patch-ab b/games/awele/files/patch-tkAppInit.c
index f205006..f205006 100644
--- a/games/awele/files/patch-ab
+++ b/games/awele/files/patch-tkAppInit.c
diff --git a/games/awele/files/patch-ac b/games/awele/files/patch-xawele
index aff2a69..aff2a69 100644
--- a/games/awele/files/patch-ac
+++ b/games/awele/files/patch-xawele
diff --git a/games/blockade/files/patch-aa b/games/blockade/files/patch-Makefile
index 7c2444b..7c2444b 100644
--- a/games/blockade/files/patch-aa
+++ b/games/blockade/files/patch-Makefile
diff --git a/games/blockade/files/patch-ab b/games/blockade/files/patch-blockade.c
index da2cb67..da2cb67 100644
--- a/games/blockade/files/patch-ab
+++ b/games/blockade/files/patch-blockade.c
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index 1ae2a55..0e0afc0 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -8,14 +8,13 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 DISTNAME=	bugsx108
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Breed bugs using genetic algorithms
 
 LICENSE=	GPLv1
 
-USES=		imake
+USES=		imake tar:tgz
 USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/bugsx
 PLIST_FILES=	bin/bugsx man/man1/bugsx.1.gz
diff --git a/games/bugsx/files/patch-aa b/games/bugsx/files/patch-Imakefile
index b5cc62e..b5cc62e 100644
--- a/games/bugsx/files/patch-aa
+++ b/games/bugsx/files/patch-Imakefile
diff --git a/games/columns/files/patch-ab b/games/columns/files/patch-columns.cc
index 340e665..340e665 100644
--- a/games/columns/files/patch-ab
+++ b/games/columns/files/patch-columns.cc
diff --git a/games/columns/files/patch-ac b/games/columns/files/patch-configure
index f7623db..f7623db 100644
--- a/games/columns/files/patch-ac
+++ b/games/columns/files/patch-configure
diff --git a/games/cosmo/files/patch-aa b/games/cosmo/files/patch-Imakefile
index 94a1bf8..94a1bf8 100644
--- a/games/cosmo/files/patch-aa
+++ b/games/cosmo/files/patch-Imakefile
diff --git a/games/cosmo/files/patch-ab b/games/cosmo/files/patch-setup.c
index 2e69f9d..2e69f9d 100644
--- a/games/cosmo/files/patch-ab
+++ b/games/cosmo/files/patch-setup.c
diff --git a/games/cowsay/files/patch-aa b/games/cowsay/files/patch-cowsay
index 7bf70197..7bf70197 100644
--- a/games/cowsay/files/patch-aa
+++ b/games/cowsay/files/patch-cowsay
diff --git a/games/cursive/Makefile b/games/cursive/Makefile
index d024390..0be21b6 100644
--- a/games/cursive/Makefile
+++ b/games/cursive/Makefile
@@ -6,11 +6,11 @@ PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://puck.nether.net/pub/janc/
 DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create ASCII character cursive handwriting
 
+USES=		tar:tgz
 PLIST_FILES=	bin/cursive \
 		man/man6/cursive.6.gz
 
diff --git a/games/cursive/files/patch-aa b/games/cursive/files/patch-Makefile
index cc69375..cc69375 100644
--- a/games/cursive/files/patch-aa
+++ b/games/cursive/files/patch-Makefile
diff --git a/games/cursive/files/patch-ac b/games/cursive/files/patch-cursive.6
index fcf82cf..fcf82cf 100644
--- a/games/cursive/files/patch-ac
+++ b/games/cursive/files/patch-cursive.6
diff --git a/games/cursive/files/patch-ab b/games/cursive/files/patch-cursive.c
index 8a3e553..8a3e553 100644
--- a/games/cursive/files/patch-ab
+++ b/games/cursive/files/patch-cursive.c
diff --git a/games/drm/Makefile b/games/drm/Makefile
index 90463ef..bf2eed7 100644
--- a/games/drm/Makefile
+++ b/games/drm/Makefile
@@ -7,12 +7,12 @@ CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
 DISTNAME=		dr_mario
-EXTRACT_SUFX=		.tar.Z
 
 MAINTAINER=		ports@FreeBSD.org
-COMMENT=	Very simple Tetris-style game
+COMMENT=		Very simple Tetris-style game
 
 ALL_TARGET=
+USES=			tar:Z
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/games/drm/files/patch-aa b/games/drm/files/patch-Makefile
index 282df43..282df43 100644
--- a/games/drm/files/patch-aa
+++ b/games/drm/files/patch-Makefile
diff --git a/games/editss/files/patch-aa b/games/editss/files/patch-actions.c
index 368be1b..368be1b 100644
--- a/games/editss/files/patch-aa
+++ b/games/editss/files/patch-actions.c
diff --git a/games/editss/files/patch-ab b/games/editss/files/patch-editss.c
index 854005f..854005f 100644
--- a/games/editss/files/patch-ab
+++ b/games/editss/files/patch-editss.c
diff --git a/games/editss/files/patch-ac b/games/editss/files/patch-xstuff.c
index 9383eea..9383eea 100644
--- a/games/editss/files/patch-ac
+++ b/games/editss/files/patch-xstuff.c
diff --git a/games/flying/files/patch-aa b/games/flying/files/patch-Imakefile
index e0bd731..e0bd731 100644
--- a/games/flying/files/patch-aa
+++ b/games/flying/files/patch-Imakefile
diff --git a/games/flying/files/patch-ab b/games/flying/files/patch-carrom.C
index 2b0002e..2b0002e 100644
--- a/games/flying/files/patch-ab
+++ b/games/flying/files/patch-carrom.C
diff --git a/games/flying/files/patch-ad b/games/flying/files/patch-main.C
index ab80ac7..ab80ac7 100644
--- a/games/flying/files/patch-ad
+++ b/games/flying/files/patch-main.C
diff --git a/games/flying/files/patch-af b/games/flying/files/patch-pool8.C
index 535090b..535090b 100644
--- a/games/flying/files/patch-af
+++ b/games/flying/files/patch-pool8.C
diff --git a/games/flying/files/patch-ac b/games/flying/files/patch-xgraph.C
index 5df22e6..5df22e6 100644
--- a/games/flying/files/patch-ac
+++ b/games/flying/files/patch-xgraph.C
diff --git a/games/flying/files/patch-ae b/games/flying/files/patch-xmover.C
index 31c62dc..31c62dc 100644
--- a/games/flying/files/patch-ae
+++ b/games/flying/files/patch-xmover.C
diff --git a/games/gnugo/files/patch-ab b/games/gnugo/files/patch-configure
index 0991db8..0991db8 100644
--- a/games/gnugo/files/patch-ab
+++ b/games/gnugo/files/patch-configure
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 69ab2db..c939780 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -25,10 +25,8 @@ LIBS+=		-L${LOCALBASE}/lib
 # for plib (sound):
 CONFIGURE_ARGS+=	--with-plib=${LOCALBASE}/plib
 
-.include <bsd.port.pre.mk>
-
 pre-patch:
 	@${REINPLACE_CMD} -i '' -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/common/gr_memory.h
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/gracer/files/patch-aa b/games/gracer/files/patch-configure.in
index 737df1e..737df1e 100644
--- a/games/gracer/files/patch-aa
+++ b/games/gracer/files/patch-configure.in
diff --git a/games/gracer/files/patch-ac b/games/gracer/files/patch-src_glbind.c
index 3f189f5..3f189f5 100644
--- a/games/gracer/files/patch-ac
+++ b/games/gracer/files/patch-src_glbind.c
diff --git a/games/heretic/files/patch-aa b/games/heretic/files/patch-Makefile
index 8792e86..8792e86 100644
--- a/games/heretic/files/patch-aa
+++ b/games/heretic/files/patch-Makefile
diff --git a/games/heretic/files/patch-al b/games/heretic/files/patch-i_udp.c
index e7e198b..e7e198b 100644
--- a/games/heretic/files/patch-al
+++ b/games/heretic/files/patch-i_udp.c
diff --git a/games/heretic/files/patch-ah b/games/heretic/files/patch-opengl_gl_fonts.c
index 26a1436..26a1436 100644
--- a/games/heretic/files/patch-ah
+++ b/games/heretic/files/patch-opengl_gl_fonts.c
diff --git a/games/heretic/files/patch-ae b/games/heretic/files/patch-opengl_gl_struct.h
index 009be36..009be36 100644
--- a/games/heretic/files/patch-ae
+++ b/games/heretic/files/patch-opengl_gl_struct.h
diff --git a/games/heretic/files/patch-ad b/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h
index 1e6ec40..1e6ec40 100644
--- a/games/heretic/files/patch-ad
+++ b/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h
diff --git a/games/heretic/files/patch-aj b/games/heretic/files/patch-sndserv_Makefile
index 9293acc..9293acc 100644
--- a/games/heretic/files/patch-aj
+++ b/games/heretic/files/patch-sndserv_Makefile
diff --git a/games/heretic/files/patch-ak b/games/heretic/files/patch-sndserv_linux.c
index 5aac936..5aac936 100644
--- a/games/heretic/files/patch-ak
+++ b/games/heretic/files/patch-sndserv_linux.c
diff --git a/games/heretic/files/patch-af b/games/heretic/files/patch-sndserv_soundsrv.c
index e744690..e744690 100644
--- a/games/heretic/files/patch-af
+++ b/games/heretic/files/patch-sndserv_soundsrv.c
diff --git a/games/heretic/files/patch-ag b/games/heretic/files/patch-sndserv_wadread.c
index d878db7..d878db7 100644
--- a/games/heretic/files/patch-ag
+++ b/games/heretic/files/patch-sndserv_wadread.c
diff --git a/games/heretic/files/patch-ac b/games/heretic/files/patch-w_wad.c
index 74df663..74df663 100644
--- a/games/heretic/files/patch-ac
+++ b/games/heretic/files/patch-w_wad.c
diff --git a/games/hex/files/patch-ac b/games/hex/files/patch-Makefile
index 7936e63..7936e63 100644
--- a/games/hex/files/patch-ac
+++ b/games/hex/files/patch-Makefile
diff --git a/games/hex/files/patch-aa b/games/hex/files/patch-hex.c
index c00792c..c00792c 100644
--- a/games/hex/files/patch-aa
+++ b/games/hex/files/patch-hex.c
diff --git a/games/hex/files/patch-ab b/games/hex/files/patch-hex.h
index 023e818..023e818 100644
--- a/games/hex/files/patch-ab
+++ b/games/hex/files/patch-hex.h
diff --git a/games/imaze/files/patch-aa b/games/imaze/files/patch-source_Makefile.in
index 32ae788..32ae788 100644
--- a/games/imaze/files/patch-aa
+++ b/games/imaze/files/patch-source_Makefile.in
diff --git a/games/imaze/files/patch-ad b/games/imaze/files/patch-source_configure
index bc70380..bc70380 100644
--- a/games/imaze/files/patch-ad
+++ b/games/imaze/files/patch-source_configure
diff --git a/games/imaze/files/patch-ab b/games/imaze/files/patch-source_fbsd_joystick.c
index 8d1d16c..8d1d16c 100644
--- a/games/imaze/files/patch-ab
+++ b/games/imaze/files/patch-source_fbsd_joystick.c
diff --git a/games/imaze/files/patch-ac b/games/imaze/files/patch-source_voxware_audio.c
index 950aa60..950aa60 100644
--- a/games/imaze/files/patch-ac
+++ b/games/imaze/files/patch-source_voxware_audio.c
diff --git a/games/inform/files/patch-aa b/games/inform/files/patch-header.h
index f465a25..f465a25 100644
--- a/games/inform/files/patch-aa
+++ b/games/inform/files/patch-header.h
diff --git a/games/ladder/files/patch-ab b/games/ladder/files/patch-Makefile
index 0b36462..0b36462 100644
--- a/games/ladder/files/patch-ab
+++ b/games/ladder/files/patch-Makefile
diff --git a/games/ladder/files/patch-aa b/games/ladder/files/patch-ladder.c_1
index 2b082bb..2b082bb 100644
--- a/games/ladder/files/patch-aa
+++ b/games/ladder/files/patch-ladder.c_1
diff --git a/games/ladder/files/patch-ac b/games/ladder/files/patch-ladder.c_2
index 3dfe726..3dfe726 100644
--- a/games/ladder/files/patch-ac
+++ b/games/ladder/files/patch-ladder.c_2
diff --git a/games/ladder/files/patch-ag b/games/ladder/files/patch-ladder.h
index ff629e0..ff629e0 100644
--- a/games/ladder/files/patch-ag
+++ b/games/ladder/files/patch-ladder.h
diff --git a/games/ladder/files/patch-ad b/games/ladder/files/patch-lplay.c
index eef6d35..eef6d35 100644
--- a/games/ladder/files/patch-ad
+++ b/games/ladder/files/patch-lplay.c
diff --git a/games/ladder/files/patch-ae b/games/ladder/files/patch-lscore.c
index f7545c8..f7545c8 100644
--- a/games/ladder/files/patch-ae
+++ b/games/ladder/files/patch-lscore.c
diff --git a/games/ladder/files/patch-af b/games/ladder/files/patch-ltime.c
index c1f515e..c1f515e 100644
--- a/games/ladder/files/patch-af
+++ b/games/ladder/files/patch-ltime.c
diff --git a/games/lbreakout/files/patch-ad b/games/lbreakout/files/patch-Makefile.in
index a44be7a..a44be7a 100644
--- a/games/lbreakout/files/patch-ad
+++ b/games/lbreakout/files/patch-Makefile.in
diff --git a/games/lbreakout/files/patch-ae b/games/lbreakout/files/patch-configure
index a7a54c9..a7a54c9 100644
--- a/games/lbreakout/files/patch-ae
+++ b/games/lbreakout/files/patch-configure
diff --git a/games/lbreakout/files/patch-aa b/games/lbreakout/files/patch-lbreakout_Makefile.in
index 3d8896c..3d8896c 100644
--- a/games/lbreakout/files/patch-aa
+++ b/games/lbreakout/files/patch-lbreakout_Makefile.in
diff --git a/games/lbreakout/files/patch-ab b/games/lbreakout/files/patch-lbreakout_breakout.cpp
index 341e2de..341e2de 100644
--- a/games/lbreakout/files/patch-ab
+++ b/games/lbreakout/files/patch-lbreakout_breakout.cpp
diff --git a/games/lbreakout/files/patch-ac b/games/lbreakout/files/patch-lbreakout_game.cpp
index b542dcb..b542dcb 100644
--- a/games/lbreakout/files/patch-ac
+++ b/games/lbreakout/files/patch-lbreakout_game.cpp
diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile
index 0595814..8c84c5a 100644
--- a/games/mindfocus/Makefile
+++ b/games/mindfocus/Makefile
@@ -17,9 +17,7 @@ RESTRICTED=	'contains commercial character data'
 
 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
 
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@@ -36,13 +34,11 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/pixmaps/$i ${STAGEDIR}${EXAMPLESDIR}/pixmaps
 .endfor
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/HISTORY.euc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/MFC.euc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/README.euc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/SCRIPT.euc ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/TODO.euc ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/mindfocus/files/patch-ab b/games/mindfocus/files/patch-Imakefile
index c800ef9..c800ef9 100644
--- a/games/mindfocus/files/patch-ab
+++ b/games/mindfocus/files/patch-Imakefile
diff --git a/games/mindfocus/files/patch-aa b/games/mindfocus/files/patch-configure.h
index 07eac14..07eac14 100644
--- a/games/mindfocus/files/patch-aa
+++ b/games/mindfocus/files/patch-configure.h
diff --git a/games/mindfocus/files/patch-ac b/games/mindfocus/files/patch-mindfocus_Imakefile
index 7524fa8..7524fa8 100644
--- a/games/mindfocus/files/patch-ac
+++ b/games/mindfocus/files/patch-mindfocus_Imakefile
diff --git a/games/mindfocus/pkg-plist b/games/mindfocus/pkg-plist
index 9caee22..87e2c4c 100644
--- a/games/mindfocus/pkg-plist
+++ b/games/mindfocus/pkg-plist
@@ -1,57 +1,57 @@
 bin/mindfocus
-%%EXAMPLESDIR%%/akane.mfc
-%%EXAMPLESDIR%%/misaki.mfc
-%%EXAMPLESDIR%%/nanase.mfc
-%%EXAMPLESDIR%%/mayu.mfc
-%%EXAMPLESDIR%%/mio.mfc
-%%EXAMPLESDIR%%/misaki2.mfc
-%%EXAMPLESDIR%%/mizuka.mfc
-%%EXAMPLESDIR%%/myu.mfc
-%%EXAMPLESDIR%%/ryoko.mfc
-%%EXAMPLESDIR%%/system.mindfocus
-%%EXAMPLESDIR%%/pixmaps/akane0.xpm
-%%EXAMPLESDIR%%/pixmaps/akane1.xpm
-%%EXAMPLESDIR%%/pixmaps/akane2.xpm
-%%EXAMPLESDIR%%/pixmaps/akane3.xpm
-%%EXAMPLESDIR%%/pixmaps/misaki0.xpm
-%%EXAMPLESDIR%%/pixmaps/misaki1.xpm
-%%EXAMPLESDIR%%/pixmaps/misaki2.xpm
-%%EXAMPLESDIR%%/pixmaps/misaki3.xpm
-%%EXAMPLESDIR%%/pixmaps/nanase0.xpm
-%%EXAMPLESDIR%%/pixmaps/nanase1.xpm
-%%EXAMPLESDIR%%/pixmaps/nanase2.xpm
-%%EXAMPLESDIR%%/pixmaps/nanase3.xpm
-%%EXAMPLESDIR%%/pixmaps/mayu1.xpm
-%%EXAMPLESDIR%%/pixmaps/mayu2.xpm
-%%EXAMPLESDIR%%/pixmaps/mayu3.xpm
-%%EXAMPLESDIR%%/pixmaps/mayu4.xpm
-%%EXAMPLESDIR%%/pixmaps/mio1.xpm
-%%EXAMPLESDIR%%/pixmaps/mio2.xpm
-%%EXAMPLESDIR%%/pixmaps/mio3.xpm
-%%EXAMPLESDIR%%/pixmaps/mio4.xpm
-%%EXAMPLESDIR%%/pixmaps/misaki2-1.xpm
-%%EXAMPLESDIR%%/pixmaps/misaki2-2.xpm
-%%EXAMPLESDIR%%/pixmaps/misaki2-3.xpm
-%%EXAMPLESDIR%%/pixmaps/misaki2-4.xpm
-%%EXAMPLESDIR%%/pixmaps/mizuka1.xpm
-%%EXAMPLESDIR%%/pixmaps/mizuka2.xpm
-%%EXAMPLESDIR%%/pixmaps/mizuka3.xpm
-%%EXAMPLESDIR%%/pixmaps/mizuka4.xpm
-%%EXAMPLESDIR%%/pixmaps/myu1.xpm
-%%EXAMPLESDIR%%/pixmaps/myu2.xpm
-%%EXAMPLESDIR%%/pixmaps/myu3.xpm
-%%EXAMPLESDIR%%/pixmaps/myu4.xpm
-%%EXAMPLESDIR%%/pixmaps/ryoko1.xpm
-%%EXAMPLESDIR%%/pixmaps/ryoko2.xpm
-%%EXAMPLESDIR%%/pixmaps/ryoko3.xpm
-%%EXAMPLESDIR%%/pixmaps/ryoko4.xpm
-%%EXAMPLESDIR%%/scripts/eye.ms
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/akane.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misaki.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nanase.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mayu.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mio.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misaki2.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mizuka.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myu.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ryoko.mfc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/system.mindfocus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/akane0.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/akane1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/akane2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/akane3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki0.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/nanase0.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/nanase1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/nanase2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/nanase3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mayu1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mayu2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mayu3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mayu4.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mio1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mio2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mio3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mio4.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2-1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2-2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2-3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2-4.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mizuka1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mizuka2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mizuka3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mizuka4.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/myu1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/myu2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/myu3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/myu4.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/ryoko1.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/ryoko2.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/ryoko3.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/ryoko4.xpm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/eye.ms
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY.euc
 %%PORTDOCS%%%%DOCSDIR%%/MFC.euc
 %%PORTDOCS%%%%DOCSDIR%%/README.euc
 %%PORTDOCS%%%%DOCSDIR%%/SCRIPT.euc
 %%PORTDOCS%%%%DOCSDIR%%/TODO.euc
-@dirrm %%EXAMPLESDIR%%/pixmaps
-@dirrm %%EXAMPLESDIR%%/scripts
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pixmaps
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scripts
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/mindguard/files/patch-aa b/games/mindguard/files/patch-Makefile
index a1d794d..a1d794d 100644
--- a/games/mindguard/files/patch-aa
+++ b/games/mindguard/files/patch-Makefile
diff --git a/games/mindguard/files/patch-ab b/games/mindguard/files/patch-mindguard.c
index 94079c9..94079c9 100644
--- a/games/mindguard/files/patch-ab
+++ b/games/mindguard/files/patch-mindguard.c
diff --git a/games/miscom/files/patch-ab b/games/miscom/files/patch-draw.c
index fa8ebf2..fa8ebf2 100644
--- a/games/miscom/files/patch-ab
+++ b/games/miscom/files/patch-draw.c
diff --git a/games/miscom/files/patch-ac b/games/miscom/files/patch-fire.c
index 0c82037..0c82037 100644
--- a/games/miscom/files/patch-ac
+++ b/games/miscom/files/patch-fire.c
diff --git a/games/miscom/files/patch-ad b/games/miscom/files/patch-level.c
index 327eba3..327eba3 100644
--- a/games/miscom/files/patch-ad
+++ b/games/miscom/files/patch-level.c
diff --git a/games/miscom/files/patch-ae b/games/miscom/files/patch-main.c
index a2f133e..a2f133e 100644
--- a/games/miscom/files/patch-ae
+++ b/games/miscom/files/patch-main.c
diff --git a/games/miscom/files/patch-ag b/games/miscom/files/patch-unix.c
index 252404c..252404c 100644
--- a/games/miscom/files/patch-ag
+++ b/games/miscom/files/patch-unix.c
diff --git a/games/nadar/files/patch-aa b/games/nadar/files/patch-Makefile.mk
index da5f933..da5f933 100644
--- a/games/nadar/files/patch-aa
+++ b/games/nadar/files/patch-Makefile.mk
diff --git a/games/netris/files/patch-aa b/games/netris/files/patch-Configure
index 7b61622..7b61622 100644
--- a/games/netris/files/patch-aa
+++ b/games/netris/files/patch-Configure
diff --git a/games/newvox/files/patch-aa b/games/newvox/files/patch-configure
index f68f771..f68f771 100644
--- a/games/newvox/files/patch-aa
+++ b/games/newvox/files/patch-configure
diff --git a/games/nonsense/Makefile b/games/nonsense/Makefile
index 9fcf1c8..6591aef 100644
--- a/games/nonsense/Makefile
+++ b/games/nonsense/Makefile
@@ -13,8 +13,6 @@ COMMENT=	Nonsense text generator
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-.include <bsd.port.options.mk>
-
 post-configure:
 		${REINPLACE_CMD} -e "s,/usr/local,${PREFIX}," ${WRKSRC}/nonsense
 		${SED} -e "s^%%PREFIX%%^${PREFIX}^g" \
diff --git a/games/nonsense/files/patch-aa b/games/nonsense/files/patch-nonsense
index b676817..b676817 100644
--- a/games/nonsense/files/patch-aa
+++ b/games/nonsense/files/patch-nonsense
diff --git a/games/omega/files/patch-aa b/games/omega/files/patch-Makefile
index b95523a..b95523a 100644
--- a/games/omega/files/patch-aa
+++ b/games/omega/files/patch-Makefile
diff --git a/games/omega/files/patch-ab b/games/omega/files/patch-defs.h
index 70b35e8..70b35e8 100644
--- a/games/omega/files/patch-ab
+++ b/games/omega/files/patch-defs.h
diff --git a/games/omega/files/patch-ac b/games/omega/files/patch-file.c
index 8a4c6ee..8a4c6ee 100644
--- a/games/omega/files/patch-ac
+++ b/games/omega/files/patch-file.c
diff --git a/games/omega/files/patch-ad b/games/omega/files/patch-fixstr.c
index 9f72800..9f72800 100644
--- a/games/omega/files/patch-ad
+++ b/games/omega/files/patch-fixstr.c
diff --git a/games/omega/files/patch-ae b/games/omega/files/patch-genclr.c
index 362d2f1..362d2f1 100644
--- a/games/omega/files/patch-ae
+++ b/games/omega/files/patch-genclr.c
diff --git a/games/omega/files/patch-af b/games/omega/files/patch-inv.c
index 932cae6..932cae6 100644
--- a/games/omega/files/patch-af
+++ b/games/omega/files/patch-inv.c
diff --git a/games/omega/files/patch-ag b/games/omega/files/patch-scr.c
index 7602685..7602685 100644
--- a/games/omega/files/patch-ag
+++ b/games/omega/files/patch-scr.c
diff --git a/games/oonsoo/files/patch-ab b/games/oonsoo/files/patch-Makefile.common
index 4d61eb2..4d61eb2 100644
--- a/games/oonsoo/files/patch-ab
+++ b/games/oonsoo/files/patch-Makefile.common
diff --git a/games/oonsoo/files/patch-ac b/games/oonsoo/files/patch-UI_BasicWidget.hxx
index 44f0ad5..44f0ad5 100644
--- a/games/oonsoo/files/patch-ac
+++ b/games/oonsoo/files/patch-UI_BasicWidget.hxx
diff --git a/games/seabattle/files/patch-aa b/games/seabattle/files/patch-Makefile
index e7b3533..e7b3533 100644
--- a/games/seabattle/files/patch-aa
+++ b/games/seabattle/files/patch-Makefile
diff --git a/games/seabattle/files/patch-ab b/games/seabattle/files/patch-batt.h
index 57484ef..57484ef 100644
--- a/games/seabattle/files/patch-ab
+++ b/games/seabattle/files/patch-batt.h
diff --git a/games/seabattle/files/patch-ac b/games/seabattle/files/patch-bdb.c
index 65c6ab6..65c6ab6 100644
--- a/games/seabattle/files/patch-ac
+++ b/games/seabattle/files/patch-bdb.c
diff --git a/games/seabattle/files/patch-ad b/games/seabattle/files/patch-binp.c
index fe9699e..fe9699e 100644
--- a/games/seabattle/files/patch-ad
+++ b/games/seabattle/files/patch-binp.c
diff --git a/games/smiley/files/patch-aa b/games/smiley/files/patch-Makefile
index 5c5adfc..5c5adfc 100644
--- a/games/smiley/files/patch-aa
+++ b/games/smiley/files/patch-Makefile
diff --git a/games/sol/Makefile b/games/sol/Makefile
index c360ffe..b37f705 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -23,7 +23,7 @@ USE_XORG=	xpm x11 xaw
 OPTIONS_DEFINE=	DOCS
 
 pre-build:
-	cd ${WRKSRC} && ${MAKE_CMD} readme.var
+	(cd ${WRKSRC} && ${MAKE_CMD} readme.var)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sol ${STAGEDIR}${PREFIX}/bin
diff --git a/games/sol/files/patch-aa b/games/sol/files/patch-Makefile
index f94aa9f..f94aa9f 100644
--- a/games/sol/files/patch-aa
+++ b/games/sol/files/patch-Makefile
diff --git a/games/spellcast/files/patch-aa b/games/spellcast/files/patch-Makefile
index ef61d96..ef61d96 100644
--- a/games/spellcast/files/patch-aa
+++ b/games/spellcast/files/patch-Makefile
diff --git a/games/speyes/files/patch-aa b/games/speyes/files/patch-Imakefile
index 1bdef65..1bdef65 100644
--- a/games/speyes/files/patch-aa
+++ b/games/speyes/files/patch-Imakefile
diff --git a/games/spider/files/patch-ab b/games/spider/files/patch-Imakefile
index 74689bc..74689bc 100644
--- a/games/spider/files/patch-ab
+++ b/games/spider/files/patch-Imakefile
diff --git a/games/spider/files/patch-ad b/games/spider/files/patch-globals.h
index 203be24..203be24 100644
--- a/games/spider/files/patch-ad
+++ b/games/spider/files/patch-globals.h
diff --git a/games/spider/files/patch-ac b/games/spider/files/patch-spider.man
index 6eb8eb3..6eb8eb3 100644
--- a/games/spider/files/patch-ac
+++ b/games/spider/files/patch-spider.man
diff --git a/games/sxsame/files/patch-aa b/games/sxsame/files/patch-Imakefile
index 64f87b0..64f87b0 100644
--- a/games/sxsame/files/patch-aa
+++ b/games/sxsame/files/patch-Imakefile
diff --git a/games/sxsame/files/patch-ad b/games/sxsame/files/patch-hiscore.c
index 34b7a81..34b7a81 100644
--- a/games/sxsame/files/patch-ad
+++ b/games/sxsame/files/patch-hiscore.c
diff --git a/games/sxsame/files/patch-ae b/games/sxsame/files/patch-inifile.c
index 10ba162..10ba162 100644
--- a/games/sxsame/files/patch-ae
+++ b/games/sxsame/files/patch-inifile.c
diff --git a/games/sxsame/files/patch-af b/games/sxsame/files/patch-loadbmp.c
index 9d193e2..9d193e2 100644
--- a/games/sxsame/files/patch-af
+++ b/games/sxsame/files/patch-loadbmp.c
diff --git a/games/sxsame/files/patch-ag b/games/sxsame/files/patch-loaddata.c
index 7641c57..7641c57 100644
--- a/games/sxsame/files/patch-ag
+++ b/games/sxsame/files/patch-loaddata.c
diff --git a/games/sxsame/files/patch-ah b/games/sxsame/files/patch-sxsame.c
index d4e6795..d4e6795 100644
--- a/games/sxsame/files/patch-ah
+++ b/games/sxsame/files/patch-sxsame.c
diff --git a/games/taipan/files/patch-ab b/games/taipan/files/patch-taipan.c
index 35a18b4..35a18b4 100644
--- a/games/taipan/files/patch-ab
+++ b/games/taipan/files/patch-taipan.c
diff --git a/games/tank/files/patch-aa b/games/tank/files/patch-MESA
index 837375c..837375c 100644
--- a/games/tank/files/patch-aa
+++ b/games/tank/files/patch-MESA
diff --git a/games/tkmoo/files/patch-aa b/games/tkmoo/files/patch-Makefile
index 4c308735..4c308735 100644
--- a/games/tkmoo/files/patch-aa
+++ b/games/tkmoo/files/patch-Makefile
diff --git a/games/wmshuffle/files/patch-aa b/games/wmshuffle/files/patch-Makefile
index c121f42..c121f42 100644
--- a/games/wmshuffle/files/patch-aa
+++ b/games/wmshuffle/files/patch-Makefile
diff --git a/games/wmtictactoe/files/patch-aa b/games/wmtictactoe/files/patch-Makefile
index 93830cb..93830cb 100644
--- a/games/wmtictactoe/files/patch-aa
+++ b/games/wmtictactoe/files/patch-Makefile
diff --git a/games/xataxx/files/patch-aa b/games/xataxx/files/patch-Imakefile
index 41f9e90..41f9e90 100644
--- a/games/xataxx/files/patch-aa
+++ b/games/xataxx/files/patch-Imakefile
diff --git a/games/xbat/files/patch-aa b/games/xbat/files/patch-Imakefile
index 6165e9f..6165e9f 100644
--- a/games/xbat/files/patch-aa
+++ b/games/xbat/files/patch-Imakefile
diff --git a/games/xblood/files/patch-aa b/games/xblood/files/patch-Makefile
index 11a7325..11a7325 100644
--- a/games/xblood/files/patch-aa
+++ b/games/xblood/files/patch-Makefile
diff --git a/games/xbomber/files/patch-aa b/games/xbomber/files/patch-makefile
index d4e650e..d4e650e 100644
--- a/games/xbomber/files/patch-aa
+++ b/games/xbomber/files/patch-makefile
diff --git a/games/xbomber/files/patch-ac b/games/xbomber/files/patch-xbomber.c
index 4b5ec3c..4b5ec3c 100644
--- a/games/xbomber/files/patch-ac
+++ b/games/xbomber/files/patch-xbomber.c
diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile
index 8781360..af23e91 100644
--- a/games/xchadance/Makefile
+++ b/games/xchadance/Makefile
@@ -16,17 +16,17 @@ USE_XORG=	x11
 MAKEFILE=	makefile
 NO_WRKSUBDIR=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 RESTRICTED=	'contains commercial character data'
 
 post-patch:
-	@cd ${WRKSRC}; \
-	${PATCH} < ${WRKSRC}/xchada01.bug
+	@(cd ${WRKSRC}; \
+		${PATCH} < ${WRKSRC}/xchada01.bug)
 
 post-install:
-.if !defined(NOPORTOCS)
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xchadance
-	@${INSTALL_DATA} ${WRKSRC}/README.jp ${STAGEDIR}${PREFIX}/share/doc/xchadance
-	@${INSTALL_DATA} ${WRKSRC}/README.eng ${STAGEDIR}${PREFIX}/share/doc/xchadance
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.jp ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.eng ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/xchadance/files/patch-aa b/games/xchadance/files/patch-Makefile
index 6ebb43b..6ebb43b 100644
--- a/games/xchadance/files/patch-aa
+++ b/games/xchadance/files/patch-Makefile
diff --git a/games/xchadance/pkg-plist b/games/xchadance/pkg-plist
index e286610..ecd3bac 100644
--- a/games/xchadance/pkg-plist
+++ b/games/xchadance/pkg-plist
@@ -1,4 +1,4 @@
 bin/xchadance
-share/doc/xchadance/README.eng
-share/doc/xchadance/README.jp
-@dirrm share/doc/xchadance
+%%PORTDOCS%%%%DOCSDIR%%/README.eng
+%%PORTDOCS%%%%DOCSDIR%%/README.jp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/xchomp/files/patch-aa b/games/xchomp/files/patch-Imakefile
index 97fc978..97fc978 100644
--- a/games/xchomp/files/patch-aa
+++ b/games/xchomp/files/patch-Imakefile
diff --git a/games/xdeblock/files/patch-aa b/games/xdeblock/files/patch-Imakefile
index 6abcf9a..6abcf9a 100644
--- a/games/xdeblock/files/patch-aa
+++ b/games/xdeblock/files/patch-Imakefile
diff --git a/games/xdeblock/files/patch-ac b/games/xdeblock/files/patch-dialog.c
index d89daf3..d89daf3 100644
--- a/games/xdeblock/files/patch-ac
+++ b/games/xdeblock/files/patch-dialog.c
diff --git a/games/xdeblock/files/patch-ab b/games/xdeblock/files/patch-main.c
index d732280..d732280 100644
--- a/games/xdeblock/files/patch-ab
+++ b/games/xdeblock/files/patch-main.c
diff --git a/games/xdigger/files/patch-ad b/games/xdigger/files/patch-Imakefile
index d50bef6..d50bef6 100644
--- a/games/xdigger/files/patch-ad
+++ b/games/xdigger/files/patch-Imakefile
diff --git a/games/xdigger/files/patch-aa b/games/xdigger/files/patch-configure.h
index 13b379e..13b379e 100644
--- a/games/xdigger/files/patch-aa
+++ b/games/xdigger/files/patch-configure.h
diff --git a/games/xdigger/files/patch-ae b/games/xdigger/files/patch-drawpixmaps.c
index e526892..e526892 100644
--- a/games/xdigger/files/patch-ae
+++ b/games/xdigger/files/patch-drawpixmaps.c
diff --git a/games/xdigger/files/patch-ab b/games/xdigger/files/patch-sound.c
index 6cf40fad..6cf40fad 100644
--- a/games/xdigger/files/patch-ab
+++ b/games/xdigger/files/patch-sound.c
diff --git a/games/xdigger/files/patch-ac b/games/xdigger/files/patch-xdigger.c
index 35c655b..35c655b 100644
--- a/games/xdigger/files/patch-ac
+++ b/games/xdigger/files/patch-xdigger.c
diff --git a/games/xevil/files/patch-aa b/games/xevil/files/patch-config.mk
index a786c4e..a786c4e 100644
--- a/games/xevil/files/patch-aa
+++ b/games/xevil/files/patch-config.mk
diff --git a/games/xevil/files/patch-ad b/games/xevil/files/patch-makefile
index ee41a16..ee41a16 100644
--- a/games/xevil/files/patch-ad
+++ b/games/xevil/files/patch-makefile
diff --git a/games/xfireworks/files/patch-aa b/games/xfireworks/files/patch-Makefile
index dd7d742..dd7d742 100644
--- a/games/xfireworks/files/patch-aa
+++ b/games/xfireworks/files/patch-Makefile
diff --git a/games/xfrisk/files/patch-ab b/games/xfrisk/files/patch-Makefile
index 77d10ba..77d10ba 100644
--- a/games/xfrisk/files/patch-ab
+++ b/games/xfrisk/files/patch-Makefile
diff --git a/games/xgalaga/files/patch-aa b/games/xgalaga/files/patch-Makefile.in
index 319d89a..319d89a 100644
--- a/games/xgalaga/files/patch-aa
+++ b/games/xgalaga/files/patch-Makefile.in
diff --git a/games/xgalaga/files/patch-ac b/games/xgalaga/files/patch-configure
index ddecdb0..ddecdb0 100644
--- a/games/xgalaga/files/patch-ac
+++ b/games/xgalaga/files/patch-configure
diff --git a/games/xgalaga/files/patch-ae b/games/xgalaga/files/patch-main.c
index dea2bd7..dea2bd7 100644
--- a/games/xgalaga/files/patch-ae
+++ b/games/xgalaga/files/patch-main.c
diff --git a/games/xgalaga/files/patch-ad b/games/xgalaga/files/patch-struct.h
index 364d8f7..364d8f7 100644
--- a/games/xgalaga/files/patch-ad
+++ b/games/xgalaga/files/patch-struct.h
diff --git a/games/xgalaga/files/patch-ab b/games/xgalaga/files/patch-xgal.sndsrv.freebsd.c
index 49e7dcdf..49e7dcdf 100644
--- a/games/xgalaga/files/patch-ab
+++ b/games/xgalaga/files/patch-xgal.sndsrv.freebsd.c
diff --git a/games/xhime/Makefile b/games/xhime/Makefile
index 1cf974d..e5ea8e5 100644
--- a/games/xhime/Makefile
+++ b/games/xhime/Makefile
@@ -27,8 +27,8 @@ post-install:
 	#${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/ja/man6/xhime.6
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/xhime
 	@(cd ${WRKSRC};\
-	${INSTALL_DATA} xhime-doc.euc xhime.doc rh110-doc.euc \
-		${STAGEDIR}${PREFIX}/share/doc/ja/xhime; \
+		${INSTALL_DATA} xhime-doc.euc xhime.doc rh110-doc.euc \
+			${STAGEDIR}${PREFIX}/share/doc/ja/xhime; \
 	)
 
 .include <bsd.port.mk>
diff --git a/games/xhime/files/patch-aa b/games/xhime/files/patch-Imakefile
index e7ccedd..e7ccedd 100644
--- a/games/xhime/files/patch-aa
+++ b/games/xhime/files/patch-Imakefile
diff --git a/games/xhime/files/patch-ab b/games/xhime/files/patch-xhime.c
index 19a66b3..19a66b3 100644
--- a/games/xhime/files/patch-ab
+++ b/games/xhime/files/patch-xhime.c
diff --git a/games/xinfocom/files/patch-aa b/games/xinfocom/files/patch-Imakefile
index c97fc47..c97fc47 100644
--- a/games/xinfocom/files/patch-aa
+++ b/games/xinfocom/files/patch-Imakefile
diff --git a/games/xinvaders3d/files/patch-aa b/games/xinvaders3d/files/patch-Makefile
index a09d750..a09d750 100644
--- a/games/xinvaders3d/files/patch-aa
+++ b/games/xinvaders3d/files/patch-Makefile
diff --git a/games/xisola/files/patch-aa b/games/xisola/files/patch-Imakefile
index 0342c8b..0342c8b 100644
--- a/games/xisola/files/patch-aa
+++ b/games/xisola/files/patch-Imakefile
diff --git a/games/xjig/files/patch-aa b/games/xjig/files/patch-Makefile.Linux
index 8f8f62c..8f8f62c 100644
--- a/games/xjig/files/patch-aa
+++ b/games/xjig/files/patch-Makefile.Linux
diff --git a/games/xjig/files/patch-ab b/games/xjig/files/patch-gifx_image.C
index 51a2ca4..51a2ca4 100644
--- a/games/xjig/files/patch-ab
+++ b/games/xjig/files/patch-gifx_image.C
diff --git a/games/xjig/files/patch-ac b/games/xjig/files/patch-gifx_image.H
index 20a647e..20a647e 100644
--- a/games/xjig/files/patch-ac
+++ b/games/xjig/files/patch-gifx_image.H
diff --git a/games/xjig/files/patch-ad b/games/xjig/files/patch-imgbuff.C
index 1d57e96..1d57e96 100644
--- a/games/xjig/files/patch-ad
+++ b/games/xjig/files/patch-imgbuff.C
diff --git a/games/xjig/files/patch-ae b/games/xjig/files/patch-objects.C
index c05d5e3..c05d5e3 100644
--- a/games/xjig/files/patch-ae
+++ b/games/xjig/files/patch-objects.C
diff --git a/games/xjig/files/patch-af b/games/xjig/files/patch-options.H
index 8be81a3..8be81a3 100644
--- a/games/xjig/files/patch-af
+++ b/games/xjig/files/patch-options.H
diff --git a/games/xjig/files/patch-ag b/games/xjig/files/patch-reset_image.H
index 1685207..1685207 100644
--- a/games/xjig/files/patch-ag
+++ b/games/xjig/files/patch-reset_image.H
diff --git a/games/xjig/files/patch-ah b/games/xjig/files/patch-rotate.H
index eda795d..eda795d 100644
--- a/games/xjig/files/patch-ah
+++ b/games/xjig/files/patch-rotate.H
diff --git a/games/xjig/files/patch-ai b/games/xjig/files/patch-xjig.C
index af0baff..af0baff 100644
--- a/games/xjig/files/patch-ai
+++ b/games/xjig/files/patch-xjig.C
diff --git a/games/xlaby/files/patch-aa b/games/xlaby/files/patch-Imakefile
index 49a6fef..49a6fef 100644
--- a/games/xlaby/files/patch-aa
+++ b/games/xlaby/files/patch-Imakefile
diff --git a/games/xmastermind/files/patch-ab b/games/xmastermind/files/patch-configure.h
index 3cfc2ea..3cfc2ea 100644
--- a/games/xmastermind/files/patch-ab
+++ b/games/xmastermind/files/patch-configure.h
diff --git a/games/xmemory/files/patch-aa b/games/xmemory/files/patch-Imakefile
index 0bcf8ed..0bcf8ed 100644
--- a/games/xmemory/files/patch-aa
+++ b/games/xmemory/files/patch-Imakefile
diff --git a/games/xmemory/files/patch-ab b/games/xmemory/files/patch-xmemory.C
index e7a190c..e7a190c 100644
--- a/games/xmemory/files/patch-ab
+++ b/games/xmemory/files/patch-xmemory.C
diff --git a/games/xmine/files/patch-ab b/games/xmine/files/patch-Imakefile
index 74bf3cb..74bf3cb 100644
--- a/games/xmine/files/patch-ab
+++ b/games/xmine/files/patch-Imakefile
diff --git a/games/xmine/files/patch-aa b/games/xmine/files/patch-xmine.c
index f159ea3..f159ea3 100644
--- a/games/xmine/files/patch-aa
+++ b/games/xmine/files/patch-xmine.c
diff --git a/games/xmine/files/patch-ad b/games/xmine/files/patch-xmine.c_1
index 2a1b8dc..2a1b8dc 100644
--- a/games/xmine/files/patch-ad
+++ b/games/xmine/files/patch-xmine.c_1
diff --git a/games/xmine/files/patch-ae b/games/xmine/files/patch-xmine.c_2
index 58e2f69..58e2f69 100644
--- a/games/xmine/files/patch-ae
+++ b/games/xmine/files/patch-xmine.c_2
diff --git a/games/xmine/files/patch-ac b/games/xmine/files/patch-xmine.man
index 44f1f7a..44f1f7a 100644
--- a/games/xmine/files/patch-ac
+++ b/games/xmine/files/patch-xmine.man
diff --git a/games/xmines/files/patch-aa b/games/xmines/files/patch-Makefile
index 2c8070b..2c8070b 100644
--- a/games/xmines/files/patch-aa
+++ b/games/xmines/files/patch-Makefile
diff --git a/games/xmines/files/patch-ab b/games/xmines/files/patch-score.c
index ac01cec..ac01cec 100644
--- a/games/xmines/files/patch-ab
+++ b/games/xmines/files/patch-score.c
diff --git a/games/xmulti/Makefile b/games/xmulti/Makefile
index 41b3284..8104ee7 100644
--- a/games/xmulti/Makefile
+++ b/games/xmulti/Makefile
@@ -20,14 +20,10 @@ DOCSDIR=	${PREFIX}/share/doc/ja/{PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in MODULE.jp README.jp STYLESHEET.jp XMULTI.jp
 	${INSTALL_MAN} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/xmulti/files/patch-aa b/games/xmulti/files/patch-config.tmpl
index ad88b15..ad88b15 100644
--- a/games/xmulti/files/patch-aa
+++ b/games/xmulti/files/patch-config.tmpl
diff --git a/games/xoids/files/patch-aa b/games/xoids/files/patch-Imakefile
index a8aeac5..a8aeac5 100644
--- a/games/xoids/files/patch-aa
+++ b/games/xoids/files/patch-Imakefile
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index 6a06373..ed91726 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -7,12 +7,11 @@ PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/demos
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	O. J. Simpson Simulator root window demo
 
-USES=		imake
+USES=		imake tar:tgz
 USE_XORG=	xaw
 NO_INSTALL_MANPAGES=	yes
 PLIST_FILES=	bin/xoj
diff --git a/games/xoj/files/patch-ab b/games/xoj/files/patch-Imakefile
index d8fab9c..d8fab9c 100644
--- a/games/xoj/files/patch-ab
+++ b/games/xoj/files/patch-Imakefile
diff --git a/games/xoj/files/patch-aa b/games/xoj/files/patch-xoj.c
index af856b9..af856b9 100644
--- a/games/xoj/files/patch-aa
+++ b/games/xoj/files/patch-xoj.c
diff --git a/games/xosmulti/files/patch-aa b/games/xosmulti/files/patch-Makefile
index e7190fb..e7190fb 100644
--- a/games/xosmulti/files/patch-aa
+++ b/games/xosmulti/files/patch-Makefile
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 2857ffd..a1062c9 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -8,7 +8,6 @@ CATEGORIES=	games
 MASTER_SITES=	SUNSITE
 MASTER_SITE_SUBDIR=	games/strategy
 DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Connect the pipes to stop the leaks
@@ -16,7 +15,7 @@ COMMENT=	Connect the pipes to stop the leaks
 # LP64 issues
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		imake
+USES=		imake tar:Z
 USE_XORG=	x11 xaw xext xmu xt sm ice
 CFLAGS+=	-Wno-error=return-type
 
diff --git a/games/xpipeman/files/patch-ab b/games/xpipeman/files/patch-Imakefile
index f5f57b0..f5f57b0 100644
--- a/games/xpipeman/files/patch-ab
+++ b/games/xpipeman/files/patch-Imakefile
diff --git a/games/xpipeman/files/patch-ac b/games/xpipeman/files/patch-main.c
index df7d9d2..df7d9d2 100644
--- a/games/xpipeman/files/patch-ac
+++ b/games/xpipeman/files/patch-main.c
diff --git a/games/xpipeman/files/patch-aa b/games/xpipeman/files/patch-score.c
index ddeaebe..ddeaebe 100644
--- a/games/xpipeman/files/patch-aa
+++ b/games/xpipeman/files/patch-score.c
diff --git a/games/xpuyopuyo/files/patch-aa b/games/xpuyopuyo/files/patch-Makefile.in
index e16f892..e16f892 100644
--- a/games/xpuyopuyo/files/patch-aa
+++ b/games/xpuyopuyo/files/patch-Makefile.in
diff --git a/games/xpuyopuyo/files/patch-ab b/games/xpuyopuyo/files/patch-pgame_Makefile.in
index 87a41ba..87a41ba 100644
--- a/games/xpuyopuyo/files/patch-ab
+++ b/games/xpuyopuyo/files/patch-pgame_Makefile.in
diff --git a/games/xpuzzletama/files/patch-aa b/games/xpuzzletama/files/patch-Imakefile
index 3167672..3167672 100644
--- a/games/xpuzzletama/files/patch-aa
+++ b/games/xpuzzletama/files/patch-Imakefile
diff --git a/games/xrisk/files/patch-ab b/games/xrisk/files/patch-doc_Imakefile
index 90039a8..90039a8 100644
--- a/games/xrisk/files/patch-ab
+++ b/games/xrisk/files/patch-doc_Imakefile
diff --git a/games/xrisk/files/patch-ac b/games/xrisk/files/patch-lib_Imakefile
index 1547b5c..1547b5c 100644
--- a/games/xrisk/files/patch-ac
+++ b/games/xrisk/files/patch-lib_Imakefile
diff --git a/games/xrisk/files/patch-aa b/games/xrisk/files/patch-xrisk.def
index c64fdf7..c64fdf7 100644
--- a/games/xrisk/files/patch-aa
+++ b/games/xrisk/files/patch-xrisk.def
diff --git a/games/xroach/files/patch-aa b/games/xroach/files/patch-Makefile
index a5c1aea..a5c1aea 100644
--- a/games/xroach/files/patch-aa
+++ b/games/xroach/files/patch-Makefile
diff --git a/games/xroach/files/patch-ab b/games/xroach/files/patch-xroach.c
index ea392fd2..ea392fd2 100644
--- a/games/xroach/files/patch-ab
+++ b/games/xroach/files/patch-xroach.c
diff --git a/games/xroads/files/patch-aa b/games/xroads/files/patch-Makefile
index 0d0c353..0d0c353 100644
--- a/games/xroads/files/patch-aa
+++ b/games/xroads/files/patch-Makefile
diff --git a/games/xroads/files/patch-ab b/games/xroads/files/patch-config.h
index e1d3efc..e1d3efc 100644
--- a/games/xroads/files/patch-ab
+++ b/games/xroads/files/patch-config.h
diff --git a/games/xsokoban/files/patch-aa b/games/xsokoban/files/patch-Imakefile
index 355fb6b..355fb6b 100644
--- a/games/xsokoban/files/patch-aa
+++ b/games/xsokoban/files/patch-Imakefile
diff --git a/games/xsokoban/files/patch-ab b/games/xsokoban/files/patch-config.h
index 32d94eb..32d94eb 100644
--- a/games/xsokoban/files/patch-ab
+++ b/games/xsokoban/files/patch-config.h
diff --git a/games/xsokoban/files/patch-ac b/games/xsokoban/files/patch-config_local.h
index 9478799..9478799 100644
--- a/games/xsokoban/files/patch-ac
+++ b/games/xsokoban/files/patch-config_local.h
diff --git a/games/xsokoban/files/patch-ad b/games/xsokoban/files/patch-externs.h
index b8f1195..b8f1195 100644
--- a/games/xsokoban/files/patch-ad
+++ b/games/xsokoban/files/patch-externs.h
diff --git a/games/xsoldier/files/patch-ac b/games/xsoldier/files/patch-main.c
index 23c46a3..23c46a3 100644
--- a/games/xsoldier/files/patch-ac
+++ b/games/xsoldier/files/patch-main.c
diff --git a/games/xsoldier/files/patch-ab b/games/xsoldier/files/patch-manage.c
index 05ec1ea..05ec1ea 100644
--- a/games/xsoldier/files/patch-ab
+++ b/games/xsoldier/files/patch-manage.c
diff --git a/games/xspacewarp/files/patch-ad b/games/xspacewarp/files/patch-Imakefile
index 7f1f28d..7f1f28d 100644
--- a/games/xspacewarp/files/patch-ad
+++ b/games/xspacewarp/files/patch-Imakefile
diff --git a/games/xspacewarp/files/patch-aa b/games/xspacewarp/files/patch-c_endever.hh
index ed3b8c1..ed3b8c1 100644
--- a/games/xspacewarp/files/patch-aa
+++ b/games/xspacewarp/files/patch-c_endever.hh
diff --git a/games/xspacewarp/files/patch-ac b/games/xspacewarp/files/patch-c_jovian.cc
index 27a9c80..27a9c80 100644
--- a/games/xspacewarp/files/patch-ac
+++ b/games/xspacewarp/files/patch-c_jovian.cc
diff --git a/games/xspacewarp/files/patch-ab b/games/xspacewarp/files/patch-xprep.hh
index 95f91e2..95f91e2 100644
--- a/games/xspacewarp/files/patch-ab
+++ b/games/xspacewarp/files/patch-xprep.hh
diff --git a/games/xspringies/files/patch-01 b/games/xspringies/files/patch-phys.c
index 2b7a99a..2b7a99a 100644
--- a/games/xspringies/files/patch-01
+++ b/games/xspringies/files/patch-phys.c
diff --git a/games/xtet42/files/patch-aa b/games/xtet42/files/patch-Makefile.in
index a085b28..a085b28 100644
--- a/games/xtet42/files/patch-aa
+++ b/games/xtet42/files/patch-Makefile.in
diff --git a/games/xtet42/files/patch-ab b/games/xtet42/files/patch-xtete42.c
index 34d979a..34d979a 100644
--- a/games/xtet42/files/patch-ab
+++ b/games/xtet42/files/patch-xtete42.c
diff --git a/games/xtic/files/patch-aa b/games/xtic/files/patch-configure.h
index 386c6c7..386c6c7 100644
--- a/games/xtic/files/patch-aa
+++ b/games/xtic/files/patch-configure.h
diff --git a/games/xtic/files/patch-ab b/games/xtic/files/patch-src_Imakefile
index 1fa68ac..1fa68ac 100644
--- a/games/xtic/files/patch-ab
+++ b/games/xtic/files/patch-src_Imakefile
diff --git a/games/xtron/files/patch-aa b/games/xtron/files/patch-Makefile
index 4324ff0..4324ff0 100644
--- a/games/xtron/files/patch-aa
+++ b/games/xtron/files/patch-Makefile
diff --git a/games/xtron/files/patch-ab b/games/xtron/files/patch-resource.c
index ce4873e..ce4873e 100644
--- a/games/xtron/files/patch-ab
+++ b/games/xtron/files/patch-resource.c
diff --git a/games/xtron/files/patch-ac b/games/xtron/files/patch-xtronrc
index d188ebe..d188ebe 100644
--- a/games/xtron/files/patch-ac
+++ b/games/xtron/files/patch-xtronrc
diff --git a/games/xtruco/files/patch-aa b/games/xtruco/files/patch-Makefile
index dc7a6b4..dc7a6b4 100644
--- a/games/xtruco/files/patch-aa
+++ b/games/xtruco/files/patch-Makefile
diff --git a/games/xtux/files/patch-aa b/games/xtux/files/patch-Makefile
index ccf272f..ccf272f 100644
--- a/games/xtux/files/patch-aa
+++ b/games/xtux/files/patch-Makefile
diff --git a/games/xtux/files/patch-ab b/games/xtux/files/patch-src_client_misc.c
index 4870a11..4870a11 100644
--- a/games/xtux/files/patch-ab
+++ b/games/xtux/files/patch-src_client_misc.c
diff --git a/games/xtux/files/patch-af b/games/xtux/files/patch-src_common_timing.c
index 4317790..4317790 100644
--- a/games/xtux/files/patch-af
+++ b/games/xtux/files/patch-src_common_timing.c
diff --git a/games/xvmines/files/patch-aa b/games/xvmines/files/patch-Imakefile
index f2e3dcb..f2e3dcb 100644
--- a/games/xvmines/files/patch-aa
+++ b/games/xvmines/files/patch-Imakefile
diff --git a/games/xworm/files/patch-ab b/games/xworm/files/patch-xworm.c
index 12bfff8..12bfff8 100644
--- a/games/xworm/files/patch-ab
+++ b/games/xworm/files/patch-xworm.c
diff --git a/games/yahtzee/Makefile b/games/yahtzee/Makefile
index e24ad46..eb8be9d 100644
--- a/games/yahtzee/Makefile
+++ b/games/yahtzee/Makefile
@@ -8,16 +8,16 @@ CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
 DISTNAME=	${PORTNAME}-src
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses version of the dice game for one or more players
 
+USES=		tar:Z
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/yahtzee ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} -m 0755 ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} -m 0664 /dev/null ${STAGEDIR}${DATADIR}/yahtzee.sco
+	${TOUCH} ${STAGEDIR}${DATADIR}/yahtzee.sco
 
 .include <bsd.port.mk>
diff --git a/games/yahtzee/files/patch-aa b/games/yahtzee/files/patch-Makefile
index c2eb526..c2eb526 100644
--- a/games/yahtzee/files/patch-aa
+++ b/games/yahtzee/files/patch-Makefile
diff --git a/games/yahtzee/files/patch-ab b/games/yahtzee/files/patch-config.h
index 5f2e454..5f2e454 100644
--- a/games/yahtzee/files/patch-ab
+++ b/games/yahtzee/files/patch-config.h
diff --git a/games/yahtzee/files/patch-ac b/games/yahtzee/files/patch-main.c
index c5c96b2..c5c96b2 100644
--- a/games/yahtzee/files/patch-ac
+++ b/games/yahtzee/files/patch-main.c
diff --git a/games/yahtzee/pkg-plist b/games/yahtzee/pkg-plist
index 831fc5a..76c519f 100644
--- a/games/yahtzee/pkg-plist
+++ b/games/yahtzee/pkg-plist
@@ -1,7 +1,8 @@
 @group games
 @mode 2755
 bin/yahtzee
-@mode
+@mode 664
 %%DATADIR%%/yahtzee.sco
 @group
+@mode
 @dirrm %%DATADIR%%