8 files changed, 26 insertions, 40 deletions

diff --git a/chinese/xcin/Makefile b/chinese/xcin/Makefile
index 40e2c05d441c..6baa11449505 100644
--- a/chinese/xcin/Makefile
+++ b/chinese/xcin/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Nov 28 ,1997
 # Whom:			Yen-Shuo Su <yssu@CCCA.NCTU.edu.tw>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/15 17:57:48 vanilla Exp $
+# $Id: Makefile,v 1.2 1997/12/17 04:32:09 vanilla Exp $
 #
 
 DISTNAME=       xcin-2.3.01
@@ -14,13 +14,13 @@ MASTER_SITES=   ftp://ftp.ncu.edu.tw/OS/linux/chinese/xcin/ \
 
 MAINTAINER=     yssu@CCCA.NCTU.edu.tw
 
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/chinese/kc15.pcf.gz:${PORTSDIR}/chinese/kcfonts
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/chinese/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
 
 USE_X11=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS	=-prefix="${X11BASE}" \
 		-x-font-prefix="${X11BASE}/lib/X11/fonts"
-MAN1=		xcin.1 cin2tab.1
+MAN1=		xcin.1 crxvt.1 cin2tab.1
 
 .if defined(USE_24_FONT)
 CONFIGURE_ARGS+=-use-24-fonts
diff --git a/chinese/xcin/files/patch-aa b/chinese/xcin/files/patch-aa
index 24deb8310ef1..7db3e03d6e4d 100644
--- a/chinese/xcin/files/patch-aa
+++ b/chinese/xcin/files/patch-aa
@@ -62,12 +62,3 @@
  INSTALL_DATA=${INSTALL_DATA-'$(INSTALL)'}
  INSTALL_DIR=${INSTALL_DIR-mkdir}
  
-@@ -800,7 +805,7 @@
-     grep $1 install.status | sed "s%$1=%%"
- }
- INSTALL_XCIN=`GetData INSTALL_XCIN`
--INSTALL_CRXVT=`GetData INSTALL_CRXVT`
-+#INSTALL_CRXVT=`GetData INSTALL_CRXVT`
- INSTALL_FONTS=`GetData INSTALL_FONTS`
- INSTALL_INPTABS=`GetData INSTALL_INPTABS`
- INSTALL_DOCS=`GetData INSTALL_DOCS`
diff --git a/chinese/xcin/files/patch-ab b/chinese/xcin/files/patch-ab
index b90b96b60ed7..b7c9c925d90f 100644
--- a/chinese/xcin/files/patch-ab
+++ b/chinese/xcin/files/patch-ab
@@ -27,15 +27,15 @@
 -    OPT_CRXVT_CFONT=taipei15
 -    OPT_CRXVT_EFONT=8x16
 +    if [ "$use_24_fonts" = '1' ]; then
-+    OPT_XCIN_CFONT=kc24
-+    OPT_XCIN_EFONT=12x24
-+    OPT_CRXVT_CFONT=kc24
-+    OPT_CRXVT_EFONT=12x24
++    OPT_XCIN_CFONT=kc24f
++    OPT_XCIN_EFONT=kc12x24
++    OPT_CRXVT_CFONT=kc24f
++    OPT_CRXVT_EFONT=kc12x24f
 +    else
-+    OPT_XCIN_CFONT=kc15
-+    OPT_XCIN_EFONT=8x15
-+    OPT_CRXVT_CFONT=kc15
-+    OPT_CRXVT_EFONT=8x15
++    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
diff --git a/chinese/xcin/pkg-plist b/chinese/xcin/pkg-plist
index 015abbb5e95e..49d2903b5207 100644
--- a/chinese/xcin/pkg-plist
+++ b/chinese/xcin/pkg-plist
@@ -1,3 +1,4 @@
+bin/crxvt
 bin/xcin
 lib/X11/xcin/3-dayi.cin
 lib/X11/xcin/3-dayi.tab
@@ -40,6 +41,7 @@ lib/X11/xcin/zmdbosh.tab
 lib/X11/xcin/zmdbosh.tab.rev
 lib/X11/xcin/zo.kbm
 man/man1/cin2tab.1.gz
+man/man1/crxvt.1.gz
 man/man1/xcin.1.gz
 @dirrm lib/X11/xcin/docs
 @dirrm lib/X11/xcin
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index 40e2c05d441c..6baa11449505 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Nov 28 ,1997
 # Whom:			Yen-Shuo Su <yssu@CCCA.NCTU.edu.tw>
 #
-# $Id: Makefile,v 1.1.1.1 1997/12/15 17:57:48 vanilla Exp $
+# $Id: Makefile,v 1.2 1997/12/17 04:32:09 vanilla Exp $
 #
 
 DISTNAME=       xcin-2.3.01
@@ -14,13 +14,13 @@ MASTER_SITES=   ftp://ftp.ncu.edu.tw/OS/linux/chinese/xcin/ \
 
 MAINTAINER=     yssu@CCCA.NCTU.edu.tw
 
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/chinese/kc15.pcf.gz:${PORTSDIR}/chinese/kcfonts
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/chinese/kc15f.pcf.gz:${PORTSDIR}/chinese/kcfonts
 
 USE_X11=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS	=-prefix="${X11BASE}" \
 		-x-font-prefix="${X11BASE}/lib/X11/fonts"
-MAN1=		xcin.1 cin2tab.1
+MAN1=		xcin.1 crxvt.1 cin2tab.1
 
 .if defined(USE_24_FONT)
 CONFIGURE_ARGS+=-use-24-fonts
diff --git a/chinese/xcin25/files/patch-aa b/chinese/xcin25/files/patch-aa
index 24deb8310ef1..7db3e03d6e4d 100644
--- a/chinese/xcin25/files/patch-aa
+++ b/chinese/xcin25/files/patch-aa
@@ -62,12 +62,3 @@
  INSTALL_DATA=${INSTALL_DATA-'$(INSTALL)'}
  INSTALL_DIR=${INSTALL_DIR-mkdir}
  
-@@ -800,7 +805,7 @@
-     grep $1 install.status | sed "s%$1=%%"
- }
- INSTALL_XCIN=`GetData INSTALL_XCIN`
--INSTALL_CRXVT=`GetData INSTALL_CRXVT`
-+#INSTALL_CRXVT=`GetData INSTALL_CRXVT`
- INSTALL_FONTS=`GetData INSTALL_FONTS`
- INSTALL_INPTABS=`GetData INSTALL_INPTABS`
- INSTALL_DOCS=`GetData INSTALL_DOCS`
diff --git a/chinese/xcin25/files/patch-ab b/chinese/xcin25/files/patch-ab
index b90b96b60ed7..b7c9c925d90f 100644
--- a/chinese/xcin25/files/patch-ab
+++ b/chinese/xcin25/files/patch-ab
@@ -27,15 +27,15 @@
 -    OPT_CRXVT_CFONT=taipei15
 -    OPT_CRXVT_EFONT=8x16
 +    if [ "$use_24_fonts" = '1' ]; then
-+    OPT_XCIN_CFONT=kc24
-+    OPT_XCIN_EFONT=12x24
-+    OPT_CRXVT_CFONT=kc24
-+    OPT_CRXVT_EFONT=12x24
++    OPT_XCIN_CFONT=kc24f
++    OPT_XCIN_EFONT=kc12x24
++    OPT_CRXVT_CFONT=kc24f
++    OPT_CRXVT_EFONT=kc12x24f
 +    else
-+    OPT_XCIN_CFONT=kc15
-+    OPT_XCIN_EFONT=8x15
-+    OPT_CRXVT_CFONT=kc15
-+    OPT_CRXVT_EFONT=8x15
++    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
diff --git a/chinese/xcin25/pkg-plist b/chinese/xcin25/pkg-plist
index 015abbb5e95e..49d2903b5207 100644
--- a/chinese/xcin25/pkg-plist
+++ b/chinese/xcin25/pkg-plist
@@ -1,3 +1,4 @@
+bin/crxvt
 bin/xcin
 lib/X11/xcin/3-dayi.cin
 lib/X11/xcin/3-dayi.tab
@@ -40,6 +41,7 @@ lib/X11/xcin/zmdbosh.tab
 lib/X11/xcin/zmdbosh.tab.rev
 lib/X11/xcin/zo.kbm
 man/man1/cin2tab.1.gz
+man/man1/crxvt.1.gz
 man/man1/xcin.1.gz
 @dirrm lib/X11/xcin/docs
 @dirrm lib/X11/xcin