aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/imake-4/files/patch-c5
-rw-r--r--devel/imake-4/files/patch-i11
-rw-r--r--devel/imake-4/scripts/configure14
-rw-r--r--x11-servers/XFree86-4-Server-snap/scripts/configure9
-rw-r--r--x11-servers/XFree86-4-Server/scripts/configure9
-rw-r--r--x11/XFree86-4-libraries/files/patch-c9
-rw-r--r--x11/XFree86-4-libraries/files/patch-z0311
7 files changed, 60 insertions, 8 deletions
diff --git a/devel/imake-4/files/patch-c b/devel/imake-4/files/patch-c
index 7c9208e18a55..22623f1c32cf 100644
--- a/devel/imake-4/files/patch-c
+++ b/devel/imake-4/files/patch-c
@@ -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 --git a/devel/imake-4/files/patch-i b/devel/imake-4/files/patch-i
new file mode 100644
index 000000000000..9234130815ef
--- /dev/null
+++ b/devel/imake-4/files/patch-i
@@ -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 --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure
index 05d5ae47329d..e48165c1e9e2 100644
--- a/devel/imake-4/scripts/configure
+++ b/devel/imake-4/scripts/configure
@@ -26,11 +26,23 @@ if [ X${BuildXIE} != "X" ]; then
fi
cat >> $F <<EOF
+#ifndef XF86CardDrivers
+#ifdef 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 --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 5539850adccc..a1d6022f6e85 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -59,12 +59,21 @@ configure () {
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
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 5539850adccc..a1d6022f6e85 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -59,12 +59,21 @@ configure () {
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
diff --git a/x11/XFree86-4-libraries/files/patch-c b/x11/XFree86-4-libraries/files/patch-c
index 42729fc15e7f..4043a25bd8bc 100644
--- a/x11/XFree86-4-libraries/files/patch-c
+++ b/x11/XFree86-4-libraries/files/patch-c
@@ -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 --git a/x11/XFree86-4-libraries/files/patch-z03 b/x11/XFree86-4-libraries/files/patch-z03
index cbae345baefc..cec66a9790ca 100644
--- a/x11/XFree86-4-libraries/files/patch-z03
+++ b/x11/XFree86-4-libraries/files/patch-z03
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 08:46:21 +0000