From bb772f0708cb3de3285f92d38b56f2fdc0d03c2a Mon Sep 17 00:00:00 2001 From: flz Date: Fri, 7 Mar 2008 21:47:50 +0000 Subject: Remove support for XFree8-4. From now on, X_WINDOW_SYSTEM != "xorg" is not supported anymore. PR: ports/119418 Submitted by: flz Approved by: portmgr (pav) --- x11-servers/Makefile | 5 - x11-servers/XFree86-4-FontServer/Makefile | 50 ---- x11-servers/XFree86-4-FontServer/distinfo | 9 - .../files/patch-programs::xfs::Imakefile | 11 - x11-servers/XFree86-4-FontServer/files/xfs.sh | 35 --- x11-servers/XFree86-4-FontServer/pkg-descr | 3 - x11-servers/XFree86-4-FontServer/pkg-install | 12 - x11-servers/XFree86-4-FontServer/pkg-plist | 5 - x11-servers/XFree86-4-FontServer/scripts/configure | 68 ----- x11-servers/XFree86-4-NestServer/Makefile | 43 --- x11-servers/XFree86-4-NestServer/distinfo | 9 - x11-servers/XFree86-4-NestServer/pkg-descr | 8 - x11-servers/XFree86-4-NestServer/pkg-install | 13 - x11-servers/XFree86-4-NestServer/scripts/configure | 63 ----- x11-servers/XFree86-4-PrintServer/Makefile | 43 --- x11-servers/XFree86-4-PrintServer/distinfo | 9 - x11-servers/XFree86-4-PrintServer/pkg-descr | 3 - .../XFree86-4-PrintServer/scripts/configure | 62 ---- x11-servers/XFree86-4-Server/Makefile | 222 --------------- x11-servers/XFree86-4-Server/distinfo | 9 - .../XFree86-4-Server/files/patch-CAN-2005-2495 | 312 --------------------- .../XFree86-4-Server/files/patch-FreeBSD.cf | 49 ---- .../XFree86-4-Server/files/patch-GL-Imakefile | 11 - .../XFree86-4-Server/files/patch-HALlib_bindings.c | 27 -- x11-servers/XFree86-4-Server/files/patch-Imake.cf | 18 -- x11-servers/XFree86-4-Server/files/patch-Pci.h | 16 -- .../XFree86-4-Server/files/patch-bsdResource.c | 68 ----- .../XFree86-4-Server/files/patch-bus_Imakefile | 21 -- .../XFree86-4-Server/files/patch-compiler.h | 16 -- .../XFree86-4-Server/files/patch-drm_Imakefile | 15 - .../XFree86-4-Server/files/patch-elfloader.c | 82 ------ .../files/patch-lib_font_FreeType_ftfuncs.c | 238 ---------------- .../files/patch-lib_font_FreeType_ftfuncs.h | 12 - .../files/patch-lib_font_FreeType_ftsystem.c | 15 - .../files/patch-lib_font_bitmap_pcfread.c | 93 ------ x11-servers/XFree86-4-Server/files/patch-loader.c | 13 - .../XFree86-4-Server/files/patch-mga_driver.c | 35 --- x11-servers/XFree86-4-Server/files/patch-mouse.c | 18 -- .../files/patch-os-support_Imakefile | 15 - .../XFree86-4-Server/files/patch-trident_driver.c | 17 -- .../XFree86-4-Server/files/patch-trident_video.c | 19 -- x11-servers/XFree86-4-Server/pkg-descr | 4 - x11-servers/XFree86-4-Server/pkg-install | 13 - x11-servers/XFree86-4-Server/pkg-plist | 182 ------------ x11-servers/XFree86-4-Server/scripts/configure | 117 -------- .../XFree86-4-VirtualFramebufferServer/Makefile | 43 --- .../XFree86-4-VirtualFramebufferServer/distinfo | 9 - .../XFree86-4-VirtualFramebufferServer/pkg-descr | 3 - .../XFree86-4-VirtualFramebufferServer/pkg-install | 13 - .../scripts/configure | 65 ----- 50 files changed, 2241 deletions(-) delete mode 100644 x11-servers/XFree86-4-FontServer/Makefile delete mode 100644 x11-servers/XFree86-4-FontServer/distinfo delete mode 100644 x11-servers/XFree86-4-FontServer/files/patch-programs::xfs::Imakefile delete mode 100644 x11-servers/XFree86-4-FontServer/files/xfs.sh delete mode 100644 x11-servers/XFree86-4-FontServer/pkg-descr delete mode 100644 x11-servers/XFree86-4-FontServer/pkg-install delete mode 100644 x11-servers/XFree86-4-FontServer/pkg-plist delete mode 100644 x11-servers/XFree86-4-FontServer/scripts/configure delete mode 100644 x11-servers/XFree86-4-NestServer/Makefile delete mode 100644 x11-servers/XFree86-4-NestServer/distinfo delete mode 100644 x11-servers/XFree86-4-NestServer/pkg-descr delete mode 100644 x11-servers/XFree86-4-NestServer/pkg-install delete mode 100644 x11-servers/XFree86-4-NestServer/scripts/configure delete mode 100644 x11-servers/XFree86-4-PrintServer/Makefile delete mode 100644 x11-servers/XFree86-4-PrintServer/distinfo delete mode 100644 x11-servers/XFree86-4-PrintServer/pkg-descr delete mode 100644 x11-servers/XFree86-4-PrintServer/scripts/configure delete mode 100644 x11-servers/XFree86-4-Server/Makefile delete mode 100644 x11-servers/XFree86-4-Server/distinfo delete mode 100644 x11-servers/XFree86-4-Server/files/patch-CAN-2005-2495 delete mode 100644 x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf delete mode 100644 x11-servers/XFree86-4-Server/files/patch-GL-Imakefile delete mode 100644 x11-servers/XFree86-4-Server/files/patch-HALlib_bindings.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-Imake.cf delete mode 100644 x11-servers/XFree86-4-Server/files/patch-Pci.h delete mode 100644 x11-servers/XFree86-4-Server/files/patch-bsdResource.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-bus_Imakefile delete mode 100644 x11-servers/XFree86-4-Server/files/patch-compiler.h delete mode 100644 x11-servers/XFree86-4-Server/files/patch-drm_Imakefile delete mode 100644 x11-servers/XFree86-4-Server/files/patch-elfloader.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h delete mode 100644 x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-loader.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-mga_driver.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-mouse.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile delete mode 100644 x11-servers/XFree86-4-Server/files/patch-trident_driver.c delete mode 100644 x11-servers/XFree86-4-Server/files/patch-trident_video.c delete mode 100644 x11-servers/XFree86-4-Server/pkg-descr delete mode 100644 x11-servers/XFree86-4-Server/pkg-install delete mode 100644 x11-servers/XFree86-4-Server/pkg-plist delete mode 100644 x11-servers/XFree86-4-Server/scripts/configure delete mode 100644 x11-servers/XFree86-4-VirtualFramebufferServer/Makefile delete mode 100644 x11-servers/XFree86-4-VirtualFramebufferServer/distinfo delete mode 100644 x11-servers/XFree86-4-VirtualFramebufferServer/pkg-descr delete mode 100644 x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install delete mode 100644 x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure (limited to 'x11-servers') diff --git a/x11-servers/Makefile b/x11-servers/Makefile index 971f630a0a31..9a974e7da066 100644 --- a/x11-servers/Makefile +++ b/x11-servers/Makefile @@ -3,11 +3,6 @@ COMMENT = X11 servers - SUBDIR += XFree86-4-FontServer - SUBDIR += XFree86-4-NestServer - SUBDIR += XFree86-4-PrintServer - SUBDIR += XFree86-4-Server - SUBDIR += XFree86-4-VirtualFramebufferServer SUBDIR += Xfstt SUBDIR += driglide SUBDIR += mga_hal diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile deleted file mode 100644 index 164c8db70706..000000000000 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# New ports collection makefile for: XFree86-FontServer -# Date created: 10 Oct 1999 -# Whom: taguchi@tohoku.iij.ad.jp -# -# $FreeBSD$ -# - -PORTNAME= FontServer -PORTVERSION= 4.5.0 -PORTREVISION= 3 -CATEGORIES= x11-servers x11-fonts -MASTER_SITES= ${MASTER_SITE_XFREE} -MASTER_SITE_SUBDIR= ${PORTVERSION} -PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ - XFree86-${PORTVERSION}-src-2.tgz \ - XFree86-${PORTVERSION}-src-3.tgz - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-4 font server - -CONFLICTS= xorg-fontserver-* xfs-* - -DEPRECATED= isn't maintained anymore -EXPIRATION_DATE= 2007-12-25 - -MAN1= xfs.1 -XBUILD_DIRS= programs/xfs -XINCLUDE_DIRS= lib/xtrans programs/Xserver -XINSTALL_MAN_DIRS= programs/xfs -EXTRA_PATCHES+= ${FILESDIR}/patch-programs::xfs::Imakefile -USE_RC_SUBR= yes - -post-build: - @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ - -e 's|%%RC_SUBR%%|${RC_SUBR}|g' \ - ${FILESDIR}/xfs.sh >${WRKDIR}/xfs.sh - -post-install: - @${INSTALL_SCRIPT} ${WRKDIR}/xfs.sh ${PREFIX}/etc/rc.d - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include -.if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86 and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo deleted file mode 100644 index a439d4854378..000000000000 --- a/x11-servers/XFree86-4-FontServer/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-FontServer/files/patch-programs::xfs::Imakefile b/x11-servers/XFree86-4-FontServer/files/patch-programs::xfs::Imakefile deleted file mode 100644 index 7133d1c1c76d..000000000000 --- a/x11-servers/XFree86-4-FontServer/files/patch-programs::xfs::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/xfs/Imakefile.orig Tue Apr 20 20:57:28 2004 -+++ programs/xfs/Imakefile Tue Apr 20 20:58:12 2004 -@@ -58,7 +58,7 @@ - InstallManPage(xfs,$(MANDIR)) - - #if InstallFSConfig --InstallNonExecFile(config,$(FSLIBDIR)) -+InstallNamedNonExec(config,config.default,$(FSLIBDIR)) - #else - InstallNonExecFileNoClobber(config,$(FSLIBDIR)) - #endif diff --git a/x11-servers/XFree86-4-FontServer/files/xfs.sh b/x11-servers/XFree86-4-FontServer/files/xfs.sh deleted file mode 100644 index f4397b00b368..000000000000 --- a/x11-servers/XFree86-4-FontServer/files/xfs.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: xfs -# REQUIRE: cleartmp ldconfig -# BEFORE: LOGIN - -# The following variables are provided to control startup of X font server in -# rc configuration file (eg /etc/rc.conf): -# xfs_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable X font server -# xfs_config (str): Set to "%%PREFIX%%/lib/X11/fs/config" by default. -# Configuration file for X font server. -# -# Please see xfs(1), rc.conf(5) and rc(8) for further details. - -. %%RC_SUBR%% - -name="xfs" -rcvar=`set_rcvar` - -# Set defaults -[ -z "$xfs_enable" ] && xfs_enable="NO" -[ -z "$xfs_config" ] && xfs_config="%%PREFIX%%/lib/X11/fs/config" - -load_rc_config $name - -command="%%PREFIX%%/bin/${name}" -command_args="-config ${xfs_config} -daemon" -required_files="$xfs_config" -extra_commands="reload" - -run_rc_command "$1" diff --git a/x11-servers/XFree86-4-FontServer/pkg-descr b/x11-servers/XFree86-4-FontServer/pkg-descr deleted file mode 100644 index 343419f6ab8f..000000000000 --- a/x11-servers/XFree86-4-FontServer/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains Font Server. - -WWW: http://www.xfree86.org/ diff --git a/x11-servers/XFree86-4-FontServer/pkg-install b/x11-servers/XFree86-4-FontServer/pkg-install deleted file mode 100644 index 24645352073e..000000000000 --- a/x11-servers/XFree86-4-FontServer/pkg-install +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} -XFSCONFDIR=${PKG_PREFIX}/lib/X11/fs - -if [ ! -f ${XFSCONFDIR}/config ]; then - cp ${XFSCONFDIR}/config.default ${XFSCONFDIR}/config -fi diff --git a/x11-servers/XFree86-4-FontServer/pkg-plist b/x11-servers/XFree86-4-FontServer/pkg-plist deleted file mode 100644 index fa422c54fa19..000000000000 --- a/x11-servers/XFree86-4-FontServer/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -@unexec if cmp -s %D/lib/X11/fs/config %D/lib/X11/fs/config.default; then rm -f %D/lib/X11/fs/config; fi -bin/xfs -etc/rc.d/xfs.sh -lib/X11/fs/config.default -@dirrm lib/X11/fs diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure deleted file mode 100644 index 3daedd35e4ea..000000000000 --- a/x11-servers/XFree86-4-FontServer/scripts/configure +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -# This script does the following: -# (1) cp xf86site.def, installed by imake-4 port, -# to ${WRKDIR}/xc/config/cf. -# this provides settings for the ports system. -# (2) Create a host.def for this specific port, using -# host.def as a base. - -ORIGDEF=$PREFIX/lib/X11/config/xf86site.def -DESTDEF=$WRKDIR/xc/config/cf/xf86site.def -ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -HOSTDEF=$WRKDIR/xc/config/cf/host.def - -# Use original host.def as initial config file -rm -f $LOCALDEF -grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF -echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - -# This is also defined in xf86site.def, but doesn't get -# picked up for some reason. -echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - -# disable some options -for i in BuildFonts \ - Build75DpiFonts \ - Build100DpiFonts \ - BuildSpeedoFonts \ - BuildType1Fonts \ - BuildCIDFonts \ - BuildCyrillicFonts \ - BuildLatin2Fonts \ - BuildHtmlManPages \ - XF86Server \ - XnestServer \ - XVirtualFramebufferServer \ - XprtServer \ - XdmxServer \ - LibHeaders \ - ForceNormalLib \ - XTrueTypeInstallCConvHeaders -do \ - echo "#define $i NO" >> $LOCALDEF -done - -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define BuildFontServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -if [ X$InstallFSConfig = "X" ]; then - InstallFSConfig=YES -fi -echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF -echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF -echo "#define BuildFontCacheLib YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define FreeBSDCC ${CC}" >> $LOCALDEF -echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF -echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF - -# Copy ORIGDEF to DESTDEF -rm -f $DESTDEF -cp -f $ORIGDEF $DESTDEF - -# copy generated config to host.def -cp -f $LOCALDEF $HOSTDEF - -exit 0 diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile deleted file mode 100644 index 2fc0d6df6791..000000000000 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: XFree86-NestServer -# Date created: 10 Oct 1999 -# Whom: taguchi@tohoku.iij.ad.jp -# -# $FreeBSD$ -# - -PORTNAME= NestServer -PORTVERSION= 4.5.0 -PORTREVISION= 2 -CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE} -MASTER_SITE_SUBDIR= ${PORTVERSION} -PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ - XFree86-${PORTVERSION}-src-2.tgz \ - XFree86-${PORTVERSION}-src-3.tgz - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-4 nested X server - -CONFLICTS= xorg-nestserver-[0-9]* - -DEPRECATED= isn't maintained anymore -EXPIRATION_DATE= 2007-12-25 - -EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c -MAN1= Xnest.1 -PLIST_FILES= bin/Xnest - -XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver -XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= programs/Xserver -XINSTALL_MAN_DIRS= programs/Xserver/hw/xnest - -.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include -.if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86 and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo deleted file mode 100644 index a439d4854378..000000000000 --- a/x11-servers/XFree86-4-NestServer/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-NestServer/pkg-descr b/x11-servers/XFree86-4-NestServer/pkg-descr deleted file mode 100644 index fc238b95e0fa..000000000000 --- a/x11-servers/XFree86-4-NestServer/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This package contains Xnest, a nested X server. -Xnest is a client and a server. Xnest is a client of the -real server which manages windows and graphics requests on -its behalf. Xnest is a server to its own clients. Xnest -manages windows and graphics requests on their behalf. To -these clients Xnest appears to be a conventional server. - -WWW: http://www.xfree86.org/ diff --git a/x11-servers/XFree86-4-NestServer/pkg-install b/x11-servers/XFree86-4-NestServer/pkg-install deleted file mode 100644 index 6f04a27ffda8..000000000000 --- a/x11-servers/XFree86-4-NestServer/pkg-install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} -SECCONFDIR=${PKG_PREFIX}/lib/X11/xserver - -if [ ! -f ${SECCONFDIR}/SecurityPolicy ]; then - cp ${SECCONFDIR}/SecurityPolicy.default-NestServer \ - ${SECCONFDIR}/SecurityPolicy -fi diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure deleted file mode 100644 index a5a5dfc2c9e5..000000000000 --- a/x11-servers/XFree86-4-NestServer/scripts/configure +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -# This script does the following: -# (1) cp xf86site.def, installed by imake-4 port, -# to ${WRKDIR}/xc/config/cf. -# this provides settings for the ports system. -# (2) Create a host.def for this specific port, using -# host.def as a base. - -ORIGDEF=$PREFIX/lib/X11/config/xf86site.def -DESTDEF=$WRKDIR/xc/config/cf/xf86site.def -ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -HOSTDEF=$WRKDIR/xc/config/cf/host.def - -# Use original host.def as initial config file -rm -f $LOCALDEF -grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF -echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - -# This is also defined in xf86site.def, but doesn't get -# picked up for some reason. -echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - -# disable some options -for i in BuildFonts \ - Build75DpiFonts \ - Build100DpiFonts \ - BuildSpeedoFonts \ - BuildType1Fonts \ - BuildCIDFonts \ - BuildCyrillicFonts \ - BuildLatin2Fonts \ - BuildHtmlManPages \ - XF86Server \ - BuildFontServer \ - XVirtualFramebufferServer \ - XprtServer \ - XdmxServer \ - LibHeaders \ - ForceNormalLib \ - InstallSecurityConfig \ - XTrueTypeInstallCConvHeaders -do \ - echo "#define $i NO" >> $LOCALDEF -done - -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define XnestServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define FreeBSDCC ${CC}" >> $LOCALDEF -echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF -echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF - -# Copy ORIGDEF to DESTDEF -rm -f $DESTDEF -cp -f $ORIGDEF $DESTDEF - -# copy generated config to host.def -cp -f $LOCALDEF $HOSTDEF - -exit 0 diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile deleted file mode 100644 index 1def8b743ffb..000000000000 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: XFree86-PrintServer -# Date created: 10 Oct 1999 -# Whom: taguchi@tohoku.iij.ad.jp -# -# $FreeBSD$ -# - -PORTNAME= PrintServer -PORTVERSION= 4.5.0 -PORTREVISION= 2 -CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE} -MASTER_SITE_SUBDIR= ${PORTVERSION} -PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ - XFree86-${PORTVERSION}-src-2.tgz \ - XFree86-${PORTVERSION}-src-3.tgz - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-4 print server - -CONFLICTS= xorg-printserver-* - -DEPRECATED= isn't maintained anymore -EXPIRATION_DATE= 2007-12-25 - -EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c -PLIST_FILES= bin/Xprt -XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver -XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= programs/Xserver - -do-install: - $(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt - -.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include -.if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86 and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo deleted file mode 100644 index a439d4854378..000000000000 --- a/x11-servers/XFree86-4-PrintServer/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-PrintServer/pkg-descr b/x11-servers/XFree86-4-PrintServer/pkg-descr deleted file mode 100644 index ed3cb4ddd5e9..000000000000 --- a/x11-servers/XFree86-4-PrintServer/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains Xprt, X print server. - -WWW: http://www.xfree86.org/ diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure deleted file mode 100644 index 4891f552f098..000000000000 --- a/x11-servers/XFree86-4-PrintServer/scripts/configure +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -# This script does the following: -# (1) cp xf86site.def, installed by imake-4 port, -# to ${WRKDIR}/xc/config/cf. -# this provides settings for the ports system. -# (2) Create a host.def for this specific port, using -# host.def as a base. - -ORIGDEF=$PREFIX/lib/X11/config/xf86site.def -DESTDEF=$WRKDIR/xc/config/cf/xf86site.def -ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -HOSTDEF=$WRKDIR/xc/config/cf/host.def - -# Use original host.def as initial config file -rm -f $LOCALDEF -grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF -echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - -# This is also defined in xf86site.def, but doesn't get -# picked up for some reason. -echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - -# disable some options -for i in BuildFonts \ - Build75DpiFonts \ - Build100DpiFonts \ - BuildSpeedoFonts \ - BuildType1Fonts \ - BuildCIDFonts \ - BuildCyrillicFonts \ - BuildLatin2Fonts \ - BuildHtmlManPages \ - XF86Server \ - BuildFontServer \ - XnestServer \ - XVirtualFramebufferServer \ - XdmxServer \ - LibHeaders \ - ForceNormalLib \ - XTrueTypeInstallCConvHeaders -do \ - echo "#define $i NO" >> $LOCALDEF -done - -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define XprtServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define FreeBSDCC ${CC}" >> $LOCALDEF -echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF -echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF - -# Copy ORIGDEF to DESTDEF -rm -f $DESTDEF -cp -f $ORIGDEF $DESTDEF - -# copy generated config to host.def -cp -f $LOCALDEF $HOSTDEF - -exit 0 diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile deleted file mode 100644 index 72b971d8ffa6..000000000000 --- a/x11-servers/XFree86-4-Server/Makefile +++ /dev/null @@ -1,222 +0,0 @@ -# New ports collection makefile for: XFree86-Server -# Date created: 10 Oct 1999 -# Whom: taguchi@tohoku.iij.ad.jp -# -# $FreeBSD$ -# - -PORTNAME= Server -PORTVERSION= 4.5.0 -PORTREVISION= 5 -CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE} -MASTER_SITE_SUBDIR= ${PORTVERSION} -PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ - XFree86-${PORTVERSION}-src-2.tgz \ - XFree86-${PORTVERSION}-src-3.tgz - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-4 X server and related programs - -CONFLICTS= xorg-server-[0-9]* - -DEPRECATED= isn't maintained anymore -EXPIRATION_DATE= 2007-12-25 - -# Override default from XFree86-4-libraries/Makefile.inc -PATCHDIR= ${MASTERDIR}/files - -.for pf in patch-Imake.rules patch-Imake.tmpl \ - patch-X11.tmpl patch-Xcursor-Imakefile \ - patch-c2 \ - patch-f patch-imake.c \ - patch-texteroids patch-xditview-Imakefile patch-xdm \ - patch-xdm_session.c patch-xf86.tmpl \ - patch-xterm-Imakefile patch-z14 \ - patch-z15 patch-z34 patch-z35 \ - patch-z45 \ - patch-lib_GL_GL_Imakefile \ - patch-lib_GL_mesa_drivers_dri_Imakefile \ - patch-lib_GL_mesa_drivers_osmesa_Imakefile \ - patch-programs_Xserver_GL_dri_Imakefile -# patch-startx - -EXTRA_PATCHES+= ${.CURDIR}/../../x11/XFree86-4-libraries/files/${pf} -.endfor - -SCRIPTS_ENV= OSVERSION=${OSVERSION} \ - BuildXF86DRI=${BuildXF86DRI} \ - WITH_DEBUG="${WITH_DEBUG}" -MAN1= XFree86.1 \ - Xserver.1 \ - getconfig.1 \ - gtf.1 \ - kbd_mode.1 \ - pcitweak.1 \ - xf86cfg.1 \ - xf86config.1 -MAN3= XF86VidMode.3 \ - XF86VidModeDeleteModeLine.3 \ - XF86VidModeGetAllModeLines.3 \ - XF86VidModeGetDotClocks.3 \ - XF86VidModeGetGamma.3 \ - XF86VidModeGetGammaRamp.3 \ - XF86VidModeGetGammaRampSize.3 \ - XF86VidModeGetModeLine.3 \ - XF86VidModeGetMonitor.3 \ - XF86VidModeGetPermissions.3 \ - XF86VidModeGetViewPort.3 \ - XF86VidModeLockModeSwitch.3 \ - XF86VidModeModModeLine.3 \ - XF86VidModeQueryExtension.3 \ - XF86VidModeQueryVersion.3 \ - XF86VidModeSetClientVersion.3 \ - XF86VidModeSetGamma.3 \ - XF86VidModeSetGammaRamp.3 \ - XF86VidModeSetViewPort.3 \ - XF86VidModeSwitchMode.3 \ - XF86VidModeSwitchToMode.3 \ - XF86VidModeValidateModeLine.3 -MAN4= citron.4x \ - dynapro.4x \ - elographics.4x \ - fbdevhw.4x \ - kbd.4x \ - keyboard.4x \ - microtouch.4x \ - mouse.4x \ - mutouch.4x \ - nv.4x \ - r128.4x \ - radeon.4x \ - void.4x \ - wacom.4x -MAN5= XF86Config.5 \ - getconfig.5 -XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver -XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= lib/font programs/Xserver -XINSTALL_MAN_DIRS= programs/Xserver - -NOT_FOR_ARCHS= ia64 - -.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include - -.if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86 and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif - -.if ${ARCH} == i386 || ${ARCH} == alpha || ${ARCH} == amd64 -RUN_DEPENDS+= ${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/xfree86-dri -BuildXF86DRI= YES -PLIST_SUB+= DRI="" -.else -BuildXF86DRI= NO -PLIST_SUB+= DRI="@comment " -.endif - -.if ${ARCH} == alpha -PLIST_SUB+= ALPHA_NA="@comment " -MAN4+= cirrus.4x -.else -PLIST_SUB+= ALPHA_NA="" -.endif - -.if ${ARCH} == amd64 -PLIST_SUB+= AMD64_NA="@comment " -PLIST_SUB+= AMD64="" -MAN4+= apm.4x \ - chips.4x \ - cirrus.4x \ - cyrix.4x \ - fbdev.4x \ - i128.4x \ - neomagic.4x \ - sis.4x \ - trident.4x \ - tseng.4x \ - vesa.4x -.else -PLIST_SUB+= AMD64_NA="" -PLIST_SUB+= AMD64="@comment " -.endif - -.if ${ARCH} == ia64 -PLIST_SUB+= IA64_NA="@comment " -.else -PLIST_SUB+= IA64_NA="" -.endif - -.if ${ARCH} == powerpc -PLIST_SUB+= PPC_NA="@comment " -.else -PLIST_SUB+= PPC_NA="" -.endif - -.if ${ARCH} == sparc64 -PLIST_SUB+= SPARC64_NA="@comment " -PLIST_SUB+= SPARC64="" -MAN4+= sunffb.4x -.else -PLIST_SUB+= SPARC64="@comment " -PLIST_SUB+= SPARC64_NA="" -MAN4+= glint.4x \ - mga.4x \ - s3virge.4x \ - savage.4x \ - tdfx.4x \ - vga.4x -.endif - -.if ${ARCH} == i386 -PLIST_SUB+= I386="" -MAN1+= scanpci.1 -MAN4+= apm.4x \ - chips.4x \ - cirrus.4x \ - cyrix.4x \ - i128.4x \ - i740.4x \ - i810.4x \ - neomagic.4x \ - nsc.4x \ - sis.4x \ - trident.4x \ - tseng.4x \ - vesa.4x \ - via.4x \ - vmware.4x -.else -PLIST_SUB+= I386="@comment " -.endif - -.if ${ARCH} == i386 || ${ARCH} == amd64 -PLIST_SUB+= AMD64_I386="" -.else -PLIST_SUB+= AMD64_I386="@comment " -.endif - -.if ${ARCH} != powerpc && ${ARCH} != sparc64 -MAN4+= rendition.4x \ - siliconmotion.4x -.endif - -.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO -pre-everything:: - @${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by" - @${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper" - @${ECHO_MSG} "port before handling them normally. If you are concerned about the security" - @${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm," - @${ECHO_MSG} "which will still run the server as root), you can cancel the build and set" - @${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf." - -SCRIPTS_ENV+= SUID_XSERVER=YES -.else -SCRIPTS_ENV+= SUID_XSERVER=NO -.endif - -.include diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo deleted file mode 100644 index a439d4854378..000000000000 --- a/x11-servers/XFree86-4-Server/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-Server/files/patch-CAN-2005-2495 b/x11-servers/XFree86-4-Server/files/patch-CAN-2005-2495 deleted file mode 100644 index 672d7b7e6222..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-CAN-2005-2495 +++ /dev/null @@ -1,312 +0,0 @@ -Index: programs/Xserver/afb/afbpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/afb/afbpixmap.c,v -retrieving revision 3.1 -retrieving revision 3.1.20.1 -diff -u -r3.1 -r3.1.20.1 ---- programs/Xserver/afb/afbpixmap.c 3 Jun 1997 14:11:07 -0000 3.1 -+++ programs/Xserver/afb/afbpixmap.c 18 Sep 2005 00:20:57 -0000 3.1.20.1 -@@ -76,6 +76,9 @@ - int datasize; - int paddedWidth; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ - paddedWidth = BitmapBytePad(width); - datasize = height * paddedWidth * depth; - pPixmap = AllocatePixmap(pScreen, datasize); -Index: programs/Xserver/cfb/cfbpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/cfb/cfbpixmap.c,v -retrieving revision 1.5 -retrieving revision 1.5.8.1 -diff -u -r1.5 -r1.5.8.1 ---- programs/Xserver/cfb/cfbpixmap.c 14 Dec 2001 19:59:23 -0000 1.5 -+++ programs/Xserver/cfb/cfbpixmap.c 18 Sep 2005 00:20:57 -0000 1.5.8.1 -@@ -73,6 +72,9 @@ - int datasize; - int paddedWidth; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ - paddedWidth = PixmapBytePad(width, depth); - datasize = height * paddedWidth; - pPixmap = AllocatePixmap(pScreen, datasize); -Index: programs/Xserver/dix/pixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/dix/pixmap.c,v -retrieving revision 3.5 -retrieving revision 3.5.8.1 -diff -u -r3.5 -r3.5.8.1 ---- programs/Xserver/dix/pixmap.c 14 Dec 2001 19:59:32 -0000 3.5 -+++ programs/Xserver/dix/pixmap.c 18 Sep 2005 00:20:58 -0000 3.5.8.1 -@@ -126,7 +125,9 @@ - unsigned size; - int i; - -- pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize); -+ if (((unsigned)(-1) - pScreen->totalPixmapSize) < (unsigned)pixDataSize) -+ return NullPixmap; -+ pPixmap = xalloc(pScreen->totalPixmapSize + (unsigned)pixDataSize); - if (!pPixmap) - return NullPixmap; - ppriv = (DevUnion *)(pPixmap + 1); -@@ -144,7 +145,7 @@ - ppriv->ptr = (pointer)NULL; - } - #else -- pPixmap = (PixmapPtr)xalloc(sizeof(PixmapRec) + pixDataSize); -+ pPixmap = xalloc(sizeof(PixmapRec) + (unsigned)pixDataSize); - #endif - return pPixmap; - } -Index: programs/Xserver/fb/fbpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/fb/fbpixmap.c,v -retrieving revision 1.11 -retrieving revision 1.11.6.1 -diff -u -r1.11 -r1.11.6.1 ---- programs/Xserver/fb/fbpixmap.c 16 Sep 2002 18:05:34 -0000 1.11 -+++ programs/Xserver/fb/fbpixmap.c 18 Sep 2005 00:20:58 -0000 1.11.6.1 -@@ -37,6 +37,9 @@ - int adjust; - int base; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ - paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits); - datasize = height * paddedWidth; - #ifdef PIXPRIV -Index: programs/Xserver/hw/xfree86/xaa/xaaInit.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v -retrieving revision 1.35 -retrieving revision 1.35.10.1 -diff -u -r1.35 -r1.35.10.1 ---- programs/Xserver/hw/xfree86/xaa/xaaInit.c 19 Jul 2001 18:50:16 -0000 1.35 -+++ programs/Xserver/hw/xfree86/xaa/xaaInit.c 18 Sep 2005 00:20:59 -0000 1.35.10.1 -@@ -479,8 +479,12 @@ - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - XAAPixmapPtr pPriv; - PixmapPtr pPix = NULL; -- int size = w * h; -+ int size; -+ -+ if ((w > MAXSHORT) || (h > MAXSHORT)) -+ return NullPixmap; - -+ size = w * h; - if (!infoRec->offscreenDepthsInitialized) - XAAInitializeOffscreenDepths (pScreen); - -Index: programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v -retrieving revision 1.5 -retrieving revision 1.5.14.1 -diff -u -r1.5 -r1.5.14.1 ---- programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c 27 Apr 2000 16:26:49 -0000 1.5 -+++ programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c 18 Sep 2005 00:21:00 -0000 1.5.14.1 -@@ -89,8 +89,8 @@ - - TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ; - -- if ( depth > 8 ) -- return (PixmapPtr) NULL ; -+ if ((depth > 8) || (width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; - - size = PixmapBytePad(width, depth); - pPixmap = AllocatePixmap (pScreen, (height * size)); -Index: programs/Xserver/ilbm/ilbmpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/ilbm/ilbmpixmap.c,v -retrieving revision 3.0 -retrieving revision 3.0.26.1 -diff -u -r3.0 -r3.0.26.1 ---- programs/Xserver/ilbm/ilbmpixmap.c 18 Aug 1996 01:54:01 -0000 3.0 -+++ programs/Xserver/ilbm/ilbmpixmap.c 18 Sep 2005 00:21:00 -0000 3.0.26.1 -@@ -78,6 +78,9 @@ - int datasize; - int paddedWidth; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ - paddedWidth = BitmapBytePad(width); - datasize = height * paddedWidth * depth; - pPixmap = AllocatePixmap(pScreen, datasize); -Index: programs/Xserver/iplan2p4/iplpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/iplan2p4/iplpixmap.c,v -retrieving revision 3.1 -retrieving revision 3.1.8.1 -diff -u -r3.1 -r3.1.8.1 ---- programs/Xserver/iplan2p4/iplpixmap.c 17 Dec 2001 20:00:46 -0000 3.1 -+++ programs/Xserver/iplan2p4/iplpixmap.c 18 Sep 2005 00:21:00 -0000 3.1.8.1 -@@ -76,8 +76,12 @@ - PixmapPtr pPixmap; - int datasize; - int paddedWidth; -- int ipad=INTER_PLANES*2 - 1; -+ int ipad; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ -+ ipad = INTER_PLANES*2 - 1; - paddedWidth = PixmapBytePad(width, depth); - paddedWidth = (paddedWidth + ipad) & ~ipad; - datasize = height * paddedWidth; -Index: programs/Xserver/mfb/mfbpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/mfb/mfbpixmap.c,v -retrieving revision 1.2 -retrieving revision 1.2.8.1 -diff -u -r1.2 -r1.2.8.1 ---- programs/Xserver/mfb/mfbpixmap.c 14 Dec 2001 20:00:10 -0000 1.2 -+++ programs/Xserver/mfb/mfbpixmap.c 18 Sep 2005 00:21:00 -0000 1.2.8.1 -@@ -44,7 +45,6 @@ - SOFTWARE. - - ******************************************************************/ --/* $Xorg: mfbpixmap.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ - - /* pixmap management - written by drewry, september 1986 -@@ -75,8 +75,9 @@ - int datasize; - int paddedWidth; - -- if (depth != 1) -+ if ((depth != 1) || (width > MAXSHORT) || (height > MAXSHORT)) - return NullPixmap; -+ - paddedWidth = BitmapBytePad(width); - datasize = height * paddedWidth; - pPixmap = AllocatePixmap(pScreen, datasize); -Index: programs/Xserver/os/utils.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/os/utils.c,v -retrieving revision 3.102 -retrieving revision 3.102.2.1 -diff -u -r3.102 -r3.102.2.1 ---- programs/Xserver/os/utils.c 3 Feb 2005 02:01:14 -0000 3.102 -+++ programs/Xserver/os/utils.c 18 Sep 2005 00:21:00 -0000 3.102.2.1 -@@ -1243,19 +1243,19 @@ - void * - Xalloc(unsigned long amount) - { -- register pointer ptr; -- -- if ((long)amount <= 0) -- return NULL; -+ pointer ptr; - - /* aligned extra on long word boundary */ - amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); -+ -+ if ((long)amount <= 0) -+ return NULL; - #ifdef MEMBUG - if (!Must_have_memory && Memory_fail && - ((random() % MEM_FAIL_SCALE) < Memory_fail)) - return NULL; - #endif -- if ((ptr = (pointer)malloc(amount))) { -+ if ((ptr = malloc(amount))) { - return ptr; - } - if (Must_have_memory) -@@ -1273,12 +1273,16 @@ - { - register pointer ptr; - -- if ((long)amount <= 0) -- return NULL; -+ if (amount == 0) -+ return NULL; - - /* aligned extra on long word boundary */ - amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); -- ptr = (pointer)malloc(amount); -+ -+ if ((long)amount <= 0) -+ FatalError("Bad request for memory"); -+ -+ ptr = malloc(amount); - if (!ptr) - FatalError("Out of memory"); - -@@ -1292,11 +1296,11 @@ - void * - Xcalloc(unsigned long amount) - { -- unsigned long *ret; -+ pointer ret; - -- ret = Xalloc (amount); -+ ret = Xalloc(amount); - if (ret) -- bzero ((void *) ret, (int) amount); -+ bzero (ret, (int) amount); - return ret; - } - -@@ -1307,13 +1311,17 @@ - void * - XNFcalloc(unsigned long amount) - { -- unsigned long *ret; -+ pointer ret; - -- ret = Xalloc (amount); -- if (ret) -- bzero ((char *) ret, (int) amount); -- else if ((long)amount > 0) -+ if (amount == 0) -+ return NULL; -+ -+ ret = Xalloc(amount); -+ if (!ret) - FatalError("Out of memory"); -+ -+ bzero (ret, (int) amount); -+ - return ret; - } - -@@ -1336,10 +1344,12 @@ - return NULL; - } - amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); -+ if ((long)amount <= 0) -+ return NULL; - if (ptr) -- ptr = (pointer)realloc((char *)ptr, amount); -+ ptr = realloc(ptr, amount); - else -- ptr = (pointer)malloc(amount); -+ ptr = malloc(amount); - if (ptr) - return ptr; - if (Must_have_memory) -@@ -1355,12 +1365,12 @@ - void * - XNFrealloc(pointer ptr, unsigned long amount) - { -- if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL) -+ if ((ptr = Xrealloc(ptr, amount)) == NULL) - { -- if ((long)amount > 0) -+ if (amount != 0) - FatalError( "Out of memory" ); - } -- return ((unsigned long *)ptr); -+ return ptr; - } - - /***************** diff --git a/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf b/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf deleted file mode 100644 index 01fcb12d6134..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf +++ /dev/null @@ -1,49 +0,0 @@ ---- config/cf/FreeBSD.cf.orig Thu Mar 3 03:32:17 2005 -+++ config/cf/FreeBSD.cf Wed Mar 23 10:41:03 2005 -@@ -234,11 +234,11 @@ - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ -+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX - #else --# define CcCmd cc --# define CplusplusCmd c++ -+# define CcCmd FreeBSDCC -+# define CplusplusCmd FreeBSDCXX - #endif - - #define CppCmd /usr/bin/cpp -@@ -470,6 +470,9 @@ - #define AsVISOption -Av9a - #define AsOutputArchSize 64 - #endif -+#ifdef PpcArchitecture -+#define XF86INT10_BUILD X86INT10_STUB -+#endif - - #define StandardDefines -DCSRG_BASED - -@@ -491,18 +494,8 @@ - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - #endif - --/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ --#ifndef DefaultGcc2i386Opt --#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 GccAliasingArgs --#endif --#endif -- --#ifdef i386Architecture --# define OptimizedCDebugFlags DefaultGcc2i386Opt --#else --# define OptimizedCDebugFlags -O --#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags FreeBSDCFLAGS - - #ifndef PreIncDir - # define PreIncDir /usr/include diff --git a/x11-servers/XFree86-4-Server/files/patch-GL-Imakefile b/x11-servers/XFree86-4-Server/files/patch-GL-Imakefile deleted file mode 100644 index 40560c382274..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-GL-Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/GL/Imakefile.orig Thu Oct 23 00:33:15 2003 -+++ lib/GL/Imakefile Thu Oct 23 00:35:49 2003 -@@ -110,7 +110,7 @@ - #if BuildXF86DRI && GlxUseBuiltInDRIDriver - SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) - #else --SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS) -+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) /*$(LIBGLBUILDDIR) $(OSMESADIRS) */ $(DRIVERDIRS) - #endif - - MakeSubdirs($(SUBDIRS)) diff --git a/x11-servers/XFree86-4-Server/files/patch-HALlib_bindings.c b/x11-servers/XFree86-4-Server/files/patch-HALlib_bindings.c deleted file mode 100644 index 4f2b4f41f0f6..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-HALlib_bindings.c +++ /dev/null @@ -1,27 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -r1.6 -r1.7 ---- programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h 31 Mar 2004 16:37:09 -0000 1.6 -+++ programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h 26 Apr 2005 00:56:44 -0000 1.7 -@@ -210,6 +210,8 @@ - #define MGAMODEINFO_FORCE_PITCH (1L << 5) - #define MGAMODEINFO_FORCE_DISPLAYORG (1L << 6) - #define MGAMODEINFO_TV (1L << 7) -+#define MGAMODEINFO_FLATPANEL1 (1L << 8) -+#define MGAMODEINFO_FLATPANEL2 (1L << 9) - #define MGAMODEINFO_TESTONLY 0x80000000 - - /* Cable Type */ -@@ -243,7 +245,8 @@ - ULONG MGAGetBOARDHANDLESize(void); - ULONG MGASetTVStandard(LPBOARDHANDLE pBoard, ULONG ulTVStandard); - ULONG MGASetTVCableType(LPBOARDHANDLE pBoard, ULONG ulCableType); --ULONG MGASetDisplayStart(LPBOARDHANDLE pBoard, ULONG ulX, ULONG ulY, ULONG ulCrtc); -+ULONG MGAForceFlatPanel(LPBOARDHANDLE pBoard); -+ULONG HALSetDisplayStart(LPBOARDHANDLE pBoard, ULONG ulX, ULONG ulY, ULONG ulCrtc); - - #if defined(__cplusplus) - } diff --git a/x11-servers/XFree86-4-Server/files/patch-Imake.cf b/x11-servers/XFree86-4-Server/files/patch-Imake.cf deleted file mode 100644 index cdda9ca19f79..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-Imake.cf +++ /dev/null @@ -1,18 +0,0 @@ - ---- patch-Imake.cf begins here --- ---- config/cf/Imake.cf.orig Wed Jan 19 20:53:39 2005 -+++ config/cf/Imake.cf Wed Jan 19 20:55:09 2005 -@@ -282,6 +282,10 @@ - # undef __amd64__ - # undef __x86_64__ - # endif -+# ifdef __powerpc__ -+# define PpcArchitecture -+# undef __powerpc__ -+# endif - #endif /* __FreeBSD__ */ - - /* Systems based on kernel of FreeBSD */ ---- patch-Imake.cf ends here --- - - diff --git a/x11-servers/XFree86-4-Server/files/patch-Pci.h b/x11-servers/XFree86-4-Server/files/patch-Pci.h deleted file mode 100644 index ece4cf51dbc4..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-Pci.h +++ /dev/null @@ -1,16 +0,0 @@ - ---- patch-Pci.h begins here --- ---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Thu Jan 20 06:51:21 2005 -+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Thu Jan 20 06:52:09 2005 -@@ -285,7 +285,7 @@ - # define ARCH_PCI_INIT linuxPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN /* Needs kernel work to remove */ --# elif defined(__OpenBSD__) -+# elif defined(__FreeBSD__) || defined(__OpenBSD__) - # define ARCH_PCI_INIT freebsdPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN ---- patch-Pci.h ends here --- - - diff --git a/x11-servers/XFree86-4-Server/files/patch-bsdResource.c b/x11-servers/XFree86-4-Server/files/patch-bsdResource.c deleted file mode 100644 index e031b2681f53..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-bsdResource.c +++ /dev/null @@ -1,68 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005 -@@ -18,7 +18,7 @@ - - #ifdef INCLUDE_XF86_NO_DOMAIN - --#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) -+#if defined(__alpha__) || defined(__amd64__) - - resPtr - xf86BusAccWindowsFromOS(void) -@@ -112,7 +112,7 @@ - return ret; - } - --#elif defined(__powerpc__) -+#elif defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) - - resPtr - xf86BusAccWindowsFromOS(void) -@@ -123,7 +123,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -137,7 +141,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -153,7 +161,11 @@ - RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); - ret = xf86AddResToList(ret, &range, -1); - -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - return ret; - } -@@ -175,7 +187,11 @@ - ret = xf86AddResToList(ret, &range, -1); - RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); - ret = xf86AddResToList(ret, &range, -1); -+#if defined(__sparc__) || defined(__sparc64__) -+ RANGE(range, 0x00ffffff, 0x00ffffff, ResExcIoBlock); -+#else - RANGE(range, 0x0000ffff, 0x0000ffff, ResExcIoBlock); -+#endif - ret = xf86AddResToList(ret, &range, -1); - - return ret; diff --git a/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile b/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile deleted file mode 100644 index 0e80a054d0ef..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile +++ /dev/null @@ -1,21 +0,0 @@ - ---- patch-bus-Imakefile begins here --- ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Thu Jan 20 03:43:03 2005 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Thu Jan 20 03:46:40 2005 -@@ -66,6 +66,13 @@ - PCIDRVRSRC = netbsdPci.c - PCIDRVROBJ = netbsdPci.o - -+#elif defined(FreeBSDArchitecture) && defined(PpcArchitecture) -+ -+XCOMM FreeBSD/PowerPC PCI driver (using /dev/pci) -+ -+PCIDRVRSRC = freebsdPci.c -+PCIDRVROBJ = freebsdPci.o -+ - #elif defined(PpcArchitecture) - - XCOMM PowerPC PCI drivers ---- patch-bus-Imakefile ends here --- - - diff --git a/x11-servers/XFree86-4-Server/files/patch-compiler.h b/x11-servers/XFree86-4-Server/files/patch-compiler.h deleted file mode 100644 index cab042675d88..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-compiler.h +++ /dev/null @@ -1,16 +0,0 @@ - ---- patch-compiler.h begins here --- ---- programs/Xserver/hw/xfree86/common/compiler.h.orig Fri Jan 21 03:19:16 2005 -+++ programs/Xserver/hw/xfree86/common/compiler.h Fri Jan 21 03:20:03 2005 -@@ -1068,7 +1068,7 @@ - # define write_mem_barrier() /* NOP */ - # endif /* __arm32__ */ - --# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__powerpc__) -+# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__) - - # ifndef MAP_FAILED - # define MAP_FAILED ((void *)-1) ---- patch-compiler.h ends here --- - - diff --git a/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile b/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile deleted file mode 100644 index 08e8d9ab4756..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile +++ /dev/null @@ -1,15 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile.orig Thu Feb 24 16:37:48 2005 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile Thu Feb 24 16:38:50 2005 -@@ -125,6 +125,7 @@ - $(LN) $${UP}$(DRMBSDDIR)/$$i/Makefile $(DRM_COPY_DIR)/$$i); \ - done - -+/* - INSTALL_LIST = $(INSTALL_SHARED) $(INSTALL_BSD) - InstallMultiple($(INSTALL_LIST),$(DRMBSDINSTSRCDIR)) - -@@ -138,3 +139,4 @@ - $(DESTDIR)$(DRMBSDINSTSRCDIR)/$$i); \ - done - -+*/ diff --git a/x11-servers/XFree86-4-Server/files/patch-elfloader.c b/x11-servers/XFree86-4-Server/files/patch-elfloader.c deleted file mode 100644 index 7013d0a33b28..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-elfloader.c +++ /dev/null @@ -1,82 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/elfloader.c.orig Mon Mar 28 19:12:53 2005 -+++ programs/Xserver/hw/xfree86/loader/elfloader.c Mon Mar 28 19:22:51 2005 -@@ -203,6 +203,7 @@ - #if defined (__alpha__) || \ - defined (__ia64__) || \ - defined (__AMD64__) || \ -+ defined (__amd64__) || \ - (defined (__sparc__) && \ - (defined (__arch64__) || \ - defined (__sparcv9))) -@@ -294,7 +295,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - typedef Elf_Rela Elf_Rel_t; - #else - typedef Elf_Rel Elf_Rel_t; -@@ -488,7 +490,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - ELFDEBUG(", r_addend 0x%lx", rel->r_addend); - # endif - ELFDEBUG("\n"); -@@ -524,6 +527,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -548,6 +552,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -603,6 +608,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -1263,7 +1269,7 @@ - unsigned long *dest64; - unsigned short *dest16; - #endif --#if defined(__AMD64__) -+#if defined(__AMD64__) || defined(__amd64__) - unsigned long *dest64; - int *dest32s; - #endif -@@ -1281,7 +1287,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - ELFDEBUG("%lx", rel->r_addend); - # endif - ELFDEBUG("\n"); -@@ -1340,7 +1347,7 @@ - - break; - #endif /* i386 */ --#if defined(__AMD64__) -+#if defined(__AMD64__) || defined(__amd64__) - case R_X86_64_32: - dest32 = (unsigned int *)(secp + rel->r_offset); - # ifdef ELFDEBUG diff --git a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c deleted file mode 100644 index 65e0a748702e..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.c +++ /dev/null @@ -1,238 +0,0 @@ ---- lib/font/FreeType/ftfuncs.c.orig Wed Apr 14 11:32:43 2004 -+++ lib/font/FreeType/ftfuncs.c Sun Aug 27 14:35:48 2006 -@@ -50,10 +50,7 @@ THE SOFTWARE. - #include FT_TYPE1_TABLES_H - #include FT_XFREE86_H - #include FT_BBOX_H --#include FT_INTERNAL_TRUETYPE_TYPES_H - #include FT_TRUETYPE_TAGS_H --#include FT_INTERNAL_SFNT_H --#include FT_INTERNAL_STREAM_H - /* - * If you want to use FT_Outline_Get_CBox instead of - * FT_Outline_Get_BBox, define here. -@@ -119,6 +116,46 @@ static char *xlfd_props[] = { - }; - - -+/* read 2-byte value from a SFNT table */ -+static FT_UShort -+sfnt_get_ushort( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[2]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) ); -+ result = (FT_UShort)( (buff[0] << 8) | buff[1] ); -+ -+ return result; -+} -+ -+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o))) -+ -+ -+#if 0 -+static FT_ULong -+sfnt_get_ulong( FT_Face face, -+ FT_ULong table_tag, -+ FT_ULong table_offset ) -+{ -+ FT_Byte buff[4]; -+ FT_ULong len = sizeof(buff); -+ FT_UShort result = 0; -+ -+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ); -+ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) | -+ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3]; -+ -+ return result; -+} -+#endif -+ -+ -+ -+ - static int ftypeInitP = 0; /* is the engine initialised? */ - static FT_Library ftypeLibrary; - -@@ -207,6 +244,10 @@ FreeTypeOpenFace(FTFacePtr *facep, char - if(maxp && maxp->maxContours == 0) - face->bitmap = 1; - } -+ -+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face, -+ TTAG_hhea, 34 ); -+ - /* Insert face in hashtable and return it */ - face->next = faceTable[bucket]; - faceTable[bucket] = face; -@@ -458,6 +499,29 @@ FreeTypeOpenInstance(FTInstancePtr *inst - } - - if( FT_IS_SFNT( face->face ) ) { -+#if 1 -+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y; -+ FT_UInt nn; -+ -+ instance->strike_index=0xFFFFU; -+ -+ tt_char_width = (int)(trans->scale*(1<<6) + 0.5); -+ tt_char_height = (int)(trans->scale*(1<<6) + 0.5); -+ -+ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64; -+ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64; -+ -+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ ) -+ { -+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn]; -+ -+ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem ) -+ { -+ instance->strike_index = nn; -+ break; -+ } -+ } -+#else - /* See Set_Char_Sizes() in ttdriver.c */ - FT_Error err; - TT_Face tt_face; -@@ -482,6 +546,7 @@ FreeTypeOpenInstance(FTInstancePtr *inst - sfnt = (SFNT_Service)tt_face->sfnt; - err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index); - if ( err ) instance->strike_index=0xFFFFU; -+#endif - } - - /* maintain a linked list of instances */ -@@ -799,31 +864,36 @@ ft_make_up_italic_bitmap( char *raster, - * parse the htmx field in TrueType font. - */ - --/* from src/truetype/ttgload.c */ - static void --tt_get_metrics( TT_HoriHeader* header, -+tt_get_metrics( FT_Face face, - FT_UInt idx, -+ FT_UInt num_hmetrics, - FT_Short* bearing, - FT_UShort* advance ) --/* Copyright 1996-2001, 2002 by */ --/* David Turner, Robert Wilhelm, and Werner Lemberg. */ - { -- TT_LongMetrics longs_m; -- FT_UShort k = header->number_Of_HMetrics; -+ /* read the metrics directly from the horizontal header, we -+ * parse the SFNT table directly through the standard FreeType API. -+ * this works with any version of the library and doesn't need to -+ * peek at its internals. Maybe a bit less -+ */ -+ FT_UInt count = num_hmetrics; - -- if ( k == 0 ) { -- *bearing = *advance = 0; -- return; -+ if ( count == 0 ) -+ { -+ *advance = 0; -+ *bearing = 0; - } -+ else if ( idx < count ) -+ { -+ FT_ULong offset = idx*4; - -- if ( idx < (FT_UInt)k ) { -- longs_m = (TT_LongMetrics )header->long_metrics + idx; -- *bearing = longs_m->bearing; -- *advance = longs_m->advance; -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 ); - } -- else { -- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k]; -- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance; -+ else -+ { -+ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 ); -+ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 ); - } - } - -@@ -831,6 +901,7 @@ static int - ft_get_very_lazy_bbox( FT_UInt index, - FT_Face face, - FT_Size size, -+ FT_UInt num_hmetrics, - double slant, - FT_Matrix *matrix, - FT_BBox *bbox, -@@ -838,14 +909,13 @@ ft_get_very_lazy_bbox( FT_UInt index, - FT_Long *vertAdvance) - { - if ( FT_IS_SFNT( face ) ) { -- TT_Face ttface = (TT_Face)face; - FT_Size_Metrics *smetrics = &size->metrics; - FT_Short leftBearing = 0; - FT_UShort advance = 0; - FT_Vector p0, p1, p2, p3; - - /* horizontal */ -- tt_get_metrics(&ttface->horizontal, index, -+ tt_get_metrics( face, num_hmetrics, index, - &leftBearing, &advance); - - #if 0 -@@ -905,6 +975,27 @@ static FT_Error - FT_Do_SBit_Metrics( FT_Face ft_face, FT_Size ft_size, FT_ULong strike_index, - FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return ) - { -+#if 1 -+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0) -+ { -+ FT_Error error; -+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index]; -+ -+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 ); -+ if ( !error ) -+ { -+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY ); -+ if ( !error ) -+ { -+ if ( metrics_return != NULL ) -+ *metrics_return = ft_face->glyph->metrics; -+ -+ return 0; -+ } -+ } -+ } -+ return -1; -+#elif (FREETYPE_VERSION >= 2001008) - SFNT_Service sfnt; - TT_Face face; - FT_Error error; -@@ -968,6 +1059,7 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_ - - Exit: - return error; -+#endif - } - - int -@@ -1023,6 +1115,7 @@ FreeTypeRasteriseGlyph(unsigned idx, int - if( bitmap_metrics == NULL ) { - if ( instance->ttcap.flags & TTCAP_IS_VERY_LAZY ) { - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, -@@ -1197,6 +1290,7 @@ FreeTypeRasteriseGlyph(unsigned idx, int - if( is_outline == 1 ){ - if( correct ){ - if( ft_get_very_lazy_bbox( idx, face->face, instance->size, -+ face->num_hmetrics, - instance->ttcap.vl_slant, - &instance->transformation.matrix, - &bbox, &outline_hori_advance, diff --git a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h deleted file mode 100644 index 925263c0009e..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftfuncs.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $ - ---- lib/font/FreeType/ftfuncs.h.orig 2005-07-07 15:59:47.000000000 +0100 -+++ lib/font/FreeType/ftfuncs.h 2006-06-01 23:21:39.000000000 +0100 -@@ -47,6 +47,7 @@ - char *filename; - FT_Face face; - int bitmap; -+ FT_UInt num_hmetrics; - struct _FTInstance *instances; - struct _FTInstance *active_instance; - struct _FTFace *next; /* link to next face in bucket */ diff --git a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c b/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c deleted file mode 100644 index 51569bfa7104..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-lib_font_FreeType_ftsystem.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $ - ---- lib/font/FreeType/ftsystem.c.orig 2005-07-09 07:36:10.000000000 +0100 -+++ lib/font/FreeType/ftsystem.c 2006-06-01 23:21:53.000000000 +0100 -@@ -32,7 +32,9 @@ - #endif - #include - #include FT_CONFIG_CONFIG_H --#include FT_INTERNAL_DEBUG_H -+#define FT_TRACE( level, varformat ) do ; while ( 0 ) /* nothing */ -+#define FT_TRACE1( varformat ) FT_TRACE( 1, varformat ) -+#define FT_ERROR( varformat ) do ; while ( 0 ) /* nothing */ - #include FT_SYSTEM_H - #include FT_ERRORS_H - #include FT_TYPES_H diff --git a/x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c b/x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c deleted file mode 100644 index 0983fdd5d677..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c +++ /dev/null @@ -1,93 +0,0 @@ ---- lib/font/bitmap/pcfread.c.orig Tue Nov 18 02:17:04 2003 -+++ lib/font/bitmap/pcfread.c Sat Aug 26 00:13:05 2006 -@@ -129,6 +129,10 @@ - return (PCFTablePtr) NULL; - count = pcfGetLSB32(file); - if (IS_EOF(file)) return (PCFTablePtr) NULL; -+ if ((count < 0) || (count > (0x7fffffff / sizeof(PCFTableRec)))) { -+ pcfError("pcfReadTOC(): invalid file format\n"); -+ return NULL; -+ } - tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec)); - if (!tables) { - pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec)); -@@ -248,6 +252,10 @@ - if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT)) - goto Bail; - nprops = pcfGetINT32(file, format); -+ if ((nprops <= 0) || (nprops > (0x7fffffff / sizeof(FontPropRec)))) { -+ pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops); -+ goto Bail; -+ } - if (IS_EOF(file)) goto Bail; - props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec)); - if (!props) { -@@ -263,6 +271,13 @@ - props[i].name = pcfGetINT32(file, format); - isStringProp[i] = pcfGetINT8(file, format); - props[i].value = pcfGetINT32(file, format); -+ if (props[i].name < 0 -+ || (isStringProp[i] != 0 && isStringProp[i] != 1) -+ || (isStringProp[i] && props[i].value < 0)) { -+ pcfError("pcfGetProperties(): invalid file format %d %d %d\n", -+ props[i].name, isStringProp[i], props[i].value); -+ goto Bail; -+ } - if (IS_EOF(file)) goto Bail; - } - /* pad the property array */ -@@ -278,6 +293,7 @@ - } - if (IS_EOF(file)) goto Bail; - string_size = pcfGetINT32(file, format); -+ if (string_size < 0) goto Bail; - if (IS_EOF(file)) goto Bail; - strings = (char *) xalloc(string_size); - if (!strings) { -@@ -418,6 +434,10 @@ - else - nmetrics = pcfGetINT16(file, format); - if (IS_EOF(file)) goto Bail; -+ if ((nmetrics < 0) || (nmetrics > (0x7fffffff / sizeof(CharInfoRec)))) { -+ pcfError("pcfReadFont(): invalid file format\n"); -+ goto Bail; -+ } - metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec)); - if (!metrics) { - pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec)); -@@ -443,7 +463,7 @@ - nbitmaps = pcfGetINT32(file, format); - if (nbitmaps != nmetrics || IS_EOF(file)) - goto Bail; -- -+ /* nmetrics is already ok, so nbitmap also is */ - offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32)); - if (!offsets) { - pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32)); -@@ -457,6 +477,7 @@ - for (i = 0; i < GLYPHPADOPTIONS; i++) { - bitmapSizes[i] = pcfGetINT32(file, format); - if (IS_EOF(file)) goto Bail; -+ if (bitmapSizes[i] < 0) goto Bail; - } - - sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)]; -@@ -532,6 +553,7 @@ - if (IS_EOF(file)) goto Bail; - if (nink_metrics != nmetrics) - goto Bail; -+ /* nmetrics already checked */ - ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo)); - if (!ink_metrics) { - pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo)); -@@ -805,6 +827,10 @@ - else - nmetrics = pcfGetINT16(file, format); - if (IS_EOF(file)) goto Bail; -+ if ((nmetrics < 0) || (nmetrics > (0x7fffffff / sizeof(CharInfoRec)))) { -+ pcfError("pmfReadFont(): invalid file format\n"); -+ goto Bail; -+ } - metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec)); - if (!metrics) { - pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec)); diff --git a/x11-servers/XFree86-4-Server/files/patch-loader.c b/x11-servers/XFree86-4-Server/files/patch-loader.c deleted file mode 100644 index f68744ce35fc..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-loader.c +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/loader.c.orig Tue Feb 22 06:58:18 2005 -+++ programs/Xserver/hw/xfree86/loader/loader.c Tue Feb 22 06:59:09 2005 -@@ -552,8 +552,8 @@ - FatalError("\n_LoaderFileToMem() read() failed: %s\n", - strerror(errno)); - --# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__)) \ -- && defined(__powerpc__) -+# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) \ -+ || defined(__FreeBSD__)) && defined(__powerpc__) - /* - * Keep the instruction cache in sync with changes in the - * main memory. diff --git a/x11-servers/XFree86-4-Server/files/patch-mga_driver.c b/x11-servers/XFree86-4-Server/files/patch-mga_driver.c deleted file mode 100644 index 533d9ba9caf4..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-mga_driver.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v -retrieving revision 1.250 -retrieving revision 1.251 -diff -u -r1.250 -r1.251 ---- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 18 Feb 2005 02:55:08 -0000 1.250 -+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 26 Apr 2005 00:56:43 -0000 1.251 -@@ -401,7 +401,7 @@ - "MGASetVgaMode", - "MGAValidateMode", - "MGAValidateVideoParameters", -- "MGASetDisplayStart", -+ "HALSetDisplayStart", - NULL - }; - #endif -@@ -3644,7 +3644,7 @@ - MGAAdjustGranularity(pScrn,&x,&y); - pMga->HALGranularityOffX = pMga->HALGranularityOffX - x; - pMga->HALGranularityOffY = pMga->HALGranularityOffY - y; -- MGASetDisplayStart(pMga->pBoard,x,y,0); -+ HALSetDisplayStart(pMga->pBoard,x,y,0); - ); - #endif - MGA_NOT_HAL( -@@ -3692,7 +3692,7 @@ - #ifdef USEMGAHAL - MGA_HAL( - MGAAdjustGranularity(pScrn,&x,&y); -- MGASetDisplayStart(pMga->pBoard,x,y,1); -+ HALSetDisplayStart(pMga->pBoard,x,y,1); - ); - #endif - MGA_NOT_HAL( diff --git a/x11-servers/XFree86-4-Server/files/patch-mouse.c b/x11-servers/XFree86-4-Server/files/patch-mouse.c deleted file mode 100644 index 6aba3f5627b1..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-mouse.c +++ /dev/null @@ -1,18 +0,0 @@ - ---- patch-mouse.c begins here --- ---- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jan 29 06:57:55 2005 -+++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Sat Jan 29 06:59:03 2005 -@@ -1501,8 +1501,8 @@ - - case PROT_SYSMOUSE: /* sysmouse */ - buttons = (~pBuf[0]) & 0x07; -- dx = (char)(pBuf[1]) + (char)(pBuf[3]); -- dy = - ((char)(pBuf[2]) + (char)(pBuf[4])); -+ dx = (signed char)(pBuf[1]) + (signed char)(pBuf[3]); -+ dy = - ((signed char)(pBuf[2]) + (signed char)(pBuf[4])); - /* FreeBSD sysmouse sends additional data bytes */ - if (pMse->protoPara[4] >= 8) { - /* ---- patch-mouse.c ends here --- - - diff --git a/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile b/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile deleted file mode 100644 index c418e5cad535..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile +++ /dev/null @@ -1,15 +0,0 @@ - ---- patch-support-Imakefile begins here --- ---- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Thu Jan 20 03:30:38 2005 -+++ programs/Xserver/hw/xfree86/os-support/Imakefile Thu Jan 20 03:31:37 2005 -@@ -15,6 +15,7 @@ - (defined(SunArchitecture) && defined(SparcArchitecture)) || \ - (defined(KFreeBSDArchitecture) && defined(AlphaArchitecture)) || \ - (defined(KFreeBSDArchitecture) && defined(Sparc64Architecture)) || \ -+ (defined(KFreeBSDArchitecture) && defined(PpcArchitecture)) || \ - (defined(KNetBSDArchitecture) && defined(AlphaArchitecture)) || \ - (defined(KNetBSDArchitecture) && defined(PpcArchitecture)) || \ - (defined(KNetBSDArchitecture) && defined(SparcArchitecture)) || \ ---- patch-support-Imakefile ends here --- - - diff --git a/x11-servers/XFree86-4-Server/files/patch-trident_driver.c b/x11-servers/XFree86-4-Server/files/patch-trident_driver.c deleted file mode 100644 index 5a062e416351..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-trident_driver.c +++ /dev/null @@ -1,17 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c -=================================================================== -RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v -retrieving revision 1.193 -retrieving revision 1.194 -diff -u -r1.193 -r1.194 ---- programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 18 Feb 2005 02:55:10 -0000 1.193 -+++ programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 30 Apr 2005 17:04:00 -0000 1.194 -@@ -2606,7 +2606,7 @@ - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - TRIDENTRegPtr tridentReg; - -- WAITFORVSYNC; -+ if (!xf86IsPc98()) WAITFORVSYNC; - - TridentFindClock(pScrn,mode->Clock); - diff --git a/x11-servers/XFree86-4-Server/files/patch-trident_video.c b/x11-servers/XFree86-4-Server/files/patch-trident_video.c deleted file mode 100644 index 776d1ded68b5..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-trident_video.c +++ /dev/null @@ -1,19 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/trident/trident_video.c -=================================================================== -RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v -retrieving revision 1.47 -retrieving revision 1.48 -diff -u -r1.47 -r1.48 ---- programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 29 Mar 2004 16:25:22 -0000 1.47 -+++ programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 30 Apr 2005 17:04:00 -0000 1.48 -@@ -1307,6 +1307,8 @@ - * full vblank has passed. - * - Alan. - */ -- WAITFORVSYNC; -- WAITFORVSYNC; -+ if (!xf86IsPc98()) { -+ WAITFORVSYNC; -+ WAITFORVSYNC; -+ } - } diff --git a/x11-servers/XFree86-4-Server/pkg-descr b/x11-servers/XFree86-4-Server/pkg-descr deleted file mode 100644 index 7bb168d1f581..000000000000 --- a/x11-servers/XFree86-4-Server/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains X server and its related programs, -such as xf86cfg, xf86config, kbd_mode, and so on. - -WWW: http://www.xfree86.org/ diff --git a/x11-servers/XFree86-4-Server/pkg-install b/x11-servers/XFree86-4-Server/pkg-install deleted file mode 100644 index d62eb7772f13..000000000000 --- a/x11-servers/XFree86-4-Server/pkg-install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} -SECCONFDIR=${PKG_PREFIX}/lib/X11/xserver - -if [ ! -f ${SECCONFDIR}/SecurityPolicy ]; then - cp ${SECCONFDIR}/SecurityPolicy.default-Server \ - ${SECCONFDIR}/SecurityPolicy -fi diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist deleted file mode 100644 index 8db4e4324834..000000000000 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ /dev/null @@ -1,182 +0,0 @@ -bin/X -bin/XFree86 -bin/getconfig -bin/getconfig.pl -bin/gtf -%%PPC_NA%%%%SPARC64_NA%%bin/inb -%%PPC_NA%%%%SPARC64_NA%%bin/inl -%%PPC_NA%%%%SPARC64_NA%%bin/inw -%%PPC_NA%%%%SPARC64_NA%%bin/ioport -bin/kbd_mode -bin/mmapr -bin/mmapw -%%PPC_NA%%%%SPARC64_NA%%bin/outb -%%PPC_NA%%%%SPARC64_NA%%bin/outl -%%PPC_NA%%%%SPARC64_NA%%bin/outw -bin/pcitweak -%%I386%%bin/scanpci -bin/xf86cfg -bin/xf86config -include/X11/bitmaps/card.xbm -include/X11/bitmaps/down.xbm -include/X11/bitmaps/keyboard.xbm -include/X11/bitmaps/left.xbm -include/X11/bitmaps/monitor.xbm -include/X11/bitmaps/mouse.xbm -include/X11/bitmaps/narrower.xbm -include/X11/bitmaps/right.xbm -include/X11/bitmaps/shorter.xbm -include/X11/bitmaps/taller.xbm -include/X11/bitmaps/up.xbm -include/X11/bitmaps/wider.xbm -include/X11/pixmaps/card.xpm -include/X11/pixmaps/computer.xpm -include/X11/pixmaps/keyboard.xpm -include/X11/pixmaps/monitor.xpm -include/X11/pixmaps/mouse.xpm -lib/X11/Cards -lib/X11/Options -lib/X11/XF86Config.98 -lib/X11/XF86Config.eg -lib/X11/app-defaults/XF86Cfg -share/doc/XFree86/BUILD -share/doc/XFree86/BugReport -share/doc/XFree86/DESIGN -share/doc/XFree86/Install -share/doc/XFree86/Japanese/README98 -share/doc/XFree86/Japanese/README98.1st -share/doc/XFree86/LICENSE -share/doc/XFree86/README -share/doc/XFree86/README.DECtga -share/doc/XFree86/README.DRI -share/doc/XFree86/README.DRIcomp -share/doc/XFree86/README.I128 -share/doc/XFree86/README.SiS -share/doc/XFree86/README.XKB-Config -share/doc/XFree86/README.XKB-Enhancing -share/doc/XFree86/README.apm -share/doc/XFree86/README.ati -share/doc/XFree86/README.chips -share/doc/XFree86/README.cyrix -share/doc/XFree86/README.dps -share/doc/XFree86/README.fonts -share/doc/XFree86/README.i740 -share/doc/XFree86/README.i810 -share/doc/XFree86/README.mouse -share/doc/XFree86/README.newport -share/doc/XFree86/README.r128 -share/doc/XFree86/README.rapidaccess -share/doc/XFree86/README.rendition -share/doc/XFree86/README.s3virge -share/doc/XFree86/RELNOTES -share/doc/XFree86/Versions -share/doc/XFree86/VideoBoard98 -lib/X11/etc/Xinstall.sh -lib/X11/etc/sun.termcap -lib/X11/etc/sun.terminfo -lib/X11/etc/xmodmap.std -lib/X11/getconfig/cfg.sample -lib/X11/getconfig/xfree86.cfg -%%AMD64_I386%%lib/modules/drivers/apm_drv.o -%%AMD64_I386%%lib/modules/drivers/ark_drv.o -lib/modules/drivers/ati_drv.o -lib/modules/drivers/atimisc_drv.o -%%AMD64_I386%%lib/modules/drivers/chips_drv.o -%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o -%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o -%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o -%%AMD64_I386%%lib/modules/drivers/cyrix_drv.o -%%AMD64%%lib/modules/drivers/dummy_drv.o -%%AMD64%%lib/modules/drivers/fbdev_drv.o -%%SPARC64_NA%%lib/modules/drivers/glint_drv.o -%%AMD64_I386%%lib/modules/drivers/i128_drv.o -%%I386%%lib/modules/drivers/i740_drv.o -%%I386%%lib/modules/drivers/i810_drv.o -%%SPARC64_NA%%lib/modules/drivers/mga_drv.o -%%AMD64_I386%%lib/modules/drivers/neomagic_drv.o -%%I386%%lib/modules/drivers/nsc_drv.o -lib/modules/drivers/nv_drv.o -lib/modules/drivers/r128_drv.o -lib/modules/drivers/radeon_drv.o -%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o -lib/modules/drivers/riva128.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o -%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o -%%AMD64_I386%%lib/modules/drivers/sis_drv.o -%%SPARC64%%lib/modules/drivers/sunffb_drv.o -%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o -%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o -%%AMD64_I386%%lib/modules/drivers/trident_drv.o -%%AMD64_I386%%lib/modules/drivers/tseng_drv.o -%%AMD64_I386%%lib/modules/drivers/vesa_drv.o -%%SPARC64_NA%%lib/modules/drivers/vga_drv.o -%%I386%%lib/modules/drivers/via_drv.o -%%I386%%lib/modules/drivers/vmware_drv.o -lib/modules/extensions/libGLcore.a -lib/modules/extensions/libdbe.a -%%DRI%%lib/modules/extensions/libdri.a -lib/modules/extensions/libextmod.a -lib/modules/extensions/libglx.a -lib/modules/extensions/librecord.a -lib/modules/extensions/libxtrap.a -lib/modules/fonts/libbitmap.a -lib/modules/fonts/libfreetype.a -lib/modules/fonts/libspeedo.a -lib/modules/fonts/libtype1.a -lib/modules/fonts/libxtt.a -%%DRI%%lib/modules/freebsd/libdrm.a -lib/modules/input/citron_drv.o -lib/modules/input/digitaledge_drv.o -lib/modules/input/dynapro_drv.o -lib/modules/input/elo2300_drv.o -lib/modules/input/elographics_drv.o -lib/modules/input/kbd_drv.o -lib/modules/input/magellan_drv.o -lib/modules/input/microtouch_drv.o -lib/modules/input/mouse_drv.o -lib/modules/input/mutouch_drv.o -lib/modules/input/spaceorb_drv.o -lib/modules/input/summa_drv.o -lib/modules/input/void_drv.o -lib/modules/input/wacom_drv.o -%%I386%%lib/modules/libafb.a -lib/modules/libcfb.a -lib/modules/libcfb16.a -lib/modules/libcfb24.a -lib/modules/libcfb32.a -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 -lib/modules/libramdac.a -lib/modules/libscanpci.a -lib/modules/libshadow.a -lib/modules/libshadowfb.a -lib/modules/libvbe.a -lib/modules/libvgahw.a -lib/modules/libxaa.a -lib/modules/libxf1bpp.a -lib/modules/libxf24_32bpp.a -lib/modules/libxf4bpp.a -lib/modules/libxf8_16bpp.a -lib/modules/libxf8_32bpp.a -%%SPARC64%%lib/modules/libxf8_32wid.a -%%PPC_NA%%%%SPARC64_NA%%lib/modules/v10002d.uc -%%PPC_NA%%%%SPARC64_NA%%lib/modules/v20002d.uc -@dirrm lib/X11/etc -@dirrm lib/X11/getconfig -@dirrm lib/modules/drivers -@dirrm lib/modules/extensions -@dirrm lib/modules/fonts -@dirrm lib/modules/freebsd -@dirrm lib/modules/input -@dirrmtry include/X11/pixmaps -@dirrmtry lib/modules -@dirrmtry share/doc/XFree86/Japanese -@dirrmtry share/doc/XFree86 diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure deleted file mode 100644 index 11dbf6ad85e8..000000000000 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -# This script does the following: -# (1) cp xf86site.def, installed by imake-4 port, -# to ${WRKDIR}/xc/config/cf. -# this provides settings for the ports system. -# (2) Create a host.def for this specific port, using -# host.def as a base. - -ORIGDEF=$PREFIX/lib/X11/config/xf86site.def -DESTDEF=$WRKDIR/xc/config/cf/xf86site.def -ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -HOSTDEF=$WRKDIR/xc/config/cf/host.def - -# Use original host.def as initial config file -rm -f $LOCALDEF -grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF -echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - -# This is also defined in xf86site.def, but doesn't get -# picked up for some reason. -echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - -# Now, we can use this configuration. -# Thanks, Trevor Johnson -echo "#define InstallXserverSetUID NO" >> $LOCALDEF - -echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \ - elographics magellan \ - microtouch mutouch spaceorb summa \ - wacom void citron" >> $LOCALDEF -echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF -echo "#define BuildXF86DRM NO" >> $LOCALDEF -echo "#define HasGlide3 YES" >> $LOCALDEF - -# Install driver manpages as foo.4x so they can easily be accesed by -# 'man 4x foo' -echo "#define DriverManSuffix 4x" >> $LOCALDEF -echo "#define DriverManDir \$(MANSOURCEPATH)4" >> $LOCALDEF - -# disable some options -for i in \ - BuildFonts \ - Build75DpiFonts \ - Build100DpiFonts \ - BuildSpeedoFonts \ - BuildType1Fonts \ - BuildCIDFonts \ - BuildCyrillicFonts \ - BuildHtmlManPages \ - JoystickSupport \ - XnestServer \ - BuildFontServer \ - XVirtualFramebufferServer \ - XprtServer \ - BuildDmx \ - LibHeaders \ - LibInstall \ - ForceNormalLib \ - InstallSecurityConfig \ - XTrueTypeInstallCConvHeaders -do \ - echo "#define $i NO" >> $LOCALDEF -done - -echo "#define InstallXserverSetUID ${SUID_XSERVER}" >> $LOCALDEF -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define LibInstallBuild YES" >> $LOCALDEF -echo "#define ModInstall YES" >> $LOCALDEF -echo "#define XF86Server YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define BuildGLXLibrary YES" >> $LOCALDEF -echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF -echo "#define InstallJapaneseDocs YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define UseInstalledLibraries YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF - -echo "#define FreeBSDCC ${CC}" >> $LOCALDEF -echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF -if [ X$WITH_DEBUG != X ]; then - echo "#define FreeBSDCFLAGS -g ${CFLAGS}" >> $LOCALDEF - echo "#define InstPgmFlags" >> $LOCALDEF -else - echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF -fi - -# We need to test cards on these architectures and see what can be added -# to the other architectures. -cat >> $LOCALDEF <> $LOCALDEF - -# Copy ORIGDEF to DESTDEF -rm -f $DESTDEF -cp -f $ORIGDEF $DESTDEF - -# copy generated config to host.def -cp -f $LOCALDEF $HOSTDEF - -exit 0 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile deleted file mode 100644 index 6219da01741f..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: XFree86-VirtualFramebufferServer -# Date created: 10 Oct 1999 -# Whom: taguchi@tohoku.iij.ad.jp -# -# $FreeBSD$ -# - -PORTNAME= VirtualFramebufferServer -PORTVERSION= 4.5.0 -PORTREVISION= 2 -CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE} -MASTER_SITE_SUBDIR= ${PORTVERSION} -PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ - XFree86-${PORTVERSION}-src-2.tgz \ - XFree86-${PORTVERSION}-src-3.tgz - -MAINTAINER= x11@FreeBSD.org -COMMENT= XFree86-4 virtual framebuffer server - -CONFLICTS= xorg-vfbserver-[0-9]* - -DEPRECATED= isn't maintained anymore -EXPIRATION_DATE= 2007-12-25 - -EXTRA_PATCHES= ${.CURDIR}/../../x11-servers/XFree86-4-Server/files/patch-lib_font_bitmap_pcfread.c -MAN1= Xvfb.1 -PLIST_FILES= bin/Xvfb - -XBUILD_DIRS= lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver -XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= programs/Xserver -XINSTALL_MAN_DIRS= programs/Xserver/hw/vfb - -.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include -.if ${X_WINDOW_SYSTEM:L} != xfree86-4 -IGNORE= is part of XFree86 and you have ${X_WINDOW_SYSTEM} set for X11\ - distribution. See The X Window System and Virtual Consoles chapter\ - of FAQ for more information -.endif -.include diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo deleted file mode 100644 index a439d4854378..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-descr b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-descr deleted file mode 100644 index 33a18240b35c..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -This package contains XVirtualFramebufferServer(Xvfb). - -WWW: http://www.xfree86.org/ diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install deleted file mode 100644 index 3b7163d6046d..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6} -SECCONFDIR=${PKG_PREFIX}/lib/X11/xserver - -if [ ! -f ${SECCONFDIR}/SecurityPolicy ]; then - cp ${SECCONFDIR}/SecurityPolicy.default-VFBServer \ - ${SECCONFDIR}/SecurityPolicy -fi diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure deleted file mode 100644 index 1882084a1b9e..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -# This script does the following: -# (1) cp xf86site.def, installed by imake-4 port, -# to ${WRKDIR}/xc/config/cf. -# this provides settings for the ports system. -# (2) Create a host.def for this specific port, using -# host.def as a base. - -ORIGDEF=$PREFIX/lib/X11/config/xf86site.def -DESTDEF=$WRKDIR/xc/config/cf/xf86site.def -ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -HOSTDEF=$WRKDIR/xc/config/cf/host.def - - -# Use original host.def as initial config file -rm -f $LOCALDEF -grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF -echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - -# This is also defined in xf86site.def, but doesn't get -# picked up for some reason. -echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - -# disable some options -for i in BuildFonts \ - Build75DpiFonts \ - Build100DpiFonts \ - BuildSpeedoFonts \ - BuildType1Fonts \ - BuildCIDFonts \ - BuildCyrillicFonts \ - BuildLatin2Fonts \ - BuildHtmlManPages \ - XF86Server \ - BuildFontServer \ - XnestServer \ - XprtServer \ - XdmxServer \ - LibHeaders \ - ForceNormalLib \ - InstallSecurityConfig \ - XTrueTypeInstallCConvHeaders -do \ - echo "#define $i NO" >> $LOCALDEF -done - -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define XVirtualFramebufferServer YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF -echo "#define FreeBSDCC ${CC}" >> $LOCALDEF -echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF -echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF - -# Copy ORIGDEF to DESTDEF -rm -f $DESTDEF -cp -f $ORIGDEF $DESTDEF - -# copy generated config to host.def -cp -f $LOCALDEF $HOSTDEF - -exit 0 -- cgit