Date: Sun, 30 Jan 2000 02:08:36 +0900 (JST) From: nobutaka@nobutaka.com To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16447: Update port: japanese/eterm Message-ID: <200001291708.CAA54193@narcissus.pel.sys.hiroshima-u.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 16447 >Category: ports >Synopsis: Update port: japanese/eterm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jan 29 09:10:00 PST 2000 >Closed-Date: >Last-Modified: >Originator: MANTANI Nobutaka >Release: FreeBSD 4.0-CURRENT i386 >Organization: Hiroshima University >Environment: >Description: Upgrade to 0.8.10. Added files: patches/ patch-ap patch-aq patch-ar patch-as >How-To-Repeat: >Fix: diff -urN eterm.old/Makefile eterm/Makefile --- eterm.old/Makefile Sat Jan 29 22:48:08 2000 +++ eterm/Makefile Sun Jan 30 02:06:24 2000 @@ -1,19 +1,18 @@ # New ports collection makefile for: eterm -# Version required: 0.8.9 +# Version required: 0.8.10 # Date created: 11th December 1998 # Whom: MANTANI Nobutaka <nobutaka@nobutaka.com> # # $FreeBSD: ports/japanese/eterm/Makefile,v 1.8 1999/10/08 03:29:55 nakai Exp $ # -DISTNAME= Eterm-0.8.9 -PKGNAME= ja-eterm-0.8.9 +DISTNAME= Eterm-0.8.10 +PKGNAME= ja-eterm-0.8.10 CATEGORIES= japanese x11 -MASTER_SITES= http://www.eterm.org/download/ \ - ftp://ftp.eterm.org/pub/Eterm/ \ - http://www.tcserv.com/archive/E/ \ - http://eterm.is.nontoxic.org/download/ \ - http://www.tcserv.com/archive/E/old/ +MASTER_SITES= ftp://eterm.sourceforge.net/pub/eterm/ \ + ftp://ftp.enlightenment.org/pub/enlightenment/Eterm/ \ + ftp://ftp.themes.org/pub/enlightenment/eterm/ \ + ftp://ftp.dti.ad.jp/pub/X/Eterm/ MAINTAINER= nobutaka@nobutaka.com @@ -22,17 +21,17 @@ USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lxpg4" +CONFIGURE_ENV= LIBS="-lxpg4" MAN1= Eterm.1 post-install: + @${CHMOD} 4711 ${PREFIX}/bin/Eterm .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/Eterm @${INSTALL_DATA} ${WRKSRC}/ReleaseNotes ${PREFIX}/share/doc/Eterm @${INSTALL_DATA} ${WRKSRC}/doc/Eterm_reference.html ${PREFIX}/share/doc/Eterm @${INSTALL_DATA} ${WRKSRC}/doc/Eterm.tcap ${PREFIX}/share/doc/Eterm @${INSTALL_DATA} ${WRKSRC}/doc/Eterm.ti ${PREFIX}/share/doc/Eterm - @${INSTALL_DATA} ${WRKSRC}/doc/FAQ.html ${PREFIX}/share/doc/Eterm .endif .include <bsd.port.mk> diff -urN eterm.old/files/md5 eterm/files/md5 --- eterm.old/files/md5 Sat Jan 29 22:48:07 2000 +++ eterm/files/md5 Wed Dec 1 04:36:32 1999 @@ -1 +1 @@ -MD5 (Eterm-0.8.9.tar.gz) = 9e4945a6920f7d10cf28516266307519 +MD5 (Eterm-0.8.10.tar.gz) = 44b0b498d8186205d0898b266643fbf1 diff -urN eterm.old/patches/patch-aa eterm/patches/patch-aa --- eterm.old/patches/patch-aa Sat Jan 29 22:48:07 2000 +++ eterm/patches/patch-aa Wed Jan 26 23:39:04 2000 @@ -1,6 +1,6 @@ ---- src/feature.h.in.orig Fri Jan 29 21:29:07 1999 -+++ src/feature.h.in Fri Jan 29 21:30:32 1999 -@@ -350,7 +350,8 @@ +--- src/feature.h.in.orig Thu Aug 19 08:54:24 1999 ++++ src/feature.h.in Wed Jan 26 23:24:22 2000 +@@ -326,7 +326,8 @@ /* #define GREEK_SUPPORT */ /* To compile as a Kanji terminal. Executable should be renamed "Kterm". */ @@ -10,3 +10,12 @@ /********************* Miscellaneous options *********************/ +@@ -380,7 +381,7 @@ + * may seem to be owned by root. But if you define this and don't have them, + * the utmp and tty stuff could break. Do some testing. DO NOT get this one + * wrong! */ +-/* #define HAVE_SAVED_UIDS */ ++#define HAVE_SAVED_UIDS + + /* Use getgrnam() to determine the group id of TTY_GRP_NAME, and chgrp tty + * device files to that group. This should be ok on SVR4 and Linux systems diff -urN eterm.old/patches/patch-ad eterm/patches/patch-ad --- eterm.old/patches/patch-ad Sat Jan 29 22:48:07 2000 +++ eterm/patches/patch-ad Wed Jan 26 23:42:26 2000 @@ -1,6 +1,14 @@ ---- src/main.c.orig Tue Apr 20 09:46:37 1999 -+++ src/main.c Fri Apr 30 22:17:51 1999 -@@ -118,6 +118,10 @@ +--- src/main.c.orig Thu Oct 28 01:44:05 1999 ++++ src/main.c Wed Jan 26 23:41:32 2000 +@@ -66,6 +66,7 @@ + #ifdef USE_POSIX_THREADS + # include "threads.h" + #endif ++#define NEED_LINUX_HACK 1 + + /* Global attributes */ + XWindowAttributes attr; +@@ -112,6 +113,10 @@ # endif #endif @@ -11,7 +19,7 @@ /* extern variables referenced */ extern int my_ruid, my_rgid, my_euid, my_egid; extern unsigned int rs_shadePct; -@@ -376,6 +380,7 @@ +@@ -368,6 +373,7 @@ #endif Create_Windows(argc, argv); diff -urN eterm.old/patches/patch-ae eterm/patches/patch-ae --- eterm.old/patches/patch-ae Sat Jan 29 22:48:07 2000 +++ eterm/patches/patch-ae Wed Jan 26 23:45:51 2000 @@ -1,7 +1,20 @@ ---- src/command.c.orig Sat Apr 24 05:56:49 1999 -+++ src/command.c Mon May 3 03:05:33 1999 -@@ -91,6 +91,10 @@ - # include <X11/Xlocale.h> +--- src/command.c.orig Wed Nov 3 01:34:35 1999 ++++ src/command.c Wed Jan 26 23:45:10 2000 +@@ -40,6 +40,8 @@ + #include "feature.h" + #include "config.h" + ++#undef HAVE_SAVED_UIDS ++ + /* System Headers */ + #include <stdio.h> + #include <stdlib.h> +@@ -87,10 +89,12 @@ + # if (XtVersion < 11005) + # define NO_XLOCALE + # include <locale.h> +-# else +-# include <X11/Xlocale.h> # endif #endif /* NO_XLOCALE */ +#ifdef USE_XIM @@ -11,7 +24,15 @@ #ifdef USE_GETGRNAME # include <grp.h> #endif -@@ -299,7 +303,7 @@ +@@ -120,6 +124,7 @@ + #endif + #ifdef HAVE_TERMIOS_H + # include <termios.h> ++# include <sys/ttydefaults.h> + #else + # include <sgtty.h> + #endif +@@ -299,7 +304,7 @@ /* defines: */ @@ -20,24 +41,23 @@ #define STRING_MAX 512 /* max string size for process_xterm_seq() */ #define ESC_ARGS 32 /* max # of args for esc sequences */ -@@ -584,12 +588,11 @@ +@@ -577,11 +582,12 @@ #endif /* OFFIX_DND */ -#ifndef NO_XLOCALE -static char *rs_inputMethod = ""; /* XtNinputMethod */ --static char *rs_preeditType = NULL; /* XtNpreeditType */ +#ifdef USE_XIM -+extern char *rs_inputMethod; /* XtNinputMethod */ -+extern char *rs_preeditType; /* XtNpreeditType */ ++extern char *rs_inputMethod; ++extern char *rs_preeditType; static XIC Input_Context; /* input context */ -- + -#endif /* NO_XLOCALE */ +#endif /* USE_XIM */ /* command input buffering */ -@@ -647,6 +650,16 @@ +@@ -638,6 +644,16 @@ #else # define init_xlocale() ((void)0) #endif @@ -54,7 +74,17 @@ /*for Big Paste Handling */ static int v_doPending(void); -@@ -2425,8 +2438,6 @@ +@@ -2075,6 +2091,9 @@ + # if VTIME != VEOL + tio->c_cc[VTIME] = 0; + # endif ++# ifdef VSTATUS ++ tio->c_cc[VSTATUS] = CSTATUS; ++# endif + + /* input modes */ + tio->c_iflag = (BRKINT | IGNPAR | ICRNL | IXON +@@ -2401,8 +2420,6 @@ DndSelection = XInternAtom(Xdisplay, "DndSelection", False); #endif /* OFFIX_DND */ @@ -63,11 +93,11 @@ /* get number of available file descriptors */ #ifdef _POSIX_VERSION num_fds = sysconf(_SC_OPEN_MAX); -@@ -2489,135 +2500,20 @@ +@@ -2467,135 +2484,21 @@ void init_xlocale(void) { -+ char *locale; ++ char *locale = NULL; - char *p, *s, buf[32], tmp[1024]; - XIM xim = NULL; @@ -105,7 +135,7 @@ - - for (; *s && isspace(*s); s++); - if (!*s) -- break; +- break; - end = s; - for (; *end && (*end != ','); end++); - next_s = end--; @@ -113,21 +143,13 @@ - *(end + 1) = '\0'; - - if (*s) { -- snprintf(buf, sizeof(buf), "@im=%s", s); -- if ((p = XSetLocaleModifiers(buf)) != NULL && *p && (xim = XOpenIM(Xdisplay, NULL, NULL, NULL)) != NULL) { -- break; -- } -+#ifdef USE_XIM -+ locale = setlocale(LC_CTYPE, ""); -+ if (locale == NULL) { -+ print_error("Setting locale failed."); -+ } else { -+ if (strcmp(locale, "C") != 0) { -+ setTermFontSet(); -+ XRegisterIMInstantiateCallback(Xdisplay, NULL, NULL, NULL, IMInstantiateCallback, NULL); - } +- snprintf(buf, sizeof(buf), "@im=%s", s); +- if ((p = XSetLocaleModifiers(buf)) != NULL && *p && (xim = XOpenIM(Xdisplay, NULL, NULL, NULL)) != NULL) { +- break; +- } +- } - if (!*next_s) -- break; +- break; - s = (next_s + 1); - } - } @@ -157,12 +179,12 @@ - for (i = 0, found = 0; i < xim_styles->count_styles; i++) { - D_X11((" -> Supported style flags: 0x%08x %s\n", xim_styles->supported_styles[i], get_input_style_flags(xim_styles->supported_styles[i]))); - D_X11((" -> 0x%08x %s\n", xim_styles->supported_styles[i] & input_style, -- get_input_style_flags(xim_styles->supported_styles[i] & input_style))); +- get_input_style_flags(xim_styles->supported_styles[i] & input_style))); - if ((xim_styles->supported_styles[i] & input_style) == (xim_styles->supported_styles[i])) { - input_style = xim_styles->supported_styles[i]; - found = 1; - break; - } +- } - } - XFree(xim_styles); - @@ -172,8 +194,7 @@ - return; - } - /* Create Font Set */ -+#endif - +- -#ifdef KANJI - fontname = MALLOC(strlen(rs_font[0]) + strlen(rs_kfont[0]) + sizeof(fs_base) + 2); - if (fontname) { @@ -197,19 +218,31 @@ - XFreeStringList(ml); - fontset = 0; - return; -- } ++#ifndef NO_XLOCALE ++ locale = setlocale(LC_CTYPE, ""); ++#endif ++#ifdef USE_XIM ++ if (locale == NULL) ++ print_error("Setting locale failed."); ++ else { ++ setTermFontSet(); ++ if (strcmp(locale, "C")) ++ XRegisterIMInstantiateCallback(Xdisplay, NULL, NULL, NULL, ++ IMInstantiateCallback, NULL); + } - } - list = XVaCreateNestedList(0, XNFontSet, fontset, NULL); - Input_Context = XCreateIC(xim, XNInputStyle, input_style, XNClientWindow, TermWin.parent, XNFocusWindow, TermWin.parent, -- XNPreeditAttributes, list, XNStatusAttributes, list, NULL); +- XNPreeditAttributes, list, XNStatusAttributes, list, NULL); - if (Input_Context == NULL) { - D_X11(("Error: Unable to create Input Context\n")); - XCloseIM(xim); - } ++#endif } #endif /* NO_XLOCALE */ -@@ -3160,6 +3056,9 @@ +@@ -3138,6 +3041,9 @@ if (greek_mode) len = greek_xlat(kbuf, len); #endif @@ -219,7 +252,7 @@ } if (len <= 0) -@@ -3344,6 +3243,7 @@ +@@ -3323,6 +3229,7 @@ #else scr_refresh(refresh_type); #endif @@ -227,7 +260,7 @@ } /* characters already read in */ if (CHARS_READ()) { -@@ -3444,6 +3344,9 @@ +@@ -3423,6 +3330,9 @@ scr_refresh(refresh_type); if (scrollbar_visible()) scrollbar_show(1); @@ -237,7 +270,7 @@ } } } -@@ -4157,6 +4060,9 @@ +@@ -4136,6 +4046,9 @@ refresh_count = refresh_limit = 0; scr_refresh(refresh_type); scrollbar_show(mouseoffset); @@ -247,7 +280,7 @@ #endif } else if ((ev->xany.window == scrollBar.win) && scrollbar_isMotion()) { Window unused_root, unused_child; -@@ -4174,6 +4080,9 @@ +@@ -4153,6 +4066,9 @@ refresh_count = refresh_limit = 0; scr_refresh(refresh_type); scrollbar_show(mouseoffset); @@ -257,7 +290,7 @@ } #ifdef PROFILE_X_EVENTS P_SETTIMEVAL(motion_stop); -@@ -5065,6 +4974,9 @@ +@@ -5044,6 +4960,9 @@ } } Gr_do_graphics(cmd, nargs, args, text); @@ -267,7 +300,7 @@ #endif } -@@ -6311,6 +6223,9 @@ +@@ -6293,6 +6212,9 @@ /* parent already resized */ resize_window1(width, height); @@ -277,7 +310,7 @@ } /* xterm sequences - title, iconName, color (exptl) */ -@@ -6893,6 +6808,328 @@ +@@ -6875,6 +6797,328 @@ free(orig_tnstr); #endif } diff -urN eterm.old/patches/patch-ap eterm/patches/patch-ap --- eterm.old/patches/patch-ap Thu Jan 1 09:00:00 1970 +++ eterm/patches/patch-ap Sun Jan 23 22:53:48 2000 @@ -0,0 +1,10 @@ +--- src/command.h.orig Sun Jan 23 22:53:17 2000 ++++ src/command.h Sun Jan 23 22:53:22 2000 +@@ -35,7 +35,6 @@ + # ifndef X_LOCALE + # define X_LOCALE + # endif +-# include <X11/Xlocale.h> + # endif + + # define menuBar_esc 10 diff -urN eterm.old/patches/patch-aq eterm/patches/patch-aq --- eterm.old/patches/patch-aq Thu Jan 1 09:00:00 1970 +++ eterm/patches/patch-aq Sun Jan 23 23:01:06 2000 @@ -0,0 +1,15 @@ +--- src/menubar.c.orig Wed Nov 3 01:34:35 1999 ++++ src/menubar.c Sun Jan 23 23:00:38 2000 +@@ -42,11 +42,7 @@ + #endif + + #ifdef KANJI +-# ifdef NO_XLOCALE +-# include <locale.h> +-# else +-# include <X11/Xlocale.h> +-# endif ++# include <locale.h> + static XFontSet fontset = 0; + + #endif diff -urN eterm.old/patches/patch-ar eterm/patches/patch-ar --- eterm.old/patches/patch-ar Thu Jan 1 09:00:00 1970 +++ eterm/patches/patch-ar Sun Jan 23 23:15:11 2000 @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig Sun Jan 23 23:14:37 2000 ++++ src/Makefile.in Sun Jan 23 23:14:55 2000 +@@ -106,7 +106,7 @@ + libEterm_la_SOURCES = activeconfig.c activeeterm.c activetags.c command.c graphics.c grkelot.c menubar.c misc.c netdisp.c options.c pixmap.c screen.c scrollbar.c system.c threads.c utmp.c + + libEterm_la_DEPENDENCIES = $(DIST_ROOT)/libmej/libmej.la feature.h +-libEterm_la_LDFLAGS = -release $(VERSION) ++libEterm_la_LDFLAGS = -version-info 8:8:8 + + bin_PROGRAMS = Eterm + Eterm_SOURCES = main.c diff -urN eterm.old/patches/patch-as eterm/patches/patch-as --- eterm.old/patches/patch-as Thu Jan 1 09:00:00 1970 +++ eterm/patches/patch-as Sun Jan 23 23:23:52 2000 @@ -0,0 +1,11 @@ +--- libmej/Makefile.in.orig Sun Jan 23 23:22:35 2000 ++++ libmej/Makefile.in Sun Jan 23 23:23:12 2000 +@@ -107,7 +107,7 @@ + + INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS) + +-libmej_la_LDFLAGS = -release $(VERSION) ++libmej_la_LDFLAGS = -version-info 8:8:8 + + EXTRA_DIST = debug.h global.h mem.h strings.h strptime.h strptime.c + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -urN eterm.old/pkg/PLIST eterm/pkg/PLIST --- eterm.old/pkg/PLIST Sat Jan 29 22:48:08 2000 +++ eterm/pkg/PLIST Sun Jan 23 23:33:44 2000 @@ -14,9 +14,9 @@ @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/Eterm/pix/014.png +share/Eterm/pix/40.png +share/Eterm/pix/6.png share/Eterm/pix/backwave.jpg -share/Eterm/pix/button1.jpg -share/Eterm/pix/button5.jpg share/Eterm/pix/circuit.png share/Eterm/pix/fourthday.jpg share/Eterm/pix/gaia.jpg @@ -47,7 +47,6 @@ share/doc/Eterm/Eterm_reference.html share/doc/Eterm/Eterm.tcap share/doc/Eterm/Eterm.ti -share/doc/Eterm/FAQ.html share/doc/Eterm/ReleaseNotes @dirrm share/Eterm/themes/trans @dirrm share/Eterm/themes/tn3270 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001291708.CAA54193>