aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorSatoshi Asami <asami@FreeBSD.org>2000-09-07 00:03:49 +0000
committerSatoshi Asami <asami@FreeBSD.org>2000-09-07 00:03:49 +0000
commite9c8b285ce3dbbd53e0ffc7a61982be72932d8c3 (patch)
tree72ee9f36e19c729fb6894fedb2b3505c049b2c00 /x11-servers
parent7b09b2f7645381cdf75c82e661d0f8cfdf8c8425 (diff)
downloadports-e9c8b285ce3dbbd53e0ffc7a61982be72932d8c3.tar.gz
ports-e9c8b285ce3dbbd53e0ffc7a61982be72932d8c3.zip
Both of the below are
Submitted by: maintainer (1) Respect CFLAGS when compiling shared libraries and servers. (imake-4, XFree86-4-libraries) Reported by: asami (2) Do not redefine list of supported cards, and support architectures other than i386 better. (imake-4, XFree86-4-Server)
Notes
Notes: svn path=/head/; revision=32360
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server-snap/scripts/configure9
-rw-r--r--x11-servers/XFree86-4-Server/scripts/configure9
2 files changed, 18 insertions, 0 deletions
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