From owner-ports-jp@jp.freebsd.org  Wed Jan 10 07:54:56 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id HAA36518;
	Wed, 10 Jan 2001 07:54:56 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from st41.arena.ne.jp (st41.arena.ne.jp [210.150.208.2])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id HAA36513
	for <ports-jp@jp.freebsd.org>; Wed, 10 Jan 2001 07:54:56 +0900 (JST)
	(envelope-from issei@issei.org)
Received: (qmail 6007 invoked from network); 10 Jan 2001 07:54:55 +0900
Received: from unknown (HELO localhost) (210.228.192.90)
  by issei.org with SMTP; 10 Jan 2001 07:54:55 +0900
Date: Wed, 10 Jan 2001 07:55:20 +0900 (JST)
Message-Id: <20010110.075520.74596113.issei@issei.org>
To: ports-jp@jp.freebsd.org
From: Issei Suzuki <issei@issei.org>
X-Mailer: Mew version 1.95b94 on XEmacs 21.1.12 (Channel Islands)
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Wed_Jan_10_07:55:20_2001_475)--"
Content-Transfer-Encoding: 7bit
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 10607
Subject: [ports-jp 10607] Fix breakage by removal CIRCLEQ
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: issei@issei.org

----Next_Part(Wed_Jan_10_07:55:20_2001_475)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

CIRCLEQ $B$,:o=|$5$l$?1F6A$G(B ports/editors/nvi-m17n $B$b2u$l$F$k$N$G!"D>$7$?(B
$B$$$H;W$$$^$9!#(B


CIRCLEQ $B$N:o=|$KBP1~$9$kJ}K!$O!"Bg$-$/FsDL$j9M$($i$l$^$9!#(B

1. FreeBSD $BI8=`$N(B nvi $B$G$d$C$F$k$h$&$K(B queue.h $B$r<+A0$GMQ0U$7$F$7$^$$!"(B
   $B%7%9%F%`I8=`$N(B /usr/include/sys/queue.h $B$O8+$J$$$3$H$K$9$k!#(B

2. $B@h$K(B japanese/less $B$G$d$C$?$h$&$K!"(BCIRCLEQ $B$r;H$C$F$$$kItJ,$r(B TAILQ
   $B$G=q$-$J$*$9!#(B

1 $B$O(B nvi-m17n $B$G$O;H$($^$;$s!#(Bnvi-m17n $B$O(B <sys/event.h> $B$rFI$_$3$s$G$$$^(B
$B$9$,!"$3$l$,(B nvi $BIUB0$N(B sys/queue.h $B$K4^$^$l$F$$$J$$(B SLIST_* $B$r;H$C$F$$(B
$B$k$?$a$G$9!#(B

$B$+$H$$$C$F!"%=!<%9$,Bg$-$$$N$H!"%*%j%8%J%k$N(B nvi-m17n $B$HBg$-$/$+$1N%$l$k(B
$BJQ99$r9T$C$F$7$^$&$H!"8e!9%a%s%F%J%s%9$,LLE]$=$&$@$H$$$&$3$H$G(B 2 $B$NJ}K!(B
$B$b$H$j$?$/$J$$!#(B


$B$"$^$j$-$l$$$JJ}K!$G$O$"$j$^$;$s$,!"@^Co:v$r$H$C$F(B

   <sys/queue.h> $B$H(B CIRCLEQ $BDj5A$r4^$s$@(B nvi-m17n $BIUB0$N(B sys/queue.h $B$r(B
   $BN>J}FI$_$3$`(B

$B$h$&$K$7$h$&$H;W$$$^$9$,!"$I$&$G$7$g$&!)(B  ports-current $B$+$i$N:9J,$r$D$1(B
$B$F$*$-$^$9!#(B

Issei.-

----Next_Part(Wed_Jan_10_07:55:20_2001_475)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="nvi-m17n.diff"

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/nvi-m17n/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	2001/01/09 05:57:01	1.18
+++ Makefile	2001/01/09 22:27:07
@@ -29,10 +29,8 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 400000
-post-extract:
-	${RM} -f ${WRKSRC}/../include/sys/queue.h
-.endif
+post-patch:
+	${LN} -s /usr/include/sys/queue.h ${WRKSRC}/../include/sys/queue_dist.h
 
 post-install:
 	@${CP} ${WRKSRC}/../docs.m17n/README.english \
Index: files/patch-ac
===================================================================
RCS file: patch-ac
diff -N patch-ac
--- /dev/null	Wed Jan 10 07:27:28 2001
+++ patch-ac	Wed Jan 10 07:21:31 2001
@@ -0,0 +1,51 @@
+--- ../include/sys/queue.h.old	Wed Jan 10 07:16:01 2001
++++ ../include/sys/queue.h	Wed Jan 10 07:17:02 2001
+@@ -33,8 +33,10 @@
+  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
+  */
+ 
+-#ifndef	_SYS_QUEUE_H_
+-#define	_SYS_QUEUE_H_
++#ifndef	_SYS_QUEUE_HACK_H_
++#define	_SYS_QUEUE_HACK_H_
++
++#include <sys/queue_dist.h>
+ 
+ /*
+  * This file defines three types of data structures: lists, tail queues,
+@@ -65,6 +67,7 @@
+  * For details on the use of these macros, see the queue(3) manual page.
+  */
+ 
++#ifndef LIST_HEAD
+ /*
+  * List definitions.
+  */
+@@ -114,7 +117,9 @@
+ 		    (elm)->field.le_prev;				\
+ 	*(elm)->field.le_prev = (elm)->field.le_next;			\
+ }
++#endif /* LIST_HEAD */
+ 
++#ifndef TAILQ_HEAD
+ /*
+  * Tail queue definitions.
+  */
+@@ -180,7 +185,9 @@
+ 		(head)->tqh_last = (elm)->field.tqe_prev;		\
+ 	*(elm)->field.tqe_prev = (elm)->field.tqe_next;			\
+ }
++#endif /* TAILQ_HEAD */
+ 
++#ifndef CIRCLEQ_HEAD
+ /*
+  * Circular queue definitions.
+  */
+@@ -256,4 +263,6 @@
+ 		(elm)->field.cqe_prev->field.cqe_next =			\
+ 		    (elm)->field.cqe_next;				\
+ }
+-#endif	/* !_SYS_QUEUE_H_ */
++#endif /* CIRCLEQ_HEAD */
++
++#endif	/* !_SYS_QUEUE_HACK_H_ */

----Next_Part(Wed_Jan_10_07:55:20_2001_475)----
