aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2003-09-25 22:31:46 +0000
committerEric Anholt <anholt@FreeBSD.org>2003-09-25 22:31:46 +0000
commit64629ca58174fb89044170a527700abba44765d7 (patch)
treebdd6000eb907c8b24f94617eec321f9fe830ce59 /x11-servers
parenta8e16966b2c12df079f4ede074286a33049a8ea4 (diff)
downloadports-64629ca58174fb89044170a527700abba44765d7.tar.gz
ports-64629ca58174fb89044170a527700abba44765d7.zip
Notes
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile25
-rw-r--r--x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf13
-rw-r--r--x11-servers/XFree86-4-Server-snap/files/patch-Pci.h4
-rw-r--r--x11-servers/XFree86-4-Server-snap/pkg-plist24
4 files changed, 38 insertions, 28 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index a4ee26178171..69fce458b3a2 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.3.99.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S|source/||:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -76,22 +76,14 @@ MAN4= citron.4 \
dynapro.4 \
elographics.4 \
fbdevhw.4 \
- glint.4 \
kbd.4 \
keyboard.4 \
- mga.4 \
microtouch.4 \
mouse.4 \
mutouch.4 \
nv.4 \
r128.4 \
radeon.4 \
- rendition.4 \
- s3virge.4 \
- savage.4 \
- siliconmotion.4 \
- tdfx.4 \
- vga.4 \
void.4 \
wacom.4
MAN5= XF86Config.5
@@ -118,7 +110,6 @@ PLIST_SUB+= DRI="@comment "
PLIST_SUB+= ALPHA_NA="@comment "
.else
PLIST_SUB+= ALPHA_NA=""
-MAN1+= scanpci.1
.endif
.if ${ARCH} == ia64
@@ -128,13 +119,25 @@ PLIST_SUB+= IA64_NA=""
.endif
.if ${ARCH} == sparc64
-PLIST_SUB+= SPARC64_NA="@comment "
+PLIST_SUB SPARC64_NA="@comment "
+PLIST_SUB+= SPARC64=""
+MAN4+= sunffb.4
.else
+PLIST_SUB+= SPARC64="@comment "
PLIST_SUB+= SPARC64_NA=""
+MAN4+= glint.4 \
+ mga.4 \
+ rendition.4 \
+ s3virge.4 \
+ savage.4 \
+ siliconmotion.4 \
+ tdfx.4 \
+ vga.4
.endif
.if ${ARCH} == i386
PLIST_SUB+= I386=""
+MAN1+= scanpci.1
MAN4+= apm.4 \
chips.4 \
cirrus.4 \
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf b/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf
index a3c1afd34c13..0716e72982be 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-FreeBSD.cf
@@ -58,20 +58,23 @@
(OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))
# define HasX86Support YES
# define HasMMXSupport YES
-@@ -349,10 +359,8 @@
+@@ -349,11 +359,13 @@
#ifdef i386Architecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines
#endif
-#ifdef AlphaArchitecture
--#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
--#endif
--#ifdef Sparc64Architecture
+#if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \
+ defined(ia64Architecture) || defined(x86_64Architecture)
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#endif
+ #ifdef Sparc64Architecture
+-#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
++#define AsVISOption -Av9a
++#define AsOutputArchSize 64
+ #endif
-@@ -376,18 +384,8 @@
+ #define StandardDefines -DCSRG_BASED
+@@ -376,18 +388,8 @@
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#endif
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h
index 3f0842e170a4..0a3b90b9c635 100644
--- a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h
@@ -11,7 +11,7 @@
# endif
# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
#elif defined(__i386__)
-@@ -315,14 +319,18 @@
+@@ -315,14 +319,20 @@
# elif defined(sun)
# define ARCH_PCI_INIT sparcPciInit
# define INCLUDE_XF86_MAP_PCI_MEM
@@ -21,7 +21,9 @@
# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
++# if !defined(__FreeBSD__)
# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge
++# endif
#elif defined(__AMD64__)
-# define ARCH_PCI_INIT ix86PciInit
+# if defined(__FreeBSD__)
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 5a09e4b89784..c50e3b99814c 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -1,18 +1,18 @@
bin/X
bin/XFree86
bin/gtf
-bin/inb
-bin/inl
-bin/inw
-bin/ioport
+%%SPARC64_NA%%bin/inb
+%%SPARC64_NA%%bin/inl
+%%SPARC64_NA%%bin/inw
+%%SPARC64_NA%%bin/ioport
bin/kbd_mode
bin/mmapr
bin/mmapw
-bin/outb
-bin/outl
-bin/outw
+%%SPARC64_NA%%bin/outb
+%%SPARC64_NA%%bin/outl
+%%SPARC64_NA%%bin/outw
bin/pcitweak
-%%ALPHA_NA%%bin/scanpci
+%%I386%%bin/scanpci
bin/xf86cfg
bin/xf86config
include/X11/bitmaps/card.xbm
@@ -130,6 +130,7 @@ lib/modules/drivers/atimisc_drv.o
%%I386%%lib/modules/drivers/neomagic_drv.o
%%I386%%lib/modules/drivers/nsc_drv.o
lib/modules/drivers/nv_drv.o
+lib/modules/drivers/riva128.o
lib/modules/drivers/r128_drv.o
lib/modules/drivers/radeon_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o
@@ -138,6 +139,7 @@ lib/modules/drivers/radeon_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o
%%I386%%lib/modules/drivers/sis_drv.o
+%%SPARC64%%lib/modules/drivers/sunffb_drv.o
%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o
%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o
%%I386%%lib/modules/drivers/trident_drv.o
@@ -173,7 +175,7 @@ lib/modules/input/spaceorb_drv.o
lib/modules/input/summa_drv.o
lib/modules/input/void_drv.o
lib/modules/input/wacom_drv.o
-%%ALPHA_NA%%lib/modules/libafb.a
+%%I386%%lib/modules/libafb.a
lib/modules/libcfb.a
lib/modules/libcfb16.a
lib/modules/libcfb24.a
@@ -198,5 +200,5 @@ lib/modules/libxf24_32bpp.a
lib/modules/libxf4bpp.a
lib/modules/libxf8_16bpp.a
lib/modules/libxf8_32bpp.a
-lib/modules/v10002d.uc
-lib/modules/v20002d.uc
+%%SPARC64_NA%%lib/modules/v10002d.uc
+%%SPARC64_NA%%lib/modules/v20002d.uc