Update to version 1.70p1.

PR:		10251
Submitted by:	Takeshi WATANABE <watanabe@komadori.planet.sci.kobe-u.ac.jp>

8 files changed, 319 insertions, 60 deletions

diff --git a/japanese/chimera/Makefile b/japanese/chimera/Makefile
index 08aa295b1adf..7061a052cdf5 100644
--- a/japanese/chimera/Makefile
+++ b/japanese/chimera/Makefile
@@ -1,25 +1,29 @@
 # New ports collection makefile for:	chimera + kanji patch
-# Version required:	1.65
+# Version required:	1.70p1
 # Date created:		26 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.9 1998/10/16 01:11:39 jseger Exp $
+# $Id: Makefile,v 1.10 1998/10/30 10:33:43 asami Exp $
 #
 
-DISTNAME=	chimera-1.65
-PKGNAME=	ja-chimera-1.65
+DISTNAME=	chimera-1.70p0
+PKGNAME=	ja-chimera-1.70p1
 CATEGORIES=	japanese www
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
 
-PATCH_SITES=	ftp://ftp.tohoku.ac.jp/pub/net/www/chimera/old/
-PATCHFILES=	chimera-1.65-kanji.patch
+PATCH_SITES=	http://hasse.mathematik.tu-muenchen.de/%7Enikl/chimera-1.65p/ \
+		ftp://netbsd.tohoku.ac.jp/network/www/chimera/
+PATCHFILES=	chimera-1.70p0-1.70p1.gz diff-1.70p1-jp-01
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-BROKEN=		build
+FETCH_BEFORE_ARGS=	-b
+USE_IMAKE=	yes
+MAN1=		chimera.1
 
-USE_IMAKE=		yes
-PATCH_DIST_STRIP=	-p1
-MAN1=			chimera.1
+pre-configure:
+	${CP} ${WRKSRC}/Common.tmpl.dist ${WRKSRC}/Common.tmpl
+	${CP} ${WRKSRC}/options.h.dist ${WRKSRC}/options.h
 
 .include <bsd.port.mk>
diff --git a/japanese/chimera/distinfo b/japanese/chimera/distinfo
index ce727bee447f..f3ffa5375c37 100644
--- a/japanese/chimera/distinfo
+++ b/japanese/chimera/distinfo
@@ -1,2 +1,3 @@
-MD5 (chimera-1.65.tar.gz) = 38b67ecb961ea52803a3c815076cc9fa
-MD5 (chimera-1.65-kanji.patch) = 6f9364eb18a386d6ba55dcb994ae8bf7
+MD5 (chimera-1.70p0.tar.gz) = 977488f40b15decafc51f3db282ae5a9
+MD5 (chimera-1.70p0-1.70p1.gz) = f40c1dbd742449cd81bff2f2de59763d
+MD5 (diff-1.70p1-jp-01) = cb8b6d9fe2dfaa307df0a87627adb9e4
diff --git a/japanese/chimera/files/patch-aa b/japanese/chimera/files/patch-aa
index 805f25785c65..df525e122eb8 100644
--- a/japanese/chimera/files/patch-aa
+++ b/japanese/chimera/files/patch-aa
@@ -1,6 +1,15 @@
---- ./Common.tmpl.dist.org	Sat Apr  1 19:20:24 1995
-+++ ./Common.tmpl.dist	Tue Apr  4 07:51:01 1995
-@@ -80,7 +80,7 @@
+--- Common.tmpl.dist.orig	Wed May 28 02:44:33 1997
++++ Common.tmpl.dist	Sun Feb 21 21:23:21 1999
+@@ -25,7 +25,7 @@
+  * CMANDIR  - manual pages (not used)
+  */
+ CBINDIR = $(BINDIR)
+-CUTILDIR = $(BINDIR)
++CUTILDIR = $(LIBDIR)/chimera
+ CLIBDIR = $(LIBDIR)/chimera
+ CMANDIR = $(MANDIR)
+ 
+@@ -91,7 +91,7 @@
  #define NEED_STRCASECMP 0
  
  CEXTRA_DEFINES = -DHAVE_MKTIME -DHAVE_STDLIB_H -DHAVE_STRING_H \
@@ -9,14 +18,31 @@
  
  /*
   * OSF1 needs -D_BSD
---- ./compat/Imakefile.org	Mon Mar 13 19:48:00 1995
-+++ ./compat/Imakefile	Wed Jun 11 12:15:59 1997
-@@ -31,7 +31,7 @@
+--- Imakefile.orig	Wed May 28 02:44:33 1997
++++ Imakefile	Sun Feb 21 12:17:07 1999
+@@ -1,5 +1,5 @@
+ #define IHaveSubDirs
+-#define PassCDebugFlags 'CDEBUGFLAGS=-g -O0'
++#define PassCDebugFlags "CDEBUGFLAGS=-g ${CFLAGS}"
+ 
+ SUBDIRS = compat libhtmlw mxw xloadimage common src lib util
+ 
+--- lib/protocol.orig	Sat Apr 19 07:07:07 1997
++++ lib/protocol	Sun Feb 21 11:42:50 1999
+@@ -9,4 +9,4 @@
+ #
+ #nntp                /home/john/bin/access_nntp
  
- DependTarget()
- #else
--all:
-+all::
+-mailto		/usr/X11/bin/mailto.pl
++mailto		/usr/X11R6/lib/X11/chimera/mailto.pl
+--- src/Imakefile.orig	Wed May 28 02:44:35 1997
++++ src/Imakefile	Sun Feb 21 11:42:50 1999
+@@ -28,7 +28,7 @@
+                    -L../xloadimage -lxloadimage $(COMPATLIB) \
+                    -L../common -lcommon \
+                    $(CSOCKSLIB) $(CTERMLIB) $(CEXTRA_LIBS) \
+-                   XawClientLibs -lm
++                   XawClientLibs -lm -lxpg4
  
- depend::
- #endif
+ #ifdef __QNX__
+ LOCAL_DEPLIBS    = ../common/common3r.lib ../mxw/mxw3r.lib \
diff --git a/japanese/chimera/files/patch-ab b/japanese/chimera/files/patch-ab
index d25eedafa31c..c26d56db1475 100644
--- a/japanese/chimera/files/patch-ab
+++ b/japanese/chimera/files/patch-ab
@@ -1,9 +1,36 @@
---- ./Imakefile.org	Sat Apr  1 19:38:56 1995
-+++ ./Imakefile	Tue Apr  4 07:52:03 1995
-@@ -1,5 +1,5 @@
- #define IHaveSubDirs
--#define PassCDebugFlags 'CDEBUGFLAGS='
-+#define PassCDebugFlags 'CDEBUGFLAGS=-O2 -m486'
+--- libhtmlw/HTMLformat.c.orig	Wed May 28 04:42:34 1997
++++ libhtmlw/HTMLformat.c	Sun Feb 21 11:42:52 1999
+@@ -6150,6 +6150,7 @@
+   char *col_spec, *t;
+   XColor xcolor;
+   Colormap cmap;
++  Visual *v;
  
- SUBDIRS = compat libhtmlw mxw xloadimage common src lib util
+   if (!(hw->html.use_body_colors))
+     return (False);
+@@ -6179,7 +6180,11 @@
+       XtFree(t);
+       return(False);
+     }
+-    FindColor (XtDisplay(hw), cmap, &xcolor);
++    v = DefaultVisual(XtDisplay(hw), DefaultScreen(XtDisplay(hw)));
++    if ((v->class == TrueColor) || (v->class == DirectColor))
++      XAllocColor (XtDisplay(hw), cmap, &xcolor);
++    else
++      FindColor (XtDisplay(hw), cmap, &xcolor);
+     *value = xcolor.pixel;
  
+     XtFree (t);
+--- src/main.c.orig	Wed May 28 02:44:35 1997
++++ src/main.c	Sun Feb 21 11:42:53 1999
+@@ -1134,7 +1134,9 @@
+       CreateStrReq("filename", filename, False, SaveOCallback,
+ 		   SaveDCallback, (XtPointer)d);
+   }
+-  else if ((d->content != NULL && strcasecmp(d->content, "text/html") == 0) ||
++  else if ((d->content != NULL && strncasecmp(d->content, "text/html", 9) == 0
++	   && (!d->content[9] || d->content[9] == ' ' || d->content[9] == ';'))
++	   ||
+ 	   (d->pcontent != NULL && strcasecmp(d->pcontent, "text/html") == 0))
+   {
+     dn = (DocNode *)alloc_mem(sizeof(DocNode));
diff --git a/japanese/chimera/files/patch-ac b/japanese/chimera/files/patch-ac
index 16a05682056d..48a5c1cf2231 100644
--- a/japanese/chimera/files/patch-ac
+++ b/japanese/chimera/files/patch-ac
@@ -1,11 +1,216 @@
---- ./Common.tmpl.dist.org	Fri Sep 22 02:22:01 1995
-+++ ./Common.tmpl.dist	Fri Sep 22 03:03:57 1995
-@@ -109,7 +109,7 @@
- XRELEASE = 0
- #endif
+--- libhtmlw/HTMLwidgets.c.orig	Wed May 14 22:12:21 1997
++++ libhtmlw/HTMLwidgets.c	Mon Feb 22 13:41:52 1999
+@@ -106,7 +106,12 @@
+ static void setTextSize _ArgProto((Widget, int, int));
+ static Widget GetAsciiTextWidget _ArgProto((Widget));
  
--KANJI_DEFINES = -DKANJI -DL10N -DNAIST
-+KANJI_DEFINES = -DKANJI -DL10N -DNAIST -DSETLOCALE
++#ifdef CHIMERA_JP
++#define XTextWidth(font, string, count) TextWidth(font, string, count)
++#define FONTHEIGHT(font) FontHeight(font)
++#else
+ #define FONTHEIGHT(font) (font->max_bounds.ascent + font->max_bounds.descent)
++#endif
  
- #define MyNull
- CBINDIR = /usr/X11R6/bin
+ static Widget
+ GetAsciiTextWidget(w)
+@@ -131,7 +136,11 @@
+ int columns;
+ int lines;
+ {
++#ifdef CHIMERA_JP
++  XFontSet font = NULL;
++#else
+   XFontStruct *font = NULL;
++#endif
+   Position lm, rm, tm, bm;
+   Dimension width, height;
+   Widget rw;
+@@ -139,7 +148,11 @@
+   rw = GetAsciiTextWidget(w);
+ 
+   XtVaGetValues (rw,
++#ifdef CHIMERA_JP
++		 XtNfontSet, &font,
++#else
+ 		 XtNfont, &font,
++#endif
+ 		 XtNleftMargin, &lm,
+ 		 XtNrightMargin, &rm,
+ 		 XtNtopMargin, &tm,
+@@ -1173,13 +1186,21 @@
+  * For the various widgets, return their font structures so
+  * we can use the font's baseline to place them.
+  */
++#ifdef CHIMERA_JP
++XFontSet
++#else
+ XFontStruct *
++#endif
+ GetWidgetFont (hw, wptr)
+ HTMLWidget hw;
+ WidgetInfo *wptr;
+ {
+   Widget child;
++#ifdef CHIMERA_JP
++  XFontSet font;
++#else
+   XFontStruct *font;
++#endif
+ 
+   /*
+    * For option menus we have to first get the child that has the
+@@ -1187,7 +1208,11 @@
+    */
+   if (wptr->type == W_OPTIONMENU)
+   {
++#ifdef CHIMERA_JP
++    XtVaGetValues (wptr->w, XtNfontSet, &font, NULL);
++#else
+     XtVaGetValues (wptr->w, XtNfont, &font, NULL);
++#endif
+   }
+   else
+   {
+@@ -1197,15 +1222,27 @@
+       int nc;
+       XtVaGetValues (wptr->w, XtNchildren, &wl, XtNnumChildren, &nc, NULL);
+       child = *++wl;
++#ifdef CHIMERA_JP
++      XtVaGetValues (child, XtNfontSet, &font, NULL);
++#else
+       XtVaGetValues (child, XtNfont, &font, NULL);
++#endif
+     }
+     else if (wptr->type == W_TEXTFIELD || wptr->type == W_PASSWORD)
+     {
++#ifdef CHIMERA_JP
++      XtVaGetValues (GetAsciiTextWidget(wptr->w), XtNfontSet, &font, NULL);
++#else
+       XtVaGetValues (GetAsciiTextWidget(wptr->w), XtNfont, &font, NULL);
++#endif
+     }
+     else
+     {
++#ifdef CHIMERA_JP
++      XtVaGetValues (wptr->w, XtNfontSet, &font, NULL);
++#else
+       XtVaGetValues (wptr->w, XtNfont, &font, NULL);
++#endif
+     }
+   }
+ 
+@@ -2090,7 +2127,11 @@
+ 
+   if (type == W_OPTIONMENU)
+   {
++#ifdef CHIMERA_JP
++    XFontSet font;
++#else
+     XFontStruct *font;
++#endif
+     Dimension maxWidth = 0, width, iW;
+ 
+     argcnt = 0;
+@@ -2122,7 +2163,11 @@
+       if (i == 0)
+       {
+ 	XtVaGetValues (w,
++#ifdef CHIMERA_JP
++		       XtNfontSet, &font,
++#else
+ 		       XtNfont, &font,
++#endif
+ 		       XtNinternalWidth, &iW,
+ 		       NULL);
+       }
+@@ -2265,10 +2310,18 @@
+     if (size > list_cnt) size = list_cnt;
+     if (size > 1)
+     {
++#ifdef CHIMERA_JP
++      XFontSet font = NULL;
++#else
+       XFontStruct *font = NULL;
++#endif
+       Dimension h, width, s;
+ 
++#ifdef CHIMERA_JP
++      XtVaGetValues (w, XtNfontSet, &font,
++#else
+       XtVaGetValues (w, XtNfont, &font,
++#endif
+ 		     XtNinternalHeight, &h,
+ 		     XtNwidth, &width,
+ 		     XtNrowSpacing, &s,
+@@ -2505,3 +2558,16 @@
+     XtSetMappedWhenManaged (eptr->widget_data->w, True);
+   }
+ }
++
++#ifdef CHIMERA_JP
++int
++TextWidth(fs, str, len)
++XFontSet fs;
++char *str;
++int len;
++{
++  XRectangle logical, ink;
++  XmbTextExtents(fs, str, len, &ink, &logical);
++  return logical.width;
++}
++#endif
+--- mxw/Imakefile.orig	Tue Mar 14 12:39:59 1995
++++ mxw/Imakefile	Mon Feb 22 21:15:38 1999
+@@ -24,7 +24,7 @@
+ OBJS = ScrollText.o OutputSel.o StrReq.o AuthReq.o Bookmark.o $(R4OBJS)
+ 
+ EXTRA_INCLUDES = -I./
+-EXTRA_DEFINES  = $(XRELEASE) $(CEXTRA_DEFINES)
++EXTRA_DEFINES  = $(XRELEASE) $(CEXTRA_DEFINES) $(KANJI_DEFINES)
+ 
+ NormalLibraryTarget(mxw, $(OBJS))
+ DependTarget()
+--- mxw/ScrollText.c.orig	Wed May 21 18:05:09 1997
++++ mxw/ScrollText.c	Mon Feb 22 17:37:27 1999
+@@ -123,7 +123,11 @@
+     ArgList args;
+     Cardinal *num_args;
+ {
++#ifdef CHIMERA_JP
++    XFontSet font;
++#else
+     XFontStruct *font;
++#endif
+     Dimension width, height;
+ 
+     Widget text = PRIVATE(new,text_widget) =
+@@ -145,12 +149,20 @@
+     }
+ 
+     XtVaGetValues(text,
++#ifdef CHIMERA_JP
++		  XtNfontSet, &font,
++#else
+ 		  XtNfont, &font,
++#endif
+ 		  XtNwidth, &width,
+ 		  XtNheight, &height,
+ 		  NULL);
+ 
++#ifdef CHIMERA_JP
++    PRIVATE(new,font_width) = FontWidth(font);
++#else
+     PRIVATE(new,font_width) = font->max_bounds.width;
++#endif
+ 
+     if (!new->core.width)
+     {
+--- src/Chimera.ad.orig	Thu May 22 10:20:36 1997
++++ src/Chimera.ad	Mon Feb 22 21:30:16 1999
+@@ -284,3 +284,6 @@
+ !*html.verticalScrollBarPos: 0
+ !*html.horizontalScrollBarPos: 0
+ !*html.autoSize:             True
++
++! Japanese resources
++*international:    True
diff --git a/japanese/chimera/pkg-comment b/japanese/chimera/pkg-comment
index 373e15adc880..ce05813fb5f2 100644
--- a/japanese/chimera/pkg-comment
+++ b/japanese/chimera/pkg-comment
@@ -1 +1 @@
-X/Athena World-Wide Web client + kanji patch
+X/Athena World-Wide Web client + Japanese patch
diff --git a/japanese/chimera/pkg-descr b/japanese/chimera/pkg-descr
index 705c87099473..bf64cc76d9c8 100644
--- a/japanese/chimera/pkg-descr
+++ b/japanese/chimera/pkg-descr
@@ -2,10 +2,4 @@ Chimera is a program which allows a user to access World-Wide Web servers
 and other information servers.  It presents the user with a point-and-click
 graphical interface using the X Window System and the Athena Widgets.
 
-This is version 1.65 with a kanji patch to display Japanese.  It
-understands JIS/EUC by default: if you want to see Shift-JIS, add
-"-xnllanguage ja_JP.SJIS" to the command line option.  Or you can use
-the X resource "xnlLanguage".
-
-- Satoshi
-(asami@cs.berkeley.edu)
+This is a Japanized version, which can display Japanese (JIS/EUC/SJIS).
diff --git a/japanese/chimera/pkg-plist b/japanese/chimera/pkg-plist
index e523b756ef2e..7585b79f8bce 100644
--- a/japanese/chimera/pkg-plist
+++ b/japanese/chimera/pkg-plist
@@ -1,13 +1,15 @@
 bin/chimera
-lib/cacheinfo
-lib/convert
-lib/help.html
-lib/home.html
-lib/mailcap
-lib/mime.types
-lib/protocol
-lib/chimera/Chimera
-lib/chimera/do3270
-lib/chimera/dotelnet
-lib/chimera/playaudio
-lib/chimera/pstopxm
+lib/X11/app-defaults/Chimera
+lib/X11/chimera/cacheinfo
+lib/X11/chimera/convert
+lib/X11/chimera/do3270
+lib/X11/chimera/dotelnet
+lib/X11/chimera/help.html
+lib/X11/chimera/home.html
+lib/X11/chimera/mailcap
+lib/X11/chimera/mailto.pl
+lib/X11/chimera/mime.types
+lib/X11/chimera/playaudio
+lib/X11/chimera/protocol
+lib/X11/chimera/pstopxm
+@dirrm lib/X11/chimera