diff options
23 files changed, 75 insertions, 677 deletions
@@ -3535,3 +3535,4 @@ net-im/psi-gentoo||2008-07-11|Removed because no longer supported lang/yarv|lang/ruby19|2008-07-11|Officially released as Ruby 1.9 japanese/samba|japanese/samba3|2008-07-21|Superseded by japanese/samba3 net/silky||2008-07-21|Broken with newer silc-toolkit version +japanese/kterm16c|japanese/kterm|2008-07-24|Deprecated in favor of japanese/kterm diff --git a/japanese/Makefile b/japanese/Makefile index adc4281b95bc..a3c00ce4179c 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -164,7 +164,6 @@ SUBDIR += kon2-16dot SUBDIR += kpcal SUBDIR += kterm - SUBDIR += kterm16c SUBDIR += lambdamoo SUBDIR += latex2html SUBDIR += leafrogue diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile index 63df75e775e2..8156d02da0c3 100644 --- a/japanese/kterm/Makefile +++ b/japanese/kterm/Makefile @@ -7,28 +7,27 @@ PORTNAME= kterm PORTVERSION= 6.2.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= japanese x11 MASTER_SITES= ${MASTER_SITE_PORTS_JP:S/$/:wp_jp/} \ ${MASTER_SITE_XCONTRIB} \ - ${MASTER_SITE_LOCAL:S/$/:wp_local/} -MASTER_SITE_SUBDIR= applications kterm/:wp_jp shige/kterm/:wp_local + ${MASTER_SITE_LOCAL:S/$/:wp_local,pcemu/} +MASTER_SITE_SUBDIR= applications \ + kterm/:wp_jp \ + shige/kterm/:wp_local \ + hrs/:pcemu DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - README.wallpaper.ja:wp_local,wp_jp - -MAINTAINER= nork@FreeBSD.org -COMMENT= An xterm that speaks Japanese - -BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf - + README.wallpaper.ja:wp_local,wp_jp \ + pcemu1.01alpha.tar.gz:pcemu +DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -DIST_SUBDIR= kterm + PATCH_SITES= ftp://ftp.sra.co.jp/pub/x11/kterm/:nfs \ http://www.asahi-net.or.jp/~hc3j-tkg/kterm/:wpi \ http://dists.lovepeers.org/distfiles/:termios \ ${MASTER_SITE_LOCAL:S/$/:jisx0213,color16,termios/} PATCH_SITE_SUBDIR= shige/kterm/:jisx0213,color16 \ - nork/:termios + nork/:termios PATCHFILES= ${DISTNAME}.NFS-xauth.patch:nfs \ ${DISTNAME}-wpi.patch.gz:wpi \ ${DISTNAME}-jisx0213.patch.gz:jisx0213 \ @@ -36,53 +35,74 @@ PATCHFILES= ${DISTNAME}.NFS-xauth.patch:nfs \ ${DISTNAME}-termios-0.2.patch.gz:termios PATCH_DIST_STRIP= -p1 +MAINTAINER= nork@FreeBSD.org +COMMENT= An xterm variant with Japanese support + +BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf + USE_IMAKE= yes USE_XORG= xaw MAN1= kterm.1 MANLANG= "" ja -PLIST_FILES= bin/kterm lib/X11/app-defaults/KTerm -PORTDOCS= README.kt README.wallpaper.ja - -NKFCMD= nkf - -.if !defined(PACKAGE_BUILDING) - -.if defined(WITH_XAW3DLIB) && defined(WITH_NEXTAWLIB) -.BEGIN: - @${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!" - @${FALSE} -.elif defined(WITH_XAW3DLIB) -LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -post-patch: - @${ECHO_MSG} "===> Applying Xaw3d scrollbar patch" - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-Xaw3d -.elif defined(WITH_NEXTAWLIB) -LIB_DEPENDS+= neXtaw:${PORTSDIR}/x11-toolkits/neXtaw -post-patch: - @${ECHO_MSG} "===> Applying neXtaw scrollbar patch" - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-neXtaw +.if !defined(NOPORTDOCS) +PORTDOCS= README.kt README.wallpaper.ja dot.termcap +.endif + +OPTIONS= XAW3DLIB "with Xaw3d scrollbar" off \ + NEXTAWLIB "with neXtaw scrollbar" off \ + TEKTRONIXEMU "Tektronix emulation" off \ + VGAFONT "install VGA font" off + +NKFCMD= ${LOCALBASE}/bin/nkf + +.include <bsd.port.pre.mk> + +.if !defined(WITHOUT_XAW3DLIB) +LIB_DEPENDS+= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Xaw3d +.elif !defined(WITHOUT_NEXTAWLIB) +LIB_DEPENDS+= neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-neXtaw .endif -.if defined(WITH_TEKTRONIX) -post-patch: - @${ECHO_MSG} "===> Applying Tektronix emulation patch" - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-Tektronix + +.if !defined(WITHOUT_TEKTRONIXEMU) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Tektronix .endif +.if !defined(WITHOUT_VGAFONT) +PLIST_SUB= VGAFONT="" +post-extract: + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ + ${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \ + ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} pcemu1.01alpha/vga.bdf + cd ${WRKDIR}/pcemu1.01alpha && \ + ${LOCALBASE}/bin/bdftopcf vga.bdf | ${GZIP_CMD} > vga.pcf.gz +post-install-vgafont: + ${MKDIR} ${PREFIX}/lib/X11/fonts/misc + ${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \ + ${PREFIX}/lib/X11/fonts/misc + ${LOCALBASE}/bin/mkfontdir ${PREFIX}/lib/X11/fonts/misc +post-install: post-install-vgafont +.else +PLIST_SUB= VGAFONT="@comment " .endif post-build: - @${MV} ${WRKSRC}/kterm.jman ${WRKSRC}/kterm.jman.jis - @${NKFCMD} -e -u ${WRKSRC}/kterm.jman.jis >${WRKSRC}/${MAN1} + ${NKFCMD} -e -u ${WRKSRC}/kterm.jman \ + | ${GZIP_CMD} > ${WRKSRC}/${MAN1}.gz post-install: - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/ja/man1 - ${GZIP_CMD} ${MANPREFIX}/man/ja/man1/${MAN1} + ${INSTALL_MAN} ${WRKSRC}/${MAN1}.gz ${MANPREFIX}/man/ja/man1 .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.kt ${DOCSDIR} - ${INSTALL_DATA} ${_DISTDIR}/README.wallpaper.ja ${DOCSDIR}/README.wallpaper.ja + ${INSTALL_DATA} \ + ${WRKSRC}/README.kt \ + ${DISTDIR}/${DIST_SUBDIR}/README.wallpaper.ja \ + ${FILESDIR}/dot.termcap \ + ${DOCSDIR}/README.wallpaper.ja \ + ${DOCSDIR} .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/kterm/distinfo b/japanese/kterm/distinfo index a5afa70e1a58..d31564f6c9a9 100644 --- a/japanese/kterm/distinfo +++ b/japanese/kterm/distinfo @@ -4,6 +4,9 @@ SIZE (kterm/kterm-6.2.0.tar.gz) = 200448 MD5 (kterm/README.wallpaper.ja) = debae083ddb71e53a958c4ffb4c108e9 SHA256 (kterm/README.wallpaper.ja) = 6e127e933cc10e0d4966169c813f1bfd09882f887dd3212df828722f622b534c SIZE (kterm/README.wallpaper.ja) = 1459 +MD5 (kterm/pcemu1.01alpha.tar.gz) = 1fed124b199839e439bec0f45abf006b +SHA256 (kterm/pcemu1.01alpha.tar.gz) = 0936d3e3b8b6ef36078b40983d10b66971206142ab489c096cc29e94b17852ea +SIZE (kterm/pcemu1.01alpha.tar.gz) = 316257 MD5 (kterm/kterm-6.2.0.NFS-xauth.patch) = a2f11334e14929997e987e463f004dd0 SHA256 (kterm/kterm-6.2.0.NFS-xauth.patch) = 84adfe3bdd2be7942c250f51158395184956f0e548d62fef375bab1fb86b4268 SIZE (kterm/kterm-6.2.0.NFS-xauth.patch) = 4137 diff --git a/japanese/kterm16c/files/dot.termcap b/japanese/kterm/files/dot.termcap index 2d56ef5ab2dd..2d56ef5ab2dd 100644 --- a/japanese/kterm16c/files/dot.termcap +++ b/japanese/kterm/files/dot.termcap diff --git a/japanese/kterm/pkg-descr b/japanese/kterm/pkg-descr index eee58511a595..b3edd5949d34 100644 --- a/japanese/kterm/pkg-descr +++ b/japanese/kterm/pkg-descr @@ -2,7 +2,6 @@ Kterm is a xterm replacement with Japanese (Kanji) support. It also understands ANSI color sequences. This version is 6.2.0, available from the X11R6 contrib tape. - Also included is support for Xaw3d arrow-style scrollbars and neXtaw NeX-style scrollbars. You can now hold down the arrow buttons to scroll continuously. diff --git a/japanese/kterm/pkg-plist b/japanese/kterm/pkg-plist new file mode 100644 index 000000000000..37bb5c0a2fad --- /dev/null +++ b/japanese/kterm/pkg-plist @@ -0,0 +1,7 @@ +@comment $FreeBSD$ +bin/kterm +lib/X11/app-defaults/KTerm +%%VGAFONT%%lib/X11/fonts/misc/vga.pcf.gz +%%VGAFONT%%@exec %D/bin/mkfontdir %D/lib/X11/fonts/misc +%%VGAFONT%%@unexec %D/bin/mkfontdir %D/lib/X11/fonts/misc; if [ `/usr/bin/wc -c < %D/lib/X11/fonts/misc/fonts.dir` = 2 ]; then /bin/rm -f %D/lib/X11/fonts/misc/fonts.dir; fi +@dirrmtry lib/X11/fonts/misc diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile deleted file mode 100644 index 0b0e31876036..000000000000 --- a/japanese/kterm16c/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# New ports collection makefile for: kterm of 16 colors -# Date created: 18 November 1994 -# Whom: asami -# -# $FreeBSD$ -# - -PORTNAME= kterm16c -PORTVERSION= 6.2.0 -PORTREVISION= 2 -CATEGORIES= japanese x11 -MASTER_SITES= ${MASTER_SITE_XCONTRIB} \ - ftp://ftp.interface-business.de/pub/outgoing/ \ - ftp://ftp.cs.bris.ac.uk/pub/users/hedley/ -MASTER_SITE_SUBDIR= applications -DISTNAME= kterm-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - pcemu1.01alpha.tar.gz -DIST_SUBDIR= kterm -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= ftp://ftp.sra.co.jp/pub/x11/kterm/ \ - http://www.asahi-net.or.jp/~hc3j-tkg/kterm/ -PATCHFILES= ${DISTNAME}.NFS-xauth.patch \ - ${DISTNAME}-wpr1.patch.gz -PATCH_DIST_STRIP= -p1 - -MAINTAINER= ports@FreeBSD.org -COMMENT= An xterm that speaks Japanese with 16 colors like on a VGA - -BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf -RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir -EXTRACT_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf - -USE_IMAKE= yes -USE_XORG= xaw - -CONFLICTS= ja-kterm-[0-9]* - -.if !defined(NOPORTDOCS) -PORTDOCS= dot.termcap kterm16c.doc -.endif - -.include <bsd.port.pre.mk> - -post-extract: - @${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/${DIST_SUBDIR}/pcemu1.01alpha.tar.gz \ - ${EXTRACT_AFTER_ARGS} -C ${WRKDIR} pcemu1.01alpha/vga.bdf - @cd ${WRKDIR}/pcemu1.01alpha; \ - bdftopcf vga.bdf > vga.pcf; \ - ${GZIP_CMD} vga.pcf - -.if !defined(PACKAGE_BUILDING) - -.if defined(WITH_XAW3DLIB) && defined(WITH_NEXTAWLIB) -.BEGIN: - @${ECHO} "Error: \$${WITH_XAW3DLIB} and \$${WITH_NEXTAWLIB} cannot be specified simultaneously!" - @${FALSE} -.elif defined(WITH_XAW3DLIB) -LIB_DEPENDS+= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d -post-patch: - @${ECHO_MSG} "===> Applying Xaw3d scrollbar patch" - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-Xaw3d -.elif defined(WITH_NEXTAWLIB) -LIB_DEPENDS+= neXtaw.6:${PORTSDIR}/x11-toolkits/neXtaw -post-patch: - @${ECHO_MSG} "===> Applying neXtaw scrollbar patch" - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-neXtaw -.endif - -.endif - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/kterm ${PREFIX}/bin/kterm16c - @${INSTALL_DATA} ${WRKSRC}/KTerm.ad ${PREFIX}/lib/X11/app-defaults/KTerm - @${MKDIR} ${PREFIX}/lib/X11/fonts/misc - @${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \ - ${PREFIX}/lib/X11/fonts/misc - @mkfontdir ${PREFIX}/lib/X11/fonts/misc - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/dot.termcap \ - ${FILESDIR}/kterm16c.doc ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/japanese/kterm16c/distinfo b/japanese/kterm16c/distinfo deleted file mode 100644 index 1c37f42ec6f1..000000000000 --- a/japanese/kterm16c/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -MD5 (kterm/kterm-6.2.0.tar.gz) = 9cc72841b50dfba92bce01dbbebf3039 -SHA256 (kterm/kterm-6.2.0.tar.gz) = ecc965b926483cb97b74d1da5808359fac95d937dfa5e7338395988b1a3afaa5 -SIZE (kterm/kterm-6.2.0.tar.gz) = 200448 -MD5 (kterm/pcemu1.01alpha.tar.gz) = 1fed124b199839e439bec0f45abf006b -SHA256 (kterm/pcemu1.01alpha.tar.gz) = 0936d3e3b8b6ef36078b40983d10b66971206142ab489c096cc29e94b17852ea -SIZE (kterm/pcemu1.01alpha.tar.gz) = 316257 -MD5 (kterm/kterm-6.2.0.NFS-xauth.patch) = a2f11334e14929997e987e463f004dd0 -SHA256 (kterm/kterm-6.2.0.NFS-xauth.patch) = 84adfe3bdd2be7942c250f51158395184956f0e548d62fef375bab1fb86b4268 -SIZE (kterm/kterm-6.2.0.NFS-xauth.patch) = 4137 -MD5 (kterm/kterm-6.2.0-wpr1.patch.gz) = 139c824069743f8aa2ed85d55a2b0dfc -SHA256 (kterm/kterm-6.2.0-wpr1.patch.gz) = fcca718672560a95c983dff876ec34f6fb75560d21655ee397d08d3b5919baff -SIZE (kterm/kterm-6.2.0-wpr1.patch.gz) = 8947 diff --git a/japanese/kterm16c/files/extra-patch-Xaw3d b/japanese/kterm16c/files/extra-patch-Xaw3d deleted file mode 100644 index ab1e0db5c5f9..000000000000 --- a/japanese/kterm16c/files/extra-patch-Xaw3d +++ /dev/null @@ -1,11 +0,0 @@ ---- ./kterm.h.org Thu Jul 11 22:01:37 1996 -+++ ./kterm.h Fri Nov 1 05:22:15 1996 -@@ -36,6 +36,7 @@ - #define KTERM_KINPUT2 /* Kinput2 protocol */ - #define KTERM_COLOR /* color sequence */ - #define KTERM_NOTEK /* disables Tektronix emulation */ --#undef KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ -+#define KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ -+#define USE_XAW3DLIB - - #endif /* !_KTERM_H_ */ diff --git a/japanese/kterm16c/files/extra-patch-neXtaw b/japanese/kterm16c/files/extra-patch-neXtaw deleted file mode 100644 index fae1ae770f29..000000000000 --- a/japanese/kterm16c/files/extra-patch-neXtaw +++ /dev/null @@ -1,11 +0,0 @@ ---- ./kterm.h.org Thu Jul 11 22:01:37 1996 -+++ ./kterm.h Fri Nov 1 05:22:15 1996 -@@ -36,6 +36,7 @@ - #define KTERM_KINPUT2 /* Kinput2 protocol */ - #define KTERM_COLOR /* color sequence */ - #define KTERM_NOTEK /* disables Tektronix emulation */ --#undef KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ -+#define KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ -+#define USE_NEXTAWLIB - - #endif /* !_KTERM_H_ */ diff --git a/japanese/kterm16c/files/kterm16c.doc b/japanese/kterm16c/files/kterm16c.doc deleted file mode 100644 index d708c06d4884..000000000000 --- a/japanese/kterm16c/files/kterm16c.doc +++ /dev/null @@ -1,195 +0,0 @@ -Subject: [FreeBSD-users-jp 36743] Re: Console dump? -From: Toshihiro Kanda <candy@kgc.co.jp> -To: FreeBSD-users-jp@jp.freebsd.org -Date: Thu, 24 Dec 1998 11:56:05 +0900 (JST) -Reply-To: FreeBSD-users-jp@jp.freebsd.org - -> /stand/sysinstall の 16色カラー表示をビットマップにするのが目 -> 的であれば、以前神田さんが users-jp で kterm-6.1.0 で 16色表示す -> るためのパッチを公開されているので、それがが使えます(kterm 上で -> 動かして、普通に grab する)。 -> # 手元では kterm-6.2.0 に無理矢理手でパッチあてて使っています。 - -こんな古いものを覚えていらっしゃる方がいるとはびっくりです。無理矢理手 -パッチさせてしまっては恐縮なので、kterm-6.2.0 用のパッチを作りました。 - -神田敏広 <candy@kgc.co.jp> - ------------------------------------------------------------- -kterm-6.2.0 用 16 色パッチ & コンソール(sc)互換 termcap エントリ - -このパッチは無保証です。 - -●パッチの使い方 -kterm-6.2.0/ のあるディレクトリで以下を実行してください。16 色対応 -kterm をインストールします。 - - # patch -p < this-patch - # cd kterm-6.2.0 - # xmkmf -a - # make all install - -●termcap エントリの追加 -次のようなエントリを $HOME/.termcap に追加してください。16 色対応 -kterm を起動したら、環境変数 TERM を ktermc に設定してください。 - ---------8<-------- $HOME/.termcap --------8<-------- -ktermc|kanji terminal with 16 colors:\ - :op=\E[m:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:\ - :mb=\E[5m:md=\E[1m:mr=\E[7m:mh=\E[2m:me=\E[m:\ - :tc=kterm: ---------8<--------8<--------8<--------8<--------8<-------- - -●VGA font の作り方 -VGA フォントはpackages/emulators/pcemu-1.01a の vga.pcf.Z を利用すると -それらしく見えます。 - - $ su - # cp vga.pcf.Z /usr/X11R6/lib/X11/fonts/misc - # cd /usr/X11R6/lib/X11/fonts/misc - # mkfontdir - # exit - $ xset fp rehash - -kterm の起動(例) - $ kterm -fn vga -fk kanji16 -rv & - -●kterm-6.2.0 用 16 色パッチ ---------8<--------8<--------8<--------8<--------8<-------- -diff --exclude=Makefile -ur kterm-6.2.0.orig/KTerm.ad kterm-6.2.0/KTerm.ad ---- kterm-6.2.0.orig/KTerm.ad Sun Jun 23 17:00:22 1996 -+++ kterm-6.2.0/KTerm.ad Thu Dec 24 11:47:10 1998 -@@ -97,14 +97,22 @@ - !*VT100*kanjiMode: jis - !*VT100*lineSpace: 0 - --!*VT100*textColor0: Black --!*VT100*textColor1: Red --!*VT100*textColor2: Green --!*VT100*textColor3: Yellow --!*VT100*textColor4: Blue --!*VT100*textColor5: Magenta --!*VT100*textColor6: Cyan --!*VT100*textColor7: White -+*VT100*textColor0: #505050 -+*VT100*textColor1: Red -+*VT100*textColor2: Green -+*VT100*textColor3: Yellow -+*VT100*textColor4: Blue -+*VT100*textColor5: Magenta -+*VT100*textColor6: Cyan -+*VT100*textColor7: White -+*VT100*textColor8: Black -+*VT100*textColor9: #c00000 -+*VT100*textColor10: #00c000 -+*VT100*textColor11: #c0c000 -+*VT100*textColor12: #0000c0 -+*VT100*textColor13: #c000c0 -+*VT100*textColor14: #00c0c0 -+*VT100*textColor15: #c0c0c0 - - *tekMenu.Label: Tek Options - *tekMenu*tektextlarge*Label: Large Characters -diff --exclude=Makefile -ur kterm-6.2.0.orig/charproc.c kterm-6.2.0/charproc.c ---- kterm-6.2.0.orig/charproc.c Fri Jul 12 14:01:36 1996 -+++ kterm-6.2.0/charproc.c Thu Dec 24 11:46:28 1998 -@@ -143,6 +143,16 @@ - #define XtNtextColor5 "textColor5" - #define XtNtextColor6 "textColor6" - #define XtNtextColor7 "textColor7" -+#ifdef COLOR_16 -+#define XtNtextColor8 "textColor8" -+#define XtNtextColor9 "textColor9" -+#define XtNtextColor10 "textColor10" -+#define XtNtextColor11 "textColor11" -+#define XtNtextColor12 "textColor12" -+#define XtNtextColor13 "textColor13" -+#define XtNtextColor14 "textColor14" -+#define XtNtextColor15 "textColor15" -+#endif - #endif /* KTERM_COLOR */ - #define XtNcutNewline "cutNewline" - #define XtNcutToBeginningOfLine "cutToBeginningOfLine" -@@ -576,6 +586,32 @@ - {XtNtextColor7, XtCForeground, XtRPixel, sizeof(Pixel), - XtOffsetOf(XtermWidgetRec, screen.textcolor[7]), - XtRString, "White"}, -+#ifdef COLOR_16 /* [ */ -+{XtNtextColor8, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[8]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor9, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[9]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor10, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[10]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor11, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[11]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor12, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[12]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor13, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[13]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor14, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[14]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor15, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[15]), -+ XtRString, "XtDefaultForeground"}, -+#endif /* ] */ - #endif /* KTERM_COLOR */ - {XtNeightBitInput, XtCEightBitInput, XtRBoolean, sizeof(Boolean), - XtOffsetOf(XtermWidgetRec, screen.input_eight_bits), -@@ -4979,6 +5015,9 @@ - screen->fnt_norm = nfs; - screen->fnt_bold = bfs; - screen->enbolden = (nfs == bfs); -+#ifdef COLOR_16 -+ screen->enbolden = 0; -+#endif - set_menu_font (False); - screen->menu_font_number = fontnum; - set_menu_font (True); -diff --exclude=Makefile -ur kterm-6.2.0.orig/kterm.h kterm-6.2.0/kterm.h ---- kterm-6.2.0.orig/kterm.h Fri Jul 12 14:01:37 1996 -+++ kterm-6.2.0/kterm.h Thu Dec 24 11:46:28 1998 -@@ -37,5 +37,6 @@ - #define KTERM_COLOR /* color sequence */ - #define KTERM_NOTEK /* disables Tektronix emulation */ - #undef KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ -+#define COLOR_16 /* 16 palets, BOLD means hilight */ - - #endif /* !_KTERM_H_ */ -diff --exclude=Makefile -ur kterm-6.2.0.orig/ptyx.h kterm-6.2.0/ptyx.h ---- kterm-6.2.0.orig/ptyx.h Tue Jul 2 14:01:53 1996 -+++ kterm-6.2.0/ptyx.h Thu Dec 24 11:46:28 1998 -@@ -300,7 +300,11 @@ - Pixel mousecolor; /* Mouse color */ - Pixel mousecolorback; /* Mouse color background */ - #ifdef KTERM_COLOR -+#ifndef COLOR_16 - Pixel textcolor[8]; /* text colors */ -+#else -+ Pixel textcolor[16]; /* text colors */ -+#endif - #endif /* KTERM_COLOR */ - int border; /* inner border */ - Cursor arrow; /* arrow cursor */ -@@ -656,6 +660,12 @@ - #define BACKCOLORMASK 0x7000 - #define BACKCOLOR(c) ((c) << 12) - #define BACKCOLORNUM(f) (((f) & BACKCOLORMASK) >> 12) -+#ifdef COLOR_16 -+#undef FORECOLORNUM -+#undef BACKCOLORNUM -+#define FORECOLORNUM(f) ((((f) & FORECOLORMASK) >> 8) + (((f) & BOLD)?0:8)) -+#define BACKCOLORNUM(f) ((((f) & BACKCOLORMASK) >> 12) + (((f) & BOLD)?8:8)) -+#endif - #endif /* KTERM_COLOR */ - /* global flags */ - #ifdef KTERM ---------8<--------8<--------8<--------8<--------8<-------- - diff --git a/japanese/kterm16c/files/patch-aa b/japanese/kterm16c/files/patch-aa deleted file mode 100644 index d915ee0bdca4..000000000000 --- a/japanese/kterm16c/files/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- Imakefile.orig Sun Dec 13 16:59:08 1998 -+++ Imakefile Sun Dec 13 17:37:16 1998 -@@ -13,6 +13,17 @@ - XPOLL_DEF = -DNO_XPOLL_H - #endif - -+#ifdef USE_XAW3DLIB -+#undef XawClientLibs -+#define XawClientLibs -lXaw3d $(XMULIB) $(XTOOLLIB) $(XLIB) -+#endif -+ -+#ifdef USE_NEXTAWLIB -+#undef XawClientLibs -+#define XawClientLibs -lneXtaw $(XMULIB) $(XTOOLLIB) $(XLIB) -+#endif -+ -+ - /* - * add -DWTMP and -DLASTLOG if you want them. - */ diff --git a/japanese/kterm16c/files/patch-ab b/japanese/kterm16c/files/patch-ab deleted file mode 100644 index 1ad357c6a65c..000000000000 --- a/japanese/kterm16c/files/patch-ab +++ /dev/null @@ -1,34 +0,0 @@ -diff --exclude=Makefile -ur kterm-6.2.0.orig/KTerm.adKTerm.ad ---- kterm-6.2.0.orig/KTerm.ad Sun Jun 23 17:00:22 1996 -+++ KTerm.ad Thu Dec 24 11:47:10 1998 -@@ -97,14 +97,22 @@ - !*VT100*kanjiMode: jis - !*VT100*lineSpace: 0 - --!*VT100*textColor0: Black --!*VT100*textColor1: Red --!*VT100*textColor2: Green --!*VT100*textColor3: Yellow --!*VT100*textColor4: Blue --!*VT100*textColor5: Magenta --!*VT100*textColor6: Cyan --!*VT100*textColor7: White -+*VT100*textColor0: #505050 -+*VT100*textColor1: Red -+*VT100*textColor2: Green -+*VT100*textColor3: Yellow -+*VT100*textColor4: Blue -+*VT100*textColor5: Magenta -+*VT100*textColor6: Cyan -+*VT100*textColor7: White -+*VT100*textColor8: Black -+*VT100*textColor9: #c00000 -+*VT100*textColor10: #00c000 -+*VT100*textColor11: #c0c000 -+*VT100*textColor12: #0000c0 -+*VT100*textColor13: #c000c0 -+*VT100*textColor14: #00c0c0 -+*VT100*textColor15: #c0c0c0 - - *tekMenu.Label: Tek Options - *tekMenu*tektextlarge*Label: Large Characters diff --git a/japanese/kterm16c/files/patch-ac b/japanese/kterm16c/files/patch-ac deleted file mode 100644 index 947f2bc0b037..000000000000 --- a/japanese/kterm16c/files/patch-ac +++ /dev/null @@ -1,63 +0,0 @@ -diff --exclude=Makefile -ur kterm-6.2.0.orig/charproc.ccharproc.c ---- kterm-6.2.0.orig/charproc.c Fri Jul 12 14:01:36 1996 -+++ charproc.c Thu Dec 24 11:46:28 1998 -@@ -143,6 +143,16 @@ - #define XtNtextColor5 "textColor5" - #define XtNtextColor6 "textColor6" - #define XtNtextColor7 "textColor7" -+#ifdef COLOR_16 -+#define XtNtextColor8 "textColor8" -+#define XtNtextColor9 "textColor9" -+#define XtNtextColor10 "textColor10" -+#define XtNtextColor11 "textColor11" -+#define XtNtextColor12 "textColor12" -+#define XtNtextColor13 "textColor13" -+#define XtNtextColor14 "textColor14" -+#define XtNtextColor15 "textColor15" -+#endif - #endif /* KTERM_COLOR */ - #define XtNcutNewline "cutNewline" - #define XtNcutToBeginningOfLine "cutToBeginningOfLine" -@@ -576,6 +586,32 @@ - {XtNtextColor7, XtCForeground, XtRPixel, sizeof(Pixel), - XtOffsetOf(XtermWidgetRec, screen.textcolor[7]), - XtRString, "White"}, -+#ifdef COLOR_16 /* [ */ -+{XtNtextColor8, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[8]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor9, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[9]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor10, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[10]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor11, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[11]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor12, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[12]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor13, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[13]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor14, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[14]), -+ XtRString, "XtDefaultForeground"}, -+{XtNtextColor15, XtCForeground, XtRPixel, sizeof(Pixel), -+ XtOffsetOf(XtermWidgetRec, screen.textcolor[15]), -+ XtRString, "XtDefaultForeground"}, -+#endif /* ] */ - #endif /* KTERM_COLOR */ - {XtNeightBitInput, XtCEightBitInput, XtRBoolean, sizeof(Boolean), - XtOffsetOf(XtermWidgetRec, screen.input_eight_bits), -@@ -4979,6 +5015,9 @@ - screen->fnt_norm = nfs; - screen->fnt_bold = bfs; - screen->enbolden = (nfs == bfs); -+#ifdef COLOR_16 -+ screen->enbolden = 0; -+#endif - set_menu_font (False); - screen->menu_font_number = fontnum; - set_menu_font (True); diff --git a/japanese/kterm16c/files/patch-ad b/japanese/kterm16c/files/patch-ad deleted file mode 100644 index ff35c7727104..000000000000 --- a/japanese/kterm16c/files/patch-ad +++ /dev/null @@ -1,10 +0,0 @@ -diff --exclude=Makefile -ur kterm-6.2.0.orig/kterm.hkterm.h ---- kterm-6.2.0.orig/kterm.h Fri Jul 12 14:01:37 1996 -+++ kterm.h Thu Dec 24 11:46:28 1998 -@@ -37,5 +37,6 @@ - #define KTERM_COLOR /* color sequence */ - #define KTERM_NOTEK /* disables Tektronix emulation */ - #undef KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ -+#define COLOR_16 /* 16 palets, BOLD means hilight */ - - #endif /* !_KTERM_H_ */ diff --git a/japanese/kterm16c/files/patch-ae b/japanese/kterm16c/files/patch-ae deleted file mode 100644 index d71f8f8e5d7c..000000000000 --- a/japanese/kterm16c/files/patch-ae +++ /dev/null @@ -1,28 +0,0 @@ -diff --exclude=Makefile -ur kterm-6.2.0.orig/ptyx.hptyx.h ---- kterm-6.2.0.orig/ptyx.h Tue Jul 2 14:01:53 1996 -+++ ptyx.h Thu Dec 24 11:46:28 1998 -@@ -300,7 +300,11 @@ - Pixel mousecolor; /* Mouse color */ - Pixel mousecolorback; /* Mouse color background */ - #ifdef KTERM_COLOR -+#ifndef COLOR_16 - Pixel textcolor[8]; /* text colors */ -+#else -+ Pixel textcolor[16]; /* text colors */ -+#endif - #endif /* KTERM_COLOR */ - int border; /* inner border */ - Cursor arrow; /* arrow cursor */ -@@ -656,6 +660,12 @@ - #define BACKCOLORMASK 0x7000 - #define BACKCOLOR(c) ((c) << 12) - #define BACKCOLORNUM(f) (((f) & BACKCOLORMASK) >> 12) -+#ifdef COLOR_16 -+#undef FORECOLORNUM -+#undef BACKCOLORNUM -+#define FORECOLORNUM(f) ((((f) & FORECOLORMASK) >> 8) + (((f) & BOLD)?0:8)) -+#define BACKCOLORNUM(f) ((((f) & BACKCOLORMASK) >> 12) + (((f) & BOLD)?8:8)) -+#endif - #endif /* KTERM_COLOR */ - /* global flags */ - #ifdef KTERM diff --git a/japanese/kterm16c/files/patch-af b/japanese/kterm16c/files/patch-af deleted file mode 100644 index 3a7766311030..000000000000 --- a/japanese/kterm16c/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- charproc.c.orig Tue Sep 24 01:22:52 2002 -+++ charproc.c Tue Sep 24 01:23:10 2002 -@@ -102,8 +102,6 @@ - extern XtAppContext app_con; - extern Widget toplevel; - extern void exit(); --extern char *malloc(); --extern char *realloc(); - extern fd_set Select_mask; - extern fd_set X_mask; - extern fd_set pty_mask; diff --git a/japanese/kterm16c/files/patch-main.c b/japanese/kterm16c/files/patch-main.c deleted file mode 100644 index 36f9f151b065..000000000000 --- a/japanese/kterm16c/files/patch-main.c +++ /dev/null @@ -1,115 +0,0 @@ -Place the following patch in the files/ directory. - ---- main.c 2008-01-28 08:42:32.000000000 +0100 -+++ main.c 2008-01-28 08:42:25.000000000 +0100 -@@ -224,8 +224,14 @@ - #define HAS_UTMP_UT_HOST - #endif - #else /* } !SYSV { */ /* BSD systems */ --#ifndef linux --#include <sgtty.h> -+#ifdef __FreeBSD__ -+#include <termios.h> -+#define USE_TERMIOS -+#define USE_TERMINFO -+#define USE_SYSV_TERMIO -+#define termio termios -+#define USE_POSIX_WAIT -+#define HAS_POSIX_SAVED_IDS - #endif - #include <sys/resource.h> - #define HAS_UTMP_UT_HOST -@@ -249,11 +255,6 @@ - #include <sys/param.h> /* for NOFILE */ - #endif - --#if (BSD >= 199103) --#define USE_POSIX_WAIT --#define HAS_POSIX_SAVED_IDS --#endif -- - #include <stdio.h> - #include <errno.h> - #include <setjmp.h> -@@ -1293,7 +1294,7 @@ - ** implementation to implementation). - */ - d_tio.c_iflag = ICRNL|IXON; -- d_tio.c_oflag = OPOST|ONLCR|TAB3; -+ d_tio.c_oflag = OPOST|ONLCR|OXTABS; - #if defined(macII) || defined(ATT) || defined(CRAY) /* { */ - d_tio.c_cflag = B9600|CS8|CREAD|PARENB|HUPCL; - d_tio.c_lflag = ISIG|ICANON|ECHO|ECHOE|ECHOK; -@@ -1349,11 +1350,13 @@ - #ifdef ECHOCTL - d_tio.c_lflag |= ECHOCTL|IEXTEN; - #endif -+#ifndef __FreeBSD__ - #ifdef NTTYDISC - d_tio.c_line = NTTYDISC; - #else - d_tio.c_line = 0; - #endif -+#endif - #ifdef __sgi - d_tio.c_cflag &= ~(HUPCL|PARENB); - d_tio.c_iflag |= BRKINT|ISTRIP|IGNPAR; -@@ -1403,7 +1406,11 @@ - - for (i = 0; i <= 2; i++) { - struct termio deftio; -+#ifdef USE_TERMIOS -+ if (tcgetattr(i, &deftio) == 0) { -+#else - if (ioctl (i, TCGETA, &deftio) == 0) { -+#endif - d_tio.c_cc[VINTR] = deftio.c_cc[VINTR]; - d_tio.c_cc[VQUIT] = deftio.c_cc[VQUIT]; - d_tio.c_cc[VERASE] = deftio.c_cc[VERASE]; -@@ -2370,7 +2377,11 @@ - lmode = d_lmode; - #endif /* TIOCLSET */ - #ifdef USE_SYSV_TERMIO -+#ifdef USE_TERMIOS -+ if(tcgetattr(tty, &tio) == -1) -+#else - if(ioctl(tty, TCGETA, &tio) == -1) -+#endif - tio = d_tio; - - #else /* not USE_SYSV_TERMIO */ -@@ -2770,19 +2781,17 @@ - tio.c_iflag &= ~(INLCR|IGNCR); - tio.c_iflag |= ICRNL; - /* ouput: cr->cr, nl is not return, no delays, ln->cr/nl */ -- tio.c_oflag &= -- ~(OCRNL|ONLRET|NLDLY|CRDLY|TABDLY|BSDLY|VTDLY|FFDLY); -+ tio.c_oflag &= ~(OCRNL|ONLRET); - tio.c_oflag |= ONLCR; - #ifdef OPOST - tio.c_oflag |= OPOST; - #endif /* OPOST */ - #ifdef BAUD_0 - /* baud rate is 0 (don't care) */ -- tio.c_cflag &= ~(CBAUD); -+ cfsetspeed(&tio, 0); - #else /* !BAUD_0 */ - /* baud rate is 9600 (nice default) */ -- tio.c_cflag &= ~(CBAUD); -- tio.c_cflag |= B9600; -+ cfsetspeed(&tio, 9600); - #endif /* !BAUD_0 */ - tio.c_cflag &= ~CSIZE; - if (screen->input_eight_bits) -@@ -2895,7 +2904,11 @@ - if (ioctl (tty, TIOCLSET, (char *)&lmode) == -1) - HsSysError(cp_pipe[1], ERROR_TIOCLSET); - #endif /* TIOCLSET */ -+#ifdef USE_TERMIOS -+ if (tcsetattr(tty, TCSANOW, &tio) == -1) -+#else - if (ioctl (tty, TCSETA, &tio) == -1) -+#endif - HsSysError(cp_pipe[1], ERROR_TIOCSETP); - #else /* USE_SYSV_TERMIO */ - #ifdef KTERM diff --git a/japanese/kterm16c/pkg-deinstall b/japanese/kterm16c/pkg-deinstall deleted file mode 100644 index af4f2ac39f66..000000000000 --- a/japanese/kterm16c/pkg-deinstall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -perl -pi -e 's/^vga\.pcf\.gz[ \t]+.*\n$//' ${PKG_PREFIX}/lib/X11/fonts/misc/fonts.dir diff --git a/japanese/kterm16c/pkg-descr b/japanese/kterm16c/pkg-descr deleted file mode 100644 index 2f4124fa6327..000000000000 --- a/japanese/kterm16c/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -kterm is a xterm replacement with Japanese (Kanji) support. It also -understands ANSI color sequences. This version is 6.2.0. - -kterm16c is for console hardcopy on a VGA terminal. It enables to get -bitmaps of VGA terminal mode. Conversion for 16 color kterm was made by -KANDA Toshihiro<candy@kgc.co.jp>. - -Also included is support for Xaw3d arrow-style scrollbars. You can -now hold down the arrow buttons to scroll continuously. - --KIRIYAMA Kazuhiko -<kiri@FreeBSD.org> diff --git a/japanese/kterm16c/pkg-message b/japanese/kterm16c/pkg-message deleted file mode 100644 index 8b82b18e8556..000000000000 --- a/japanese/kterm16c/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -*********************************************************************** -* You must reset X, copy .termcap to your home directory and set TERM * -* ktermc: * -* % xset fp rehash * -* % cp /usr/X11R6/share/doc/kterm16c/dot.termcap $HOME/.termcap * -* % kterm16c -fn vga -rv & (for VGA terminal) * -* % kterm16c -fn kanji14 -fk kanji14 -rv & (for kon on VGA) * -* % setenv TERM ktermc * -*********************************************************************** diff --git a/japanese/kterm16c/pkg-plist b/japanese/kterm16c/pkg-plist deleted file mode 100644 index e7e13c972c3b..000000000000 --- a/japanese/kterm16c/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -@comment $FreeBSD$ -bin/kterm16c -lib/X11/app-defaults/KTerm -lib/X11/fonts/misc/vga.pcf.gz -@exec %D/bin/mkfontdir %D/lib/X11/fonts/misc -@unexec if [ `wc -c < %D/lib/X11/fonts/misc/fonts.dir` = 2 ]; then rm -f %D/lib/X11/fonts/misc/fonts.dir; fi -@dirrmtry lib/X11/fonts/misc |