Support stage.

68 files changed, 459 insertions, 191 deletions

diff --git a/chinese/auto-cn-l10n/Makefile b/chinese/auto-cn-l10n/Makefile
index 8480ec9c2e21..e2b63ac39d38 100644
--- a/chinese/auto-cn-l10n/Makefile
+++ b/chinese/auto-cn-l10n/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The automatic localization for Simplified Chinese zh_CN.eucCN locale
 
 NO_BUILD=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=  	pkg-message
 REINPLACE_ARGS=	-i ""
 
 OPTIONS_DEFINE=	WQY FIREFLYTTF FCITX SCIM MINICHINPUT RELAXCONF
@@ -25,7 +25,6 @@ SCIM_DESC=		Smart Common Input Method platform
 MINICHINPUT_DESC=	A tiny version of Chinput
 RELAXCONF_DESC=		A set of utilities for FreeBSD LiveCD
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MWQY}
@@ -58,12 +57,7 @@ post-patch:
 		s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/dot.xselector ${WRKSRC}/dot.xinitrc
 
 do-install:
-	${MKDIR} ${PREFIX}/share/skel/zh_CN.eucCN
-	${CP} ${WRKSRC}/* ${PREFIX}/share/skel/zh_CN.eucCN
-
-post-install:
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g" \
-		${.CURDIR}/pkg-message > ${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}/${PREFIX}/share/skel/zh_CN.eucCN
+	${CP} ${WRKSRC}/* ${STAGEDIR}/${PREFIX}/share/skel/zh_CN.eucCN
 
 .include <bsd.port.post.mk>
diff --git a/chinese/auto-cn-l10n/pkg-message b/chinese/auto-cn-l10n/files/pkg-message.in
index cfe53931e80d..cfe53931e80d 100644
--- a/chinese/auto-cn-l10n/pkg-message
+++ b/chinese/auto-cn-l10n/files/pkg-message.in
diff --git a/chinese/auto-tw-l10n/Makefile b/chinese/auto-tw-l10n/Makefile
index e89372e283b4..3bf55607700d 100644
--- a/chinese/auto-tw-l10n/Makefile
+++ b/chinese/auto-tw-l10n/Makefile
@@ -13,19 +13,14 @@ COMMENT=	Automatic localization for Traditional Chinese locale
 NO_BUILD=	yes
 USE_XZ=		yes
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 pre-install:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 	@${MV} ${WRKSRC}/make.conf.in ${WRKSRC}/make.conf
 
 do-install:
-	${MKDIR} ${PREFIX}/share/skel/zh_TW.UTF-8/
-	${CP} ${WRKSRC}/* ${PREFIX}/share/skel/zh_TW.UTF-8/
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}/${PREFIX}/share/skel/zh_TW.UTF-8/
+	${CP} ${WRKSRC}/* ${STAGEDIR}/${PREFIX}/share/skel/zh_TW.UTF-8/
 
 .include <bsd.port.mk>
diff --git a/chinese/bg5pdf/Makefile b/chinese/bg5pdf/Makefile
index 8cf7b7f7f543..a896eb68e4f5 100644
--- a/chinese/bg5pdf/Makefile
+++ b/chinese/bg5pdf/Makefile
@@ -17,7 +17,6 @@ CFLAGS+=	-fPIC
 USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/bin/python,python,g'  ${WRKSRC}/bg5pdf
 
@@ -26,12 +25,13 @@ do-build:
 		-I${PYTHON_INCLUDEDIR} -L${PREFIX}/lib -lpdf -o ${WRKSRC}/bg5pdflib.so
 
 do-install:
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/bg5pdf ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/gbpdf ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bg5pdflib.so ${PYTHON_SITELIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/test.big5 ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/test.big5.pdf ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/genTest.py ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/bg5pdf ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/gbpdf ${STAGEDIR}/${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bg5pdflib.so ${STAGEDIR}/${PYTHON_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/test.big5 ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/test.big5.pdf ${STAGEDIR}/${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/genTest.py ${STAGEDIR}/${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/chinese/bg5pdf/pkg-plist b/chinese/bg5pdf/pkg-plist
index 060e94a53675..77abbaf6b442 100644
--- a/chinese/bg5pdf/pkg-plist
+++ b/chinese/bg5pdf/pkg-plist
@@ -1,8 +1,8 @@
 @comment $FreeBSD$
+bin/bg5pdf
+bin/gbpdf
+%%PYTHON_SITELIBDIR%%/bg5pdflib.so
 %%EXAMPLESDIR%%/genTest.py
 %%EXAMPLESDIR%%/test.big5
 %%EXAMPLESDIR%%/test.big5.pdf
-%%PYTHON_SITELIBDIR%%/bg5pdflib.so
-bin/bg5pdf
-bin/gbpdf
 @dirrm %%EXAMPLESDIR%%
diff --git a/chinese/c2t/Makefile b/chinese/c2t/Makefile
index 824af93822c9..f25dae7b16b0 100644
--- a/chinese/c2t/Makefile
+++ b/chinese/c2t/Makefile
@@ -13,13 +13,11 @@ COMMENT=	Translates GB/Big5 encoding to tone pinyin
 
 NO_WRKSUBDIR=	yes
 EXTRACT_ONLY=	c2t.tar.gz
-MAN1=		c2t.1
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${PREFIX}/share/chinese/gb
-	${INSTALL_PROGRAM} ${WRKSRC}/c2t ${PREFIX}/bin
-	${INSTALL_DATA} ${DISTDIR}/TONEPY.tit ${PREFIX}/share/chinese/gb
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/chinese/gb
+	${INSTALL_PROGRAM} ${WRKSRC}/c2t ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_DATA} ${DISTDIR}/TONEPY.tit ${STAGEDIR}/${PREFIX}/share/chinese/gb
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}/${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/chinese/c2t/pkg-plist b/chinese/c2t/pkg-plist
index 2599a95b9d6c..671eff0948d6 100644
--- a/chinese/c2t/pkg-plist
+++ b/chinese/c2t/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/c2t
+man/man1/c2t.1.gz
 share/chinese/gb/TONEPY.tit
 @dirrmtry share/chinese/gb
 @dirrmtry share/chinese
diff --git a/chinese/gb2jis/Makefile b/chinese/gb2jis/Makefile
index 79650ba95516..1b0e41aaee10 100644
--- a/chinese/gb2jis/Makefile
+++ b/chinese/gb2jis/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Convert GuoBiao Hanzi to JIS Kanji
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=
 
-MAN1=		${PORTNAME}.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/gb2jis/files/patch-Makefile b/chinese/gb2jis/files/patch-Makefile
index 08f19144dcd3..816ec565428f 100644
--- a/chinese/gb2jis/files/patch-Makefile
+++ b/chinese/gb2jis/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig	1995-02-09 06:29:35.000000000 +0200
-+++ ./Makefile	2009-06-01 18:28:52.173974060 +0300
+--- Makefile.orig	1995-02-09 12:29:35.000000000 +0800
++++ Makefile	2013-09-26 20:13:01.000000000 +0800
 @@ -1,6 +1,10 @@
  SHELL = /bin/sh
  
@@ -12,7 +12,7 @@
  
  TABLEC = GB2312JX0208.c GB2312JX0212.c GB2312UZPJ.c
  TABLEO = GB2312JX0208.o GB2312JX0212.o GB2312UZPJ.o
-@@ -11,19 +15,20 @@
+@@ -11,19 +15,20 @@ TABLEO = GB2312JX0208.o GB2312JX0212.o G
  	./t2c $< $@
  
  .c.o:
@@ -32,13 +32,13 @@
  install: gb2jis gb2jis.1
 -	cp gb2jis /usr/local/bin/gb2jis
 -	cp gb2jis.1 /usr/local/man/man1/gb2jis.1
-+	${BSD_INSTALL_PROGRAM} gb2jis ${PREFIX}/bin/gb2jis
-+	${BSD_INSTALL_MAN} gb2jis.1 ${MAN1PREFIX}/man/man1/gb2jis.1
-+	${BSD_INSTALL_DATA} gb2jis.el ${PREFIX}/share/emacs/site-lisp/gb2jis.el
++	${BSD_INSTALL_PROGRAM} gb2jis ${DESTDIR}${PREFIX}/bin/gb2jis
++	${BSD_INSTALL_MAN} gb2jis.1 ${DESTDIR}${MAN1PREFIX}/man/man1/gb2jis.1
++	${BSD_INSTALL_DATA} gb2jis.el ${DESTDIR}${PREFIX}/share/emacs/site-lisp/gb2jis.el
  #	nroff -man gb2jis.1 > /usr/local/catman/C/u_man/cat1/gb2jis.1
  
  clean:
-@@ -34,7 +39,7 @@
+@@ -34,7 +39,7 @@ check: $(TABLEC)
  	-egrep '0x([2-9].[8-f]|[8-f].[2-9])' GB2312UZPJ.c
  
  t2c: t2c.c
diff --git a/chinese/gb2jis/pkg-plist b/chinese/gb2jis/pkg-plist
index 1f114aeacdf3..dc710deceb5b 100644
--- a/chinese/gb2jis/pkg-plist
+++ b/chinese/gb2jis/pkg-plist
@@ -1,2 +1,3 @@
 bin/gb2jis
+man/man1/gb2jis.1.gz
 share/emacs/site-lisp/gb2jis.el
diff --git a/chinese/gb2ps/Makefile b/chinese/gb2ps/Makefile
index 7a64fa173d10..0df1a1a529c1 100644
--- a/chinese/gb2ps/Makefile
+++ b/chinese/gb2ps/Makefile
@@ -17,17 +17,16 @@ COMMENT=	Converts Chinese GB (simple) encoded text to PostScript
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}/GB2PS
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${PREFIX}/share/chinese/gb
-	${INSTALL_PROGRAM} ${WRKSRC}/gb2ps ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/cover.ps ${PREFIX}/share/chinese
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/chinese/gb
+	${INSTALL_PROGRAM} ${WRKSRC}/gb2ps ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/cover.ps ${STAGEDIR}/${PREFIX}/share/chinese
 .for font in csong24.ccf ckai24.ccf cfang24.ccf chei24.ccf cfan24.ccf
-	${GUNZIP_CMD} -c ${DISTDIR}/${font}.gz > ${PREFIX}/share/chinese/gb/${font}
+	${GUNZIP_CMD} -c ${DISTDIR}/${font}.gz > ${STAGEDIR}/${PREFIX}/share/chinese/gb/${font}
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/gb2ps
-	${INSTALL_DATA} ${WRKSRC}/gb2ps.help ${PREFIX}/share/doc/gb2ps
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/gb2ps
+	${INSTALL_DATA} ${WRKSRC}/gb2ps.help ${STAGEDIR}/${PREFIX}/share/doc/gb2ps
 .endif
 
 .include <bsd.port.mk>
diff --git a/chinese/gb2ps/files/patch-01 b/chinese/gb2ps/files/patch-01
index cf6fa9f3c4fb..8519fe6cf66b 100644
--- a/chinese/gb2ps/files/patch-01
+++ b/chinese/gb2ps/files/patch-01
@@ -1,6 +1,6 @@
---- Makefile.orig	Mon Aug 17 13:34:14 1992
-+++ Makefile	Sun Apr  2 11:40:36 2000
-@@ -5,11 +5,11 @@
+--- Makefile.orig	1992-08-17 13:34:14.000000000 +0800
++++ Makefile	2013-09-26 21:07:54.000000000 +0800
+@@ -5,31 +5,31 @@
  # COVERPAGE -- the absolute path and name of coverpage PS file
  # 	    -- default is current directory 
  
@@ -15,3 +15,30 @@
       
  all: gb2ps
  
+ gb2ps:gbmain.o gbchar.o gbinit.o gbpage.o cover.o
+-	cc ${CFLAGS} -o gb2ps gbmain.o gbchar.o gbinit.o \
++	${CC} ${CFLAGS} -o gb2ps gbmain.o gbchar.o gbinit.o \
+ 			gbpage.o cover.o
+     
+ cover.o:cover.c  Makefile
+-	cc ${CFLAGS} -c cover.c
++	${CC} ${CFLAGS} -c cover.c
+ 
+ gbmain.o: gbmain.c Makefile
+-	cc ${CFLAGS} -c gbmain.c
++	${CC} ${CFLAGS} -c gbmain.c
+ gbchar.o: gbchar.c Makefile
+-	cc ${CFLAGS} -c gbchar.c
++	${CC} ${CFLAGS} -c gbchar.c
+ gbinit.o: gbinit.c Makefile
+-	cc ${CFLAGS} -c gbinit.c
++	${CC} ${CFLAGS} -c gbinit.c
+ gbpage.o: gbpage.c Makefile
+-	cc ${CFLAGS} -c gbpage.c
++	${CC} ${CFLAGS} -c gbpage.c
+ gbpost.o: gbpost.c Makefile
+-	cc ${CFLAGS} -c gbpost.c
++	${CC} ${CFLAGS} -c gbpost.c
+ 
+ clean:
+ 	rm -f *.o core gb2ps plib2ccf
diff --git a/chinese/gb2ps/files/patch-cover.c b/chinese/gb2ps/files/patch-cover.c
new file mode 100644
index 000000000000..b4d1be861721
--- /dev/null
+++ b/chinese/gb2ps/files/patch-cover.c
@@ -0,0 +1,10 @@
+--- cover.c.orig	2013-09-26 21:05:08.000000000 +0800
++++ cover.c	2013-09-26 21:05:14.000000000 +0800
+@@ -25,6 +25,7 @@ char coverPS[50];
+ #define COVERPAGE "cover.ps"
+ #endif
+ 
++void
+ coverpage() 
+ {
+ 	int	tmp;
diff --git a/chinese/gb2ps/files/patch-gb2ps.h b/chinese/gb2ps/files/patch-gb2ps.h
new file mode 100644
index 000000000000..5d96d1bbf349
--- /dev/null
+++ b/chinese/gb2ps/files/patch-gb2ps.h
@@ -0,0 +1,48 @@
+--- gb2ps.h.orig	1992-08-23 11:38:03.000000000 +0800
++++ gb2ps.h	2013-09-26 21:06:36.000000000 +0800
+@@ -11,6 +11,9 @@
+  *      and THERE IS NO WARRANTY FOR THIS PROGRAM.
+  ****************************************************************************/
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <ctype.h>
+ 
+ #define CHAR_LIMIT 2
+ #ifndef CFONT
+@@ -81,6 +84,7 @@ extern int	endpage_flag;
+ extern int	format_flag;
+ extern int	pageno_flag;
+ extern int	coverpage_flag;
++extern void coverpage();
+ extern int	pagecounter;
+ extern int	linecounter;
+ extern float	line_h[];
+@@ -90,14 +94,19 @@ extern FILE	*in, *out;
+ extern FILE	*cfont;
+ extern float	H,V;
+ 
+-extern int ASCshow();
+-extern int put_ASC();
+-extern int put_CH();
++extern void ASCshow();
++extern void put_ASC();
++extern void put_CH();
+ extern int putChar();
+-extern int putString();
+-extern int DefCHdict();
+-extern int AnalyseDoc();
+-
++extern void putString();
++extern void DefCHdict();
++extern void AnalyseDoc();
++
++extern void ps_end();
++extern void end_page();
++extern void begin_page();
++extern void ps_header();
++extern void init_page();
+ extern int init();
+-extern int cleanup();
++extern void cleanup();
+ extern int readchar();
diff --git a/chinese/gb2ps/files/patch-gbchar.c b/chinese/gb2ps/files/patch-gbchar.c
new file mode 100644
index 000000000000..3c03c595c273
--- /dev/null
+++ b/chinese/gb2ps/files/patch-gbchar.c
@@ -0,0 +1,96 @@
+--- gbchar.c.orig	1992-08-23 11:37:58.000000000 +0800
++++ gbchar.c	2013-09-26 20:54:32.000000000 +0800
+@@ -26,6 +26,7 @@ int	commandcounter=0;
+ int	rotate_flag=FALSE;
+ int	setgray=0;
+ 
++void
+ ASCshow() {
+ 	if (ascflag) {
+ 		if (!Analyse_flag) fprintf(out,") S\n");
+@@ -33,6 +34,7 @@ ASCshow() {
+ 	}
+ }
+ 
++void
+ newline ()
+ {
+ 	charcount=0;  H=_LM; 
+@@ -82,6 +84,7 @@ newline ()
+ 	}
+ }
+ 
++void
+ put_ASC(c)
+ int c;
+ {
+@@ -126,6 +129,7 @@ int c;
+ 		newline ();
+ }
+ 
++void
+ put_CH(ch1,ch2)
+ int ch1,ch2;
+ {
+@@ -217,6 +221,7 @@ int ch1,ch2;
+       return ch2;
+ }
+ 
++void
+ putString(st)
+ char* st;
+ {
+@@ -238,6 +243,7 @@ char* st;
+ 
+ /*===========================================================================*/
+ 
++void
+ DefCHdict() {
+ 	long i,j,k=0;
+ 	char st1[10];
+@@ -249,7 +255,7 @@ DefCHdict() {
+ 		if (CHcode[i][j]>=CHAR_LIMIT) k++;
+ 	   }
+ 
+-	fprintf(out,"/CHdict %d dict def\nCHdict begin\n",k+400);
++	fprintf(out,"/CHdict %ld dict def\nCHdict begin\n",k+400);
+ 
+ 	for (i=0;i<94*94;i++) 
+ 	   for (j=0;j<6;j++) {
+@@ -257,7 +263,7 @@ DefCHdict() {
+ 			fseek(CHFONT[j].fp,offset_CH+i*size_of_CH,0);
+ 			fgets(line,size_of_CH,CHFONT[j].fp); 
+ 			sscanf(line,"%s %s",st1,st2);
+-			fprintf(out,"/C%1d%s {H {<%s>} I G} def \n",j,st1,st2);
++			fprintf(out,"/C%1ld%s {H {<%s>} I G} def \n",j,st1,st2);
+ 		}
+ 	   }
+ }
+@@ -265,7 +271,8 @@ DefCHdict() {
+ 
+ /*AnalyseDoc: analyse the input document.*/
+ 
+-int AnalyseDoc() {
++void
++AnalyseDoc() {
+   int	ch=0,ch1,ch2,i,j;
+ 
+   for (i=0;i<94*94;i++) 
+@@ -326,13 +333,14 @@ int readchar() {
+ 			c=fgetc(in);
+ 	}
+ 
+-	if (CH_mode)
+-		if (((c&0x7f)>=0x21)&&((c&0x7f)<=0x7e))
++	if (CH_mode) {
++		if (((c&0x7f)>=0x21)&&((c&0x7f)<=0x7e)) {
+ 			return c|0x80;
+-		else {
++        } else {
+ 			CH_mode=FALSE;
+ 			return c;
+ 		}
++    }
+ 			
+ 	if (!format_flag) return c;
+ 
diff --git a/chinese/gb2ps/files/patch-gbinit.c b/chinese/gb2ps/files/patch-gbinit.c
new file mode 100644
index 000000000000..00370ae9f129
--- /dev/null
+++ b/chinese/gb2ps/files/patch-gbinit.c
@@ -0,0 +1,31 @@
+--- gbinit.c.orig	1992-08-23 11:37:58.000000000 +0800
++++ gbinit.c	2013-09-26 21:00:49.000000000 +0800
+@@ -98,11 +98,12 @@ char **arglist;
+ 	exit (1);
+   }
+ 
+-  if (*pathname==0)
++  if (*pathname==0) {
+   	if (getenv("CFONT")!=NULL)
+  		strcpy(pathname,getenv("CFONT"));
+ 	else
+     		strcpy (pathname,CFONT);
++  }
+ 
+  strcpy(cfont_name,pathname); strcat(cfont_name,SONGTI); 
+  if ((cfont = fopen (cfont_name, "r"))!=NULL) {
+@@ -185,7 +186,7 @@ char **arglist;
+   return k;
+ }
+ 
+-
++void
+ cleanup(i)
+ int i;
+ {
+@@ -201,5 +202,3 @@ int i;
+   if (cfont!=CHFONT[4].fp) fclose(CHFONT[4].fp);
+   if (cfont!=CHFONT[5].fp) fclose(CHFONT[5].fp);
+ }
+-
+-
diff --git a/chinese/gb2ps/files/patch-gbmain.c b/chinese/gb2ps/files/patch-gbmain.c
new file mode 100644
index 000000000000..71cc1e95b07a
--- /dev/null
+++ b/chinese/gb2ps/files/patch-gbmain.c
@@ -0,0 +1,10 @@
+--- gbmain.c.orig	1992-08-23 11:37:58.000000000 +0800
++++ gbmain.c	2013-09-26 20:39:56.000000000 +0800
+@@ -83,6 +83,7 @@ FILE	*in, *out;
+ FILE	*cfont;
+ float	H,V;
+ 
++int
+ main (argc,argv)
+ int	argc;
+ char	**argv;
diff --git a/chinese/gb2ps/files/patch-gbpage.c b/chinese/gb2ps/files/patch-gbpage.c
new file mode 100644
index 000000000000..2235a21d61bc
--- /dev/null
+++ b/chinese/gb2ps/files/patch-gbpage.c
@@ -0,0 +1,46 @@
+--- gbpage.c.orig	2013-09-26 20:18:53.000000000 +0800
++++ gbpage.c	2013-09-26 20:19:22.000000000 +0800
+@@ -13,6 +13,7 @@
+ 
+ #include "gb2ps.h"
+ 
++void
+ init_page()
+ {
+ /* define margins, line space and character space*/
+@@ -39,7 +40,7 @@ init_page()
+ 	page[1]=page[0];
+ }
+ 
+-
++void
+ begin_page()
+ {
+ 
+@@ -73,6 +74,7 @@ begin_page()
+ 		V=_TM-line_h[linecounter];	charcount=0;
+ }
+ 
++void
+ end_page ()
+ {
+ 	if (pagecounter) {
+@@ -97,6 +99,7 @@ end_page ()
+ 	pagecounter++;
+ }
+ 
++void
+ ps_header ()
+ {
+   fprintf(out,"%%!PS-Adobe-1.0\n");
+@@ -110,9 +113,8 @@ ps_header ()
+   fprintf(out,"%%%%EndProlog\n");
+ }
+ 
++void
+ ps_end()
+ {
+ 	fprintf(out,"%%%%Trailer\n");
+ }
+-
+-
diff --git a/chinese/gb2ps/pkg-plist b/chinese/gb2ps/pkg-plist
index 8eb5295bec1d..be945dca5adf 100644
--- a/chinese/gb2ps/pkg-plist
+++ b/chinese/gb2ps/pkg-plist
@@ -1,12 +1,12 @@
 @comment $FreeBSD$
 bin/gb2ps
 share/chinese/cover.ps
-share/chinese/gb/csong24.ccf
-share/chinese/gb/ckai24.ccf
+share/chinese/gb/cfan24.ccf
 share/chinese/gb/cfang24.ccf
 share/chinese/gb/chei24.ccf
-share/chinese/gb/cfan24.ccf
-%%PORTDOCS%%share/doc/gb2ps/gb2ps.help
-%%PORTDOCS%%@dirrm share/doc/gb2ps
+share/chinese/gb/ckai24.ccf
+share/chinese/gb/csong24.ccf
+%%PORTDOCS%%%%DOCSDIR%%/gb2ps.help
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/chinese/gb
 @dirrmtry share/chinese
diff --git a/chinese/hc/Makefile b/chinese/hc/Makefile
index 62de735e8d2b..7e375f84facb 100644
--- a/chinese/hc/Makefile
+++ b/chinese/hc/Makefile
@@ -13,19 +13,17 @@ COMMENT=	Hanzi Converter -- converts between GB and BIG-5 codes
 WRKSRC=		${WRKDIR}/hc3
 EXTRACT_ONLY=	hc-30.tar.gz
 ALL_TARGET=	hc b2g g2b
-MAN1=		hc.1
 
-NO_STAGE=	yes
 pre-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/hclib.c
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/chinese
-	${INSTALL_PROGRAM} ${WRKSRC}/hc ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/b2g ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/g2b ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/hc.tab ${PREFIX}/share/chinese
-	${INSTALL_DATA} ${DISTDIR}/hc-supp.tab ${PREFIX}/share/chinese
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/chinese
+	${INSTALL_PROGRAM} ${WRKSRC}/hc ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/b2g ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/g2b ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/hc.tab ${STAGEDIR}/${PREFIX}/share/chinese
+	${INSTALL_DATA} ${DISTDIR}/hc-supp.tab ${STAGEDIR}/${PREFIX}/share/chinese
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/chinese/hc/pkg-plist b/chinese/hc/pkg-plist
index 5cf9a8157043..0bc57288b62e 100644
--- a/chinese/hc/pkg-plist
+++ b/chinese/hc/pkg-plist
@@ -1,7 +1,7 @@
 @comment $FreeBSD$
-bin/hc
 bin/b2g
 bin/g2b
-share/chinese/hc.tab
+bin/hc
 share/chinese/hc-supp.tab
+share/chinese/hc.tab
 @dirrmtry share/chinese
diff --git a/chinese/hztty/Makefile b/chinese/hztty/Makefile
index a562a800bddb..b152f5771605 100644
--- a/chinese/hztty/Makefile
+++ b/chinese/hztty/Makefile
@@ -10,10 +10,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A translator between GuoBiao / Big5 and HZ
 
 ALL_TARGET=	bsd
-MAN1=		hztty.1
-PLIST_FILES=	bin/hztty
+PLIST_FILES=	bin/hztty man/man1/${PORTNAME}.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 900007
@@ -21,7 +19,7 @@ BROKEN=		fails to build with new utmpx
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hztty ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/hztty.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}/${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
diff --git a/chinese/irssi/Makefile b/chinese/irssi/Makefile
index 5b3d2ebde351..89f147b17afd 100644
--- a/chinese/irssi/Makefile
+++ b/chinese/irssi/Makefile
@@ -13,5 +13,4 @@ MASTERDIR=	${.CURDIR}/../../irc/irssi
 EXTRA_PATCHES=	${.CURDIR}/files/patch-irssi.conf \
 		${.CURDIR}/files/patch-utf8_break
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/jis2gb/Makefile b/chinese/jis2gb/Makefile
index e77e99204db1..483a7f2e6473 100644
--- a/chinese/jis2gb/Makefile
+++ b/chinese/jis2gb/Makefile
@@ -13,7 +13,6 @@ COMMENT=	Convert JIS Kanji to GuoBiao Hanzi
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=
 
-MAN1=		${PORTNAME}.1
+#MAN1=		${PORTNAME}.1
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/jis2gb/files/patch-Makefile b/chinese/jis2gb/files/patch-Makefile
index 7c5009930ff0..0fa4a8312ace 100644
--- a/chinese/jis2gb/files/patch-Makefile
+++ b/chinese/jis2gb/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig	1995-10-05 10:21:32.000000000 +0200
-+++ ./Makefile	2009-06-01 18:14:43.123328777 +0300
+--- Makefile.orig	1995-10-05 16:21:32.000000000 +0800
++++ Makefile	2013-09-26 21:15:32.000000000 +0800
 @@ -1,6 +1,11 @@
  SHELL = /bin/sh
  
@@ -13,7 +13,7 @@
  
  TABLEC = JX0208GB2312.c JX0208GB8565.c JX0212GB2312.c JX0212GB8565.c \
  	 MSSJISGB2312.c MSSJISJX0208.c MSSJISJX0212.c
-@@ -13,19 +18,20 @@
+@@ -13,19 +18,20 @@ TABLEO = JX0208GB2312.o JX0208GB8565.o J
  	./t2c $< $@
  
  .c.o:
@@ -34,13 +34,13 @@
  install: jis2gb jis2gb.1
 -	cp jis2gb /usr/local/bin/jis2gb
 -	cp jis2gb.1 /usr/local/man/man1/jis2gb.1
-+	${BSD_INSTALL_PROGRAM} jis2gb ${PREFIX}/bin/jis2gb
-+	${BSD_INSTALL_MAN} jis2gb.1 ${MAN1PREFIX}/man/man1/jis2gb.1
-+	${BSD_INSTALL_DATA} jis2gb.el ${PREFIX}/share/emacs/site-lisp/jis2gb.el
++	${BSD_INSTALL_PROGRAM} jis2gb ${DESTDIR}${PREFIX}/bin/jis2gb
++	${BSD_INSTALL_MAN} jis2gb.1 ${DESTDIR}${MAN1PREFIX}/man/man1/jis2gb.1
++	${BSD_INSTALL_DATA} jis2gb.el ${DESTDIR}${PREFIX}/share/emacs/site-lisp/jis2gb.el
  #	nroff -man jis2gb.1 > /usr/local/catman/C/u_man/cat1/jis2gb.1
  
  clean:
-@@ -36,7 +42,7 @@
+@@ -36,7 +42,7 @@ check: $(TABLEC)
  	-egrep '0x([2-9]|a[1-b]|f[0-9]|..[2-9])' JX0208GB8565.c JX0212GB8565.c
  
  t2c: t2c.c
diff --git a/chinese/jis2gb/pkg-plist b/chinese/jis2gb/pkg-plist
index 28389ba6d67b..7bb7fee3d09c 100644
--- a/chinese/jis2gb/pkg-plist
+++ b/chinese/jis2gb/pkg-plist
@@ -1,2 +1,3 @@
 bin/jis2gb
+man/man1/jis2gb.1.gz
 share/emacs/site-lisp/jis2gb.el
diff --git a/chinese/muni/Makefile b/chinese/muni/Makefile
index e28317cc2690..c0603cb17dbd 100644
--- a/chinese/muni/Makefile
+++ b/chinese/muni/Makefile
@@ -9,15 +9,14 @@ MASTER_SITES=	http://www.whizkidtech.redprince.net/i18n/muni/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Find Unicode values for Chinese characters
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/muni ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/m7773 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/muni ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/m7773 ${STAGEDIR}/${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/muni
-	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/doc/muni
-	${INSTALL_DATA} ${WRKSRC}/yung.gif ${PREFIX}/share/doc/muni
-	${INSTALL_DATA} ${WRKSRC}/kang.gif ${PREFIX}/share/doc/muni
+	${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/muni
+	${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}/${PREFIX}/share/doc/muni
+	${INSTALL_DATA} ${WRKSRC}/yung.gif ${STAGEDIR}/${PREFIX}/share/doc/muni
+	${INSTALL_DATA} ${WRKSRC}/kang.gif ${STAGEDIR}/${PREFIX}/share/doc/muni
 .endif
 
 .include <bsd.port.mk>
diff --git a/chinese/muni/pkg-plist b/chinese/muni/pkg-plist
index 10209b22e965..156b7cfb6e5a 100644
--- a/chinese/muni/pkg-plist
+++ b/chinese/muni/pkg-plist
@@ -1,6 +1,6 @@
 bin/m7773
 bin/muni
-%%PORTDOCS%%share/doc/muni/index.html
-%%PORTDOCS%%share/doc/muni/kang.gif
-%%PORTDOCS%%share/doc/muni/yung.gif
-%%PORTDOCS%%@dirrm share/doc/muni
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/kang.gif
+%%PORTDOCS%%%%DOCSDIR%%/yung.gif
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/chinese/oicq/Makefile b/chinese/oicq/Makefile
index c15cb820470c..fad82e73fc9e 100644
--- a/chinese/oicq/Makefile
+++ b/chinese/oicq/Makefile
@@ -16,11 +16,8 @@ BUILD_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Net::OICQ.3
-
-NO_STAGE=	yes
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/qq ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/demo1 ${PREFIX}/bin/qq-demo1
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/qq ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/demo1 ${STAGEDIR}/${PREFIX}/bin/qq-demo1
 
 .include <bsd.port.mk>
diff --git a/chinese/oicq/pkg-plist b/chinese/oicq/pkg-plist
index dc4f0bb7ebbc..736622beea26 100644
--- a/chinese/oicq/pkg-plist
+++ b/chinese/oicq/pkg-plist
@@ -1,10 +1,11 @@
 bin/qq
 bin/qq-demo1
+%%PERL5_MAN3%%/Net::OICQ.3.gz
 %%SITE_PERL%%/Net/OICQ.pm
-%%SITE_PERL%%/Net/OICQ/TextConsole.pm
-%%SITE_PERL%%/Net/OICQ/Event.pm
 %%SITE_PERL%%/Net/OICQ/ClientEvent.pm
+%%SITE_PERL%%/Net/OICQ/Event.pm
 %%SITE_PERL%%/Net/OICQ/ServerEvent.pm
+%%SITE_PERL%%/Net/OICQ/TextConsole.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OICQ/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OICQ
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net
diff --git a/chinese/p5-Date-Chinese/Makefile b/chinese/p5-Date-Chinese/Makefile
index 546bbb1f712d..332a8341b679 100644
--- a/chinese/p5-Date-Chinese/Makefile
+++ b/chinese/p5-Date-Chinese/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Perl module to calculate dates in the Chinese calendar
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Date::Chinese.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Date-Chinese/pkg-plist b/chinese/p5-Date-Chinese/pkg-plist
index 75c2ce042e70..0d9a153a9e7b 100644
--- a/chinese/p5-Date-Chinese/pkg-plist
+++ b/chinese/p5-Date-Chinese/pkg-plist
@@ -1,5 +1,6 @@
+%%PERL5_MAN3%%/Date::Chinese.3.gz
 %%SITE_PERL%%/Date/Chinese.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Chinese/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Chinese
-@dirrmtry %%SITE_PERL%%/Date
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date
+@dirrmtry %%SITE_PERL%%/Date
diff --git a/chinese/p5-Encode-CNMap/Makefile b/chinese/p5-Encode-CNMap/Makefile
index b519b820c370..7d700613713b 100644
--- a/chinese/p5-Encode-CNMap/Makefile
+++ b/chinese/p5-Encode-CNMap/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Enhanced Chinese encodings with Simplified-Traditional auto-mapping
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		cnmap.1 cnmapdir.1 cnmapwx.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Encode-CNMap/pkg-plist b/chinese/p5-Encode-CNMap/pkg-plist
index 8071e7676351..f996cbab8034 100644
--- a/chinese/p5-Encode-CNMap/pkg-plist
+++ b/chinese/p5-Encode-CNMap/pkg-plist
@@ -1,12 +1,15 @@
+bin/cnmap
+bin/cnmapdir
+bin/cnmapwx
+man/man1/cnmap.1.gz
+man/man1/cnmapdir.1.gz
+man/man1/cnmapwx.1.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap/cnmapwx.wdr
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap/cnmapwx_wdr.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CNMap/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CNMap/CNMap.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CNMap/CNMap.so
-bin/cnmap
-bin/cnmapdir
-bin/cnmapwx
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/CNMap
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Encode/CNMap
diff --git a/chinese/p5-Encode-HanConvert/Makefile b/chinese/p5-Encode-HanConvert/Makefile
index d785d6176beb..6d0aa5f1ec4d 100644
--- a/chinese/p5-Encode-HanConvert/Makefile
+++ b/chinese/p5-Encode-HanConvert/Makefile
@@ -13,9 +13,6 @@ COMMENT=	Traditional and Simplified Chinese mappings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN1=		b2g.pl.1 g2b.pl.1
-
-NO_STAGE=	yes
 regression-test:
 	cd ${WRKSRC} && ${MAKE} test
 
diff --git a/chinese/p5-Encode-HanConvert/pkg-plist b/chinese/p5-Encode-HanConvert/pkg-plist
index 978788a09ae0..3ceab25e66e8 100644
--- a/chinese/p5-Encode-HanConvert/pkg-plist
+++ b/chinese/p5-Encode-HanConvert/pkg-plist
@@ -1,5 +1,7 @@
 bin/b2g.pl
 bin/g2b.pl
+man/man1/b2g.pl.1.gz
+man/man1/g2b.pl.1.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert/Perl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanConvert/Perl.pm-orig
diff --git a/chinese/p5-Encode-HanExtra/Makefile b/chinese/p5-Encode-HanExtra/Makefile
index be57efa70b9e..c1dd59f50d85 100644
--- a/chinese/p5-Encode-HanExtra/Makefile
+++ b/chinese/p5-Encode-HanExtra/Makefile
@@ -13,7 +13,5 @@ COMMENT=	Extra sets of Chinese encodings
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Encode::HanExtra.3 Encode::TW::Unisys::SOSI1.3 Encode::TW::Unisys::SOSI2.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Encode-HanExtra/pkg-plist b/chinese/p5-Encode-HanExtra/pkg-plist
index 139eb1e85f37..b5062a3cc615 100644
--- a/chinese/p5-Encode-HanExtra/pkg-plist
+++ b/chinese/p5-Encode-HanExtra/pkg-plist
@@ -1,9 +1,12 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/HanExtra.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/HanExtra.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/.packlist
+%%PERL5_MAN3%%/Encode::HanExtra.3.gz
+%%PERL5_MAN3%%/Encode::TW::Unisys::SOSI1.3.gz
+%%PERL5_MAN3%%/Encode::TW::Unisys::SOSI2.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/HanExtra.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI1.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys/SOSI2.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/HanExtra.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra/HanExtra.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode/HanExtra
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Encode
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Encode/TW/Unisys
diff --git a/chinese/p5-Lingua-Han-PinYin/Makefile b/chinese/p5-Lingua-Han-PinYin/Makefile
index 70a490abce98..c32054c1b3a5 100644
--- a/chinese/p5-Lingua-Han-PinYin/Makefile
+++ b/chinese/p5-Lingua-Han-PinYin/Makefile
@@ -19,7 +19,4 @@ RUN_DEPENDS=	p5-Lingua-Han-Utils>=0.10:${PORTSDIR}/chinese/p5-Lingua-Han-Utils
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Lingua::Han::PinYin.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-Han-PinYin/pkg-plist b/chinese/p5-Lingua-Han-PinYin/pkg-plist
index ecfc51d4252d..700596945590 100644
--- a/chinese/p5-Lingua-Han-PinYin/pkg-plist
+++ b/chinese/p5-Lingua-Han-PinYin/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/Lingua::Han::PinYin.3.gz
 %%SITE_PERL%%/Lingua/Han/PinYin.pm
 %%SITE_PERL%%/Lingua/Han/PinYin/Mandarin.dat
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/PinYin/.packlist
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/PinYin
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/PinYin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
-@dirrmtry %%SITE_PERL%%/Lingua/Han/PinYin
+@dirrm %%SITE_PERL%%/Lingua/Han/PinYin
 @dirrmtry %%SITE_PERL%%/Lingua/Han
 @dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/p5-Lingua-Han-Utils/Makefile b/chinese/p5-Lingua-Han-Utils/Makefile
index dd2092f2824e..acee801f42ae 100644
--- a/chinese/p5-Lingua-Han-Utils/Makefile
+++ b/chinese/p5-Lingua-Han-Utils/Makefile
@@ -21,5 +21,4 @@ USE_PERL5=	configure
 
 MAN3=		Lingua::Han::Utils.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-Han-Utils/pkg-plist b/chinese/p5-Lingua-Han-Utils/pkg-plist
index 009eb95850c2..60d489fbd3fa 100644
--- a/chinese/p5-Lingua-Han-Utils/pkg-plist
+++ b/chinese/p5-Lingua-Han-Utils/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/Utils/.packlist
+%%PERL5_MAN3%%/Lingua::Han::Utils.3.gz
 %%SITE_PERL%%/Lingua/Han/Utils.pm
-@dirrmtry %%SITE_PERL%%/Lingua/Han
-@dirrmtry %%SITE_PERL%%/Lingua
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/Utils
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/Utils/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han/Utils
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Han
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/Han
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
index 5e9e1990af2f..71684ce9b2a3 100644
--- a/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
+++ b/chinese/p5-Lingua-ZH-BPMFConvert/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Rule-based conversion of BPMF (bopomofo) into Hanyu Pinyin
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Lingua::ZH::BPMFConvert.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist b/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
index 80c8240d327c..8e10d75e5bb0 100644
--- a/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
+++ b/chinese/p5-Lingua-ZH-BPMFConvert/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/BPMFConvert/.packlist
+%%PERL5_MAN3%%/Lingua::ZH::BPMFConvert.3.gz
 %%SITE_PERL%%/Lingua/ZH/BPMFConvert.pm
-@dirrmtry %%SITE_PERL%%/Lingua/ZH
-@dirrmtry %%SITE_PERL%%/Lingua
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/BPMFConvert
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/BPMFConvert/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/BPMFConvert
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/p5-Lingua-ZH-HanDetect/Makefile b/chinese/p5-Lingua-ZH-HanDetect/Makefile
index c0aa04ea2e69..6d41b5791042 100644
--- a/chinese/p5-Lingua-ZH-HanDetect/Makefile
+++ b/chinese/p5-Lingua-ZH-HanDetect/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Guess Chinese text\'s variant and encoding
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Lingua::ZH::HanDetect.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-HanDetect/pkg-plist b/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
index 56deba2e7383..e584c97796a3 100644
--- a/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
+++ b/chinese/p5-Lingua-ZH-HanDetect/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/HanDetect/.packlist
+%%PERL5_MAN3%%/Lingua::ZH::HanDetect.3.gz
 %%SITE_PERL%%/Lingua/ZH/HanDetect.pm
-@dirrmtry %%SITE_PERL%%/Lingua/ZH
-@dirrmtry %%SITE_PERL%%/Lingua
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/HanDetect
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/HanDetect/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/HanDetect
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/p5-Lingua-ZH-Keywords/Makefile b/chinese/p5-Lingua-ZH-Keywords/Makefile
index c65382c96de4..fa331e9495d3 100644
--- a/chinese/p5-Lingua-ZH-Keywords/Makefile
+++ b/chinese/p5-Lingua-ZH-Keywords/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Lingua::ZH::Keywords.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-Keywords/pkg-plist b/chinese/p5-Lingua-ZH-Keywords/pkg-plist
index 549332031379..efde2d7298b7 100644
--- a/chinese/p5-Lingua-ZH-Keywords/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Keywords/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Lingua::ZH::Keywords.3.gz
 %%SITE_PERL%%/Lingua/ZH/Keywords.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Keywords/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Keywords
diff --git a/chinese/p5-Lingua-ZH-Numbers/Makefile b/chinese/p5-Lingua-ZH-Numbers/Makefile
index 88a28f0bb5cd..b620b1b662e1 100644
--- a/chinese/p5-Lingua-ZH-Numbers/Makefile
+++ b/chinese/p5-Lingua-ZH-Numbers/Makefile
@@ -13,7 +13,4 @@ COMMENT=	Converts numeric values into their Chinese string equivalents
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Lingua::ZH::Numbers.3 Lingua::ZH::Numbers::Currency.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-Numbers/pkg-plist b/chinese/p5-Lingua-ZH-Numbers/pkg-plist
index 8aa456afa6f6..cae3f3a638fb 100644
--- a/chinese/p5-Lingua-ZH-Numbers/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Numbers/pkg-plist
@@ -1,9 +1,11 @@
+%%PERL5_MAN3%%/Lingua::ZH::Numbers.3.gz
+%%PERL5_MAN3%%/Lingua::ZH::Numbers::Currency.3.gz
 %%SITE_PERL%%/Lingua/ZH/Numbers.pm
 %%SITE_PERL%%/Lingua/ZH/Numbers/Currency.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Numbers/.packlist
-@dirrm %%SITE_PERL%%/Lingua/ZH/Numbers
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Numbers
-@dirrmtry %%SITE_PERL%%/Lingua/ZH
-@dirrmtry %%SITE_PERL%%/Lingua
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrm %%SITE_PERL%%/Lingua/ZH/Numbers
+@dirrmtry %%SITE_PERL%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/p5-Lingua-ZH-Segment/Makefile b/chinese/p5-Lingua-ZH-Segment/Makefile
index 5d3677e51f01..57cf0caa73e8 100644
--- a/chinese/p5-Lingua-ZH-Segment/Makefile
+++ b/chinese/p5-Lingua-ZH-Segment/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Chinese Text Segmentation
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Lingua::ZH::Segment.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-Segment/pkg-plist b/chinese/p5-Lingua-ZH-Segment/pkg-plist
index e89669aa5cc0..21964100648c 100644
--- a/chinese/p5-Lingua-ZH-Segment/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Segment/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Segment/.packlist
+%%PERL5_MAN3%%/Lingua::ZH::Segment.3.gz
 %%SITE_PERL%%/Lingua/ZH/Segment.pm
-@dirrmtry %%SITE_PERL%%/Lingua/ZH
-@dirrmtry %%SITE_PERL%%/Lingua
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Segment
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Segment/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Segment
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/p5-Lingua-ZH-Summarize/Makefile b/chinese/p5-Lingua-ZH-Summarize/Makefile
index 73fce07142cf..d879bd15c96c 100644
--- a/chinese/p5-Lingua-ZH-Summarize/Makefile
+++ b/chinese/p5-Lingua-ZH-Summarize/Makefile
@@ -18,7 +18,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Lingua::ZH::Summarize.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-Summarize/pkg-plist b/chinese/p5-Lingua-ZH-Summarize/pkg-plist
index c8879accda94..a15a25e3d1c9 100644
--- a/chinese/p5-Lingua-ZH-Summarize/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Summarize/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Lingua::ZH::Summarize.3.gz
 %%SITE_PERL%%/Lingua/ZH/Summarize.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Summarize/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Summarize
diff --git a/chinese/p5-Lingua-ZH-TaBE/Makefile b/chinese/p5-Lingua-ZH-TaBE/Makefile
index 6caeac89222f..f4fbada83f1f 100644
--- a/chinese/p5-Lingua-ZH-TaBE/Makefile
+++ b/chinese/p5-Lingua-ZH-TaBE/Makefile
@@ -21,9 +21,6 @@ OBSOLETE_BDB_VAR=	WITH_DB
 
 CONFIGURE_ARGS=	DB="${BDB_LIB_NAME}"
 
-MAN3=		Lingua::ZH::TaBE.3
-
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "You may specify db version to use:"
diff --git a/chinese/p5-Lingua-ZH-TaBE/pkg-plist b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
index c377ca4ba91a..4766dd86163a 100644
--- a/chinese/p5-Lingua-ZH-TaBE/pkg-plist
+++ b/chinese/p5-Lingua-ZH-TaBE/pkg-plist
@@ -1,9 +1,10 @@
+%%PERL5_MAN3%%/Lingua::ZH::TaBE.3.gz
 %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/ZH/TaBE.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/TaBE.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/TaBE.so
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/TaBE
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/ZH
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
diff --git a/chinese/p5-Lingua-ZH-Toke/Makefile b/chinese/p5-Lingua-ZH-Toke/Makefile
index 49c791d3f8ee..0cda9ad2acaf 100644
--- a/chinese/p5-Lingua-ZH-Toke/Makefile
+++ b/chinese/p5-Lingua-ZH-Toke/Makefile
@@ -17,7 +17,4 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Lingua::ZH::Toke.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-Toke/pkg-plist b/chinese/p5-Lingua-ZH-Toke/pkg-plist
index d74b87edb403..2c71fea07739 100644
--- a/chinese/p5-Lingua-ZH-Toke/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Toke/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Lingua::ZH::Toke.3.gz
 %%SITE_PERL%%/Lingua/ZH/Toke.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Toke/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Toke
diff --git a/chinese/p5-Lingua-ZH-WordSegmenter/Makefile b/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
index 46059c6e0155..be785a600df4 100644
--- a/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
+++ b/chinese/p5-Lingua-ZH-WordSegmenter/Makefile
@@ -14,7 +14,4 @@ COMMENT=	Simplified Chinese Word Segmentation
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=		Lingua::ZH::WordSegmenter.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist b/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
index f3d73a74abc4..3b9d974c5ca1 100644
--- a/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
+++ b/chinese/p5-Lingua-ZH-WordSegmenter/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/WordSegmenter/.packlist
+%%PERL5_MAN3%%/Lingua::ZH::WordSegmenter.3.gz
 %%SITE_PERL%%/Lingua/ZH/WordSegmenter.pm
-@dirrmtry %%SITE_PERL%%/Lingua/ZH
-@dirrmtry %%SITE_PERL%%/Lingua
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/WordSegmenter/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/WordSegmenter
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua
+@dirrmtry %%SITE_PERL%%/Lingua/ZH
+@dirrmtry %%SITE_PERL%%/Lingua
diff --git a/chinese/p5-Lingua-ZH-Wrap/Makefile b/chinese/p5-Lingua-ZH-Wrap/Makefile
index 64de83d5e13d..ff0d329476f4 100644
--- a/chinese/p5-Lingua-ZH-Wrap/Makefile
+++ b/chinese/p5-Lingua-ZH-Wrap/Makefile
@@ -15,5 +15,4 @@ USE_PERL5=	configure
 
 MAN3=	Lingua::ZH::Wrap.3
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Lingua-ZH-Wrap/pkg-plist b/chinese/p5-Lingua-ZH-Wrap/pkg-plist
index 25c702d8ca9a..a080d8746f31 100644
--- a/chinese/p5-Lingua-ZH-Wrap/pkg-plist
+++ b/chinese/p5-Lingua-ZH-Wrap/pkg-plist
@@ -1,3 +1,4 @@
+%%PERL5_MAN3%%/Lingua::ZH::Wrap.3.gz
 %%SITE_PERL%%/Lingua/ZH/Wrap.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Wrap/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Wrap
diff --git a/chinese/p5-Text-Greeking-zh_TW/Makefile b/chinese/p5-Text-Greeking-zh_TW/Makefile
index af2ba11be0e9..ffb267bc2b2e 100644
--- a/chinese/p5-Text-Greeking-zh_TW/Makefile
+++ b/chinese/p5-Text-Greeking-zh_TW/Makefile
@@ -16,7 +16,4 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-MAN3=	Text::Greeking::zh_TW.3
-
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/chinese/p5-Text-Greeking-zh_TW/pkg-plist b/chinese/p5-Text-Greeking-zh_TW/pkg-plist
index e9e1dec500c6..b1a0910d11e8 100644
--- a/chinese/p5-Text-Greeking-zh_TW/pkg-plist
+++ b/chinese/p5-Text-Greeking-zh_TW/pkg-plist
@@ -1,7 +1,8 @@
+%%PERL5_MAN3%%/Text::Greeking::zh_TW.3.gz
 %%SITE_PERL%%/Text/Greeking/zh_TW.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Greeking/zh_TW/.packlist
 @dirrmtry %%SITE_PERL%%/Text/Greeking
 @dirrmtry %%SITE_PERL%%/Text
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Greeking/zh_TW/.packlist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Greeking/zh_TW
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Greeking
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
diff --git a/chinese/qe/Makefile b/chinese/qe/Makefile
index ea184459d60a..4b323dfb7746 100644
--- a/chinese/qe/Makefile
+++ b/chinese/qe/Makefile
@@ -14,7 +14,6 @@ COMMENT=	QE is a PE2-like editor program under U*nix
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-NO_STAGE=	yes
 post-configure:
 	@${REINPLACE_CMD} -e '49s,-s,,' ${WRKSRC}/src/Makefile
 
diff --git a/chinese/qe/files/patch-etc__Makefile.in b/chinese/qe/files/patch-etc__Makefile.in
new file mode 100644
index 000000000000..2187471a7b97
--- /dev/null
+++ b/chinese/qe/files/patch-etc__Makefile.in
@@ -0,0 +1,48 @@
+--- etc/Makefile.in.orig	2001-04-24 16:37:58.000000000 +0800
++++ etc/Makefile.in	2013-09-26 00:25:17.000000000 +0800
+@@ -32,8 +32,6 @@ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+ 
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+@@ -167,25 +165,25 @@ maintainer-clean-generic clean mostlycle
+ 
+ 
+ install-data-local: qe.pro qe.hlp
+-	$(mkinstalldirs) $(pkgdatadir)
+-	@if test -r $(pkgdatadir)/$(PACKAGE).pro; then \
+-	    if cmp $(pkgdatadir)/$(PACKAGE).pro $(top_builddir)/etc/$(PACKAGE).pro 2> /dev/null ; then \
+-		echo "$(pkgdatadir)/$(PACKAGE).pro has not changed"; \
++	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
++	@if test -r $(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro; then \
++	    if cmp $(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro $(top_builddir)/etc/$(PACKAGE).pro 2> /dev/null ; then \
++		echo "$(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro has not changed"; \
+ 	    else \
+ 		echo;      \
+ 		echo "*******************";        \
+-		echo "* Warning: $(pkgdatadir)/$(PACKAGE).pro exist."; \
+-		echo "* It has been moved as $(pkgdatadir)/$(PACKAGE).pro.old"; \
++		echo "* Warning: $(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro exist."; \
++		echo "* It has been moved as $(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro.old"; \
+ 		echo "*******************";        \
+ 		echo; \
+-		mv $(pkgdatadir)/$(PACKAGE).pro $(pkgdatadir)/$(PACKAGE).pro.old; \
+-		$(INSTALL_DATA) $(top_builddir)/etc/$(PACKAGE).pro $(pkgdatadir)/$(PACKAGE).pro ; \
++		mv $(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro $(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro.old; \
++		$(INSTALL_DATA) $(top_builddir)/etc/$(PACKAGE).pro $(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro ; \
+ 	    fi \
+ 	else \
+-	    $(INSTALL_DATA) $(top_builddir)/etc/$(PACKAGE).pro $(pkgdatadir)/$(PACKAGE).pro; \
++	    $(INSTALL_DATA) $(top_builddir)/etc/$(PACKAGE).pro $(DESTDIR)$(pkgdatadir)/$(PACKAGE).pro; \
+ 	fi
+-	@test -r $(pkgdatadir)/qe.hlp || \
+-          $(INSTALL_DATA) $(top_srcdir)/etc/qe.hlp $(pkgdatadir)/qe.hlp ;
++	@test -r $(DESTDIR)$(pkgdatadir)/qe.hlp || \
++          $(INSTALL_DATA) $(top_srcdir)/etc/qe.hlp $(DESTDIR)$(pkgdatadir)/qe.hlp ;
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/chinese/qe/pkg-plist b/chinese/qe/pkg-plist
index e7d4ed529aa1..538273c059b4 100644
--- a/chinese/qe/pkg-plist
+++ b/chinese/qe/pkg-plist
@@ -1,5 +1,5 @@
-bin/qe
 bin/pe2
-share/qe/qe.hlp
-share/qe/qe.pro
-@dirrm share/qe/
+bin/qe
+%%DATADIR%%/qe.hlp
+%%DATADIR%%/qe.pro
+@dirrmtry %%DATADIR%%
diff --git a/chinese/telnet/Makefile b/chinese/telnet/Makefile
index ee5b31dfe9f2..a58431138411 100644
--- a/chinese/telnet/Makefile
+++ b/chinese/telnet/Makefile
@@ -12,9 +12,8 @@ MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	8bit compatible telnet client for Chinese input
 
 MAN1=		zh-telnet.1
-PLIST_FILES=	bin/zh-telnet
+PLIST_FILES=	bin/zh-telnet man/man1/zh-telnet.1.gz
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if exists (${SRC_BASE}/contrib/telnet/telnet)
@@ -48,7 +47,7 @@ pre-build:
 	@cd ${WRKSRC}/libtelnet && ${MAKE}
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/telnet ${PREFIX}/bin/zh-telnet
-	@${INSTALL_MAN} ${WRKSRC}/telnet.1 ${MAN1PREFIX}/man/man1/${MAN1}
+	@${INSTALL_PROGRAM} ${WRKSRC}/telnet ${STAGEDIR}/${PREFIX}/bin/zh-telnet
+	@${INSTALL_MAN} ${WRKSRC}/telnet.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1/zh-telnet.1
 
 .include <bsd.port.post.mk>