aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chinese/CJK/Makefile4
-rw-r--r--chinese/acroread-chsfont/Makefile1
-rw-r--r--chinese/acroread-chtfont/Makefile1
-rw-r--r--chinese/acroread5-chsfont/Makefile1
-rw-r--r--chinese/acroread5-chtfont/Makefile1
-rw-r--r--chinese/arphicttf/Makefile5
-rw-r--r--chinese/aterm/Makefile7
-rw-r--r--chinese/autoconvert/Makefile4
-rw-r--r--chinese/bg5ps/Makefile5
-rw-r--r--chinese/big5con/Makefile5
-rw-r--r--chinese/c2t/Makefile5
-rw-r--r--chinese/celvis/Makefile6
-rw-r--r--chinese/cless/Makefile5
-rw-r--r--chinese/cxterm/Makefile6
-rw-r--r--chinese/gb2ps/Makefile6
-rw-r--r--chinese/gbscript/Makefile5
-rw-r--r--chinese/hc/Makefile5
-rw-r--r--chinese/hztty/Makefile5
-rw-r--r--chinese/kcfonts/Makefile5
-rw-r--r--chinese/libtabe/Makefile6
-rw-r--r--chinese/lunar/Makefile5
-rw-r--r--chinese/moettf/Makefile5
-rw-r--r--chinese/mule-freewnn/Makefile3
-rw-r--r--chinese/muni/Makefile5
-rw-r--r--chinese/nvi-big5/Makefile3
-rw-r--r--chinese/nvi-euc-cn/Makefile3
-rw-r--r--chinese/nvi-euc-tw/Makefile3
-rw-r--r--chinese/pine4/Makefile7
-rw-r--r--chinese/rxvt/Makefile5
-rw-r--r--chinese/stardict/Makefile5
-rw-r--r--chinese/ted/Makefile7
-rw-r--r--chinese/telnet/Makefile6
-rw-r--r--chinese/tin/Makefile5
-rw-r--r--chinese/tocps/Makefile5
-rw-r--r--chinese/ve/Makefile5
-rw-r--r--chinese/xa+cv/Makefile7
-rw-r--r--chinese/xcin/Makefile7
-rw-r--r--chinese/xcin25/Makefile6
-rw-r--r--chinese/xemacs/Makefile5
-rw-r--r--print/latex-cjk/Makefile4
40 files changed, 84 insertions, 105 deletions
diff --git a/chinese/CJK/Makefile b/chinese/CJK/Makefile
index a2434c6935ef..c28ed5040a65 100644
--- a/chinese/CJK/Makefile
+++ b/chinese/CJK/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zh-CJK
-# Version required: 4.3.0
# Date created: 5 Sep 1999
# Whom: Keith Jang (keith@freebsd.sinica.edu.tw)
#
# $FreeBSD$
#
-DISTNAME= zh-CJK-4.3.0
+PORTNAME= CJK
+PORTVERSION= 4.3.0
CATEGORIES= chinese
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/
DISTFILES= cjk-20000127.tar.gz
diff --git a/chinese/acroread-chsfont/Makefile b/chinese/acroread-chsfont/Makefile
index 5f5f97f33677..0903983140a5 100644
--- a/chinese/acroread-chsfont/Makefile
+++ b/chinese/acroread-chsfont/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: acroread-chsfont
-# Version required: 1999.7.20
# Date created: 99/06/16
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
diff --git a/chinese/acroread-chtfont/Makefile b/chinese/acroread-chtfont/Makefile
index dfcab9754c7a..6759734a9061 100644
--- a/chinese/acroread-chtfont/Makefile
+++ b/chinese/acroread-chtfont/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: acroread-chtfont
-# Version required: 1999.7.20
# Date created: 99/06/16
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
diff --git a/chinese/acroread5-chsfont/Makefile b/chinese/acroread5-chsfont/Makefile
index 5f5f97f33677..0903983140a5 100644
--- a/chinese/acroread5-chsfont/Makefile
+++ b/chinese/acroread5-chsfont/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: acroread-chsfont
-# Version required: 1999.7.20
# Date created: 99/06/16
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
diff --git a/chinese/acroread5-chtfont/Makefile b/chinese/acroread5-chtfont/Makefile
index dfcab9754c7a..6759734a9061 100644
--- a/chinese/acroread5-chtfont/Makefile
+++ b/chinese/acroread5-chtfont/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: acroread-chtfont
-# Version required: 1999.7.20
# Date created: 99/06/16
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile
index b70429447be3..757085bb3e09 100644
--- a/chinese/arphicttf/Makefile
+++ b/chinese/arphicttf/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: Arphic Chinese TrueType fonts
-# Version required: 1.0
# Date created: 13 Oct 1999
# Whom: Keith Jang <keith@freebsd.sinica.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= zh-arphicttf-2.11
+PORTNAME= arphicttf
+PORTVERSION= 2.11
CATEGORIES= chinese x11-fonts
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/
+DISTNAME= ${PKGNAME}
MAINTAINER= keith@freebsd.sinica.edu.tw
diff --git a/chinese/aterm/Makefile b/chinese/aterm/Makefile
index 348ef2aff92a..9950f9b8a398 100644
--- a/chinese/aterm/Makefile
+++ b/chinese/aterm/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: zh-aterm
-# Version required: 0.3.6
# Date created: 26 April 1999
# Whom: Chia-Hsing Yu <davidyu@ken.csie.ntu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= aterm-0.3.6
-PKGNAME= zh-aterm-0.3.6
+PORTNAME= aterm
+PORTVERSION= 0.3.6
CATEGORIES= chinese
MASTER_SITES= http://members.xoom.com/sashav/aterm/ \
http://www.tigr.net/afterstep/as-apps/download/aterm/ \
@@ -30,5 +29,5 @@ post-patch:
${CP} ${FILESDIR}/cli_xcin.c ${WRKSRC}/src/
${CP} ${FILESDIR}/state.h ${WRKSRC}/src/
${CP} ${FILESDIR}/protocol.h ${WRKSRC}/src/
-
+
.include <bsd.port.mk>
diff --git a/chinese/autoconvert/Makefile b/chinese/autoconvert/Makefile
index 41812ff0d23c..144b0276aa2c 100644
--- a/chinese/autoconvert/Makefile
+++ b/chinese/autoconvert/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autoconvert
-# Version required: 0.3.5
# Date created: 26 Oct 1999
# Whom: Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= autoconvert-0.3.5
+PORTNAME= autoconvert
+PORTVERSION= 0.3.5
CATEGORIES= chinese
MASTER_SITES= http://www.linuxfocus.org/~yu.guanghui/ \
ftp://ftp.dlut.edu.cn/pub/PEOPLE/saka/
diff --git a/chinese/bg5ps/Makefile b/chinese/bg5ps/Makefile
index ac5d5a941720..d60eefae2a6e 100644
--- a/chinese/bg5ps/Makefile
+++ b/chinese/bg5ps/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: bg5ps
-# Version required: 1.1b2
# Date created: 17 June 1998
# Whom: J.T. Jang (keith@freebsd.sinica.edu.tw)
#
# $FreeBSD$
#
-DISTNAME= bg5ps-1.1b2
-PKGNAME= zh-bg5ps-1.1b2
+PORTNAME= bg5ps
+PORTVERSION= 1.1b2
CATEGORIES= chinese print
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/ \
http://students.washington.edu/~cschin/bg5ps/bg5ps-1.1b2/
diff --git a/chinese/big5con/Makefile b/chinese/big5con/Makefile
index 125bc0b15fb9..2d8f8d1b6124 100644
--- a/chinese/big5con/Makefile
+++ b/chinese/big5con/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: big5con
-# Version required: 0.92b
# Date created: 07 Jan 1997
# Whom: Hung-Chi Chu <hcchu@r350.ee.ntu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= big5con-0.92e
-PKGNAME= zh-big5con-0.92e
+PORTNAME= big5con
+PORTVERSION= 0.92e
CATEGORIES= chinese
MASTER_SITES= ftp://freebsd.ntu.edu.tw/freebsd/woju/source/ \
ftp://freebsd.ntu.edu.tw/freebsd/woju/binary/ \
diff --git a/chinese/c2t/Makefile b/chinese/c2t/Makefile
index 9c820d94139e..9b9207d06d3e 100644
--- a/chinese/c2t/Makefile
+++ b/chinese/c2t/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: c2t
-# Version required: 0.0
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= c2t
-PKGNAME= zh-c2t-1.0
+PORTNAME= c2t
+PORTVERSION= 1.0
CATEGORIES= chinese
MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/convert/ \
ftp://ftp.ifcss.org/pub/software/x-win/cxterm/dict/gb/ \
diff --git a/chinese/celvis/Makefile b/chinese/celvis/Makefile
index 1f294a63ac3b..1dc83f52ec0e 100644
--- a/chinese/celvis/Makefile
+++ b/chinese/celvis/Makefile
@@ -1,20 +1,20 @@
# ex:ts=8
# Ports collection makefile for: celvis
-# Version required: 0.0
# Date created: Thur Aug 15, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= celvis
-PKGNAME= zh-celvis-1.3
+PORTNAME= celvis
+PORTVERSION= 1.3
CATEGORIES= chinese editors
MASTER_SITES= ftp://ftp.edu.cn/pub/Chinese/
#
# switch to http://www.ifcss.org/ftp-pub/software/unix/editor/celvis-1.3.tar.gz
# if the distfile becomes unfetchable again. Note this ver is slightly
# different.
+DISTNAME= celvis
MAINTAINER= obrien@FreeBSD.org
diff --git a/chinese/cless/Makefile b/chinese/cless/Makefile
index 07ee6fb6eb10..b85a45e35a5d 100644
--- a/chinese/cless/Makefile
+++ b/chinese/cless/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: cless
-# Version required: 0.0
# Date created: Sat Aug 10, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= cless-290
-PKGNAME= zh-${DISTNAME}
+PORTNAME= cless
+PORTVERSION= 290
CATEGORIES= chinese misc
MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/c-utils/ \
ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/c-utils/ \
diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile
index e0c2f36d5275..1cdeffc65e66 100644
--- a/chinese/cxterm/Makefile
+++ b/chinese/cxterm/Makefile
@@ -1,19 +1,19 @@
# ex:ts=8
# Ports collection makefile for: cxterm
-# Version required: 0.0
# Date created: Sat Aug 10, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= cxterm5.0.p3
-PKGNAME= zh-cxterm-5.0.3
+PORTNAME= cxterm
+PORTVERSION= 5.0.3
CATEGORIES= chinese x11
MASTER_SITES= ftp://ftp.ifcss.org/pub/software/x-win/cxterm/ \
ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/x-win/cxterm/ \
ftp://ftp.edu.tw/Chinese/ifcss/software/x-win/cxterm/ \
ftp://ftp.mpi-sb.mpg.de/pub/chinese/mirror/ftp.ifcss.org/software/x-win/cxterm/
+DISTNAME= cxterm5.0.p3
MAINTAINER= obrien@FreeBSD.org
diff --git a/chinese/gb2ps/Makefile b/chinese/gb2ps/Makefile
index 606d4195f486..1494574424ca 100644
--- a/chinese/gb2ps/Makefile
+++ b/chinese/gb2ps/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: gb2ps
-# Version required: 0.0
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= gb2ps.2.02
-PKGNAME= zh-gb2ps-2.02
+PORTNAME= gb2ps
+PORTVERSION= 2.02
CATEGORIES= chinese print
MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/print/ \
ftp://ftp.ifcss.org/pub/software/fonts/gb/misc/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/print/ \
ftp://ftp.edu.tw/Chinese/ifcss/software/fonts/gb/misc/ \
ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/print/ \
ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/fonts/gb/misc/
+DISTNAME= gb2ps.2.02
DISTFILES= ${DISTNAME}.tar.gz \
csong24.ccf.gz ckai24.ccf.gz cfang24.ccf.gz chei24.ccf.gz \
cfan24.ccf.gz
diff --git a/chinese/gbscript/Makefile b/chinese/gbscript/Makefile
index d287ee5f8844..d3a03408a678 100644
--- a/chinese/gbscript/Makefile
+++ b/chinese/gbscript/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: gbscript
-# Version required: 0.0
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= gbscript-1.11
-PKGNAME= zh-gbscript-1.11
+PORTNAME= gbscript
+PORTVERSION= 1.11
CATEGORIES= chinese
MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/print/ \
ftp://ftp.ifcss.org/pub/software/fonts/gb/misc/ \
diff --git a/chinese/hc/Makefile b/chinese/hc/Makefile
index 5aff3b7c3dfd..a6551700f211 100644
--- a/chinese/hc/Makefile
+++ b/chinese/hc/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: hc
-# Version required: 0.0
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= hc-3.0
-PKGNAME= zh-hc-3.0
+PORTNAME= hc
+PORTVERSION= 3.0
CATEGORIES= chinese
MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/convert/ \
ftp://ftp.edu.tw/Chinese/ifcss/software/unix/convert/ \
diff --git a/chinese/hztty/Makefile b/chinese/hztty/Makefile
index 5edf21c98f28..4bed991bc881 100644
--- a/chinese/hztty/Makefile
+++ b/chinese/hztty/Makefile
@@ -1,13 +1,12 @@
# Ports collection makefile for: hztty
-# Version required: 2.0
# Date created: Wed Sep 24, 1997
# Whom: Ada T Lim <ada@not-enough.bandwidth.org>
#
# $FreeBSD$
#
-DISTNAME= hztty-2.0
-PKGNAME= zh-hztty-2.0
+PORTNAME= hztty
+PORTVERSION= 2.0
CATEGORIES= chinese
MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/convert/ \
ftp://ftp.cuhk.hk/pub/chinese/ifcss/software/unix/convert/ \
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 7190cb6163db..16e41e9baa10 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: kcfonts
-# Version required: 1.05
# Date Created: 5 Dec 1997
# Whom: Ming-I Hseh <PA@FreeBSD.Ntu.edu.TW>
#
# $FreeBSD$
#
-DISTNAME= kcfonts-1.05
-PKGNAME= zh-kcfonts-1.05
+PORTNAME= kcfonts
+PORTVERSION= 1.05
CATEGORIES= chinese x11-fonts
MASTER_SITES= ftp://freebsd.ntu.edu.tw/freebsd/taiwan/ \
ftp://NCTUCCCA.edu.tw/OS/FreeBSD/00MIRROR/freebsd.ntu.edu.tw/taiwan/
diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 1ac1372ecb2a..5f5d5d1a30dd 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: libtabe
-# Version required: 0.1.2
# Date created: 2 Nov 1999
# Whom: Keith Jang <keith@freebsd.sinica.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= libtabe-0.1-2
-PKGNAME= zh-libtabe-0.1.2
+PORTNAME= libtabe
+PORTVERSION= 0.1.2
CATEGORIES= chinese
MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/
+DISTNAME= libtabe-0.1-2
MAINTAINER= keith@freebsd.sinica.edu.tw
diff --git a/chinese/lunar/Makefile b/chinese/lunar/Makefile
index 67d8d29e880e..d4f6893fbd9b 100644
--- a/chinese/lunar/Makefile
+++ b/chinese/lunar/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: lunar
-# Version required: 0.0
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= lunar-2.1
-PKGNAME= zh-lunar-2.1
+PORTNAME= lunar
+PORTVERSION= 2.1
CATEGORIES= chinese
MASTER_SITES= ftp://ftp.ifcss.org/pub/software/unix/c-utils/ \
ftp://ftp.edu.tw/Chinese/ifcss/software/unix/c-utils/ \
diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile
index b24576803aa8..28423a6de795 100644
--- a/chinese/moettf/Makefile
+++ b/chinese/moettf/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: Chinese Big5 TrueType fonts
-# Version required: 1.0
# Date created: 9 July 1999
# Whom: Keith Jang <keith@freebsd.sinica.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= zh-moettf-1.0
+PORTNAME= moettf
+PORTVERSION= 1.0
CATEGORIES= chinese x11-fonts
MASTER_SITES= ftp://ftp.cc.ntut.edu.tw/OS/Linux/packages/chinese/fonts/twmoefont/ttf/ \
ftp://ftp.ncu.edu.tw/Linux/Chinese/fonts/twmoefont/ttf/ \
ftp://www.edu.tw/download/mandr/allbook/lishu/
+DISTNAME= ${PKGNAME}
DISTFILES= moe_kai.ttf moe_sung.ttf edustd-15.exe
MAINTAINER= keith@freebsd.sinica.edu.tw
diff --git a/chinese/mule-freewnn/Makefile b/chinese/mule-freewnn/Makefile
index dd81a63b3d64..f723fb534e28 100644
--- a/chinese/mule-freewnn/Makefile
+++ b/chinese/mule-freewnn/Makefile
@@ -1,12 +1,11 @@
# New ports collection makefile for: mule 2.3@19.34 with Wnn4
-# Version required: 2.3@19.34
# Date created: 20 July 1997
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-PKGNAME= zh-mule-wnn4-2.3
+PKGNAMESUFFIX= -wnn4
CATEGORIES= chinese editors
CWNN4= yes
diff --git a/chinese/muni/Makefile b/chinese/muni/Makefile
index 91f089ccebed..26c3d3dde5bb 100644
--- a/chinese/muni/Makefile
+++ b/chinese/muni/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: muni
-# Version required: 1.0
# Date created: 6 May 1999
# Whom: G. Adam Stanislav <adam@whizkidtech.net>
#
# $FreeBSD$
#
-DISTNAME= muni-1.0
-PKGNAME= zh-${DISTNAME}
+PORTNAME= muni
+PORTVERSION= 1.0
CATEGORIES= chinese
MASTER_SITES= http://www.whizkidtech.net/i18n/muni/
diff --git a/chinese/nvi-big5/Makefile b/chinese/nvi-big5/Makefile
index 44f7e14d556b..99955a016741 100644
--- a/chinese/nvi-big5/Makefile
+++ b/chinese/nvi-big5/Makefile
@@ -1,12 +1,11 @@
# New ports collection makefile for: nvi-1.79 + multilingual patch(big5)
-# Version required: 1.79
# Date created: 6 Mar 1997
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
# $FreeBSD$
#
-PKGNAME= zh-nvi-big5-1.79.19991117
+PKGNAMESUFFIX= -big5
MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n
COMMENT= ${.CURDIR}/pkg/COMMENT
diff --git a/chinese/nvi-euc-cn/Makefile b/chinese/nvi-euc-cn/Makefile
index 3c69fba4408c..3f7b97dfbdd9 100644
--- a/chinese/nvi-euc-cn/Makefile
+++ b/chinese/nvi-euc-cn/Makefile
@@ -1,12 +1,11 @@
# New ports collection makefile for: nvi-1.79 + multilingual patch(euc-cn)
-# Version required: 1.79
# Date created: 6 Mar 1997
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
# $FreeBSD$
#
-PKGNAME= zh-nvi-euccn-1.79.19991117
+PKGNAMESUFFIX= -euccn
MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n
COMMENT= ${.CURDIR}/pkg/COMMENT
diff --git a/chinese/nvi-euc-tw/Makefile b/chinese/nvi-euc-tw/Makefile
index ab417bf9339c..c7aad5c2acab 100644
--- a/chinese/nvi-euc-tw/Makefile
+++ b/chinese/nvi-euc-tw/Makefile
@@ -1,12 +1,11 @@
# New ports collection makefile for: nvi-1.79 + multilingual patch(euc-tw)
-# Version required: 1.79
# Date created: 5 Apr 1997
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
# $FreeBSD$
#
-PKGNAME= zh-nvi-euctw-1.79.19991117
+PKGNAMESUFFIX= -euctw
MASTERDIR= ${.CURDIR}/../../editors/nvi-m17n
COMMENT= ${.CURDIR}/pkg/COMMENT
diff --git a/chinese/pine4/Makefile b/chinese/pine4/Makefile
index 106c259a2ac1..a98b5876c379 100644
--- a/chinese/pine4/Makefile
+++ b/chinese/pine4/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: pine
-# http://www.washington.edu/pine/
-# Version required: 4.21
# Date created: 15 July 1998
# Whom: Tai-hwa Liang <avatar@www.mmlab.cse.yzu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= pine4.21
-PKGNAME= zh-pine-4.21
+PORTNAME= pine
+PORTVERSION= 4.21
CATEGORIES= chinese mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/
+DISTNAME= pine${PORTVERSION}
MAINTAINER= avatar@www.mmlab.cse.yzu.edu.tw
diff --git a/chinese/rxvt/Makefile b/chinese/rxvt/Makefile
index 03985ccfa736..f1f30ad729a8 100644
--- a/chinese/rxvt/Makefile
+++ b/chinese/rxvt/Makefile
@@ -1,13 +1,12 @@
# New ports collection Makefile for: rxvt
-# Version required: 2.6.0
# Date created: Nov 16 1997
# Whom: frankch@waru.life.nthu.edu.tw
#
# $FreeBSD$
#
-DISTNAME= rxvt-2.7.3
-PKGNAME= zh-rxvt-2.7.3
+PORTNAME= rxvt
+PORTVERSION= 2.7.3
CATEGORIES= chinese x11
MASTER_SITES= ftp://ftp.rxvt.org/pub/rxvt/ \
ftp://mason.primenet.com.au/pub/rxvt/ \
diff --git a/chinese/stardict/Makefile b/chinese/stardict/Makefile
index 40cf51023ab0..f0e6f2e078b4 100644
--- a/chinese/stardict/Makefile
+++ b/chinese/stardict/Makefile
@@ -1,5 +1,4 @@
# Ports collection makefile for: cdict
-# Version required: 1.0
# Date created: Thu Oct 14, 1999
# Whom: Peng HaiJie (phj@cn.FreeBSD.org)
# (phj@transfar.com)
@@ -7,9 +6,11 @@
# $FreeBSD$
#
-DISTNAME= zh-cdict-1.0
+PORTNAME= cdict
+PORTVERSION= 1.0
CATEGORIES= chinese
MASTER_SITES= ftp://ftp.cn.FreeBSD.org/pub/ported/
+DISTNAME= ${PKGNAME}
MAINTAINER= phj@cn.FreeBSD.org
diff --git a/chinese/ted/Makefile b/chinese/ted/Makefile
index c20f128e2fa7..5405b6c54ac9 100644
--- a/chinese/ted/Makefile
+++ b/chinese/ted/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: ted
-# Version required: 4.4a
# Date Created: 18 Sep 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
#
-DISTNAME= ted4.4d
-PKGNAME= zh-ted-4.4d
+PORTNAME= ted
+PORTVERSION= 4.4d
CATEGORIES= chinese editors
MASTER_SITES= ftp://freebsd.ntu.edu.tw/freebsd/ntu/moon/X/ted/
-EXTRACT_SUFX= .tgz
+DISTFILES= ted4.4d.tgz
MAINTAINER= vanilla@FreeBSD.org
diff --git a/chinese/telnet/Makefile b/chinese/telnet/Makefile
index 503b2363e833..7164251814af 100644
--- a/chinese/telnet/Makefile
+++ b/chinese/telnet/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: telnet8
-# Version required: 1.0
# Date created: 13 Feb 1999
# Whom: Ching-Hong Wu <woju@freebsd.ntu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= telnet8-1.0
-PKGNAME= zh-telnet-1.0
+PORTNAME= telnet
+PORTVERSION= 1.0
CATEGORIES= chinese
MASTER_SITES= ftp://freebsd.ntu.edu.tw/freebsd/woju/source/ \
ftp://bsd.sinica.edu.tw/pub/FreeBSD/taiwan/users/woju/source/
+DISTNAME= telnet8-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= woju@freebsd.ntu.edu.tw
diff --git a/chinese/tin/Makefile b/chinese/tin/Makefile
index 4e3d2f3ce2f1..753b59a8c98a 100644
--- a/chinese/tin/Makefile
+++ b/chinese/tin/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# New ports collection makefile for: tin
-# Version required: tinpre-1.4
# Date created: 2 Dev 1997
# Whom: Yen-Shuo Su <yssu@CCCA.NCTU.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= tin-1.4.2
-PKGNAME= zh-tin-1.4.2
+PORTNAME= tin
+PORTVERSION= 1.4.2
CATEGORIES= chinese news
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v1.4/ \
ftp://nuxi.ucdavis.edu/pub/tin/v1.4/ \
diff --git a/chinese/tocps/Makefile b/chinese/tocps/Makefile
index 64a691cb035c..97ed82852b21 100644
--- a/chinese/tocps/Makefile
+++ b/chinese/tocps/Makefile
@@ -1,14 +1,15 @@
# Ports collection makefile for: tocps
-# Version required: 1.0
# Date created: Thu Oct 14, 1999
# Whom: Peng HaiJie <phj@transfar.com>
#
# $FreeBSD$
#
-DISTNAME= zh-tocps-1.0
+PORTNAME= tocps
+PORTVERSION= 1.0
CATEGORIES= chinese
MASTER_SITES= ftp://ftp.cn.FreeBSD.org/pub/ported/
+DISTNAME= ${PKGNAME}
MAINTAINER= phj@cn.FreeBSD.org
diff --git a/chinese/ve/Makefile b/chinese/ve/Makefile
index fc022970207f..083817d0d7f1 100644
--- a/chinese/ve/Makefile
+++ b/chinese/ve/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: ve
-# Version required: 1.0
# Date created: 25 Aug 1999
# Whom: Ching-Hong Wu <woju@freebsd.ntu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= ve-1.0
-PKGNAME= zh-ve-1.0
+PORTNAME= ve
+PORTVERSION= 1.0
CATEGORIES= chinese
MASTER_SITES= ftp://freebsd.ntu.edu.tw/freebsd/woju/source/ \
ftp://bsd.sinica.edu.tw/pub/FreeBSD/taiwan/users/woju/source/
diff --git a/chinese/xa+cv/Makefile b/chinese/xa+cv/Makefile
index 2ca7f87bf5c8..77ca457a887d 100644
--- a/chinese/xa+cv/Makefile
+++ b/chinese/xa+cv/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: xa+cv
-# Version required: 0.6
# Date created: 29 March 1999
# Whom: Clive Lin <clive@CirX.ORG>
#
-# $FreeBSD: /tmp/pcvs/ports/chinese/xa+cv/Attic/Makefile,v 1.2 2000-04-01 21:34:44 mharo Exp $
+# $FreeBSD: /tmp/pcvs/ports/chinese/xa+cv/Attic/Makefile,v 1.3 2000-04-13 08:28:19 asami Exp $
#
-DISTNAME= xa+cv-0.6
-PKGNAME= zh-xa+cv-0.6
+PORTNAME= xa+cv
+PORTVERSION= 0.6
CATEGORIES= chinese
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/clive/
diff --git a/chinese/xcin/Makefile b/chinese/xcin/Makefile
index b4d871d43259..1f65b352e8cd 100644
--- a/chinese/xcin/Makefile
+++ b/chinese/xcin/Makefile
@@ -1,22 +1,23 @@
# New ports collection makefile for: xcin
-# Version required: xcin-2.3.03
# Date created: Nov 28 ,1997
# Whom: Yen-Shuo Su <yssu@CCCA.NCTU.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= xcin-2.3.04-3
-PKGNAME= zh-xcin-2.3.04-3
+PORTNAME= xcin
+PORTVERSION= 2.3.04.3
CATEGORIES= chinese
MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/xcin/old/ \
ftp://ftp.ncu.edu.tw/OS/Linux/Chinese/xcin/xcin/ \
ftp://linux.cis.nctu.edu.tw/packages/chinese/X/xcin/xcin/
+DISTNAME= xcin-2.3.04-3
MAINTAINER= yssu@CCCA.NCTU.edu.tw
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
+NO_LATEST_LINK= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index 2f4c7a1eeb10..81e92c8bfeee 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xcin25
-# Version required: xcin-2.5.2-p2
# Date created: 18 Oct 1999
# Whom: Keith Jang <keith@freebsd.sinica.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= xcin-2.5.2-pre2
-PKGNAME= zh-xcin-2.5.2p2
+PORTNAME= xcin
+PORTVERSION= 2.5.2.p2
CATEGORIES= chinese x11
MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/
+DISTNAME= xcin-2.5.2-pre2
MAINTAINER= keith@freebsd.sinica.edu.tw
diff --git a/chinese/xemacs/Makefile b/chinese/xemacs/Makefile
index fe045249c33e..b6a86fa1effc 100644
--- a/chinese/xemacs/Makefile
+++ b/chinese/xemacs/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: zh-XEmacs
-# Version required: 20.4
# Date created: 30 Oct 1999
# Whom: Keith Jang <keith@freebsd.sinica.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= xemacs-20.4
-PKGNAME= zh-xemacs-20.4
+PORTNAME= xemacs
+PORTVERSION= 20.4
CATEGORIES= chinese editors
MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/${DISTNAME}/ \
ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/${DISTNAME}/ \
diff --git a/print/latex-cjk/Makefile b/print/latex-cjk/Makefile
index a2434c6935ef..c28ed5040a65 100644
--- a/print/latex-cjk/Makefile
+++ b/print/latex-cjk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zh-CJK
-# Version required: 4.3.0
# Date created: 5 Sep 1999
# Whom: Keith Jang (keith@freebsd.sinica.edu.tw)
#
# $FreeBSD$
#
-DISTNAME= zh-CJK-4.3.0
+PORTNAME= CJK
+PORTVERSION= 4.3.0
CATEGORIES= chinese
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/
DISTFILES= cjk-20000127.tar.gz