diff --git a/chinese/bg5ps/Makefile b/chinese/bg5ps/Makefile
index 607355528563..f7a12e988e7d 100644
--- a/chinese/bg5ps/Makefile
+++ b/chinese/bg5ps/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
 USE_PYTHON=	yes
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${STAGEDIR}${PREFIX}/bin
@@ -24,7 +24,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${STAGEDIR}${PREFIX}/etc/bg5ps.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/gb2312-bg5ps.conf ${STAGEDIR}${PREFIX}/etc/gb2312-bg5ps.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/netscape.ps ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/test.big5 ${STAGEDIR}${EXAMPLESDIR}
diff --git a/chinese/bg5ps/files/patch-aa b/chinese/bg5ps/files/patch-Makefile
similarity index 100%
rename from chinese/bg5ps/files/patch-aa
rename to chinese/bg5ps/files/patch-Makefile
diff --git a/chinese/bg5ps/files/patch-ac b/chinese/bg5ps/files/patch-bg5ps
similarity index 100%
rename from chinese/bg5ps/files/patch-ac
rename to chinese/bg5ps/files/patch-bg5ps
diff --git a/chinese/bg5ps/files/patch-ab b/chinese/bg5ps/files/patch-bg5ps.conf
similarity index 100%
rename from chinese/bg5ps/files/patch-ab
rename to chinese/bg5ps/files/patch-bg5ps.conf
diff --git a/chinese/bg5ps/files/patch-ae b/chinese/bg5ps/files/patch-gb2312-bg5ps.conf
similarity index 100%
rename from chinese/bg5ps/files/patch-ae
rename to chinese/bg5ps/files/patch-gb2312-bg5ps.conf
diff --git a/chinese/bg5ps/pkg-plist b/chinese/bg5ps/pkg-plist
index 3f4719cb0b4a..8b1f74a0aa40 100644
--- a/chinese/bg5ps/pkg-plist
+++ b/chinese/bg5ps/pkg-plist
@@ -11,14 +11,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/bg5ps.html
 %%PORTDOCS%%%%DOCSDIR%%/makeps
 %%PORTDOCS%%%%DOCSDIR%%/ttf2ps.doc
-%%EXAMPLESDIR%%/netscape.ps
-%%EXAMPLESDIR%%/test.big5
-%%EXAMPLESDIR%%/test.gb2312
-%%EXAMPLESDIR%%/test.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/netscape.ps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.big5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.gb2312
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test.sh
 bin/bg5ps
 bin/ttf2psm
 etc/bg5ps.conf.sample
 etc/gb2312-bg5ps.conf.sample
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/chinese/c2t/files/patch-01 b/chinese/c2t/files/patch-Makefile
similarity index 100%
rename from chinese/c2t/files/patch-01
rename to chinese/c2t/files/patch-Makefile
diff --git a/chinese/c2t/files/patch-02 b/chinese/c2t/files/patch-c2t.c
similarity index 100%
rename from chinese/c2t/files/patch-02
rename to chinese/c2t/files/patch-c2t.c
diff --git a/chinese/celvis/files/patch-aa b/chinese/celvis/files/patch-Makefile
similarity index 100%
rename from chinese/celvis/files/patch-aa
rename to chinese/celvis/files/patch-Makefile
diff --git a/chinese/celvis/files/patch-ad b/chinese/celvis/files/patch-blk.c
similarity index 100%
rename from chinese/celvis/files/patch-ad
rename to chinese/celvis/files/patch-blk.c
diff --git a/chinese/celvis/files/patch-ag b/chinese/celvis/files/patch-cmd1.c
similarity index 100%
rename from chinese/celvis/files/patch-ag
rename to chinese/celvis/files/patch-cmd1.c
diff --git a/chinese/celvis/files/patch-ab b/chinese/celvis/files/patch-config.h
similarity index 100%
rename from chinese/celvis/files/patch-ab
rename to chinese/celvis/files/patch-config.h
diff --git a/chinese/celvis/files/patch-ae b/chinese/celvis/files/patch-recycle.c
similarity index 100%
rename from chinese/celvis/files/patch-ae
rename to chinese/celvis/files/patch-recycle.c
diff --git a/chinese/celvis/files/patch-af b/chinese/celvis/files/patch-tmp.c
similarity index 100%
rename from chinese/celvis/files/patch-af
rename to chinese/celvis/files/patch-tmp.c
diff --git a/chinese/celvis/files/patch-ac b/chinese/celvis/files/patch-vi.h
similarity index 100%
rename from chinese/celvis/files/patch-ac
rename to chinese/celvis/files/patch-vi.h
diff --git a/chinese/cless/Makefile b/chinese/cless/Makefile
index 9514c77d1703..f29d4d425dec 100644
--- a/chinese/cless/Makefile
+++ b/chinese/cless/Makefile
@@ -15,12 +15,9 @@ CPP=		#
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cless
-	${INSTALL_DATA} ${WRKSRC}/README.CLESS ${STAGEDIR}${PREFIX}/share/doc/cless
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.CLESS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/chinese/cless/files/patch-aa b/chinese/cless/files/patch-Makefile.in
similarity index 100%
rename from chinese/cless/files/patch-aa
rename to chinese/cless/files/patch-Makefile.in
diff --git a/chinese/cless/files/patch-ab b/chinese/cless/files/patch-defines.h.in
similarity index 100%
rename from chinese/cless/files/patch-ab
rename to chinese/cless/files/patch-defines.h.in
diff --git a/chinese/cless/files/patch-ac b/chinese/cless/files/patch-less.nro
similarity index 100%
rename from chinese/cless/files/patch-ac
rename to chinese/cless/files/patch-less.nro
diff --git a/chinese/cless/files/patch-ad b/chinese/cless/files/patch-lesskey.nro
similarity index 100%
rename from chinese/cless/files/patch-ad
rename to chinese/cless/files/patch-lesskey.nro
diff --git a/chinese/enscript/files/patch-aa b/chinese/enscript/files/patch-chinese-escript
similarity index 100%
rename from chinese/enscript/files/patch-aa
rename to chinese/enscript/files/patch-chinese-escript
diff --git a/chinese/enscript/files/patch-ab b/chinese/enscript/files/patch-lib_enscript.cfg.in
similarity index 100%
rename from chinese/enscript/files/patch-ab
rename to chinese/enscript/files/patch-lib_enscript.cfg.in
diff --git a/chinese/gb2ps/Makefile b/chinese/gb2ps/Makefile
index eb32e84f8c97..c7e4e7773344 100644
--- a/chinese/gb2ps/Makefile
+++ b/chinese/gb2ps/Makefile
@@ -19,8 +19,6 @@ WRKSRC=		${WRKDIR}/GB2PS
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/chinese/gb
 	${INSTALL_PROGRAM} ${WRKSRC}/gb2ps ${STAGEDIR}${PREFIX}/bin
@@ -28,9 +26,7 @@ do-install:
 .for font in csong24.ccf ckai24.ccf cfang24.ccf chei24.ccf cfan24.ccf
 	${GUNZIP_CMD} -c ${DISTDIR}/${font}.gz > ${STAGEDIR}${PREFIX}/share/chinese/gb/${font}
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/gb2ps
-	${INSTALL_DATA} ${WRKSRC}/gb2ps.help ${STAGEDIR}${PREFIX}/share/doc/gb2ps
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/gb2ps.help ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/chinese/gb2ps/files/patch-01 b/chinese/gb2ps/files/patch-Makefile
similarity index 100%
rename from chinese/gb2ps/files/patch-01
rename to chinese/gb2ps/files/patch-Makefile
diff --git a/chinese/hc/files/patch-01 b/chinese/hc/files/patch-Makefile
similarity index 100%
rename from chinese/hc/files/patch-01
rename to chinese/hc/files/patch-Makefile
diff --git a/chinese/lunar/files/patch-01 b/chinese/lunar/files/patch-Makefile
similarity index 100%
rename from chinese/lunar/files/patch-01
rename to chinese/lunar/files/patch-Makefile
diff --git a/chinese/lunar/files/patch-04 b/chinese/lunar/files/patch-lunar.1
similarity index 100%
rename from chinese/lunar/files/patch-04
rename to chinese/lunar/files/patch-lunar.1
diff --git a/chinese/lunar/files/patch-02 b/chinese/lunar/files/patch-lunar.c_1
similarity index 100%
rename from chinese/lunar/files/patch-02
rename to chinese/lunar/files/patch-lunar.c_1
diff --git a/chinese/lunar/files/patch-03 b/chinese/lunar/files/patch-lunar.c_2
similarity index 100%
rename from chinese/lunar/files/patch-03
rename to chinese/lunar/files/patch-lunar.c_2
diff --git a/chinese/telnet/files/patch-aa b/chinese/telnet/files/patch-sys_bsd.c
similarity index 100%
rename from chinese/telnet/files/patch-aa
rename to chinese/telnet/files/patch-sys_bsd.c