From owner-FreeBSD-users-jp@jp.freebsd.org  Sat Apr  7 02:19:27 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id CAA19116;
	Sat, 7 Apr 2001 02:19:27 +0900 (JST)
	(envelope-from owner-FreeBSD-users-jp@jp.FreeBSD.org)
Received: from mail160.nifty.com (mail160.nifty.com [202.248.37.176])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id CAA19111
	for <FreeBSD-users-jp@jp.freebsd.org>; Sat, 7 Apr 2001 02:19:27 +0900 (JST)
	(envelope-from shun.morimura@nifty.com)
Received: from wakaba.morimura
	by mail160.nifty.com (8.9.3+3.2W/3.7W-10/13/99) with ESMTP id CAA23807
	for <FreeBSD-users-jp@jp.freebsd.org>; Sat, 7 Apr 2001 02:19:25 +0900
Message-Id: <200104061719.CAA23807@mail160.nifty.com>
Date: Sat, 07 Apr 2001 02:20:07 +0900
From: =?ISO-2022-JP?B?GyRCPzlCPBsoQiAbJEI9UxsoQg==?=
 <shun.morimura@nifty.com>
To: FreeBSD-users-jp@jp.freebsd.org
User-Agent: Wanderlust/1.1.1 (Purple Rain) SEMI/1.13.7 (Awazu) FLIM/1.13.2 (Kasanui) Emacs/20.7 (i386--freebsd) MULE/4.0 (HANANOEN)
MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu")
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: FreeBSD-users-jp 60635
Subject: [FreeBSD-users-jp 60635] Xplore patch for FreeBSD
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org
X-Originator: shun.morimura@nifty.com

$B?9B<$H?=$7$^$9!#(B

Microsoft Windows$B$N%(%/%9%W%m!<%i%i%$%/$J%U%!%$%k%^%M!<%8%c$G$"$k(BXplore$B$r(B
FreeBSD(98)4.1R$B>e$G%3%s%Q%$%k$9$k$3$H$K@.8y$7$^$7$?$N$GJs9p$7$^$9!#(B

$B$H$$$C$F$b(BOpenBSD$BMQ$N%Q%C%A$r$[$\$=$N$^$^N.MQ$7$?$@$1$G$9$,!#(B

Xplore$B$K$D$$$F$N>\:Y$O2<$N(BWeb$B%Z!<%8$r$4Mw$/$@$5$$!#(B
    http://www.musikwissenschaft.uni-mainz.de/~ag/xplore

$B$A$J$_$K(BXplore$B$O(BXpm, Motif 2.x$B%i%$%V%i%j$rI,MW$H$7$^$9!#(B

$B0J2<!"%Q%C%A$G$9!#(B
$B%Q%C%A$NE,MQJ}K!$d%3%s%Q%$%kJ}K!$O(BWeb$B$G$43NG'$/$@$5$$!#(B
$B;d$K$O$^$@(Bports$B$r:n$kG=NO$,$"$j$^$;$s$N$G!"$4MF<O$r!#(B

??? Imakefile$B$KBP$9$k%Q%C%A(B(2$B%v=j(B)$B$,$J$<$+I,MW$G$9!#(B???
??? $B$3$l$K$D$$$F$*J,$+$j$NJ}$O$<$R$465<($/$@$5$$!#(B  ???

diff -ur xplore-1.0d/Imakefile xplore-1.0d-freebsd/Imakefile
--- xplore-1.0d/Imakefile	Fri Jan 12 22:56:45 2001
+++ xplore-1.0d-freebsd/Imakefile	Sat Apr  7 00:33:27 2001
@@ -18,7 +18,7 @@
 InstallSubdirs(scripts)
 
 Xplore.ad: Xplore.sed
-	sed -e 's?@XPLORELIBDIR@?$(XPLORELIBDIR)?g' <$< >$@
+	sed -e 's?@XPLORELIBDIR@?$(XPLORELIBDIR)?g' <Xplore.sed >$@
 
 shelf/Desk/Manpage: xplore.man
 	rman -f HTML $< | sed -e '1,3d' >$@
diff -ur xplore-1.0d/Xplore.tmpl xplore-1.0d-freebsd/Xplore.tmpl
--- xplore-1.0d/Xplore.tmpl	Sat Dec 23 19:23:17 2000
+++ xplore-1.0d-freebsd/Xplore.tmpl	Sat Apr  7 01:16:17 2001
@@ -13,8 +13,8 @@
 
 XCOMM  Set XMINCDIR and XMLIBDIR as required by your system if the Motif
 XCOMM  library is not on the standard path.
-XCOMM XMINCDIR = -I/usr/motif/include
-XCOMM XMLIBDIR = -L/usr/motif/lib
+XMINCDIR = -I/usr/X11R6/include/Xm
+XMLIBDIR = -L/usr/X11R6/lib
 
 XCOMM  How to link the Motif library:
 XMLIB = -lXm
@@ -22,8 +22,8 @@
 XCOMM  Set XPMINCDIR and XPMLIBDIR as required by your system if libXpm is not
 XCOMM  on the standard path.
 XCOMM  E.g.:
-XCOMM XPMINCDIR = -I/opt/X11/include
-XCOMM XPMLIBDIR = -L/opt/X11/lib
+XPMINCDIR = -I/usr/X11R6/include
+XPMLIBDIR = -L/usr/X11R6/lib
 
 XCOMM  How to link the XPM library
 XPMLIB = -lXpm
@@ -32,7 +32,7 @@
 
 XCOMM  Uncomment the following line if you want to compile xplore with gcc,
 XCOMM  but gcc is not the default compiler on your system.
-XCOMM #define USE_GCC
+#define USE_GCC
 
 #ifdef USE_GCC
 CC = gcc
@@ -93,7 +93,7 @@
 XCOMM SYSDEP		= -DCONVEXOS 
 XCOMM SYSDEP		= -DDYNIX 
 XCOMM SYSDEP		= -DHPUX -D_HPUX_SOURCE
-XCOMM SYSDEP		= -DFreeBSD 
+SYSDEP		= -DFreeBSD 
 XCOMM SYSDEP		= -DLINUX
 XCOMM SYSDEP		= -DOSF1 
 XCOMM SYSDEP		= -DSCO 
diff -ur xplore-1.0d/devmount.c xplore-1.0d-freebsd/devmount.c
--- xplore-1.0d/devmount.c	Sat Dec 23 19:23:17 2000
+++ xplore-1.0d-freebsd/devmount.c	Sat Apr  7 01:17:01 2001
@@ -146,7 +146,7 @@
     return ANY;
 }
 
-String devname(int d)
+String devname_(int d)
 {
     if (0 <= d && d < numdevs)
 	return devs[d].name;
diff -ur xplore-1.0d/devmount.h xplore-1.0d-freebsd/devmount.h
--- xplore-1.0d/devmount.h	Sat Dec 23 19:23:17 2000
+++ xplore-1.0d-freebsd/devmount.h	Sat Apr  7 01:17:18 2001
@@ -60,7 +60,7 @@
 /* return the number of the device matching name, ANY if not in the table;
    links are resolved */
 
-String devname(int d);
+String devname_(int d);
 String devlabel(int d);
 String devmount_action(int d);
 String devumount_action(int d);
diff -ur xplore-1.0d/dialogs.c xplore-1.0d-freebsd/dialogs.c
--- xplore-1.0d/dialogs.c	Fri Jan 12 23:42:27 2001
+++ xplore-1.0d-freebsd/dialogs.c	Sat Apr  7 01:17:34 2001
@@ -1009,7 +1009,7 @@
 
 static int umount_dlg1(IconPtr icon, int d)
 {
-  sprintf(s, UMOUNT_RETRY, devname(d));
+  sprintf(s, UMOUNT_RETRY, devname_(d));
   return msg_dlg("umount_dlg", icon, s, QUESTION,
 		 Ok|Ignore, Ok|Ignore,
 		 IGNORE);
diff -ur xplore-1.0d/lex.l xplore-1.0d-freebsd/lex.l
--- xplore-1.0d/lex.l	Sat Jan 13 00:49:36 2001
+++ xplore-1.0d-freebsd/lex.l	Sat Apr  7 01:18:42 2001
@@ -7,6 +7,7 @@
 
 static String str;
 static int strleng;
+int yylineno;
 
 int yywrap(void)
 {
diff -ur xplore-1.0d/parse.y xplore-1.0d-freebsd/parse.y
--- xplore-1.0d/parse.y	Sat Jan 13 00:57:22 2001
+++ xplore-1.0d-freebsd/parse.y	Sat Apr  7 01:19:17 2001
@@ -14,6 +14,7 @@
 #include "devmount.h"
 #include "util.h"
 
+extern int yylineno;
 int errline = 0;
 char errstr[1000];
 Boolean tmpflag = 0;
diff -ur xplore-1.0d/scripts/Imakefile xplore-1.0d-freebsd/scripts/Imakefile
--- xplore-1.0d/scripts/Imakefile	Fri Jan 12 09:52:32 2001
+++ xplore-1.0d-freebsd/scripts/Imakefile	Sat Apr  7 01:28:58 2001
@@ -7,7 +7,7 @@
 	$(RM) setup.script
 
 setup.script: setup.sed
-	sed -e 's?@XPLORELIBDIR@?$(XPLORELIBDIR)?g' <$< >$@
+	sed -e 's?@XPLORELIBDIR@?$(XPLORELIBDIR)?g' <setup.sed >$@
 	chmod 0777 $@
 
 InstallScript(setup,$(XPLORELIBDIR))
diff -ur xplore-1.0d/xg/src/TimeEntry.c xplore-1.0d-freebsd/xg/src/TimeEntry.c
--- xplore-1.0d/xg/src/TimeEntry.c	Sat Dec 23 19:23:17 2000
+++ xplore-1.0d-freebsd/xg/src/TimeEntry.c	Sat Apr  7 01:30:01 2001
@@ -1549,7 +1549,7 @@
 {
 struct tm	ts;
 long		time_value;
-extern long timezone;
+extern long tz;
 
 	ts.tm_mon = te->timeentry.month_value - 1;
 	ts.tm_mday = te->timeentry.day_value;
@@ -1574,7 +1574,7 @@
 	 */
 	if ( te->timeentry.use_timezone == False )
 	{
-		time_value -= timezone;
+		time_value -= tz;
 
 		/*
 		 * Adjust for Daylight Savings Time
diff -ur xplore-1.0d/xg/src/makefile xplore-1.0d-freebsd/xg/src/makefile
--- xplore-1.0d/xg/src/makefile	Sat Dec 23 19:23:17 2000
+++ xplore-1.0d-freebsd/xg/src/makefile	Sat Apr  7 01:30:44 2001
@@ -78,7 +78,7 @@
 $(LIBNAME) : $(TARGET)
 
 $(TARGET): $(OBJS)
-	ar $(ARFLAGS) $@ $?
+	ar $(ARFLAGS) $@ $(OBJS)
 	$(RANLIB) $@
 
 
diff -ur xplore-1.0d/xplore.h xplore-1.0d-freebsd/xplore.h
--- xplore-1.0d/xplore.h	Fri Jan 12 06:33:05 2001
+++ xplore-1.0d-freebsd/xplore.h	Sat Apr  7 01:27:00 2001
@@ -26,11 +26,11 @@
 #ifdef hpux
 #pragma alloca
 #else
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__FreeBSD__)
 #pragma alloca
 #else
 #include <alloca.h>
-#endif	/* __NetBSD__ */
+#endif	/* __NetBSD__ || __FreeBSD__ */
 #endif	/* hpux */
 #endif	/* _AIX */
 
@@ -64,7 +64,7 @@
 #ifdef USE_STATVFS
 #include <sys/statvfs.h>
 #else
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__FreeBSD__)
 #include <sys/param.h>
 #include <sys/mount.h>
 #else
@@ -73,7 +73,7 @@
 #else
 #include <sys/vfs.h>
 #endif	/* OSF1 */
-#endif	/* __NetBSD__ */
+#endif	/* __NetBSD__ || __FreeBSD__ */
 #endif	/* USE_STATVFS */
 
 #ifdef _AIX

-- 
 $B?9B<(B $B=S(B
 shun.morimura@nifty.com
