summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>1999-07-20 22:15:05 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>1999-07-20 22:15:05 +0000
commitcb65d977e781eff1e37962f479da55bf2e40d92c (patch)
treeca23d46b2a27c58941d17b8ab17e0e78ba88a286 /x11
parentUpdate to the 1999-07-18 beta snapshot of GCC-2.95. (diff)
Upgrade to 3.3.4
Notes
Notes: svn path=/head/; revision=20286
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-clients/Makefile26
-rw-r--r--x11/XFree86-4-clients/distinfo5
-rw-r--r--x11/XFree86-4-clients/pkg-plist26
-rw-r--r--x11/XFree86-4-clients/scripts/configure11
-rw-r--r--x11/XFree86-4-libraries/Makefile26
-rw-r--r--x11/XFree86-4-libraries/distinfo5
-rw-r--r--x11/XFree86-4-libraries/pkg-plist26
-rw-r--r--x11/XFree86-4-libraries/scripts/configure11
-rw-r--r--x11/XFree86-4/Makefile26
-rw-r--r--x11/XFree86-4/distinfo5
-rw-r--r--x11/XFree86-4/pkg-plist26
-rw-r--r--x11/XFree86-4/scripts/configure11
-rw-r--r--x11/XFree86/Makefile26
-rw-r--r--x11/XFree86/distinfo5
-rw-r--r--x11/XFree86/pkg-plist26
-rw-r--r--x11/XFree86/pkg-plist.pc9814
-rw-r--r--x11/XFree86/pkg-plist.stripped30
-rw-r--r--x11/XFree86/scripts/configure11
18 files changed, 175 insertions, 141 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 8f5ce209bee7..4c60a7b7d234 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -1,27 +1,21 @@
# New ports collection makefile for: XFree86
-# Version required: 3.3.3
+# Version required: 3.3.4
# Date created: 5 January 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.53 1999/03/08 07:28:35 asami Exp $
+# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $
#
DISTNAME= xc
-PKGNAME= XFree86-3.3.3.1
+PKGNAME= XFree86-3.3.4
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
- ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.3/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.3/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3/source/
-DISTFILES= X333src-1.tgz X333src-2.tgz
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
+ ftp://xfree86.cdrom.com/pub/XFree86/3.3.4/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.4/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.4/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.4/source/
+DISTFILES= X334src-1.tgz X334src-2.tgz
-PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3.1/fixes/ \
- ftp://xfree86.cdrom.com/pub/XFree86/3.3.3.1/fixes/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.3.1/fixes/ \
- ftp://ftp.cs.tu-berlin.de/pub/X11/XFree86/3.3.3.1/fixes/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3.1/fixes/
-PATCHFILES= 3.3.3-3.3.3.1.diff.gz
MAINTAINER= jmz@FreeBSD.ORG
@@ -50,7 +44,7 @@ pre-fetch:
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= X333src-1.tgz X333src-2.tgz
+EXTRACT_ONLY= X334src-1.tgz X334src-2.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index d9e8bdb8f7e7..33e1631b66b1 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1,4 +1,3 @@
-MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985
-MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039
-MD5 (xc/3.3.3-3.3.3.1.diff.gz) = 07cfaf1e17ea57b3b701ec59814f8c73
+MD5 (xc/X334src-1.tgz) = f8562b060cc35e0dc1812d35b9b7f2e2
+MD5 (xc/X334src-2.tgz) = c970ea15c63203a33fa6cc416aa94bd0
MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 301bbaccbe17..24689ce66d3d 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -524,6 +524,9 @@ lib/X11/config/convex.cf
lib/X11/config/cray.cf
lib/X11/config/fujitsu.cf
lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
lib/X11/config/host.def
lib/X11/config/hp.cf
lib/X11/config/hpLib.rules
@@ -584,6 +587,7 @@ lib/X11/config/xf86site.def
lib/X11/config/xfree86.cf
lib/X11/doc/AccelCards
lib/X11/doc/BUILD
+lib/X11/doc/BetaReport
lib/X11/doc/COPYRIGHT
lib/X11/doc/Devices
lib/X11/doc/Monitors
@@ -594,6 +598,7 @@ lib/X11/doc/README.Config
lib/X11/doc/README.DECtga
lib/X11/doc/README.DGA
lib/X11/doc/README.FreeBSD
+lib/X11/doc/README.I128
lib/X11/doc/README.LinkKit
lib/X11/doc/README.MGA
lib/X11/doc/README.Mach32
@@ -616,6 +621,7 @@ lib/X11/doc/README.cirrus
lib/X11/doc/README.clkprog
lib/X11/doc/README.cyrix
lib/X11/doc/README.epson
+lib/X11/doc/README.i740
lib/X11/doc/README.mouse
lib/X11/doc/README.neo
lib/X11/doc/README.rendition
@@ -1256,6 +1262,7 @@ lib/X11/locale/tbl_data/tab8859_9
lib/X11/locale/tbl_data/tabkoi8_r
lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
lib/X11/locale/zh/XLC_LOCALE
+lib/X11/locale/zh_TW.Big5/XLC_LOCALE
lib/X11/locale/zh_TW/XLC_LOCALE
lib/X11/proxymngr/pmconfig
lib/X11/rgb.txt
@@ -1387,7 +1394,9 @@ lib/X11/xkb/symbols/amiga
lib/X11/xkb/symbols/ataritt
lib/X11/xkb/symbols/be
lib/X11/xkb/symbols/bg
+lib/X11/xkb/symbols/br
lib/X11/xkb/symbols/ca
+lib/X11/xkb/symbols/ca_enhanced
lib/X11/xkb/symbols/cs
lib/X11/xkb/symbols/ctrl
lib/X11/xkb/symbols/de
@@ -1413,11 +1422,13 @@ lib/X11/xkb/symbols/it
lib/X11/xkb/symbols/jp
lib/X11/xkb/symbols/keypad
lib/X11/xkb/symbols/lock
+lib/X11/xkb/symbols/macintosh/us
lib/X11/xkb/symbols/nec/jp
lib/X11/xkb/symbols/no
lib/X11/xkb/symbols/pc104
lib/X11/xkb/symbols/pl
lib/X11/xkb/symbols/pt
+lib/X11/xkb/symbols/ralt
lib/X11/xkb/symbols/ru
lib/X11/xkb/symbols/se
lib/X11/xkb/symbols/sgi/jp
@@ -1426,6 +1437,7 @@ lib/X11/xkb/symbols/sun/se
lib/X11/xkb/symbols/sun/us
lib/X11/xkb/symbols/th
lib/X11/xkb/symbols/us
+lib/X11/xkb/symbols/us_intl
lib/X11/xkb/types.dir
lib/X11/xkb/types/basic
lib/X11/xkb/types/cancel
@@ -1441,7 +1453,7 @@ lib/X11/xsm/system.xsm
lib/libFS.a
lib/libICE.a
lib/libICE.so
-lib/libICE.so.6.3
+lib/libICE.so.6
lib/libPEX5.a
lib/libPEX5.so
lib/libPEX5.so.6
@@ -1450,19 +1462,19 @@ lib/libSM.so
lib/libSM.so.6
lib/libX11.a
lib/libX11.so
-lib/libX11.so.6.1
+lib/libX11.so.6
lib/libXIE.a
lib/libXIE.so
lib/libXIE.so.6
lib/libXau.a
lib/libXaw.a
lib/libXaw.so
-lib/libXaw.so.6.1
+lib/libXaw.so.6
lib/libXdmcp.a
lib/libXdpms.a
lib/libXext.a
lib/libXext.so
-lib/libXext.so.6.3
+lib/libXext.so.6
lib/libXi.a
lib/libXi.so
lib/libXi.so.6
@@ -1471,14 +1483,14 @@ lib/libXmu.so
lib/libXmu.so.6
lib/libXp.a
lib/libXp.so
-lib/libXp.so.6.2
+lib/libXp.so.6
lib/libXss.a
lib/libXt.a
lib/libXt.so
lib/libXt.so.6
lib/libXtst.a
lib/libXtst.so
-lib/libXtst.so.6.1
+lib/libXtst.so.6
lib/libXxf86dga.a
lib/libXxf86misc.a
lib/libXxf86vm.a
@@ -1491,7 +1503,9 @@ lib/libxkbui.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/modules/pex5.so
lib/modules/xf86AceCad.so
+lib/modules/xf86Calcomp.so
lib/modules/xf86Dial.so
+lib/modules/xf86Dyna.so
lib/modules/xf86Elo.so
lib/modules/xf86Jstk.so
lib/modules/xf86MuTouch.so
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 892ec160e629..7a2771866ab1 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -67,10 +67,11 @@ else
cat <<EOF
*** I don't see the static library for tk version $tkversion in /usr/local/lib.
*** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2 or 8.0 first.
+*** install tk 4.2 or 8.x first.
EOF
fi
+
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
@@ -85,7 +86,7 @@ if [ X"${MACHINE}" = X"pc98" ]; then
echo "#define BuildPC98Servers YES" >>$F
echo "#undef XF98EGCServer" >>$F
echo "#define XF98EGCServer YES" >>$F
- servers="GA968 GANBWAP MGA NEC480 NECS3 NKVNEC PWLB PWSKB SVGA TGUI WABEP WABS WSNA"
+ servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
selected=EGC
for i in $servers; do
yesno "Do you want to build the $i server?"
@@ -143,7 +144,7 @@ cat >> $F <<END
cirrus ncr77c22 compaq mga oak al2101 ali \
cl64xx video7 ark mx realtek apm s3v \
s3_svga neo chips cyrix rendition p9x00 \
- spc8110 generic
+ spc8110 i740 tdfx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
@@ -153,10 +154,6 @@ cat >> $F <<END
#define XF86MonoDrivers hgc1280 sigma apollo hercules
-#define XF86S3Drivers newmmio mmio_928 s3_generic
-
-#define XF86S3VDrivers s3_virge
-
#define XF86W32Drivers et4000w32
END
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 8f5ce209bee7..4c60a7b7d234 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -1,27 +1,21 @@
# New ports collection makefile for: XFree86
-# Version required: 3.3.3
+# Version required: 3.3.4
# Date created: 5 January 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.53 1999/03/08 07:28:35 asami Exp $
+# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $
#
DISTNAME= xc
-PKGNAME= XFree86-3.3.3.1
+PKGNAME= XFree86-3.3.4
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
- ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.3/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.3/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3/source/
-DISTFILES= X333src-1.tgz X333src-2.tgz
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
+ ftp://xfree86.cdrom.com/pub/XFree86/3.3.4/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.4/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.4/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.4/source/
+DISTFILES= X334src-1.tgz X334src-2.tgz
-PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3.1/fixes/ \
- ftp://xfree86.cdrom.com/pub/XFree86/3.3.3.1/fixes/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.3.1/fixes/ \
- ftp://ftp.cs.tu-berlin.de/pub/X11/XFree86/3.3.3.1/fixes/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3.1/fixes/
-PATCHFILES= 3.3.3-3.3.3.1.diff.gz
MAINTAINER= jmz@FreeBSD.ORG
@@ -50,7 +44,7 @@ pre-fetch:
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= X333src-1.tgz X333src-2.tgz
+EXTRACT_ONLY= X334src-1.tgz X334src-2.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo
index d9e8bdb8f7e7..33e1631b66b1 100644
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@@ -1,4 +1,3 @@
-MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985
-MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039
-MD5 (xc/3.3.3-3.3.3.1.diff.gz) = 07cfaf1e17ea57b3b701ec59814f8c73
+MD5 (xc/X334src-1.tgz) = f8562b060cc35e0dc1812d35b9b7f2e2
+MD5 (xc/X334src-2.tgz) = c970ea15c63203a33fa6cc416aa94bd0
MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index 301bbaccbe17..24689ce66d3d 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -524,6 +524,9 @@ lib/X11/config/convex.cf
lib/X11/config/cray.cf
lib/X11/config/fujitsu.cf
lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
lib/X11/config/host.def
lib/X11/config/hp.cf
lib/X11/config/hpLib.rules
@@ -584,6 +587,7 @@ lib/X11/config/xf86site.def
lib/X11/config/xfree86.cf
lib/X11/doc/AccelCards
lib/X11/doc/BUILD
+lib/X11/doc/BetaReport
lib/X11/doc/COPYRIGHT
lib/X11/doc/Devices
lib/X11/doc/Monitors
@@ -594,6 +598,7 @@ lib/X11/doc/README.Config
lib/X11/doc/README.DECtga
lib/X11/doc/README.DGA
lib/X11/doc/README.FreeBSD
+lib/X11/doc/README.I128
lib/X11/doc/README.LinkKit
lib/X11/doc/README.MGA
lib/X11/doc/README.Mach32
@@ -616,6 +621,7 @@ lib/X11/doc/README.cirrus
lib/X11/doc/README.clkprog
lib/X11/doc/README.cyrix
lib/X11/doc/README.epson
+lib/X11/doc/README.i740
lib/X11/doc/README.mouse
lib/X11/doc/README.neo
lib/X11/doc/README.rendition
@@ -1256,6 +1262,7 @@ lib/X11/locale/tbl_data/tab8859_9
lib/X11/locale/tbl_data/tabkoi8_r
lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
lib/X11/locale/zh/XLC_LOCALE
+lib/X11/locale/zh_TW.Big5/XLC_LOCALE
lib/X11/locale/zh_TW/XLC_LOCALE
lib/X11/proxymngr/pmconfig
lib/X11/rgb.txt
@@ -1387,7 +1394,9 @@ lib/X11/xkb/symbols/amiga
lib/X11/xkb/symbols/ataritt
lib/X11/xkb/symbols/be
lib/X11/xkb/symbols/bg
+lib/X11/xkb/symbols/br
lib/X11/xkb/symbols/ca
+lib/X11/xkb/symbols/ca_enhanced
lib/X11/xkb/symbols/cs
lib/X11/xkb/symbols/ctrl
lib/X11/xkb/symbols/de
@@ -1413,11 +1422,13 @@ lib/X11/xkb/symbols/it
lib/X11/xkb/symbols/jp
lib/X11/xkb/symbols/keypad
lib/X11/xkb/symbols/lock
+lib/X11/xkb/symbols/macintosh/us
lib/X11/xkb/symbols/nec/jp
lib/X11/xkb/symbols/no
lib/X11/xkb/symbols/pc104
lib/X11/xkb/symbols/pl
lib/X11/xkb/symbols/pt
+lib/X11/xkb/symbols/ralt
lib/X11/xkb/symbols/ru
lib/X11/xkb/symbols/se
lib/X11/xkb/symbols/sgi/jp
@@ -1426,6 +1437,7 @@ lib/X11/xkb/symbols/sun/se
lib/X11/xkb/symbols/sun/us
lib/X11/xkb/symbols/th
lib/X11/xkb/symbols/us
+lib/X11/xkb/symbols/us_intl
lib/X11/xkb/types.dir
lib/X11/xkb/types/basic
lib/X11/xkb/types/cancel
@@ -1441,7 +1453,7 @@ lib/X11/xsm/system.xsm
lib/libFS.a
lib/libICE.a
lib/libICE.so
-lib/libICE.so.6.3
+lib/libICE.so.6
lib/libPEX5.a
lib/libPEX5.so
lib/libPEX5.so.6
@@ -1450,19 +1462,19 @@ lib/libSM.so
lib/libSM.so.6
lib/libX11.a
lib/libX11.so
-lib/libX11.so.6.1
+lib/libX11.so.6
lib/libXIE.a
lib/libXIE.so
lib/libXIE.so.6
lib/libXau.a
lib/libXaw.a
lib/libXaw.so
-lib/libXaw.so.6.1
+lib/libXaw.so.6
lib/libXdmcp.a
lib/libXdpms.a
lib/libXext.a
lib/libXext.so
-lib/libXext.so.6.3
+lib/libXext.so.6
lib/libXi.a
lib/libXi.so
lib/libXi.so.6
@@ -1471,14 +1483,14 @@ lib/libXmu.so
lib/libXmu.so.6
lib/libXp.a
lib/libXp.so
-lib/libXp.so.6.2
+lib/libXp.so.6
lib/libXss.a
lib/libXt.a
lib/libXt.so
lib/libXt.so.6
lib/libXtst.a
lib/libXtst.so
-lib/libXtst.so.6.1
+lib/libXtst.so.6
lib/libXxf86dga.a
lib/libXxf86misc.a
lib/libXxf86vm.a
@@ -1491,7 +1503,9 @@ lib/libxkbui.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/modules/pex5.so
lib/modules/xf86AceCad.so
+lib/modules/xf86Calcomp.so
lib/modules/xf86Dial.so
+lib/modules/xf86Dyna.so
lib/modules/xf86Elo.so
lib/modules/xf86Jstk.so
lib/modules/xf86MuTouch.so
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 892ec160e629..7a2771866ab1 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -67,10 +67,11 @@ else
cat <<EOF
*** I don't see the static library for tk version $tkversion in /usr/local/lib.
*** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2 or 8.0 first.
+*** install tk 4.2 or 8.x first.
EOF
fi
+
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
@@ -85,7 +86,7 @@ if [ X"${MACHINE}" = X"pc98" ]; then
echo "#define BuildPC98Servers YES" >>$F
echo "#undef XF98EGCServer" >>$F
echo "#define XF98EGCServer YES" >>$F
- servers="GA968 GANBWAP MGA NEC480 NECS3 NKVNEC PWLB PWSKB SVGA TGUI WABEP WABS WSNA"
+ servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
selected=EGC
for i in $servers; do
yesno "Do you want to build the $i server?"
@@ -143,7 +144,7 @@ cat >> $F <<END
cirrus ncr77c22 compaq mga oak al2101 ali \
cl64xx video7 ark mx realtek apm s3v \
s3_svga neo chips cyrix rendition p9x00 \
- spc8110 generic
+ spc8110 i740 tdfx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
@@ -153,10 +154,6 @@ cat >> $F <<END
#define XF86MonoDrivers hgc1280 sigma apollo hercules
-#define XF86S3Drivers newmmio mmio_928 s3_generic
-
-#define XF86S3VDrivers s3_virge
-
#define XF86W32Drivers et4000w32
END
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 8f5ce209bee7..4c60a7b7d234 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -1,27 +1,21 @@
# New ports collection makefile for: XFree86
-# Version required: 3.3.3
+# Version required: 3.3.4
# Date created: 5 January 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.53 1999/03/08 07:28:35 asami Exp $
+# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $
#
DISTNAME= xc
-PKGNAME= XFree86-3.3.3.1
+PKGNAME= XFree86-3.3.4
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
- ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.3/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.3/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3/source/
-DISTFILES= X333src-1.tgz X333src-2.tgz
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
+ ftp://xfree86.cdrom.com/pub/XFree86/3.3.4/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.4/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.4/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.4/source/
+DISTFILES= X334src-1.tgz X334src-2.tgz
-PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3.1/fixes/ \
- ftp://xfree86.cdrom.com/pub/XFree86/3.3.3.1/fixes/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.3.1/fixes/ \
- ftp://ftp.cs.tu-berlin.de/pub/X11/XFree86/3.3.3.1/fixes/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3.1/fixes/
-PATCHFILES= 3.3.3-3.3.3.1.diff.gz
MAINTAINER= jmz@FreeBSD.ORG
@@ -50,7 +44,7 @@ pre-fetch:
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= X333src-1.tgz X333src-2.tgz
+EXTRACT_ONLY= X334src-1.tgz X334src-2.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
diff --git a/x11/XFree86-4/distinfo b/x11/XFree86-4/distinfo
index d9e8bdb8f7e7..33e1631b66b1 100644
--- a/x11/XFree86-4/distinfo
+++ b/x11/XFree86-4/distinfo
@@ -1,4 +1,3 @@
-MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985
-MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039
-MD5 (xc/3.3.3-3.3.3.1.diff.gz) = 07cfaf1e17ea57b3b701ec59814f8c73
+MD5 (xc/X334src-1.tgz) = f8562b060cc35e0dc1812d35b9b7f2e2
+MD5 (xc/X334src-2.tgz) = c970ea15c63203a33fa6cc416aa94bd0
MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4/pkg-plist b/x11/XFree86-4/pkg-plist
index 301bbaccbe17..24689ce66d3d 100644
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
@@ -524,6 +524,9 @@ lib/X11/config/convex.cf
lib/X11/config/cray.cf
lib/X11/config/fujitsu.cf
lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
lib/X11/config/host.def
lib/X11/config/hp.cf
lib/X11/config/hpLib.rules
@@ -584,6 +587,7 @@ lib/X11/config/xf86site.def
lib/X11/config/xfree86.cf
lib/X11/doc/AccelCards
lib/X11/doc/BUILD
+lib/X11/doc/BetaReport
lib/X11/doc/COPYRIGHT
lib/X11/doc/Devices
lib/X11/doc/Monitors
@@ -594,6 +598,7 @@ lib/X11/doc/README.Config
lib/X11/doc/README.DECtga
lib/X11/doc/README.DGA
lib/X11/doc/README.FreeBSD
+lib/X11/doc/README.I128
lib/X11/doc/README.LinkKit
lib/X11/doc/README.MGA
lib/X11/doc/README.Mach32
@@ -616,6 +621,7 @@ lib/X11/doc/README.cirrus
lib/X11/doc/README.clkprog
lib/X11/doc/README.cyrix
lib/X11/doc/README.epson
+lib/X11/doc/README.i740
lib/X11/doc/README.mouse
lib/X11/doc/README.neo
lib/X11/doc/README.rendition
@@ -1256,6 +1262,7 @@ lib/X11/locale/tbl_data/tab8859_9
lib/X11/locale/tbl_data/tabkoi8_r
lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
lib/X11/locale/zh/XLC_LOCALE
+lib/X11/locale/zh_TW.Big5/XLC_LOCALE
lib/X11/locale/zh_TW/XLC_LOCALE
lib/X11/proxymngr/pmconfig
lib/X11/rgb.txt
@@ -1387,7 +1394,9 @@ lib/X11/xkb/symbols/amiga
lib/X11/xkb/symbols/ataritt
lib/X11/xkb/symbols/be
lib/X11/xkb/symbols/bg
+lib/X11/xkb/symbols/br
lib/X11/xkb/symbols/ca
+lib/X11/xkb/symbols/ca_enhanced
lib/X11/xkb/symbols/cs
lib/X11/xkb/symbols/ctrl
lib/X11/xkb/symbols/de
@@ -1413,11 +1422,13 @@ lib/X11/xkb/symbols/it
lib/X11/xkb/symbols/jp
lib/X11/xkb/symbols/keypad
lib/X11/xkb/symbols/lock
+lib/X11/xkb/symbols/macintosh/us
lib/X11/xkb/symbols/nec/jp
lib/X11/xkb/symbols/no
lib/X11/xkb/symbols/pc104
lib/X11/xkb/symbols/pl
lib/X11/xkb/symbols/pt
+lib/X11/xkb/symbols/ralt
lib/X11/xkb/symbols/ru
lib/X11/xkb/symbols/se
lib/X11/xkb/symbols/sgi/jp
@@ -1426,6 +1437,7 @@ lib/X11/xkb/symbols/sun/se
lib/X11/xkb/symbols/sun/us
lib/X11/xkb/symbols/th
lib/X11/xkb/symbols/us
+lib/X11/xkb/symbols/us_intl
lib/X11/xkb/types.dir
lib/X11/xkb/types/basic
lib/X11/xkb/types/cancel
@@ -1441,7 +1453,7 @@ lib/X11/xsm/system.xsm
lib/libFS.a
lib/libICE.a
lib/libICE.so
-lib/libICE.so.6.3
+lib/libICE.so.6
lib/libPEX5.a
lib/libPEX5.so
lib/libPEX5.so.6
@@ -1450,19 +1462,19 @@ lib/libSM.so
lib/libSM.so.6
lib/libX11.a
lib/libX11.so
-lib/libX11.so.6.1
+lib/libX11.so.6
lib/libXIE.a
lib/libXIE.so
lib/libXIE.so.6
lib/libXau.a
lib/libXaw.a
lib/libXaw.so
-lib/libXaw.so.6.1
+lib/libXaw.so.6
lib/libXdmcp.a
lib/libXdpms.a
lib/libXext.a
lib/libXext.so
-lib/libXext.so.6.3
+lib/libXext.so.6
lib/libXi.a
lib/libXi.so
lib/libXi.so.6
@@ -1471,14 +1483,14 @@ lib/libXmu.so
lib/libXmu.so.6
lib/libXp.a
lib/libXp.so
-lib/libXp.so.6.2
+lib/libXp.so.6
lib/libXss.a
lib/libXt.a
lib/libXt.so
lib/libXt.so.6
lib/libXtst.a
lib/libXtst.so
-lib/libXtst.so.6.1
+lib/libXtst.so.6
lib/libXxf86dga.a
lib/libXxf86misc.a
lib/libXxf86vm.a
@@ -1491,7 +1503,9 @@ lib/libxkbui.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/modules/pex5.so
lib/modules/xf86AceCad.so
+lib/modules/xf86Calcomp.so
lib/modules/xf86Dial.so
+lib/modules/xf86Dyna.so
lib/modules/xf86Elo.so
lib/modules/xf86Jstk.so
lib/modules/xf86MuTouch.so
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 892ec160e629..7a2771866ab1 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -67,10 +67,11 @@ else
cat <<EOF
*** I don't see the static library for tk version $tkversion in /usr/local/lib.
*** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2 or 8.0 first.
+*** install tk 4.2 or 8.x first.
EOF
fi
+
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
@@ -85,7 +86,7 @@ if [ X"${MACHINE}" = X"pc98" ]; then
echo "#define BuildPC98Servers YES" >>$F
echo "#undef XF98EGCServer" >>$F
echo "#define XF98EGCServer YES" >>$F
- servers="GA968 GANBWAP MGA NEC480 NECS3 NKVNEC PWLB PWSKB SVGA TGUI WABEP WABS WSNA"
+ servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
selected=EGC
for i in $servers; do
yesno "Do you want to build the $i server?"
@@ -143,7 +144,7 @@ cat >> $F <<END
cirrus ncr77c22 compaq mga oak al2101 ali \
cl64xx video7 ark mx realtek apm s3v \
s3_svga neo chips cyrix rendition p9x00 \
- spc8110 generic
+ spc8110 i740 tdfx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
@@ -153,10 +154,6 @@ cat >> $F <<END
#define XF86MonoDrivers hgc1280 sigma apollo hercules
-#define XF86S3Drivers newmmio mmio_928 s3_generic
-
-#define XF86S3VDrivers s3_virge
-
#define XF86W32Drivers et4000w32
END
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 8f5ce209bee7..4c60a7b7d234 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -1,27 +1,21 @@
# New ports collection makefile for: XFree86
-# Version required: 3.3.3
+# Version required: 3.3.4
# Date created: 5 January 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.53 1999/03/08 07:28:35 asami Exp $
+# $Id: Makefile,v 1.54 1999/03/19 22:35:25 asami Exp $
#
DISTNAME= xc
-PKGNAME= XFree86-3.3.3.1
+PKGNAME= XFree86-3.3.4
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
- ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.3/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.3/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3/source/
-DISTFILES= X333src-1.tgz X333src-2.tgz
+MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
+ ftp://xfree86.cdrom.com/pub/XFree86/3.3.4/source/ \
+ ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.4/source/ \
+ ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.4/source/ \
+ ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.4/source/
+DISTFILES= X334src-1.tgz X334src-2.tgz
-PATCH_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3.1/fixes/ \
- ftp://xfree86.cdrom.com/pub/XFree86/3.3.3.1/fixes/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.3.1/fixes/ \
- ftp://ftp.cs.tu-berlin.de/pub/X11/XFree86/3.3.3.1/fixes/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3.1/fixes/
-PATCHFILES= 3.3.3-3.3.3.1.diff.gz
MAINTAINER= jmz@FreeBSD.ORG
@@ -50,7 +44,7 @@ pre-fetch:
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= X333src-1.tgz X333src-2.tgz
+EXTRACT_ONLY= X334src-1.tgz X334src-2.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
diff --git a/x11/XFree86/distinfo b/x11/XFree86/distinfo
index d9e8bdb8f7e7..33e1631b66b1 100644
--- a/x11/XFree86/distinfo
+++ b/x11/XFree86/distinfo
@@ -1,4 +1,3 @@
-MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985
-MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039
-MD5 (xc/3.3.3-3.3.3.1.diff.gz) = 07cfaf1e17ea57b3b701ec59814f8c73
+MD5 (xc/X334src-1.tgz) = f8562b060cc35e0dc1812d35b9b7f2e2
+MD5 (xc/X334src-2.tgz) = c970ea15c63203a33fa6cc416aa94bd0
MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86/pkg-plist b/x11/XFree86/pkg-plist
index 301bbaccbe17..24689ce66d3d 100644
--- a/x11/XFree86/pkg-plist
+++ b/x11/XFree86/pkg-plist
@@ -524,6 +524,9 @@ lib/X11/config/convex.cf
lib/X11/config/cray.cf
lib/X11/config/fujitsu.cf
lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
lib/X11/config/host.def
lib/X11/config/hp.cf
lib/X11/config/hpLib.rules
@@ -584,6 +587,7 @@ lib/X11/config/xf86site.def
lib/X11/config/xfree86.cf
lib/X11/doc/AccelCards
lib/X11/doc/BUILD
+lib/X11/doc/BetaReport
lib/X11/doc/COPYRIGHT
lib/X11/doc/Devices
lib/X11/doc/Monitors
@@ -594,6 +598,7 @@ lib/X11/doc/README.Config
lib/X11/doc/README.DECtga
lib/X11/doc/README.DGA
lib/X11/doc/README.FreeBSD
+lib/X11/doc/README.I128
lib/X11/doc/README.LinkKit
lib/X11/doc/README.MGA
lib/X11/doc/README.Mach32
@@ -616,6 +621,7 @@ lib/X11/doc/README.cirrus
lib/X11/doc/README.clkprog
lib/X11/doc/README.cyrix
lib/X11/doc/README.epson
+lib/X11/doc/README.i740
lib/X11/doc/README.mouse
lib/X11/doc/README.neo
lib/X11/doc/README.rendition
@@ -1256,6 +1262,7 @@ lib/X11/locale/tbl_data/tab8859_9
lib/X11/locale/tbl_data/tabkoi8_r
lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
lib/X11/locale/zh/XLC_LOCALE
+lib/X11/locale/zh_TW.Big5/XLC_LOCALE
lib/X11/locale/zh_TW/XLC_LOCALE
lib/X11/proxymngr/pmconfig
lib/X11/rgb.txt
@@ -1387,7 +1394,9 @@ lib/X11/xkb/symbols/amiga
lib/X11/xkb/symbols/ataritt
lib/X11/xkb/symbols/be
lib/X11/xkb/symbols/bg
+lib/X11/xkb/symbols/br
lib/X11/xkb/symbols/ca
+lib/X11/xkb/symbols/ca_enhanced
lib/X11/xkb/symbols/cs
lib/X11/xkb/symbols/ctrl
lib/X11/xkb/symbols/de
@@ -1413,11 +1422,13 @@ lib/X11/xkb/symbols/it
lib/X11/xkb/symbols/jp
lib/X11/xkb/symbols/keypad
lib/X11/xkb/symbols/lock
+lib/X11/xkb/symbols/macintosh/us
lib/X11/xkb/symbols/nec/jp
lib/X11/xkb/symbols/no
lib/X11/xkb/symbols/pc104
lib/X11/xkb/symbols/pl
lib/X11/xkb/symbols/pt
+lib/X11/xkb/symbols/ralt
lib/X11/xkb/symbols/ru
lib/X11/xkb/symbols/se
lib/X11/xkb/symbols/sgi/jp
@@ -1426,6 +1437,7 @@ lib/X11/xkb/symbols/sun/se
lib/X11/xkb/symbols/sun/us
lib/X11/xkb/symbols/th
lib/X11/xkb/symbols/us
+lib/X11/xkb/symbols/us_intl
lib/X11/xkb/types.dir
lib/X11/xkb/types/basic
lib/X11/xkb/types/cancel
@@ -1441,7 +1453,7 @@ lib/X11/xsm/system.xsm
lib/libFS.a
lib/libICE.a
lib/libICE.so
-lib/libICE.so.6.3
+lib/libICE.so.6
lib/libPEX5.a
lib/libPEX5.so
lib/libPEX5.so.6
@@ -1450,19 +1462,19 @@ lib/libSM.so
lib/libSM.so.6
lib/libX11.a
lib/libX11.so
-lib/libX11.so.6.1
+lib/libX11.so.6
lib/libXIE.a
lib/libXIE.so
lib/libXIE.so.6
lib/libXau.a
lib/libXaw.a
lib/libXaw.so
-lib/libXaw.so.6.1
+lib/libXaw.so.6
lib/libXdmcp.a
lib/libXdpms.a
lib/libXext.a
lib/libXext.so
-lib/libXext.so.6.3
+lib/libXext.so.6
lib/libXi.a
lib/libXi.so
lib/libXi.so.6
@@ -1471,14 +1483,14 @@ lib/libXmu.so
lib/libXmu.so.6
lib/libXp.a
lib/libXp.so
-lib/libXp.so.6.2
+lib/libXp.so.6
lib/libXss.a
lib/libXt.a
lib/libXt.so
lib/libXt.so.6
lib/libXtst.a
lib/libXtst.so
-lib/libXtst.so.6.1
+lib/libXtst.so.6
lib/libXxf86dga.a
lib/libXxf86misc.a
lib/libXxf86vm.a
@@ -1491,7 +1503,9 @@ lib/libxkbui.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/modules/pex5.so
lib/modules/xf86AceCad.so
+lib/modules/xf86Calcomp.so
lib/modules/xf86Dial.so
+lib/modules/xf86Dyna.so
lib/modules/xf86Elo.so
lib/modules/xf86Jstk.so
lib/modules/xf86MuTouch.so
diff --git a/x11/XFree86/pkg-plist.pc98 b/x11/XFree86/pkg-plist.pc98
index 9a81be70564e..35e0ba8052ab 100644
--- a/x11/XFree86/pkg-plist.pc98
+++ b/x11/XFree86/pkg-plist.pc98
@@ -527,6 +527,9 @@ lib/X11/config/convex.cf
lib/X11/config/cray.cf
lib/X11/config/fujitsu.cf
lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
lib/X11/config/host.def
lib/X11/config/hp.cf
lib/X11/config/hpLib.rules
@@ -587,6 +590,7 @@ lib/X11/config/xf86site.def
lib/X11/config/xfree86.cf
lib/X11/doc/AccelCards
lib/X11/doc/BUILD
+lib/X11/doc/BetaReport
lib/X11/doc/COPYRIGHT
lib/X11/doc/Devices
lib/X11/doc/Monitors
@@ -597,6 +601,7 @@ lib/X11/doc/README.Config
lib/X11/doc/README.DECtga
lib/X11/doc/README.DGA
lib/X11/doc/README.FreeBSD
+lib/X11/doc/README.I128
lib/X11/doc/README.LinkKit
lib/X11/doc/README.MGA
lib/X11/doc/README.Mach32
@@ -619,6 +624,7 @@ lib/X11/doc/README.cirrus
lib/X11/doc/README.clkprog
lib/X11/doc/README.cyrix
lib/X11/doc/README.epson
+lib/X11/doc/README.i740
lib/X11/doc/README.mouse
lib/X11/doc/README.neo
lib/X11/doc/README.rendition
@@ -1260,6 +1266,7 @@ lib/X11/locale/tbl_data/tabkoi8_r
lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
lib/X11/locale/zh/XLC_LOCALE
lib/X11/locale/zh_TW/XLC_LOCALE
+lib/X11/locale/zh_TW.Big5/XLC_LOCALE
lib/X11/proxymngr/pmconfig
lib/X11/rgb.txt
lib/X11/rstart/commands/@List
@@ -1390,7 +1397,9 @@ lib/X11/xkb/symbols/amiga
lib/X11/xkb/symbols/ataritt
lib/X11/xkb/symbols/be
lib/X11/xkb/symbols/bg
+lib/X11/xkb/symbols/br
lib/X11/xkb/symbols/ca
+lib/X11/xkb/symbols/ca_enhanced
lib/X11/xkb/symbols/cs
lib/X11/xkb/symbols/ctrl
lib/X11/xkb/symbols/de
@@ -1416,11 +1425,13 @@ lib/X11/xkb/symbols/it
lib/X11/xkb/symbols/jp
lib/X11/xkb/symbols/keypad
lib/X11/xkb/symbols/lock
+lib/X11/xkb/symbols/macintosh/us
lib/X11/xkb/symbols/nec/jp
lib/X11/xkb/symbols/no
lib/X11/xkb/symbols/pc104
lib/X11/xkb/symbols/pl
lib/X11/xkb/symbols/pt
+lib/X11/xkb/symbols/ralt
lib/X11/xkb/symbols/ru
lib/X11/xkb/symbols/se
lib/X11/xkb/symbols/sgi/jp
@@ -1429,6 +1440,7 @@ lib/X11/xkb/symbols/sun/se
lib/X11/xkb/symbols/sun/us
lib/X11/xkb/symbols/th
lib/X11/xkb/symbols/us
+lib/X11/xkb/symbols/us_intl
lib/X11/xkb/types.dir
lib/X11/xkb/types/basic
lib/X11/xkb/types/cancel
@@ -1494,7 +1506,9 @@ lib/libxkbui.a
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/modules/pex5.so
lib/modules/xf86AceCad.so
+lib/modules/xf86Calcomp.so
lib/modules/xf86Dial.so
+lib/modules/xf86Dyna.so
lib/modules/xf86Elo.so
lib/modules/xf86Jstk.so
lib/modules/xf86MuTouch.so
diff --git a/x11/XFree86/pkg-plist.stripped b/x11/XFree86/pkg-plist.stripped
index 1163667be269..78c5f1996729 100644
--- a/x11/XFree86/pkg-plist.stripped
+++ b/x11/XFree86/pkg-plist.stripped
@@ -435,6 +435,9 @@ lib/X11/config/convex.cf
lib/X11/config/cray.cf
lib/X11/config/fujitsu.cf
lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
lib/X11/config/host.def
lib/X11/config/hp.cf
lib/X11/config/hpLib.rules
@@ -542,55 +545,56 @@ lib/X11/locale/tbl_data/tab8859_9
lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
lib/X11/locale/zh/XLC_LOCALE
lib/X11/locale/zh_TW/XLC_LOCALE
+lib/X11/locale/zh_TW.Big5/XLC_LOCALE
lib/X11/proxymngr/pmconfig
lib/X11/rgb.txt
lib/libFS.a
lib/libICE.a
lib/libICE.so
-lib/libICE.so.6.3
+lib/libICE.so.6
lib/libPEX5.a
lib/libPEX5.so
-lib/libPEX5.so.6.0
+lib/libPEX5.so.6
lib/libSM.a
lib/libSM.so
-lib/libSM.so.6.0
+lib/libSM.so.6
lib/libX11.a
lib/libX11.so
-lib/libX11.so.6.1
+lib/libX11.so.6
lib/libXIE.a
lib/libXIE.so
-lib/libXIE.so.6.0
+lib/libXIE.so.6
lib/libXau.a
lib/libXaw.a
lib/libXaw.so
-lib/libXaw.so.6.1
+lib/libXaw.so.6
lib/libXdmcp.a
lib/libXdpms.a
lib/libXext.a
lib/libXext.so
-lib/libXext.so.6.3
+lib/libXext.so.6
lib/libXi.a
lib/libXi.so
-lib/libXi.so.6.0
+lib/libXi.so.6
lib/libXmu.a
lib/libXmu.so
-lib/libXmu.so.6.0
+lib/libXmu.so.6
lib/libXp.a
lib/libXp.so
-lib/libXp.so.6.2
+lib/libXp.so.6
lib/libXss.a
lib/libXt.a
lib/libXt.so
-lib/libXt.so.6.0
+lib/libXt.so.6
lib/libXtst.a
lib/libXtst.so
-lib/libXtst.so.6.1
+lib/libXtst.so.6
lib/libXxf86dga.a
lib/libXxf86misc.a
lib/libXxf86vm.a
lib/liboldX.a
lib/liboldX.so
-lib/liboldX.so.6.0
+lib/liboldX.so.6
lib/libxkbfile.a
@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 892ec160e629..7a2771866ab1 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -67,10 +67,11 @@ else
cat <<EOF
*** I don't see the static library for tk version $tkversion in /usr/local/lib.
*** XF86Setup will not be installed. If you want to build this program
-*** install tk 4.2 or 8.0 first.
+*** install tk 4.2 or 8.x first.
EOF
fi
+
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
@@ -85,7 +86,7 @@ if [ X"${MACHINE}" = X"pc98" ]; then
echo "#define BuildPC98Servers YES" >>$F
echo "#undef XF98EGCServer" >>$F
echo "#define XF98EGCServer YES" >>$F
- servers="GA968 GANBWAP MGA NEC480 NECS3 NKVNEC PWLB PWSKB SVGA TGUI WABEP WABS WSNA"
+ servers="GA968 GANBWAP NEC480 NKVNEC WABS WABEP WSNA TGUI MGA SVGA NECS3 PWSKB PWLB"
selected=EGC
for i in $servers; do
yesno "Do you want to build the $i server?"
@@ -143,7 +144,7 @@ cat >> $F <<END
cirrus ncr77c22 compaq mga oak al2101 ali \
cl64xx video7 ark mx realtek apm s3v \
s3_svga neo chips cyrix rendition p9x00 \
- spc8110 generic
+ spc8110 i740 tdfx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
@@ -153,10 +154,6 @@ cat >> $F <<END
#define XF86MonoDrivers hgc1280 sigma apollo hercules
-#define XF86S3Drivers newmmio mmio_928 s3_generic
-
-#define XF86S3VDrivers s3_virge
-
#define XF86W32Drivers et4000w32
END