Date: Wed, 12 Jul 2023 19:59:19 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 97521b49961e - main - japanese/kterm: Remove expired port Message-ID: <202307121959.36CJxJ4f074202@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=97521b49961ee5a884aa68a39c84075537177889 commit 97521b49961ee5a884aa68a39c84075537177889 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-07-12 19:59:02 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2023-07-12 19:59:02 +0000 japanese/kterm: Remove expired port 2023-07-11 japanese/kterm: Last upstream release was in 2011 --- MOVED | 1 + japanese/Makefile | 1 - japanese/kterm/Makefile | 107 ----------------------------- japanese/kterm/distinfo | 5 -- japanese/kterm/files/dot.termcap | 4 -- japanese/kterm/files/extra-patch-Tektronix | 11 --- japanese/kterm/files/extra-patch-Xaw3d | 11 --- japanese/kterm/files/extra-patch-neXtaw | 11 --- japanese/kterm/files/patch-Imakefile | 37 ---------- japanese/kterm/files/patch-KTerm.ad | 92 ------------------------- japanese/kterm/files/patch-VTPrsTbl.c | 11 --- japanese/kterm/files/patch-VTparse.h | 7 -- japanese/kterm/files/patch-charproc.c | 26 ------- japanese/kterm/files/patch-main.c | 91 ------------------------ japanese/kterm/files/patch-menu.c | 26 ------- japanese/kterm/files/patch-scrollbar.c | 26 ------- japanese/kterm/files/patch-util.c | 65 ------------------ japanese/kterm/pkg-descr | 9 --- japanese/kterm/pkg-plist | 7 -- 19 files changed, 1 insertion(+), 547 deletions(-) diff --git a/MOVED b/MOVED index 360cb70d3826..a83cfa7062a2 100644 --- a/MOVED +++ b/MOVED @@ -7771,3 +7771,4 @@ devel/rubygem-google-protobuf322|devel/rubygem-google-protobuf|2023-07-09|Remove devel/rubygem-grape15|devel/rubygem-grape|2023-07-09|Remove obsoleted port. Use devel/rubygem-grape instead net/rubygem-net-ldap017|net/rubygem-net-ldap|2023-07-09|Remove obsoleted port. Use net/rubygem-net-ldap instead textproc/rubygem-nokogiri114|textproc/rubygem-nokogiri|2023-07-09|Remove obsoleted port. Use textproc/rubygem-nokogiri instead +japanese/kterm||2023-07-12|Has expired: Last upstream release was in 2011 diff --git a/japanese/Makefile b/japanese/Makefile index 611ad704281c..50f4a5e67a96 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -144,7 +144,6 @@ SUBDIR += kiten SUBDIR += kon2-14dot SUBDIR += kon2-16dot - SUBDIR += kterm SUBDIR += latex-jlisting SUBDIR += leafrogue SUBDIR += less diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile deleted file mode 100644 index 8a692bb697bd..000000000000 --- a/japanese/kterm/Makefile +++ /dev/null @@ -1,107 +0,0 @@ -PORTNAME= kterm -PORTVERSION= 6.2.0 -DISTVERSIONPREFIX= v -DISTVERSIONSUFFIX= .fb6 -PORTREVISION= 16 -CATEGORIES= japanese x11 -MASTER_SITES= LOCAL/hrs:pcemu -DISTFILES= pcemu1.01alpha.tar.gz:pcemu -DIST_SUBDIR= ${PORTNAME} - -MAINTAINER= hrs@FreeBSD.org -COMMENT= Xterm variant with Japanese support -WWW= https://bogytech.blogspot.jp/search/label/kterm - -LICENSE= MIT - -DEPRECATED= Last upstream release was in 2011 -EXPIRATION_DATE= 2023-07-11 - -BUILD_DEPENDS= nkf:japanese/nkf - -USES= imake xorg -USE_GITHUB= yes -GH_ACCOUNT= hrs-allbsd -USE_XORG= ice sm x11 xaw xext xmu xpm xt - -CFLAGS+= -Wno-return-type - -PORTDOCS= README.kt README.wallpaper.ja dot.termcap - -OPTIONS_DEFINE= TEKTRONIXEMU VGAFONT DOCS -OPTIONS_DEFAULT=DEFAULT -OPTIONS_SINGLE= SCROLLBAR -OPTIONS_SINGLE_SCROLLBAR= DEFAULT XAW3DLIB NEXTAWLIB -OPTIONS_SUB= yes - -NEXTAWLIB_DESC= with neXtaw scrollbar -TEKTRONIXEMU_DESC= Tektronix emulation -VGAFONT_DESC= install VGA font -XAW3DLIB_DESC= with Xaw3d scrollbar - -NEXTAWLIB_LIB_DEPENDS= libneXtaw.so:x11-toolkits/neXtaw -VGAFONT_EXTRACT_DEPENDS= \ - ${LOCALBASE}/bin/bdftopcf:x11-fonts/bdftopcf -VGAFONT_BUILD_DEPENDS= \ - ${LOCALBASE}/bin/mkfontscale:x11-fonts/mkfontscale -VGAFONT_USES= fonts -XAW3DLIB_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d - -NKFCMD= ${LOCALBASE}/bin/nkf - -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CFLAGS+= -Wno-error=int-conversion -.endif - -post-extract-VGAFONT-on: - ${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-extract-TEKTRONIXEMU-on: - echo "#undef KTERM_NOTEK" >> ${WRKSRC}/kterm.h -post-extract-TEKTRONIXEMU-off: - echo "#undef KTERM_NOTEK" >> ${WRKSRC}/kterm.h - echo "#define KTERM_NOTEK" >> ${WRKSRC}/kterm.h - -post-extract-XAW3DLIB-on: - echo "#undef KTERM_XAW3D" >> ${WRKSRC}/kterm.h - echo "#undef USE_XAW3DLIB" >> ${WRKSRC}/kterm.h - echo "#define KTERM_XAW3D" >> ${WRKSRC}/kterm.h - echo "#define USE_XAW3DLIB" >> ${WRKSRC}/kterm.h -post-extract-XAW3DLIB-off: - echo "#undef KTERM_XAW3D" >> ${WRKSRC}/kterm.h - -post-extract-NEXTAWLIB-on: - echo "#undef KTERM_XAW3D" >> ${WRKSRC}/kterm.h - echo "#undef USE_NEXTAWLIB" >> ${WRKSRC}/kterm.h - echo "#define KTERM_XAW3D" >> ${WRKSRC}/kterm.h - echo "#define USE_NEXTAWLIB" >> ${WRKSRC}/kterm.h -post-extract-NEXTAWLIB-off: - echo "#undef KTERM_XAW3D" >> ${WRKSRC}/kterm.h - -post-extract: - ${ECHO_CMD} "#undef InstallXtermSetUID" >> ${WRKSRC}/kterm.h - ${ECHO_CMD} "#define InstallXtermSetUID 0" >> ${WRKSRC}/kterm.h - -post-build: - ${NKFCMD} -e -u ${WRKSRC}/kterm.jman \ - | ${GZIP_CMD} > ${WRKSRC}/kterm.1.gz -post-install: - ${INSTALL_MAN} ${WRKSRC}/kterm.1.gz ${STAGEDIR}${MANPREFIX}/man/ja/man1 - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} \ - ${WRKSRC}/README.kt \ - ${WRKSRC}/README.wallpaper.ja \ - ${FILESDIR}/dot.termcap \ - ${STAGEDIR}${DOCSDIR} -post-install-VGAFONT-on: - ${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKDIR}/pcemu1.01alpha/vga.pcf.gz \ - ${STAGEDIR}${FONTSDIR} - -.include <bsd.port.mk> diff --git a/japanese/kterm/distinfo b/japanese/kterm/distinfo deleted file mode 100644 index 6ee876300d38..000000000000 --- a/japanese/kterm/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1487003137 -SHA256 (kterm/pcemu1.01alpha.tar.gz) = 0936d3e3b8b6ef36078b40983d10b66971206142ab489c096cc29e94b17852ea -SIZE (kterm/pcemu1.01alpha.tar.gz) = 316257 -SHA256 (kterm/hrs-allbsd-kterm-v6.2.0.fb6_GH0.tar.gz) = 8ebde513d5d765b43c4a8ac44f8e4b8dc452871f661fd7311c20955cf124d487 -SIZE (kterm/hrs-allbsd-kterm-v6.2.0.fb6_GH0.tar.gz) = 276713 diff --git a/japanese/kterm/files/dot.termcap b/japanese/kterm/files/dot.termcap deleted file mode 100644 index 2d56ef5ab2dd..000000000000 --- a/japanese/kterm/files/dot.termcap +++ /dev/null @@ -1,4 +0,0 @@ -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: diff --git a/japanese/kterm/files/extra-patch-Tektronix b/japanese/kterm/files/extra-patch-Tektronix deleted file mode 100644 index 46c4ddac0f70..000000000000 --- a/japanese/kterm/files/extra-patch-Tektronix +++ /dev/null @@ -1,11 +0,0 @@ ---- ./kterm.h.orig Fri Jul 12 14:01:37 1996 -+++ ./kterm.h Thu Aug 16 01:34:54 2001 -@@ -35,7 +35,7 @@ - #define KTERM_XIM /* XIM protocol */ - #define KTERM_KINPUT2 /* Kinput2 protocol */ - #define KTERM_COLOR /* color sequence */ --#define KTERM_NOTEK /* disables Tektronix emulation */ -+#undef KTERM_NOTEK /* disables Tektronix emulation */ - #undef KTERM_XAW3D /* Xaw3d -DARROW_SCROLLBAR support */ - - #endif /* !_KTERM_H_ */ diff --git a/japanese/kterm/files/extra-patch-Xaw3d b/japanese/kterm/files/extra-patch-Xaw3d deleted file mode 100644 index ab1e0db5c5f9..000000000000 --- a/japanese/kterm/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/kterm/files/extra-patch-neXtaw b/japanese/kterm/files/extra-patch-neXtaw deleted file mode 100644 index fae1ae770f29..000000000000 --- a/japanese/kterm/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/kterm/files/patch-Imakefile b/japanese/kterm/files/patch-Imakefile deleted file mode 100644 index f12653a87eeb..000000000000 --- a/japanese/kterm/files/patch-Imakefile +++ /dev/null @@ -1,37 +0,0 @@ ---- Imakefile.orig 2016-11-04 21:41:21 UTC -+++ Imakefile -@@ -13,6 +13,16 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan - 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. - */ -@@ -27,7 +37,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan - OSMAJORVERSION = OSMajorVersion - OSMINORVERSION = OSMinorVersion - -- MAIN_DEFINES = -DUTMP $(TTYGROUPDEF) $(PUCCPTYDDEF) \ -+ MAIN_DEFINES = $(TTYGROUPDEF) $(PUCCPTYDDEF) \ - -DOSMAJORVERSION=$(OSMAJORVERSION) \ - -DOSMINORVERSION=$(OSMINORVERSION) - MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ -@@ -72,7 +82,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan - #endif - #endif - -- TERMCAPLIB = TermcapLibrary -+ TERMCAPLIB = TermcapLibrary -lutil - - AllTarget($(PROGRAMS)) - diff --git a/japanese/kterm/files/patch-KTerm.ad b/japanese/kterm/files/patch-KTerm.ad deleted file mode 100644 index 94c638f11184..000000000000 --- a/japanese/kterm/files/patch-KTerm.ad +++ /dev/null @@ -1,92 +0,0 @@ ---- KTerm.ad.orig 2016-11-04 21:41:21 UTC -+++ KTerm.ad -@@ -52,37 +52,43 @@ KTerm.JoinSession:False - - *fontMenu.Label: VT Fonts - *fontMenu*fontdefault*Label: Default --*VT100*fontList: -*-fixed-medium-r-normal--14-*,\ -- -*-gothic-medium-r-normal--14-*,\ -- -*-mincho-medium-r-normal--14-* --!*VT100*boldFontList: -*-fixed-bold-r-normal--14-*,\ --! -*-gothic-bold-r-normal--14-*,\ --! -*-mincho-bold-r-normal--14-* -+*VT100*fontList: -alias-fixed-medium-r-normal--14-*-*-*-c-*-*-*,\ -+ -*-fixed-medium-r-normal--14-*-*-*-c-*-*-*,\ -+ -*-gothic-medium-r-normal--14-*-*-*-c-*-*-*,\ -+ -*-mincho-medium-r-normal--14-*-*-*-c-*-*-* -+!*VT100*boldFontList: -*-fixed-bold-r-normal--14-*-c-*,\ -+! -*-gothic-bold-r-normal--14-*-c-*,\ -+! -*-mincho-bold-r-normal--14-*-c-* - *fontMenu*font1*Label: Unreadable --*VT100*fontList1: -*-fixed-medium-r-normal--2-*,\ -- -*-gothic-medium-r-normal--2-*,\ -- -*-mincho-medium-r-normal--2-* --*VT100*font1: -misc-nil-medium-r-normal--2-*-misc-fontspecific -+*VT100*fontList1: -*-fixed-medium-r-normal--2-*-c-*,\ -+ -*-gothic-medium-r-normal--2-*-c-*,\ -+ -*-mincho-medium-r-normal--2-*-c-* -+*VT100*font1: -misc-nil-medium-r-normal--2-*-c-*-misc-fontspecific - *fontMenu*font2*Label: Tiny --*VT100*fontList2: -*-fixed-medium-r-normal--14-*,\ -- -*-gothic-medium-r-normal--14-*,\ -- -*-mincho-medium-r-normal--14-* -+*VT100*fontList2: -alias-fixed-medium-r-normal--8-*-*-*-c-*-*-*,\ -+ -*-fixed-medium-r-normal--8-*-*-*-c-*-*-*,\ -+ -*-gothic-medium-r-normal--8-*-*-*-c-*-*-*,\ -+ -*-mincho-medium-r-normal--8-*-*-*-c-*-*-* - *fontMenu*font3*Label: Small --*VT100*fontList3: -*-fixed-medium-r-normal--16-*,\ -- -*-gothic-medium-r-normal--16-*,\ -- -*-mincho-medium-r-normal--16-* -+*VT100*fontList3: -alias-fixed-medium-r-normal--12-*-*-*-c-*-*-*,\ -+ -*-fixed-medium-r-normal--12-*-*-*-c-*-*-*,\ -+ -*-gothic-medium-r-normal--12-*-*-*-c-*-*-*,\ -+ -*-mincho-medium-r-normal--12-*-*-*-c-*-*-* - *fontMenu*font4*Label: Medium --*VT100*fontList4: -*-fixed-medium-r-normal--18-*,\ -- -*-gothic-medium-r-normal--18-*,\ -- -*-mincho-medium-r-normal--18-* -+*VT100*fontList4: -alias-fixed-medium-r-normal--16-*-*-*-c-*-*-*,\ -+ -*-fixed-medium-r-normal--16-*-*-*-c-*-*-*,\ -+ -*-gothic-medium-r-normal--16-*-*-*-c-*-*-*,\ -+ -*-mincho-medium-r-normal--16-*-*-*-c-*-*-* - *fontMenu*font5*Label: Large --*VT100*fontList5: -*-fixed-medium-r-normal--24-*,\ -- -*-gothic-medium-r-normal--24-*,\ -- -*-mincho-medium-r-normal--24-* -+*VT100*fontList5: -alias-fixed-medium-r-normal--20-*-*-*-c-*-*-*,\ -+ -*-fixed-medium-r-normal--20-*-*-*-c-*-*-*,\ -+ -*-gothic-medium-r-normal--20-*-*-*-c-*-*-*,\ -+ -*-mincho-medium-r-normal--20-*-*-*-c-*-*-* - *fontMenu*font6*Label: Huge --*VT100*fontList6: -*-fixed-medium-r-normal--26-*,\ -- -*-gothic-medium-r-normal--26-*,\ -- -*-mincho-medium-r-normal--26-* -+*VT100*fontList6: -alias-fixed-medium-r-normal--24-*-*-*-c-*-*-*,\ -+ -*-fixed-medium-r-normal--24-*-*-*-c-*-*-*,\ -+ -*-gothic-medium-r-normal--24-*-*-*-c-*-*-*,\ -+ -*-mincho-medium-r-normal--24-*-*-*-c-*-*-* - *fontMenu*fontescape*Label: Escape Sequence - *fontMenu*fontsel*Label: Selection - !fontescape and fontsel overridden by application -@@ -132,5 +138,18 @@ KTerm.JoinSession:False - *tek4014*font3: 6x13 - *tek4014*fontSmall: 6x10 - --*VT100*translations: #override Shift<Key>space: \ -- begin-conversion(_JAPANESE_CONVERSION) -+!This can be useful if you have an IntelliMouse. It maps the button -+!events generated by the wheel -+*VT100*Translations: #override \ -+ !Ctrl <Btn4Down>: scroll-back(1,halfpage) \n\ -+ !Lock Ctrl <Btn4Down>: scroll-back(1,halfpage) \n\ -+ !Lock @Num_Lock Ctrl <Btn4Down>: scroll-back(1,halfpage) \n\ -+ ! @Num_Lock Ctrl <Btn4Down>: scroll-back(1,halfpage) \n\ -+ <Btn4Down>: scroll-back(5,line) \n\ -+ !Ctrl <Btn5Down>: scroll-forw(1,halfpage) \n\ -+ !Lock Ctrl <Btn5Down>: scroll-forw(1,halfpage) \n\ -+ !Lock @Num_Lock Ctrl <Btn5Down>: scroll-forw(1,halfpage) \n\ -+ ! @Num_Lock Ctrl <Btn5Down>: scroll-forw(1,halfpage) \n\ -+ <Btn5Down>: scroll-forw(5,line) -+*VT100.translations: #override \ -+ Shift<Key>space: begin-conversion(_JAPANESE_CONVERSION) diff --git a/japanese/kterm/files/patch-VTPrsTbl.c b/japanese/kterm/files/patch-VTPrsTbl.c deleted file mode 100644 index 2c72f8dc42d5..000000000000 --- a/japanese/kterm/files/patch-VTPrsTbl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- VTPrsTbl.c.orig 2016-11-04 21:41:21 UTC -+++ VTPrsTbl.c -@@ -490,7 +490,7 @@ CASE_GROUND_STATE, - CASE_GROUND_STATE, - CASE_GROUND_STATE, - /* X Y Z [ */ --CASE_GROUND_STATE, -+CASE_ECH, - CASE_GROUND_STATE, - CASE_GROUND_STATE, - CASE_GROUND_STATE, diff --git a/japanese/kterm/files/patch-VTparse.h b/japanese/kterm/files/patch-VTparse.h deleted file mode 100644 index 43d8d4ee7340..000000000000 --- a/japanese/kterm/files/patch-VTparse.h +++ /dev/null @@ -1,7 +0,0 @@ ---- VTparse.h.orig 2016-11-04 21:41:21 UTC -+++ VTparse.h -@@ -118,3 +118,4 @@ - #define CASE_SCS_STATE 77 - #define CASE_GSET_VERSION_STATE 78 - #define CASE_GSET_VERSION 79 -+#define CASE_ECH 80 diff --git a/japanese/kterm/files/patch-charproc.c b/japanese/kterm/files/patch-charproc.c deleted file mode 100644 index f2686d39232d..000000000000 --- a/japanese/kterm/files/patch-charproc.c +++ /dev/null @@ -1,26 +0,0 @@ ---- charproc.c.orig 2016-11-04 21:41:21 UTC -+++ charproc.c -@@ -103,8 +103,8 @@ extern jmp_buf VTend; - extern XtAppContext app_con; - extern Widget toplevel; - extern void exit(); --extern char *malloc(); --extern char *realloc(); -+extern void *malloc(); -+extern void *realloc(); - extern fd_set Select_mask; - extern fd_set X_mask; - extern fd_set pty_mask; -@@ -1974,6 +1974,12 @@ static void VTparse() - } - parsestate = groundtable; - break; -+ -+ case CASE_ECH: -+ /* ECH */ -+ ClearRightN(screen, param[0] < 1 ? 1 : param[0]); -+ parsestate = groundtable; -+ break; - - case CASE_IL: - /* IL */ diff --git a/japanese/kterm/files/patch-main.c b/japanese/kterm/files/patch-main.c deleted file mode 100644 index 720d727b0c18..000000000000 --- a/japanese/kterm/files/patch-main.c +++ /dev/null @@ -1,91 +0,0 @@ ---- main.c.orig 2016-11-04 21:41:21 UTC -+++ main.c -@@ -211,7 +211,9 @@ static Bool IsPts = False; - #undef FIOCLEX - #undef FIONCLEX - #define setpgrp2 setpgrp -+#ifndef USE_POSIX_TERMIOS - #include <sgtty.h> -+#endif - #include <sys/resource.h> - #endif - #ifdef sco -@@ -237,7 +239,7 @@ static Bool IsPts = False; - #define HAS_UTMP_UT_HOST - #endif - #else /* } !SYSV { */ /* BSD systems */ --#ifndef linux -+#if !defined(linux) && !defined(USE_POSIX_TERMIOS) - #include <sgtty.h> - #endif - #include <sys/resource.h> -@@ -294,7 +296,7 @@ extern Time_t time (); - #define ttyslot() 1 - #endif /* apollo */ - --#ifdef SVR4 -+#if defined(SVR4) || (defined(__FreeBSD__) && __FreeBSD_version >= 900007) - #include <utmpx.h> - #define setutent setutxent - #define getutent getutxent -@@ -320,6 +322,10 @@ extern struct utmp *getutid __((struct utmp *_Id)); - int Ptyfd; - #endif /* PUCC_PTYD */ - -+#ifdef __FreeBSD__ -+#include <libutil.h> /* openpty() */ -+#endif -+ - #ifdef sequent - #define USE_GET_PSEUDOTTY - #endif -@@ -1360,6 +1366,8 @@ char **argv; - d_tio.c_cc[VDISCARD] = CFLUSH; - d_tio.c_cc[VWERASE] = CWERASE; - d_tio.c_cc[VLNEXT] = CLNEXT; -+ d_tio.c_cc[VMIN] = 1; -+ d_tio.c_cc[VTIME] = 0; - #endif /* } */ - #ifdef TIOCSLTC /* { */ - d_ltc.t_suspc = CSUSP; /* t_suspc */ -@@ -1408,6 +1416,8 @@ char **argv; - d_tio.c_cc[VQUIT] = CQUIT; /* '^\' */ - d_tio.c_cc[VEOF] = CEOF; /* '^D' */ - d_tio.c_cc[VEOL] = CEOL; /* '^@' */ -+ d_tio.c_cc[VMIN] = 1; -+ d_tio.c_cc[VTIME] = 0; - #ifdef VSWTCH - d_tio.c_cc[VSWTCH] = CSWTCH; /* usually '^Z' */ - #endif -@@ -1722,11 +1732,11 @@ char **argv; - case 'u': case 'U': - term->flags |= UTF8_KANJI; - update_utf8mode(); -- make_unicode_map(); - break; - default: - break; - } -+ make_unicode_map(); - } - #endif /* KTERM_KANJIMODE */ - -@@ -1973,6 +1983,10 @@ char *name; - get_pty (pty) - int *pty; - { -+#if 1 -+ int tty; -+ return (openpty(pty, &tty, ttydev, NULL, NULL)); -+#else - #ifdef __osf__ - int tty; - return (openpty(pty, &tty, ttydev, NULL, NULL)); -@@ -2076,6 +2090,7 @@ get_pty (pty) - #endif /* __sgi or umips else */ - #endif /* USE_GET_PSEUDOTTY else */ - #endif /* ATT else */ -+#endif /* !0 */ - } - - /* diff --git a/japanese/kterm/files/patch-menu.c b/japanese/kterm/files/patch-menu.c deleted file mode 100644 index a04c3b8a9e93..000000000000 --- a/japanese/kterm/files/patch-menu.c +++ /dev/null @@ -1,26 +0,0 @@ ---- menu.c.orig 2016-11-04 21:41:21 UTC -+++ menu.c -@@ -843,6 +843,7 @@ static void do_jismode (gw, closure, data) - update_eucmode(); - update_sjismode(); - update_utf8mode(); -+ make_unicode_map(); - } - - -@@ -867,6 +868,7 @@ static void do_eucmode (gw, closure, data) - update_eucmode(); - update_sjismode(); - update_utf8mode(); -+ make_unicode_map(); - } - } - -@@ -891,6 +893,7 @@ static void do_sjismode (gw, closure, data) - update_eucmode(); - update_sjismode(); - update_utf8mode(); -+ make_unicode_map(); - } - } - diff --git a/japanese/kterm/files/patch-scrollbar.c b/japanese/kterm/files/patch-scrollbar.c deleted file mode 100644 index 947a78548e30..000000000000 --- a/japanese/kterm/files/patch-scrollbar.c +++ /dev/null @@ -1,26 +0,0 @@ ---- scrollbar.c.orig 2016-11-04 21:41:21 UTC -+++ scrollbar.c -@@ -49,6 +49,7 @@ extern int BackgroundPixmapIsOn; - static void ScrollTextTo(); - static void ScrollTextUpDownBy(); - -+extern Boolean SendMousePosition(); - - /* resize the text window for a terminal screen, modifying the - * appropriate WM_SIZE_HINTS and taking advantage of bit gravity. -@@ -555,6 +556,7 @@ void HandleScrollForward (gw, event, params, nparams) - XtermWidget w = (XtermWidget) gw; - register TScreen *screen = &w->screen; - -+ if (SendMousePosition(gw, event)) return; - ScrollTextUpDownBy (gw, (XtPointer) NULL, - (XtPointer)params_to_pixels (screen, params, (int) *nparams)); - return; -@@ -571,6 +573,7 @@ void HandleScrollBack (gw, event, params, nparams) - XtermWidget w = (XtermWidget) gw; - register TScreen *screen = &w->screen; - -+ if (SendMousePosition(gw, event)) return; - ScrollTextUpDownBy (gw, (XtPointer) NULL, - (XtPointer)-params_to_pixels (screen, params, (int) *nparams)); - return; diff --git a/japanese/kterm/files/patch-util.c b/japanese/kterm/files/patch-util.c deleted file mode 100644 index f0877f9d9c5d..000000000000 --- a/japanese/kterm/files/patch-util.c +++ /dev/null @@ -1,65 +0,0 @@ ---- util.c.orig 2016-11-04 21:41:21 UTC -+++ util.c -@@ -36,6 +36,7 @@ - - #include <stdio.h> - -+static void ClearInLine(TScreen *screen, int row, int col, int len); - static void horizontal_copy_area(); - static void vertical_copy_area(); - -@@ -706,6 +707,54 @@ register TScreen *screen; - /* - * Clear last part of cursor's line, inclusive. - */ -+ClearRightN (screen, n) -+register TScreen *screen; -+register int n; -+{ -+ int i; -+ int len = (screen->max_col - screen->cur_col + 1); -+ -+ if (n < 0) /* the remainder of the line */ -+ n = screen->max_col + 1; -+ if (n == 0) /* default for 'ECH' */ -+ n = 1; -+ -+ if (len > n) -+ len = n; -+ -+ ClearInLine(screen, screen->cur_row, screen->cur_col, len); -+} -+ -+/* -+ * Clear the given row, for the given range of columns. -+ */ -+static void -+ClearInLine(TScreen *screen, int row, int col, int len) -+{ -+ if (col + len >= screen->max_col + 1) { -+ len = screen->max_col + 1 - col; -+ } -+ -+ if (screen->cursor_state) -+ HideCursor(); -+ -+ screen->do_wrap = 0; -+ -+ if (row - screen->topline <= screen->max_row) { -+ if (!AddToRefresh(screen)) { -+ if (screen->scroll_amt) -+ FlushScroll(screen); -+ XClearArea(screen->display, -+ VWindow(screen), -+ CursorX (screen, col), -+ CursorY (screen, row), -+ len * FontWidth(screen), -+ FontHeight(screen), -+ FALSE); -+ } -+ } -+} -+ - ClearRight (screen) - register TScreen *screen; - { diff --git a/japanese/kterm/pkg-descr b/japanese/kterm/pkg-descr deleted file mode 100644 index bf35e4c93ee9..000000000000 --- a/japanese/kterm/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Kterm is an xterm replacement with Japanese (Kanji) support. It also -understands ANSI color sequences. This version is 6.2.0, available -from the X11R6 contrib tape. - -This package includes the following additional patches: - - - Xaw3d arrow-style scrollbars - - neXtaw NeXT-style scrollbars - - kterm background-wallpaper support diff --git a/japanese/kterm/pkg-plist b/japanese/kterm/pkg-plist deleted file mode 100644 index 6828dcdfe761..000000000000 --- a/japanese/kterm/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -@mode 4511 -bin/kterm -@mode 0444 -man/ja/man1/kterm.1.gz -man/man1/kterm.1.gz -lib/X11/app-defaults/KTerm -%%VGAFONT%%%%FONTSDIR%%/vga.pcf.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307121959.36CJxJ4f074202>