From owner-ports-jp@jp.freebsd.org  Wed Sep  6 16:21:57 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id QAA83047;
	Wed, 6 Sep 2000 16:21:57 +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 QAA83041
	for <ports-jp@jp.freebsd.org>; Wed, 6 Sep 2000 16:21:56 +0900 (JST)
	(envelope-from taguchi@tohoku.iij.ad.jp)
From: taguchi@tohoku.iij.ad.jp
Received: by tohokugw.tohoku.iij.ad.jp; id QAA15264; Wed, 6 Sep 2000 16:21:56 +0900 (JST)
Received: from hirose.tohoku.iij.ad.jp(192.168.144.2) by tohokugw.tohoku.iij.ad.jp via smap (V4.2)
	id xma015259; Wed, 6 Sep 00 16:21:54 +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 QAA28477;
	Wed, 6 Sep 2000 16:22:57 +0900 (JST)
Date: Wed, 06 Sep 2000 16:22:56 +0900
Message-ID: <x5aedmrnlb.wl@hirose.tohoku.iij.ad.jp>
To: asami@FreeBSD.org
Cc: ports-jp@jp.freebsd.org
In-Reply-To: In your message of "05 Sep 2000 23:02:15 -0700"
	<vqcvgwaf47s.fsf@bubble.hip.berkeley.edu>
References: <200009051913.e85JDjb79019@silvia.hip.berkeley.edu>
	<x5hf7us0ce.wl@hirose.tohoku.iij.ad.jp>
	<taguchi@tohoku.iij.ad.jp>
	<vqcitsaw09f.fsf@bubble.hip.berkeley.edu>
	<x5bsy2rrxw.wl@hirose.tohoku.iij.ad.jp>
	<vqcvgwaf47s.fsf@bubble.hip.berkeley.edu>
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 9977
Subject: [ports-jp 9977] Re: CFLAGS in imake-4 and libraries
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!#(B

$B$4$a$s$J$5$$!"B?J,$"$5$_$5$s$,:n$i$l$?$b$N!"$K2C$(!":n$j$J$,$i5$$,$D$$$?(B
$B0J2<$N=$@5$r4^$a$F$^$9!#(B

  $B!&(Bx11-servers/XFree86-4-Server $B$G(B $B%5%]!<%H$9$k%+!<%I$rDj5A$9$kDj?t$,(B
    redefined $B$@$HJ86g$r8@$o$l$kLdBj$N=$@5(B
    --- $B0JA0!"5$$,$D$$$FD>$7$?$D$b$j$G$7$?$,!"D>$C$F$J$+$C$?!)(B
  $B!&(Bi386$B%"!<%-%F%/%A%c0J30$N?M$X$NBP1~(B

$B!t(B $B$&$&!"<B$O$^$@$^$@!"=$@5$;$M$P$J$i$J$$LdBj$O$"$k$G$9!#(B

${PORTSDIR} $B2<(B $B$G(B patch -p1 $B$G3]$1$F$d$C$F$/$@$5$$(B_o_

BEGIN>---8<CUT HERE>8---
diff -urN /usr/ports/devel/imake-4/patches/patch-c ./devel/imake-4/patches/patch-c
--- /usr/ports/devel/imake-4/patches/patch-c	Mon Aug 28 09:05:43 2000
+++ ./devel/imake-4/patches/patch-c	Wed Sep  6 14:52:45 2000
@@ -1,5 +1,5 @@
 --- cf/Imake.tmpl.orig	Tue Jun 27 09:55:44 2000
-+++ cf/Imake.tmpl	Sun Jul 16 18:19:54 2000
++++ cf/Imake.tmpl	Wed Sep  6 13:31:04 2000
 @@ -1385,7 +1385,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
@@ -9,11 +9,12 @@
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
-@@ -1574,7 +1574,7 @@
+@@ -1574,7 +1574,8 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
         ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
 -           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++          SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
 +           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
          LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
           LDPRELIB = LdPreLib
diff -urN /usr/ports/devel/imake-4/patches/patch-i ./devel/imake-4/patches/patch-i
--- /usr/ports/devel/imake-4/patches/patch-i	Thu Jan  1 09:00:00 1970
+++ ./devel/imake-4/patches/patch-i	Wed Sep  6 14:52:57 2000
@@ -0,0 +1,11 @@
+--- cf/Library.tmpl~	Wed Oct 13 13:20:41 1999
++++ cf/Library.tmpl	Wed Sep  6 13:32:03 2000
+@@ -67,7 +67,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+-     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++     CFLAGS = $(SYSCFLAGS) $(CLIBDEBUGFLAGS)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+    PICFLAGS = LargePositionIndependentCFlags
+ # endif
diff -urN /usr/ports/devel/imake-4/scripts/configure ./devel/imake-4/scripts/configure
--- /usr/ports/devel/imake-4/scripts/configure	Wed May 31 10:52:17 2000
+++ ./devel/imake-4/scripts/configure	Wed Sep  6 15:03:14 2000
@@ -26,11 +26,23 @@
 fi
 
 cat >> $F <<EOF
+#ifndef XF86CardDrivers
+#if i386Architecture
 #define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
                                 neomagic i740 tdfx \
                                 cirrus tseng trident chips apm \
                                 GlideDriver fbdev \
-                                ati r128 vga XF86ExtraCardDrivers
+                                ati r128 AgpGartDrivers cyrix \
+				vga XF86OSCardDrivers XF86ExtraCardDrivers
+#else
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx \
+                                cirrus tseng trident chips apm \
+                                GlideDriver fbdev \
+                                ati r128 cyrix \
+				vga XF86OSCardDrivers XF86ExtraCardDrivers
+#endif
+#endif
 EOF
 echo "#define XInputDrivers mouse dynapro elo2300 elographics magellan \
 	microtouch mutouch spaceorb wacom"  >> $F
diff -urN /usr/ports/x11/XFree86-4-libraries/patches/patch-c ./x11/XFree86-4-libraries/patches/patch-c
--- /usr/ports/x11/XFree86-4-libraries/patches/patch-c	Sat Mar 11 09:20:29 2000
+++ ./x11/XFree86-4-libraries/patches/patch-c	Wed Sep  6 14:54:15 2000
@@ -1,6 +1,6 @@
---- config/cf/Imake.tmpl~	Tue Feb 22 02:42:26 2000
-+++ config/cf/Imake.tmpl	Tue Feb 22 03:11:21 2000
-@@ -1282,7 +1282,7 @@
+--- config/cf/Imake.tmpl.orig	Tue Jun 27 09:55:44 2000
++++ config/cf/Imake.tmpl	Wed Sep  6 14:22:34 2000
+@@ -1385,7 +1385,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
@@ -9,11 +9,12 @@
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
-@@ -1469,7 +1469,7 @@
+@@ -1574,7 +1574,8 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
         ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
 -           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++          SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
 +           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
          LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
           LDPRELIB = LdPreLib
diff -urN /usr/ports/x11/XFree86-4-libraries/patches/patch-z03 ./x11/XFree86-4-libraries/patches/patch-z03
--- /usr/ports/x11/XFree86-4-libraries/patches/patch-z03	Mon Aug 28 09:08:35 2000
+++ ./x11/XFree86-4-libraries/patches/patch-z03	Wed Sep  6 14:54:29 2000
@@ -1,5 +1,14 @@
 --- config/cf/Library.tmpl.orig	Wed Oct 13 13:20:41 1999
-+++ config/cf/Library.tmpl	Wed Jul 19 09:15:07 2000
++++ config/cf/Library.tmpl	Wed Sep  6 14:25:44 2000
+@@ -67,7 +67,7 @@
+ STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
+ CDEBUGFLAGS = LibraryCDebugFlags
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+-     CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++     CFLAGS = $(SYSCFLAGS) $(CLIBDEBUGFLAGS) 
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+    PICFLAGS = LargePositionIndependentCFlags
+ # endif
 @@ -434,10 +434,14 @@
  # ifdef IncSubdir
  #  ifdef IncSubSubdir
diff -urN /usr/ports/x11-servers/XFree86-4-Server/scripts/configure ./x11-servers/XFree86-4-Server/scripts/configure
--- /usr/ports/x11-servers/XFree86-4-Server/scripts/configure	Mon Aug 28 09:08:53 2000
+++ ./x11-servers/XFree86-4-Server/scripts/configure	Wed Sep  6 15:04:33 2000
@@ -59,12 +59,21 @@
     echo "#define XF86Server YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     cat >> $LOCALDEF <<END
+#ifdef i386Architecture
 #define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
                                 neomagic i740 tdfx \
                                 cirrus tseng trident chips apm \
                                 GlideDriver fbdev \
                                 ati r128 AgpGartDrivers cyrix \
 				vga  XF86OSCardDrivers XF86ExtraCardDrivers
+#else
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx \
+                                cirrus tseng trident chips apm \
+                                GlideDriver fbdev \
+                                ati r128 cyrix \
+				vga  XF86OSCardDrivers XF86ExtraCardDrivers
+#endif
 END
     if [ $ExtendedInputDevices != "YES" ]; then
 	echo "#define XInputDrivers mouse" >> $LOCALDEF
END>--8<CUT HERE>8---
