From owner-ports-jp@jp.freebsd.org  Fri Feb 27 09:59:37 1998
Received: by jaz.jp.freebsd.org (8.8.8+3.0Wbeta7/8.7.3) id JAA01655
	Fri, 27 Feb 1998 09:59:37 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.8+3.0Wbeta7/8.7.3) with ESMTP id JAA01650
	for <ports-jp@jp.freebsd.org>; Fri, 27 Feb 1998 09:59:36 +0900 (JST)
Received: from cal.infonets.hiroshima-u.ac.jp (cal.infonets.hiroshima-u.ac.jp [133.41.33.61]) by diana.infonets.hiroshima-u.ac.jp (8.8.5/3.5Wpl5) with ESMTP id JAA10246 for <ports-jp@jp.freebsd.org>; Fri, 27 Feb 1998 09:59:35 +0900 (JST)
Received: from localhost (localhost [127.0.0.1]) by cal.infonets.hiroshima-u.ac.jp (8.8.7/3.5Wpl5) with ESMTP id JAA02444 for <ports-jp@jp.freebsd.org>; Fri, 27 Feb 1998 09:59:34 +0900 (JST)
To: ports-jp@jp.freebsd.org
From: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
In-Reply-To: Your message of "Mon, 23 Feb 1998 15:47:48 +0900"
	<19980223154748N.taoka@infonets.hiroshima-u.ac.jp>
References: <19980223154748N.taoka@infonets.hiroshima-u.ac.jp>
X-Mailer: Mew version 1.92 on XEmacs 20.3 (Vatican City)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Message-Id: <19980227095932M.taoka@infonets.hiroshima-u.ac.jp>
Date: Fri, 27 Feb 1998 09:59:32 +0900
X-Dispatcher: imput version 971024
Lines: 125
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=24]
X-Sequence: ports-jp 2885
Subject: [ports-jp 2885] Update for mule (Re: mule on -current)
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org


$BED2,$G$9!#(B

mule$B$N(Bfix$B$G$9!#(B

From: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
Subject: [ports-jp 2820] Re: mule on -current 
Date: Mon, 23 Feb 1998 15:47:48 +0900
Message-ID: <19980223154748N.taoka@infonets.hiroshima-u.ac.jp>

> $B7k6I!"(Bmule$B4XO"$G$O!"(B
> 
> site-start.el$B$NLdBj$N(Bfix
> 
> /usr/X11R6/info$B$,8+$($k$h$&$K$9$k!#(B
> 
> -current$B$NLdBj$N(Bfix
> 
> $B$r$7$^$9!#$h$m$7$$$G$9$+!)(B

$BE:IU$7$?%Q%C%A$G$I$&$G$7$g$&!#(B

> site-start.el$B$NLdBj$N(Bfix
> 

$BBg66!w6e9)Bg$5$s$N$b$N$rF~$l$?!#0l1~!"(B

make install
export FORCE_PKG_REGISTER=yes
make reinstall

$B$G3N$+$a$^$7$?!#(B

> -current$B$NLdBj$N(Bfix
> 

$B:#Ln$5$s$N(Bpatch$B$rF~$l$?!#$?$@!"$3$NLdBj$K$D$$$F!"(BDESCR$B$KF~$l$?J}$,NI$$$+(B
$B$bCN$l$^$;$s$,!"$b$&4{$K(B30$B9T$/$i$$$K$J$C$F$$$k$N$G!"F~$l$F$^$;$s!#(B
# $BK\Ev$O!";d$NBUK}$G$9!#(B:-)

 $BED2,(B $BCR;V(B    $B9-EgBg3X9)3XItBhFsN`2sO)%7%9%F%`9)3X(B
             taoka@infonets.hiroshima-u.ac.jp


diff -aruN /usr/ports/editors/mule/Makefile mule/Makefile
--- /usr/ports/editors/mule/Makefile	Thu Sep 11 00:01:25 1997
+++ mule/Makefile	Fri Feb 27 09:31:06 1998
@@ -84,6 +84,15 @@
 	find ${WRKSRC} \( -name \*.orig -o -name \*~ \) -exec ${RM} -f \{} \;
 	${RM} -f ${WRKSRC}/etc/DOC* ${WRKSRC}/src/emacs ${WRKSRC}/src/emacs-19.28.*
 
+# If site-start.el exists, you should run below when you install by
+# this port
+pre-install:
+	@if [ -f ${SITE_START} ]; then \
+		${MV} ${SITE_START} ${SITE_START}.orig ; \
+		${SED} -e '/;; BEGIN mule-family/,/;; END mule-family/d' \
+			${SITE_START}.orig > ${SITE_START}; \
+	fi
+
 post-install:
 # note that any2ps is a script
 .for file in b2m coco ctags emacsclient etags m2ps mule-19.28
@@ -112,4 +121,3 @@
 	@${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 
 .include <bsd.port.mk>
-
diff -aruN /usr/ports/editors/mule-common/files/site-start.el.tmpl mule-common/files/site-start.el.tmpl
--- /usr/ports/editors/mule-common/files/site-start.el.tmpl	Wed Sep 10 17:49:47 1997
+++ mule-common/files/site-start.el.tmpl	Fri Feb 27 09:30:27 1998
@@ -1,3 +1,5 @@
+;; BEGIN mule-family
+;;
 ;; Chinese
 ;;(load "its/erpin")
 ;;(load "its/zhuyin")
@@ -34,4 +36,7 @@
 (setq Info-default-directory-list
       (append (list
 	       "/usr/share/info"
+	       "/usr/X11R6/info"
 	       ) Info-default-directory-list)) 
+
+;; END mule-family
diff -aruN /usr/ports/editors/mule-common/patches/patch-ac mule-common/patches/patch-ac
--- /usr/ports/editors/mule-common/patches/patch-ac	Wed Sep 10 17:49:48 1997
+++ mule-common/patches/patch-ac	Mon Feb 16 17:46:25 1998
@@ -1,5 +1,5 @@
 --- ../mule-2.3.org/src/s/freebsd.h.org	Fri Nov  4 03:11:17 1994
-+++ ./src/s/freebsd.h	Wed Aug  9 02:29:56 1995
++++ ./src/s/freebsd.h	Mon Feb 16 17:29:31 1998
 @@ -31,10 +31,10 @@
  
  #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
@@ -13,12 +13,13 @@
  
  /* Reread the time zone on startup. */
  #define LOCALTIME_CACHE
-@@ -81,6 +81,8 @@
+@@ -81,6 +81,9 @@
  #define BSD 199103
  #elif __FreeBSD__ == 2
  #define BSD 199306
 +#elif __FreeBSD__ == 3
 +#define BSD 199506
++#define	FREEBSD_NEW_LDSO
  #endif
  
  #define WAITTYPE int
diff -aruN /usr/ports/editors/mule-common/patches/patch-al mule-common/patches/patch-al
--- /usr/ports/editors/mule-common/patches/patch-al	Thu Jan  1 09:00:00 1970
+++ mule-common/patches/patch-al	Mon Feb 16 17:48:28 1998
@@ -0,0 +1,11 @@
+--- ../mule-2.3.org/src/buffer.h.org	Fri Jun  9 17:31:18 1995
++++ ./src/buffer.h	Mon Feb 16 17:39:50 1998
+@@ -451,7 +451,7 @@
+ 
+ /* Allocation of buffer text.  */
+ 
+-#ifdef REL_ALLOC
++#if defined(REL_ALLOC) && !defined(FREEBSD_NEW_LDSO)
+ #define BUFFER_ALLOC(data,size) ((unsigned char *) r_alloc (&data, (size)))
+ #define BUFFER_REALLOC(data,size) ((unsigned char *) r_re_alloc (&data, (size)))
+ #define BUFFER_FREE(data) (r_alloc_free (&data))
