summaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2002-03-16 23:40:19 +0000
committerWill Andrews <will@FreeBSD.org>2002-03-16 23:40:19 +0000
commit92becb4baf7713b343d948a652f39579b35fcb52 (patch)
treee95fd7d2f39f40888e10b2d3afdb76e7196d0055 /x11-servers
parentXFree86 4.2.0 Stage 1: bsd.port.mk (diff)
XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades
[1] Upgrade to 4.2.0. [2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES by default. Submitted by: [1] sf, taguchi@tohoku.iij.ad.jp Approved by: [2] core
Notes
Notes: svn path=/head/; revision=56229
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-FontServer/Makefile7
-rw-r--r--x11-servers/XFree86-4-FontServer/distinfo2
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile30
-rw-r--r--x11-servers/XFree86-4-NestServer/distinfo2
-rw-r--r--x11-servers/XFree86-4-PrintServer/Makefile30
-rw-r--r--x11-servers/XFree86-4-PrintServer/distinfo2
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile52
-rw-r--r--x11-servers/XFree86-4-Server-snap/distinfo3
-rw-r--r--x11-servers/XFree86-4-Server-snap/pkg-plist9
-rw-r--r--x11-servers/XFree86-4-Server-snap/scripts/configure4
-rw-r--r--x11-servers/XFree86-4-Server/Makefile52
-rw-r--r--x11-servers/XFree86-4-Server/distinfo3
-rw-r--r--x11-servers/XFree86-4-Server/pkg-plist9
-rw-r--r--x11-servers/XFree86-4-Server/scripts/configure4
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile30
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/distinfo2
16 files changed, 111 insertions, 130 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 57ac30cf90b5..7672cb8c029e 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -6,13 +6,12 @@
#
PORTNAME= FontServer
-PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTVERSION= 4.2.0
CATEGORIES= x11-servers x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= 4.1.0
+MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X410src-1.tgz
+DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz
MAINTAINER= taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo
index e4b5e84b9421..df48626099b2 100644
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@@ -1 +1 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 2a4e5cd89e70..b975d5fbda0b 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -6,13 +6,17 @@
#
PORTNAME= NestServer
-PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTVERSION= 4.2.0
CATEGORIES= x11-servers
-MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= 4.1.0
+MASTER_SITES= ${MASTER_SITE_XFREE} \
+ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+ ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap \
+ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X410src-1.tgz
+DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES= Wraphelp.c
MAINTAINER= taguchi@tohoku.iij.ad.jp
@@ -28,21 +32,7 @@ INSTALL_TARGET= installXnest installXserver.man
MANCOMPRESSED= yes
MAN1= Xnest.1 Xserver.1
-HasXdmAuth?= DEFAULT
-
-.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-everything::
- @${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
-.else
-MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
- ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
- ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY= X410src-1.tgz
-DISTFILES+= Wraphelp.c
-IGNOREFILES= Wraphelp.c
-.endif # USA_RESIDENT
-.endif # HasXdmAuth
+HasXdmAuth?= YES
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index 942f997451ad..4766fc3aff79 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 0b99e1bda682..f83b9e35eedf 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -6,13 +6,17 @@
#
PORTNAME= PrintServer
-PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTVERSION= 4.2.0
CATEGORIES= x11-servers
-MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= 4.1.0
+MASTER_SITES= ${MASTER_SITE_XFREE} \
+ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
+ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X410src-1.tgz
+DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES= Wraphelp.c
MAINTAINER= taguchi@tohoku.iij.ad.jp
@@ -26,21 +30,7 @@ MAKE_ENV= MAN_INSTALL_TARGET=NOOP
ALL_TARGET= FreeBSDPortsBuild
INSTALL_TARGET= installXprt
-HasXdmAuth?= DEFAULT
-
-.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-everything::
- @${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
-.else
-MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
- ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
- ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY= X410src-1.tgz
-DISTFILES+= Wraphelp.c
-IGNOREFILES= Wraphelp.c
-.endif # USA_RESIDENT
-.endif # HasXdmAuth
+HasXdmAuth?= YES
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo
index 942f997451ad..4766fc3aff79 100644
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 0ea44d5cbce4..aa0abb6bf735 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -6,14 +6,17 @@
#
PORTNAME= Server
-PORTVERSION= 4.1.0
-PORTREVISION= 4
+PORTVERSION= 4.2.0
CATEGORIES= x11-servers
-MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= 4.1.0
+MASTER_SITES= ${MASTER_SITE_XFREE} \
+ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
+ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X410src-1.tgz
-EXTRACT_ONLY= X410src-1.tgz
+DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES= Wraphelp.c
MAINTAINER= taguchi@tohoku.iij.ad.jp
@@ -53,7 +56,8 @@ MAN3= XF86VidMode.3 \
XF86VidModeQueryVersion.3 \
XF86VidModeSetViewPort.3 \
XF86VidModeSwitchMode.3 \
- XF86VidModeSwitchToMode.3
+ XF86VidModeSwitchToMode.3 \
+ XF86VidModeValidateModeLine.3
MAN4= mga.4 \
tdfx.4 \
glint.4 \
@@ -79,22 +83,23 @@ PKGMESSAGE= ${WRKDIR}/.pkg-message
# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later)
# HasPam YES support PAM (require FreeBSD-3.1 or later)
# ExtendedInputDevices YES support extended input devices
-HasXdmAuth?= DEFAULT
+HasXdmAuth?= YES
HasSecureRPC?= DEFAULT
HasPam?= DEFAULT
ExtendedInputDevices?= DEFAULT
.if (exists(/sys) || exists(/usr/src/sys))
BuildXF86DRI= YES
+BuildXF86DRM= YES
PLIST_SUB+= DRI=""
+PLIST_SUB+= DRI_KMOD=""
.else
pre-fetch::
@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
BuildXF86DRI= NO
-PLIST_SUB+= DRI="@comment "
-.endif # have /sys
-# DRM and DRI kernel modules bundled with 4.1.0 are broken
BuildXF86DRM= NO
+PLIST_SUB+= DRI="@comment "
PLIST_SUB+= DRI_KMOD="@comment "
+.endif # have /sys
.if ${ARCH} == i386
PLIST_SUB+= I386:=""
@@ -130,13 +135,21 @@ MAN4+= citron.4 \
PLIST_SUB+= XIE:="@comment "
.endif
+# matrox BETA driver is not ready for 4.2.0.
+# I don't confirm feather it is newer than the one which included in 4.2.0,
+# but you can try the BETA driver. Just set that variable.
+
.if ${BuildXF86DRI} == YES
.if !defined(WITH_MATROX_GXX_DRIVER)
HaveMatroxHal= NO
PLIST_SUB+= MATROX="@comment "
pre-fetch::
- @${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to enable the official Matrox drivers for"
- @${ECHO_MSG} "the G200, G400, G450 and G550 graphic adapters."
+ @${ECHO_MSG} "*** WARNING: UNTESTED WITH XFREE86 4.2.0! ENABLE AT"
+ @${ECHO_MSG} "YOUR OWN RISK! ***"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to enable the official"
+ @${ECHO_MSG} "Matrox drivers for the G200, G400, G450, and G550"
+ @${ECHO_MSG} "graphic adapters."
.else
NO_PACKAGE= "Matrox drivers may not be distributed."
HaveMatroxHal= YES
@@ -156,19 +169,6 @@ post-install::
.endif # !WITH_MATROX_GXX_DRIVER
.endif
-.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-everything::
- @${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
-.else
-MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
- ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
- ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-DISTFILES+= Wraphelp.c
-IGNOREFILES= Wraphelp.c
-.endif # USA_RESIDENT
-.endif # HasXdmAuth
-
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 9b56bde72df7..4766fc3aff79 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,3 +1,2 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/Wraphelp.c) = IGNORE
-MD5 (xc/mga-133_143-source.tgz) = 849bf57f23f1684fea970459f919d1f2
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 906a6bb10c95..5714a75f2a57 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -11,6 +11,7 @@ lib/X11/Cards
lib/X11/Options
lib/X11/XF86Config.98
lib/X11/XF86Config.eg
+lib/X11/doc/BUILD
lib/X11/doc/BugReport
lib/X11/doc/DESIGN
lib/X11/doc/Install
@@ -38,6 +39,7 @@ lib/X11/doc/README.mouse
lib/X11/doc/README.rapidaccess
lib/X11/doc/README.rendition
lib/X11/doc/README.s3virge
+lib/X11/doc/RELNOTES
lib/X11/doc/ServersOnly
lib/X11/doc/Status
lib/X11/doc/Versions
@@ -46,9 +48,10 @@ lib/X11/etc/Xinstall.sh
lib/X11/etc/sun.termcap
lib/X11/etc/sun.terminfo
lib/X11/etc/xmodmap.std
-%%DRI_KMOD%%lib/X11/kernel/drm.ko
%%DRI_KMOD%%lib/X11/kernel/gamma.ko
%%DRI_KMOD%%lib/X11/kernel/mga.ko
+%%DRI_KMOD%%lib/X11/kernel/r128.ko
+%%DRI_KMOD%%lib/X11/kernel/radeon.ko
%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
%%DRI_KMOD%%@dirrm lib/X11/kernel
lib/X11/xserver/SecurityPolicy
@@ -84,6 +87,7 @@ lib/modules/codeconv/libTCVN.a
lib/modules/codeconv/libVISCII.a
%%DRI%%lib/modules/dri/gamma_dri.so
%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
%%DRI%%lib/modules/dri/mga_dri.so
%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
@@ -109,6 +113,7 @@ lib/modules/drivers/nv_drv.o
%%I386:%%lib/modules/drivers/r128_drv.o
%%I386:%%lib/modules/drivers/radeon_drv.o
lib/modules/drivers/rendition_drv.o
+lib/modules/drivers/s3_drv.o
lib/modules/drivers/s3virge_drv.o
lib/modules/drivers/savage_drv.o
lib/modules/drivers/siliconmotion_drv.o
@@ -128,6 +133,7 @@ lib/modules/extensions/libglx.a
lib/modules/extensions/libpex5.a
lib/modules/extensions/librecord.a
lib/modules/extensions/libxie.a
+lib/modules/extensions/libxtrap.a
lib/modules/fonts/libbitmap.a
lib/modules/fonts/libfreetype.a
lib/modules/fonts/libspeedo.a
@@ -157,6 +163,7 @@ lib/modules/libddc.a
lib/modules/libfb.a
lib/modules/libi2c.a
lib/modules/libint10.a
+lib/modules/liblayer.a
lib/modules/libmfb.a
lib/modules/libpcidata.a
lib/modules/librac.a
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 1d95a8262adf..35f80bd40383 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -80,7 +80,7 @@ configure () {
cat >> $LOCALDEF <<END
#ifndef XF86CardDrivers
#ifdef i386Architecture
-#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
+#define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
neomagic i740 tdfx savage \
cirrus vmware tseng trident chips apm \
GlideDriver fbdev i128 \
@@ -89,7 +89,7 @@ configure () {
vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
#else
#ifdef AlphaArchitecture
-#define XF86CardDrivers mga tdfx glint s3virge rendition tga \
+#define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga \
savage nv DevelDrivers siliconmotion vga \
XF86OSCardDrivers XF86ExtraCardDrivers
#endif
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 0ea44d5cbce4..aa0abb6bf735 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -6,14 +6,17 @@
#
PORTNAME= Server
-PORTVERSION= 4.1.0
-PORTREVISION= 4
+PORTVERSION= 4.2.0
CATEGORIES= x11-servers
-MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= 4.1.0
+MASTER_SITES= ${MASTER_SITE_XFREE} \
+ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
+ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X410src-1.tgz
-EXTRACT_ONLY= X410src-1.tgz
+DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES= Wraphelp.c
MAINTAINER= taguchi@tohoku.iij.ad.jp
@@ -53,7 +56,8 @@ MAN3= XF86VidMode.3 \
XF86VidModeQueryVersion.3 \
XF86VidModeSetViewPort.3 \
XF86VidModeSwitchMode.3 \
- XF86VidModeSwitchToMode.3
+ XF86VidModeSwitchToMode.3 \
+ XF86VidModeValidateModeLine.3
MAN4= mga.4 \
tdfx.4 \
glint.4 \
@@ -79,22 +83,23 @@ PKGMESSAGE= ${WRKDIR}/.pkg-message
# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later)
# HasPam YES support PAM (require FreeBSD-3.1 or later)
# ExtendedInputDevices YES support extended input devices
-HasXdmAuth?= DEFAULT
+HasXdmAuth?= YES
HasSecureRPC?= DEFAULT
HasPam?= DEFAULT
ExtendedInputDevices?= DEFAULT
.if (exists(/sys) || exists(/usr/src/sys))
BuildXF86DRI= YES
+BuildXF86DRM= YES
PLIST_SUB+= DRI=""
+PLIST_SUB+= DRI_KMOD=""
.else
pre-fetch::
@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
BuildXF86DRI= NO
-PLIST_SUB+= DRI="@comment "
-.endif # have /sys
-# DRM and DRI kernel modules bundled with 4.1.0 are broken
BuildXF86DRM= NO
+PLIST_SUB+= DRI="@comment "
PLIST_SUB+= DRI_KMOD="@comment "
+.endif # have /sys
.if ${ARCH} == i386
PLIST_SUB+= I386:=""
@@ -130,13 +135,21 @@ MAN4+= citron.4 \
PLIST_SUB+= XIE:="@comment "
.endif
+# matrox BETA driver is not ready for 4.2.0.
+# I don't confirm feather it is newer than the one which included in 4.2.0,
+# but you can try the BETA driver. Just set that variable.
+
.if ${BuildXF86DRI} == YES
.if !defined(WITH_MATROX_GXX_DRIVER)
HaveMatroxHal= NO
PLIST_SUB+= MATROX="@comment "
pre-fetch::
- @${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to enable the official Matrox drivers for"
- @${ECHO_MSG} "the G200, G400, G450 and G550 graphic adapters."
+ @${ECHO_MSG} "*** WARNING: UNTESTED WITH XFREE86 4.2.0! ENABLE AT"
+ @${ECHO_MSG} "YOUR OWN RISK! ***"
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to enable the official"
+ @${ECHO_MSG} "Matrox drivers for the G200, G400, G450, and G550"
+ @${ECHO_MSG} "graphic adapters."
.else
NO_PACKAGE= "Matrox drivers may not be distributed."
HaveMatroxHal= YES
@@ -156,19 +169,6 @@ post-install::
.endif # !WITH_MATROX_GXX_DRIVER
.endif
-.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-everything::
- @${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
-.else
-MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
- ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
- ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-DISTFILES+= Wraphelp.c
-IGNOREFILES= Wraphelp.c
-.endif # USA_RESIDENT
-.endif # HasXdmAuth
-
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index 9b56bde72df7..4766fc3aff79 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,3 +1,2 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/Wraphelp.c) = IGNORE
-MD5 (xc/mga-133_143-source.tgz) = 849bf57f23f1684fea970459f919d1f2
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 906a6bb10c95..5714a75f2a57 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -11,6 +11,7 @@ lib/X11/Cards
lib/X11/Options
lib/X11/XF86Config.98
lib/X11/XF86Config.eg
+lib/X11/doc/BUILD
lib/X11/doc/BugReport
lib/X11/doc/DESIGN
lib/X11/doc/Install
@@ -38,6 +39,7 @@ lib/X11/doc/README.mouse
lib/X11/doc/README.rapidaccess
lib/X11/doc/README.rendition
lib/X11/doc/README.s3virge
+lib/X11/doc/RELNOTES
lib/X11/doc/ServersOnly
lib/X11/doc/Status
lib/X11/doc/Versions
@@ -46,9 +48,10 @@ lib/X11/etc/Xinstall.sh
lib/X11/etc/sun.termcap
lib/X11/etc/sun.terminfo
lib/X11/etc/xmodmap.std
-%%DRI_KMOD%%lib/X11/kernel/drm.ko
%%DRI_KMOD%%lib/X11/kernel/gamma.ko
%%DRI_KMOD%%lib/X11/kernel/mga.ko
+%%DRI_KMOD%%lib/X11/kernel/r128.ko
+%%DRI_KMOD%%lib/X11/kernel/radeon.ko
%%DRI_KMOD%%lib/X11/kernel/tdfx.ko
%%DRI_KMOD%%@dirrm lib/X11/kernel
lib/X11/xserver/SecurityPolicy
@@ -84,6 +87,7 @@ lib/modules/codeconv/libTCVN.a
lib/modules/codeconv/libVISCII.a
%%DRI%%lib/modules/dri/gamma_dri.so
%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
%%DRI%%lib/modules/dri/mga_dri.so
%%DRI%%lib/modules/dri/radeon_dri.so
%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
@@ -109,6 +113,7 @@ lib/modules/drivers/nv_drv.o
%%I386:%%lib/modules/drivers/r128_drv.o
%%I386:%%lib/modules/drivers/radeon_drv.o
lib/modules/drivers/rendition_drv.o
+lib/modules/drivers/s3_drv.o
lib/modules/drivers/s3virge_drv.o
lib/modules/drivers/savage_drv.o
lib/modules/drivers/siliconmotion_drv.o
@@ -128,6 +133,7 @@ lib/modules/extensions/libglx.a
lib/modules/extensions/libpex5.a
lib/modules/extensions/librecord.a
lib/modules/extensions/libxie.a
+lib/modules/extensions/libxtrap.a
lib/modules/fonts/libbitmap.a
lib/modules/fonts/libfreetype.a
lib/modules/fonts/libspeedo.a
@@ -157,6 +163,7 @@ lib/modules/libddc.a
lib/modules/libfb.a
lib/modules/libi2c.a
lib/modules/libint10.a
+lib/modules/liblayer.a
lib/modules/libmfb.a
lib/modules/libpcidata.a
lib/modules/librac.a
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 1d95a8262adf..35f80bd40383 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -80,7 +80,7 @@ configure () {
cat >> $LOCALDEF <<END
#ifndef XF86CardDrivers
#ifdef i386Architecture
-#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
+#define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
neomagic i740 tdfx savage \
cirrus vmware tseng trident chips apm \
GlideDriver fbdev i128 \
@@ -89,7 +89,7 @@ configure () {
vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
#else
#ifdef AlphaArchitecture
-#define XF86CardDrivers mga tdfx glint s3virge rendition tga \
+#define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga \
savage nv DevelDrivers siliconmotion vga \
XF86OSCardDrivers XF86ExtraCardDrivers
#endif
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 771011da12f6..ca79abe4848e 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -6,13 +6,17 @@
#
PORTNAME= VirtualFramebufferServer
-PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTVERSION= 4.2.0
CATEGORIES= x11-servers
-MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= 4.1.0
+MASTER_SITES= ${MASTER_SITE_XFREE} \
+ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
+ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X410src-1.tgz
+DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES= Wraphelp.c
MAINTAINER= taguchi@tohoku.iij.ad.jp
@@ -27,21 +31,7 @@ INSTALL_TARGET= installXvfb installXserver.man
MAKE_ENV= MAN_INSTALL_TARGET=installXvfb.man
MAN1= Xserver.1 Xvfb.1
-HasXdmAuth?= DEFAULT
-
-.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-everything::
- @${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
-.else
-MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
- ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
- ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY= X410src-1.tgz
-DISTFILES+= Wraphelp.c
-IGNOREFILES= Wraphelp.c
-.endif # USA_RESIDENT
-.endif # HasXdmAuth
+HasXdmAuth?= YES
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index 942f997451ad..4766fc3aff79 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/Wraphelp.c) = IGNORE
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 05:18:33 +0000