From owner-ports-jp@jp.freebsd.org  Sat Oct 10 21:17:12 1998
Received: (from daemon@localhost)
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) id VAA16628;
	Sat, 10 Oct 1998 21:17:12 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from mail.da.airnet.ne.jp (mail.da.airnet.ne.jp [210.159.66.47])
	by jaz.jp.freebsd.org (8.9.1+3.1W/8.7.3) with ESMTP id VAA16622
	for <ports-jp@jp.freebsd.org>; Sat, 10 Oct 1998 21:17:10 +0900 (JST)
	(envelope-from mrt@da.airnet.ne.jp)
Received: from kotonoha.tom-yam.or.jp (tok145.airnet.ne.jp [210.159.88.145])
	by mail.da.airnet.ne.jp (8.8.8/3.6W/06/13/98-DA.AIRNET.NE.JP) with ESMTP id VAA67804
	for <ports-jp@jp.freebsd.org>; Sat, 10 Oct 1998 21:17:08 +0900
To: ports-jp@jp.freebsd.org
MIME-Version: 1.0 (generated by SEMI 1.9.0 - "Isurugi")
Content-Type: text/plain; charset=ISO-2022-JP
From: Murata Shuuichirou <mrt@da.airnet.ne.jp>
Date: 10 Oct 1998 21:18:00 +0900
Message-ID: <x7emsgsj9j.fsf@kotonoha.tom-yam.or.jp>
Lines: 297
User-Agent: Semi-gnus/6.8.19 SEMI/1.9.0 (Isurugi) Chao/1.11.1 (Kuramaguchi) MULE XEmacs/21.2 (Aether) (i386-unknown-freebsd3.0)
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+980914
X-Sequence: ports-jp 4785
Subject: [ports-jp 4785] Xtt broken?
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org

$B$($($H!"$J$K$+;d$N4*0c$$$+A`:n%_%9$G$"$l$P$h$$$N$G$9$,!#(B
# $B$"$k$3$*$k$,$O$$$C$F$$$k$N$G(B:-)

Sat Oct 10 20:58:06 JST 1998 $B$N;~E@$G!"(BXtt $B$N(B port $B$,2u$l$F$$$k(B
$B$h$&$J5$$,$7$^$9!#(B

$B6qBNE*$K$O(B XttXF86srv-common/patches/ $BG[2<$N(B patch-b? $B$H(B 
patch-z? $B$K!"$=$l$>$l(B($B$R$H$D$N%U%!%$%k$K(B)$BF1$8FbMF$,Fs2s$E$D$O$$$C(B
$B$F$$$F!"$=$N$;$$$G(B make patch $B$,DL$j$^$;$s!#(B

# patch-az $B$,6u$N%U%!%$%k$J$N$bFf$@(B

$B$b$7!"$[$s$H$&$K$=$&$J$C$F$$$k$N$J$i!"0J2<$N(B patch $B$r(B 
XttXF86srv-common/patches/ $B$GEv$F$F!"D>$7$A$c$C$F$/$@$5$$!#(B

# send-pr $B$b$9$Y$-$J$N$+$J(B?  $B$a$C$?$K$7$J$$$N$G!"$&$^$/$G$-$k$+(B
# $BIT0B$@!#(B

-- 
$B$`$i$?$7$e$&$$$A$m$&(B

--- patch-ba	1998/10/10 12:02:12	1.1
+++ patch-ba	1998/10/10 12:02:52
@@ -40,45 +40,3 @@
  
  /*
   * SharedLibraryDataTarget - generate rules to create shlib data file;
---- config/cf/bsdLib.rules.orig	Sun May 11 00:04:04 1997
-+++ config/cf/bsdLib.rules	Sun Sep 20 15:58:36 1998
-@@ -177,13 +177,10 @@
- #define InstallSharedLibrary(libname,rev,dest)				@@\
- install:: Concat(lib,libname.so.rev) 					@@\
- 	MakeDir($(DESTDIR)dest)						@@\
--	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
--	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\
--		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
--	(T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\.so.*$$/.so/'`;\
--		$(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T)	@@\
--	$(RM) Concat($(DESTDIR)dest/lib,libname.so)			@@\
--	$(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)
-+	(T=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`;\	@@\
-+	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest/$$T;\ @@\
-+	$(RM) Concat($(DESTDIR)dest/lib,libname.so);\			@@\
-+	$(LN) $$T Concat($(DESTDIR)dest/lib,libname.so))
- #endif /* InstallSharedLibrary */
- 
- /*
-@@ -227,6 +224,21 @@
- 	$(RM) Concat(lib,libname.so.rev)
- 
- #endif /* SharedLibraryTarget */
-+
-+#ifndef SharedDepModuleTarget
-+#define SharedDepModuleTarget(name,deps,solist)				@@\
-+AllTarget(name)								@@\
-+									@@\
-+name: deps								@@\
-+	$(RM) $@~							@@\
-+	$(CC) -o $@~ $(SHLIBLDFLAGS) solist -Wl,-soname,name $(REQUIREDLIBS)		@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+									@@\
-+clean::									@@\
-+	$(RM) name
-+
-+#endif /* SharedDepModuleTarget */
- 
- /*
-  * SharedLibraryDataTarget - generate rules to create shlib data file;
--- patch-bb	1998/10/10 12:02:12	1.1
+++ patch-bb	1998/10/10 12:03:04
@@ -77,82 +77,3 @@
  #endif
  
  #include <bsdLib.rules>
---- config/cf/FreeBSD.cf.orig	Mon Sep 21 18:23:34 1998
-+++ config/cf/FreeBSD.cf	Tue Sep 22 17:16:30 1998
-@@ -1,8 +1,14 @@
- XCOMM platform:  $TOG: FreeBSD.cf /main/18 1997/06/12 07:40:35 kaleb $
- XCOMM platform:  $XFree86: xc/config/cf/FreeBSD.cf,v 3.58.2.12 1998/04/29 04:18:26 dawes Exp $
- 
-+#if UseElfFormat
-+# define OSBinaryFormat		[ELF]
-+#else
-+# define OSBinaryFormat		/**/
-+#endif
-+
- #ifndef OSName
--#define OSName			DefaultOSName
-+#define OSName			DefaultOSName OSBinaryFormat
- #endif
- #ifndef OSVendor
- #define OSVendor		/**/
-@@ -116,9 +122,21 @@
-  */
- #if OSMajorVersion > 2 || (OsMajorVersion == 2 && OSMinorVersion >= 2)
- #ifndef ExtraLoadFlags
-+#if UseElfFormat
-+#define ExtraLoadFlags		-Wl,-rpath,$(USRLIBDIRPATH)
-+#else
- #define ExtraLoadFlags		-Wl,-R,$(USRLIBDIRPATH)
- #endif
- #endif
-+#endif
-+
-+#ifndef SharedLibraryLoadFlags
-+#if UseElfFormat
-+#define SharedLibraryLoadFlags	-shared -rpath $(USRLIBDIRPATH)
-+#else
-+#define SharedLibraryLoadFlags	-Bshareable -R $(USRLIBDIRPATH)
-+#endif
-+#endif
- 
- #ifndef GnuMallocLibrary
- #define GnuMallocLibrary	-lgnumalloc
-@@ -221,11 +239,18 @@
- #undef  InstallCmd
- #define InstallCmd		/usr/bin/install
- 
-+#if UseElfFormat
-+# define AsmElfDefines		-D__ELF__
-+#else
-+# define AsmElfDefines		/**/
-+#endif
-+
- #if GccUsesGas
- # define GccGasOption 		-DGCCUSESGAS
--# define AsmDefines		-DUSE_GAS
-+# define AsmDefines		-DUSE_GAS AsmElfDefines
- #else
- # define GccGasOption /**/
-+# define AsmDefines		AsmElfDefines
- #endif
- 
- #define ServerExtraDefines GccGasOption XFree86ServerDefines
-@@ -360,6 +385,18 @@
- 
- #ifndef StaticLibrary
- #define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-+#endif
-+
-+#if UseElfFormat
-+#define DlLibrary		-rdynamic
-+#else
-+#define DlLibrary		/**/
-+#endif
-+
-+#if BuildDynamicLoading
-+#define ServerExtraSysLibs	DlLibrary
-+#else
-+#define ServerExtraSysLibs	/**/
- #endif
- 
- #include <bsdLib.rules>
--- patch-bc	1998/10/10 12:02:12	1.1
+++ patch-bc	1998/10/10 12:03:13
@@ -9,14 +9,3 @@
  #define GLNAME(a)       a
  #else
  #define GLNAME(a)       CONCAT(_,a)
---- programs/Xserver/hw/xfree86/os-support/assyntax.h.orig	Sun Sep 20 14:32:43 1998
-+++ programs/Xserver/hw/xfree86/os-support/assyntax.h	Sun Sep 20 14:29:44 1998
-@@ -212,7 +212,7 @@
- #endif /* ACK_ASSEMBLER */
- 
- 
--#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || (defined(linux) || defined(__OS2ELF__)) && defined(__ELF__)
-+#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__)
- #define GLNAME(a)       a
- #else
- #define GLNAME(a)       CONCAT(_,a)
--- patch-bd	1998/10/10 12:02:12	1.1
+++ patch-bd	1998/10/10 12:03:20
@@ -9,14 +9,3 @@
  	__asm__(
  		"movl $0,%%ecx\n"
  		"movb %%al,%%cl\n"
---- programs/Xserver/hw/xfree86/xaa/xf86expblt.c.orig	Sun Sep 20 14:38:00 1998
-+++ programs/Xserver/hw/xfree86/xaa/xf86expblt.c	Sun Sep 20 14:38:18 1998
-@@ -83,7 +83,7 @@
- 
- #if defined(__GNUC__) && defined(__i386__)
- static __inline__ unsigned int reverse_bitorder(data) {
--#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || (defined(linux) || defined (__OS2ELF__)) && defined(__ELF__)
-+#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__)
- 	__asm__(
- 		"movl $0,%%ecx\n"
- 		"movb %%al,%%cl\n"
--- patch-be	1998/10/10 12:02:12	1.1
+++ patch-be	1998/10/10 12:03:33
@@ -9,14 +9,3 @@
  	__asm__(
  		"movl $0,%%ecx\n"
  		"movb %%al,%%cl\n"
---- programs/Xserver/hw/xfree86/vga256/drivers/s3_svga/s3accel.c.orig	Mon Mar  2 05:56:24 1998
-+++ programs/Xserver/hw/xfree86/vga256/drivers/s3_svga/s3accel.c	Sun Sep 20 15:24:49 1998
-@@ -798,7 +798,7 @@
- 
- #if defined(__GNUC__) && defined(__i386__)
- static __inline__ CARD32 reverse_bitorder(CARD32 data) {
--#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || (defined(linux) || defined (__OS2ELF__)) && defined(__ELF__)
-+#if defined(Lynx) || (defined(SYSV) || defined(SVR4)) && !defined(ACK_ASSEMBLER) || defined(__ELF__)
- 	__asm__(
- 		"movl $0,%%ecx\n"
- 		"movb %%al,%%cl\n"
--- patch-bf	1998/10/10 12:02:12	1.1
+++ patch-bf	1998/10/10 12:03:40
@@ -9,14 +9,3 @@
  #define PREPEND_UNDERSCORE
  #endif
  
---- programs/Xserver/hw/xfree86/common/xf86Dl.c.orig	Tue Sep 22 17:19:38 1998
-+++ programs/Xserver/hw/xfree86/common/xf86Dl.c	Tue Sep 22 17:18:19 1998
-@@ -35,7 +35,7 @@
- #include "xf86_Config.h"
- #include "xf86Priv.h"
- 
--#ifdef CSRG_BASED
-+#if defined(CSRG_BASED) && !defined(__ELF__)
- #define PREPEND_UNDERSCORE
- #endif
- 
--- patch-zb	1998/10/10 12:02:12	1.1
+++ patch-zb	1998/10/10 12:03:49
@@ -34,39 +34,3 @@
  #ifndef SharedDepModuleTarget
  #define SharedDepModuleTarget(name,deps,solist)				@@\
  AllTarget(name)								@@\
---- config/cf/bsdLib.rules.ORIG	Mon Sep 28 14:52:02 1998
-+++ config/cf/bsdLib.rules	Mon Sep 28 15:16:27 1998
-@@ -244,6 +244,33 @@
- 
- #endif /* SharedLibraryTarget */
- 
-+/* 
-+ * SharedDepLibraryTarget - generate rules to create a shared library.
-+ * add by 
-+ */
-+#ifndef SharedDepLibraryTarget
-+#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
-+AllTarget(Concat(lib,libname.so.rev))					@@\
-+									@@\
-+Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
-+	$(RM) $@~							@@\
-+	SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; \			@@\
-+		(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) -soname $$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-+		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
-+		LinkBuildSonameLibrary($$SONAME)			@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+	$(RM) Concat(lib,libname.so)					@@\
-+	$(LN) $@ Concat(lib,libname.so)					@@\
-+	LinkBuildLibrary($@)						@@\
-+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-+									@@\
-+clean::									@@\
-+	$(RM) Concat(lib,libname.so.rev)
-+
-+#endif /* SharedDepLibraryTarget */
-+
-+
- #ifndef SharedDepModuleTarget
- #define SharedDepModuleTarget(name,deps,solist)				@@\
- AllTarget(name)								@@\
--- patch-zc	1998/10/10 12:02:12	1.1
+++ patch-zc	1998/10/10 12:04:01
@@ -9,14 +9,3 @@
  #define PREPEND_UNDERSCORE
  #endif
  
---- lib/font/FreeType/ftcconv.c.ORIG	Sun Sep 27 10:39:21 1998
-+++ lib/font/FreeType/ftcconv.c	Sun Sep 27 10:40:26 1998
-@@ -85,7 +85,7 @@
- 
- #include "ftcconv.h"
- 
--#ifdef CSRG_BASED
-+#if defined(CSRG_BASED) && !defined(__ELF__)
- #define PREPEND_UNDERSCORE
- #endif
- 
--- patch-za	1998/10/10 12:11:54	1.1
+++ patch-za	1998/10/10 12:12:08
@@ -8,13 +8,3 @@
  	imake  -I$(IRULESRC) $(IMAKE_DEFINES) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -DUseInstalled
  	$(MAKE) $(MFLAGS) Makefiles
  	$(MAKE) $(MFLAGS) clean
---- Makefile.ORIG	Fri Aug  7 11:45:14 1998
-+++ Makefile	Fri Aug  7 11:45:26 1998
-@@ -206,6 +206,7 @@
- 	@echo "#define IncludeFlags -I`pwd`/exports/include"\
- 		>> $(IRULESRC)/host.def
- 	@echo "#define BuildXfsOnly YES" >> $(IRULESRC)/host.def
-+	@cat $(IRULESRC)/host.def.xfs >> $(IRULESRC)/host.def
- 	imake  -I$(IRULESRC) $(IMAKE_DEFINES) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -DUseInstalled
- 	$(MAKE) $(MFLAGS) Makefiles
- 	$(MAKE) $(MFLAGS) clean
