Upgrade to 2.3.03.

5 files changed, 81 insertions, 147 deletions

diff --git a/chinese/xcin/Makefile b/chinese/xcin/Makefile
index c2bf61cff4ed..6eec9e67435f 100644
--- a/chinese/xcin/Makefile
+++ b/chinese/xcin/Makefile
@@ -1,36 +1,26 @@
 # New ports collection makefile for:	xcin
-# Version required:	xcin-2.3.02
+# Version required:	xcin-2.3.03
 # Date created:		Nov 28 ,1997
 # Whom:			Yen-Shuo Su <yssu@CCCA.NCTU.edu.tw>
 #
-# $Id: Makefile,v 1.7 1998/08/05 09:30:47 asami Exp $
+# $Id: Makefile,v 1.8 1998/11/23 12:44:04 vanilla Exp $
 #
 
-DISTNAME=       xcin-2.3.02
-PKGNAME=        zh-xcin-2.3.02
-CATEGORIES=	chinese x11
-MASTER_SITES=	http://www.freebsd.org/~vanilla/ \
-		ftp://ftp.ncu.edu.tw/OS/linux/chinese/xcin/ \
-		ftp://linux.cis.nctu.edu.tw/packages/chinese/xcin/
+DISTNAME=	xcin-2.3.03
+PKGNAME=	zh-xcin-2.3.03
+CATEGORIES=	chinese
+MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/xcin/ \
+		ftp://ftp.ncu.edu.tw/OS/Linux/Chinese/xcin/xcin/ \
+		ftp://linux.cis.nctu.edu.tw/packages/chinese/X/xcin/xcin/
 
-MAINTAINER=     yssu@CCCA.NCTU.edu.tw
+MAINTAINER=	yssu@CCCA.NCTU.edu.tw
 
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
 
 USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS	=-prefix="${X11BASE}" \
-		-x-font-prefix="${X11BASE}/lib/X11/fonts"
-MAN1=		xcin.1 crxvt.1 cin2tab.1
+CONFIGURE_ARGS=	--prefix="${X11BASE}" --os=FreeBSD --no-menu
 
-.if defined(USE_24_FONT)
-CONFIGURE_ARGS+=-use-24-fonts
-.else
-pre-fetch:
-	@echo
-	@echo You can set USE_24_FONT=YES if you want to use 24 fonts
-	@echo as default when xcin is running.
-	@echo
-.endif
+MAN1=		xcin.1 cin2tab.1
 
 .include <bsd.port.mk>
diff --git a/chinese/xcin/distinfo b/chinese/xcin/distinfo
index 9963148ee3dd..fa4822bdd1c0 100644
--- a/chinese/xcin/distinfo
+++ b/chinese/xcin/distinfo
@@ -1 +1 @@
-MD5 (xcin-2.3.02.tar.gz) = 3a36a0a68b1ccb682f4fbf7f050e1cab
+MD5 (xcin-2.3.03.tar.gz) = b6b4715a1fddac8377005d6ac12b248a
diff --git a/chinese/xcin/files/patch-aa b/chinese/xcin/files/patch-aa
index a2dfee84e79f..4c392291d306 100644
--- a/chinese/xcin/files/patch-aa
+++ b/chinese/xcin/files/patch-aa
@@ -1,55 +1,62 @@
---- configure.orig	Wed Nov 19 13:00:56 1997
-+++ configure	Mon Dec 15 10:43:02 1997
-@@ -19,9 +19,10 @@
+--- script/config.status.orig	Fri Dec 11 09:36:32 1998
++++ script/config.status	Sun Jan 17 14:42:51 1999
+@@ -14,8 +14,8 @@
+ PATH_XCIN_DIR=/usr/local/lib/xcin
+ PATH_XCIN_MAN=/usr/local/man
  
- # Usage: configure [-help] [-prefix=PREFIX] [-bin-prefix=PREFIX] 
- #		   [-x-include-prefix=PREFIX] [-x-lib-prefix=PREFIX]
--#		   [-x-font-prefix=PREFIX]
-+#		   [-x-font-prefix=PREFIX] [-use-24-fonts]
+-OPT_XCIN_CFONT=-twmoe-kai-medium-r-normal--24-240-75-75-c-240-big5-1
+-OPT_XCIN_EFONT=12x24
++OPT_XCIN_CFONT=kc15f
++OPT_XCIN_EFONT=kc8x15
+ OPT_UTIL_CIN2TAB=yes
+ OPT_UTIL_TSINTOOLS=yes
+ OPT_INPTAB_SRC=yes
+--- script/configure.makefile.orig	Fri Dec 11 09:18:08 1998
++++ script/configure.makefile	Sun Jan 17 14:34:16 1999
+@@ -78,7 +78,7 @@
+           : # AIX
+         else
+           INSTALL="$dir/install -c"
+-          INSTALL_PROGRAM='$(INSTALL)'
++          INSTALL_PROGRAM='$(INSTALL) -s'
+           INSTALL_DATA='$(INSTALL) -m 644'
+           INSTALL_DIR='$(INSTALL) -d'
+           break
+--- script/configure.menu.orig	Fri Dec 11 09:49:43 1998
++++ script/configure.menu	Sun Jan 17 14:40:11 1999
+@@ -266,7 +266,7 @@
+ {
+     PATH_XCIN_PREFIX=$1
+     PATH_XCIN_BIN=$PATH_XCIN_PREFIX/bin
+-    PATH_XCIN_DIR=$PATH_XCIN_PREFIX/lib/xcin
++    PATH_XCIN_DIR=$PATH_XCIN_PREFIX/lib/X11/xcin
+     PATH_XCIN_MAN=$PATH_XCIN_PREFIX/man
+ }
  
+--- src/Makefile.in.orig	Wed Dec  9 22:26:36 1998
++++ src/Makefile.in	Sun Jan 17 14:34:16 1999
+@@ -149,7 +149,7 @@
  
-+use_24_fonts=0
- for arg in $@; do
-    case $arg in
-      -bin-prefix=*)
-@@ -34,6 +35,8 @@
- 	x_lib_prefix=`echo $arg | sed 's/[-a-z]*=//'` ;;
-      -x-font-prefix=*)
- 	x_font_prefix=`echo $arg | sed 's/[-a-z]*=//'` ;;
-+     -use-24-fonts)
-+	use_24_fonts=1 ;;
-      -help)
- 	cat << EOF >&2
- Usage:  configure [-help] [-prefix=PREFIX] [-exec-prefix=PREFIX] 
-@@ -52,6 +55,8 @@
+ install_xcin: xcin $(KBMS) $(INPUT0) tsintab
+ 	if [ ! -d $(PATH_XCIN_BIN) ]; then $(INSTALL_DIR) $(PATH_XCIN_BIN); fi
+-	$(INSTALL) xcin $(PATH_XCIN_BIN)
++	$(INSTALL_PROGRAM) xcin $(PATH_XCIN_BIN)
+ 	echo $(PATH_XCIN_BIN)/xcin >> filelist
  
-         -x-font-prefix:  Prefix dir of the X-win .pcf fonts.
+ 	if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
+@@ -159,13 +159,13 @@
  
-+        -use-24-fonts: Use 24 Fonts
-+
- EOF
- 	exit 0
- ;;
-@@ -94,11 +99,11 @@
- echo 'Chinese interface to setting up your XCIN system.'
- echo 
- echo 'Do you want to use the Chinese interface [y/n]?'
--read chinese
-+#read chinese
- if [ "$chinese" = 'y' ] || [ "$chinese" = 'Y' ]; then
-     unique_file=script/configure.Cinstall
- fi
--$srcdir/$unique_file -root=$srcdir -prefix=$prefix -bin-prefix=$bin_prefix -x-font-prefix=$x_font_prefix
-+$srcdir/$unique_file -root=$srcdir -prefix=$prefix -bin-prefix=$bin_prefix -x-font-prefix=$x_font_prefix -use-24-fonts=$use_24_fonts
- if [ "$?" = '1' ]; then
-     echo 'Stop!'
-     echo
-@@ -248,7 +253,7 @@
-   IFS="$saveifs"
- fi
- INSTALL=${INSTALL-cp}
--INSTALL_PROGRAM=${INSTALL_PROGRAM-'$(INSTALL)'}
-+INSTALL_PROGRAM="/usr/bin/install -c -s"
- INSTALL_DATA=${INSTALL_DATA-'$(INSTALL)'}
- INSTALL_DIR=${INSTALL_DIR-mkdir}
+ install_cin2tab: cin2tab
+ 	if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
+-	$(INSTALL) cin2tab $(PATH_XCIN_DIR)
++	$(INSTALL_PROGRAM) cin2tab $(PATH_XCIN_DIR)
+ 	echo $(PATH_XCIN_DIR)/cin2tab >> filelist
  
+ install_tsintools: tsintools
+ 	if [ ! -d $(PATH_XCIN_DIR) ]; then $(INSTALL_DIR) $(PATH_XCIN_DIR); fi
+ 	for f in $(TSINTOOLS); do\
+-            $(INSTALL) $$f $(PATH_XCIN_DIR); echo $(PATH_XCIN_DIR)/$$f >> filelist;\
++            $(INSTALL_PROGRAM) $$f $(PATH_XCIN_DIR); echo $(PATH_XCIN_DIR)/$$f >> filelist;\
+ 	done
+ 
+ install_tsintabsrc:
diff --git a/chinese/xcin/files/patch-ab b/chinese/xcin/files/patch-ab
deleted file mode 100644
index b7c9c925d90f..000000000000
--- a/chinese/xcin/files/patch-ab
+++ /dev/null
@@ -1,61 +0,0 @@
---- script/configure.install.orig	Wed Nov 19 13:16:00 1997
-+++ script/configure.install	Wed Dec 10 23:16:32 1997
-@@ -11,6 +11,7 @@
- #  General setup.
- #
- 
-+use_24_fonts=0
- for arg in $@; do
-     case $arg in
-     -root=*) 
-@@ -21,6 +22,9 @@
- 	BIN_PREFIX=`echo $arg | sed 's/[-a-z]*=//'` ;;
-     -x-font-prefix=*)
- 	X_FONT_PREFIX=`echo $arg | sed 's/[-a-z]*=//'` ;;
-+    -use-24-fonts=*)
-+	echo "Use 24 fonts!!!!!!!!!!"
-+	use_24_fonts=`echo $arg | sed 's/[-a-z0-9]*=//'` ;;
-     *)  echo "Invalid arguement $arg.  Stop."
- 	exit 1 ;;
-     esac
-@@ -105,10 +109,17 @@
-     PATH_XCIN_ETEN=
- 
-     OPT_XCIN_DELETEK=0
--    OPT_XCIN_CFONT=taipei15
--    OPT_XCIN_EFONT=8x16
--    OPT_CRXVT_CFONT=taipei15
--    OPT_CRXVT_EFONT=8x16
-+    if [ "$use_24_fonts" = '1' ]; then
-+    OPT_XCIN_CFONT=kc24f
-+    OPT_XCIN_EFONT=kc12x24
-+    OPT_CRXVT_CFONT=kc24f
-+    OPT_CRXVT_EFONT=kc12x24f
-+    else
-+    OPT_XCIN_CFONT=kc15f
-+    OPT_XCIN_EFONT=kc8x15
-+    OPT_CRXVT_CFONT=kc15f
-+    OPT_CRXVT_EFONT=kc8x15
-+    fi
-     OPT_FONT_ET15=no
-     OPT_FONT_ET24K=no
-     OPT_FONT_ET24L=no
-@@ -133,7 +144,7 @@
- fi
- 
- test ! -z "$PREFIX" && PATH_XCIN_BIN=`echo $PREFIX | sed 's/\/$//'`/bin \
--		    && PATH_XCIN_DIR=`echo $PREFIX | sed 's/\/$//'`/xcin \
-+		    && PATH_XCIN_DIR=`echo $PREFIX/lib/X11 | sed 's/\/$//'`/xcin \
- 		    && PATH_XCIN_MAN=`echo $PREFIX | sed 's/\/$//'`/man 
- test ! -z "$BIN_PREFIX" && PATH_XCIN_BIN=`echo $BIN_PREFIX | sed 's/\/$//'`/bin
- test ! -z "$X_FONT_PREFIX" && PATH_XCIN_CFONT=`echo $X_FONT_PREFIX | sed 's/\/$//'`/chinese \
-@@ -258,7 +269,8 @@
- EOF
- $ECHO 'Your choice [CDFHISQUX123456] : '
- 
--read ch
-+#read ch
-+ch=s
- echo
- 
- case $ch in
diff --git a/chinese/xcin/pkg-plist b/chinese/xcin/pkg-plist
index 0b4863d02620..81cfdba8ccb6 100644
--- a/chinese/xcin/pkg-plist
+++ b/chinese/xcin/pkg-plist
@@ -1,20 +1,8 @@
-bin/crxvt
 bin/xcin
-lib/X11/xcin/3-dayi.cin
-lib/X11/xcin/3-dayi.tab
-lib/X11/xcin/3-dayi.tab.rev
-lib/X11/xcin/array30.cin
-lib/X11/xcin/array30.tab
-lib/X11/xcin/array30.tab.phr
-lib/X11/xcin/array30.tab.quick
-lib/X11/xcin/array30.tab.rev
 lib/X11/xcin/cin2tab
-lib/X11/xcin/docs/Boshiamy.HOWTO
-lib/X11/xcin/docs/README.xcin
-lib/X11/xcin/docs/XCIN.client.doc
-lib/X11/xcin/docs/Xfonts.HOWTO
-lib/X11/xcin/docs/cin2tab.HOWTO
-lib/X11/xcin/docs/xcin.HOWTO
+lib/X11/xcin/cj.cin
+lib/X11/xcin/cj.tab
+lib/X11/xcin/cj.tab.rev
 lib/X11/xcin/et.kbm
 lib/X11/xcin/et26.kbm
 lib/X11/xcin/hsu.kbm
@@ -31,14 +19,24 @@ lib/X11/xcin/pinyin.tab
 lib/X11/xcin/pinyin.tab.rev
 lib/X11/xcin/sample.phs.out
 lib/X11/xcin/tsa2d
+lib/X11/xcin/tsa2rel
 lib/X11/xcin/tsd2a
 lib/X11/xcin/tsin
 lib/X11/xcin/tsin.idx
+lib/X11/xcin/tsin.rel
+lib/X11/xcin/tsin.rel.src
+lib/X11/xcin/tsin.src
 lib/X11/xcin/tsin_pin.map
 lib/X11/xcin/voca.box
 lib/X11/xcin/zmdbosh.cin
 lib/X11/xcin/zmdbosh.tab
 lib/X11/xcin/zmdbosh.tab.rev
 lib/X11/xcin/zo.kbm
+lib/X11/xcin/docs/Boshiamy.HOWTO
+lib/X11/xcin/docs/README.xcin
+lib/X11/xcin/docs/XCIN.client.doc
+lib/X11/xcin/docs/Xfonts.HOWTO
+lib/X11/xcin/docs/cin2tab.HOWTO
+lib/X11/xcin/docs/xcin.HOWTO
 @dirrm lib/X11/xcin/docs
 @dirrm lib/X11/xcin