From owner-ports-jp@jp.freebsd.org  Tue Oct  3 13:18:04 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id NAA37577;
	Tue, 3 Oct 2000 13:18:04 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from tohokugw.tohoku.iij.ad.jp (firewall-user@tohokugw.tohoku.iij.ad.jp [202.232.14.98])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id NAA37571
	for <ports-jp@jp.freebsd.org>; Tue, 3 Oct 2000 13:18:03 +0900 (JST)
	(envelope-from taguchi@tohoku.iij.ad.jp)
From: taguchi@tohoku.iij.ad.jp
Received: by tohokugw.tohoku.iij.ad.jp; id NAA00160; Tue, 3 Oct 2000 13:18:03 +0900 (JST)
Received: from hirose.tohoku.iij.ad.jp(192.168.144.2) by tohokugw.tohoku.iij.ad.jp via smap (V4.2)
	id xma000156; Tue, 3 Oct 00 13:17:24 +0900
Received: from hirose.tohoku.iij.ad.jp (localhost [127.0.0.1])
	by hirose.tohoku.iij.ad.jp (8.9.3/3.7W99113014) with ESMTP id NAA22830;
	Tue, 3 Oct 2000 13:17:24 +0900 (JST)
Date: Tue, 03 Oct 2000 13:17:23 +0900
Message-ID: <x5n1gm1ru4.wl@hirose.tohoku.iij.ad.jp>
To: asami@FreeBSD.org
Cc: ports-jp@jp.freebsd.org
In-Reply-To: In your message of "Fri, 29 Sep 2000 13:20:48 +0900"
	<x5u2az6d7j.wl@hirose.tohoku.iij.ad.jp>
References: <200009281344.e8SDiSp80500@silvia.hip.berkeley.edu>
	<x5u2az6d7j.wl@hirose.tohoku.iij.ad.jp>
User-Agent: Wanderlust/2.2.12 (Joyride) EMIKO/1.13.9 (Euglena tripteris) FLIM/1.13.2 (Kasanui) Emacs/20.6 (i386--freebsd) MULE/4.0 (HANANOEN)
MIME-Version: 1.0 (generated by EMIKO 1.13.9 - "Euglena tripteris")
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 10194
Subject: [ports-jp 10194] Re: XFree86-4-Server failure on 3-stable
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: taguchi@tohoku.iij.ad.jp

$BED8}$G$9!#$A$g$C$H;~4V$,3]$+$C$F$7$^$$$^$7$?!#(B

> >   http://onigiri.FreeBSD.org/errorlogs/errorlogs/e.3.20000926/XFree86-Server-4.0.1.log
         .....
> > make: don't know how to make install. Stop
> > *** Error code 2
> 
> DRI$B7O$NLdBj$K(B10$B%+%N%C%5!#$A$HD4$Y$F8+$^$9!#(B

$B$G$7$?!#(B

x11/XFree86-4-libraries $B$H(B x11-servers/XFree86-4-Server $B$K!"$=$l$>$l(B
$B0J2<$N(B patch $B$rEv$F$k$HD>$k!"$H!";W$$$^$9!#(B

BEGIN>---8<CUT HERE>8---
--- XFree86-4-libraries/patches/patch-z02.orig	Tue Oct  3 10:57:28 2000
+++ XFree86-4-libraries/patches/patch-z02	Tue Oct  3 11:47:28 2000
@@ -1,5 +1,5 @@
 --- Imakefile.orig	Thu Jun 15 04:36:13 2000
-+++ Imakefile	Fri Aug 18 14:40:02 2000
++++ Imakefile	Tue Oct  3 10:54:56 2000
 @@ -18,8 +18,26 @@
  #endif
  #endif
@@ -27,7 +27,7 @@
    LNINSTALLDIRS = lib
  
  #if HasParallelMake
-@@ -206,3 +224,97 @@
+@@ -206,3 +224,101 @@
  #undef BootstrapCleanSubdirs
  #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)"
  BOOTSTRAPSUBDIRS = imake makedepend
@@ -41,7 +41,11 @@
 +FreeBSDPortsInstallDir = lib programs programs programs/Xserver/hw/xfree86/xf86cfg
 +#else
 +#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv
++#if defined(BuildXF86DRI) && BuildXF86DRI
 +FreeBSDPortsInstallDir = programs lib/font lib/GL/mesa/src/drv
++#else
++FreeBSDPortsInstallDir = programs lib/font
++#endif
 +#else
 +#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs
 +FreeBSDPortsInstallDir = programs/xfs

END>---8<CUT HERE>8---

BEGIN>---8<CUT HERE>8---
--- XFree86-4-Server/Makefile.orig	Tue Oct  3 13:00:37 2000
+++ XFree86-4-Server/Makefile	Tue Oct  3 13:07:32 2000
@@ -91,6 +91,14 @@
 # Set following as NO. or type make ExtendefInputDevices=NO
 ExtendedInputDevices?=	YES
 
+# FreeBSD 3.x and 4.0 do NOT support XFree86 DRI
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 410000
+PLIST_SUB+=     XF86DRI:="@comment "
+.else
+PLIST_SUB+=     XF86DRI:=""
+.endif
+
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 pre-everything:
 	${SH} ${PKGDIR}/INSTALL
@@ -99,4 +107,4 @@
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- XFree86-4-Server/pkg/PLIST.orig	Tue Oct  3 13:00:52 2000
+++ XFree86-4-Server/pkg/PLIST	Tue Oct  3 13:10:20 2000
@@ -74,10 +74,10 @@
 lib/modules/codeconv/libMULEENCODING.a
 lib/modules/codeconv/libTCVN.a
 lib/modules/codeconv/libVISCII.a
-lib/modules/dri/gamma_dri.so
-lib/modules/dri/i810_dri.so
-lib/modules/dri/mga_dri.so
-lib/modules/dri/r128_dri.so
+%%XF86DRI:%%lib/modules/dri/gamma_dri.so
+%%XF86DRI:%%lib/modules/dri/i810_dri.so
+%%XF86DRI:%%lib/modules/dri/mga_dri.so
+%%XF86DRI:%%lib/modules/dri/r128_dri.so
 lib/modules/drivers/apm_drv.o
 lib/modules/drivers/ati_drv.o
 lib/modules/drivers/chips_drv.o
@@ -88,7 +88,7 @@
 lib/modules/drivers/fbdev_drv.o
 lib/modules/drivers/glint_drv.o
 lib/modules/drivers/i740_drv.o
-lib/modules/drivers/i810_drv.o
+%%XF86DRI:%%lib/modules/drivers/i810_drv.o
 lib/modules/drivers/mga_drv.o
 lib/modules/drivers/neomagic_drv.o
 lib/modules/drivers/nv_drv.o
@@ -103,7 +103,7 @@
 lib/modules/drivers/vga_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
-lib/modules/extensions/libdri.a
+%%XF86DRI:%%lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
 lib/modules/extensions/libpex5.a
@@ -114,7 +114,7 @@
 lib/modules/fonts/libspeedo.a
 lib/modules/fonts/libtype1.a
 lib/modules/fonts/libxtt.a
-lib/modules/freebsd/libdrm.a
+%%XF86DRI:%%lib/modules/freebsd/libdrm.a
 lib/modules/input/dynapro_drv.o
 lib/modules/input/elo2300_drv.o
 lib/modules/input/elographics_drv.o
END>---8<CUT HERE>8---
