diff options
| author | anholt <anholt@FreeBSD.org> | 2003-03-12 07:38:11 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-03-12 07:38:11 +0800 |
| commit | d580e8aa85f6c754681443742699cb344fd34220 (patch) | |
| tree | a648e1f065021daba9648efa64ba27f6d5cf6100 /x11-servers | |
| parent | f90a815ef2ca91c396820cd38bd9e9dc860bebe9 (diff) | |
| download | freebsd-ports-gnome-d580e8aa85f6c754681443742699cb344fd34220.tar.gz freebsd-ports-gnome-d580e8aa85f6c754681443742699cb344fd34220.tar.zst freebsd-ports-gnome-d580e8aa85f6c754681443742699cb344fd34220.zip | |
Update XFree86 ports, including linux_dri, to 4.3.0. Set IGNORE= in dri-devel
for being outdated. Thank you to all the testers and people who submitted
patches for this update.
Approved by: portmgr
Diffstat (limited to 'x11-servers')
40 files changed, 826 insertions, 905 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index 8641c6b9966f..70e7347af603 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -6,17 +6,17 @@ # PORTNAME= FontServer -PORTVERSION= 4.2.0 -PORTREVISION= 1 +PORTVERSION= 4.3.0 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz -EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz +DISTFILES= X430src-1.tgz \ + X430src-2.tgz \ + X430src-3.tgz MAINTAINER= anholt@freebsd.org -COMMENT= XFree86-4 Font Server +COMMENT= XFree86-4 font server XFREE86_VERSION= 4 USE_IMAKE= YES @@ -28,9 +28,8 @@ SCRIPTS_ENV= CC="${CC}" \ PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files MAN1= Xserver.1 xfs.1 XBUILD_DIRS= programs/xfs -XINCLUDE_DIRS= lib/xtrans programs/Xserver +XINCLUDE_DIRS= lib/xtrans programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver programs/xfs - .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.mk> diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo index 62b0b3a56cf9..95ac418ea9ad 100644 --- a/x11-servers/XFree86-4-FontServer/distinfo +++ b/x11-servers/XFree86-4-FontServer/distinfo @@ -1,2 +1,3 @@ -MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f -MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 +MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af +MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 +MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure index 70303f06cf69..d7ff8bbdbfec 100644 --- a/x11-servers/XFree86-4-FontServer/scripts/configure +++ b/x11-servers/XFree86-4-FontServer/scripts/configure @@ -1,14 +1,11 @@ #!/bin/sh # This script does the following: -# (1) cp current xf86site.def (it is created by the imake-4 port) +# (1) cp xf86site.def, installed by imake-4 port, # to ${WRKDIR}/xc/config/cf. -# this means this port uses imake-4's config for defaults. -# (2) Generate temporal config for compiling. -# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are -# used locally for compiling this port, so these configs will be generated -# by this script. These configs will be stored to the `host.def' file, -# but this host.def will never be installed. +# 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 @@ -16,25 +13,17 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def LOCALDEF=$WRKDIR/.config HOSTDEF=$WRKDIR/xc/config/cf/host.def -configure () { - # Use original host.def as initial config file - rm -f $LOCALDEF - grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF - echo "#define ProjectRoot $PREFIX" >> $LOCALDEF +# Use original host.def as initial config file +rm -f $LOCALDEF +grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF +echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - if [ X$InstallFSConfig = "X" ]; then - InstallFSConfig=YES - fi - - # It's good for FreeBSD ports/packages system. - echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - - # I want to set this line. - # but the probrem is too deep. not yet done. - # echo "#define InstallXserverSetUID NO" >> $LOCALDEF +# This is also defined in xf86site.def, but doesn't get +# picked up for some reason. +echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - # disable some configs: there are not used this ports - for i in BuildFonts \ +# disable some options +for i in BuildFonts \ Build75DpiFonts \ Build100DpiFonts \ BuildSpeedoFonts \ @@ -49,27 +38,28 @@ configure () { 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 - echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF - echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF - echo "#define UseInstalledPrograms YES" >> $LOCALDEF - echo "#define FreeBSDCC ${CC}" >> $LOCALDEF - echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF - echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF +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 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 ORIGDEF to DESTDEF +rm -f $DESTDEF +cp -f $ORIGDEF $DESTDEF - # copy generated config to host.def - cp -f $LOCALDEF $HOSTDEF -} +# copy generated config to host.def +cp -f $LOCALDEF $HOSTDEF -cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf -configure exit 0 diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index f45b95594e4b..ff2a9be2e59f 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -6,24 +6,23 @@ # PORTNAME= NestServer -PORTVERSION= 4.2.1 -PORTREVISION= 1 +PORTVERSION= 4.3.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= 4.2.0/:x \ +MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X420src-1.tgz:x \ +DISTFILES= X430src-1.tgz:x \ + X430src-2.tgz:x \ + X430src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X420src-1.tgz - -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= anholt/patches-4.2.0/ -PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz +EXTRACT_ONLY= X430src-1.tgz \ + X430src-2.tgz \ + X430src-3.tgz MAINTAINER= anholt@freebsd.org -COMMENT= XFree86-4 Xnest server +COMMENT= XFree86-4 nested X server XFREE86_VERSION= 4 USE_IMAKE= YES diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo index fde56e7c7696..86966f90fbd3 100644 --- a/x11-servers/XFree86-4-NestServer/distinfo +++ b/x11-servers/XFree86-4-NestServer/distinfo @@ -1,3 +1,4 @@ -MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f +MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af +MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 +MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure index c81f36f4df1b..8fc815ae2bc3 100644 --- a/x11-servers/XFree86-4-NestServer/scripts/configure +++ b/x11-servers/XFree86-4-NestServer/scripts/configure @@ -1,14 +1,11 @@ #!/bin/sh # This script does the following: -# (1) cp current xf86site.def (it is created by the imake-4 port) +# (1) cp xf86site.def, installed by imake-4 port, # to ${WRKDIR}/xc/config/cf. -# this means this port uses imake-4's config for defaults. -# (2) Generate temporal config for compiling. -# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are -# used locally for compiling this port, so these configs will be generated -# by this script. These configs will be stored to the `host.def' file, -# but this host.def will never be installed. +# 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 @@ -16,18 +13,17 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def LOCALDEF=$WRKDIR/.config HOSTDEF=$WRKDIR/xc/config/cf/host.def -configure () { - # Use original host.def as initial config file - rm -f $LOCALDEF - grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF - echo "#define ProjectRoot $PREFIX" >> $LOCALDEF +# Use original host.def as initial config file +rm -f $LOCALDEF +grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF +echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - if [ X$InstallFSConfig = "X" ]; then - InstallFSConfig=YES - fi +# This is also defined in xf86site.def, but doesn't get +# picked up for some reason. +echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - # disable some configs: there are not used this ports - for i in BuildFonts \ +# disable some options +for i in BuildFonts \ Build75DpiFonts \ Build100DpiFonts \ BuildSpeedoFonts \ @@ -42,25 +38,23 @@ configure () { LibHeaders \ ForceNormalLib \ 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 +do \ + echo "#define $i NO" >> $LOCALDEF +done - # Copy ORIGDEF to DESTDEF - rm -f $DESTDEF - cp -f $ORIGDEF $DESTDEF +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 generated config to host.def - cp -f $LOCALDEF $HOSTDEF -} +# Copy ORIGDEF to DESTDEF +rm -f $DESTDEF +cp -f $ORIGDEF $DESTDEF + +# copy generated config to host.def +cp -f $LOCALDEF $HOSTDEF -cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf -configure exit 0 diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index 4b5ddb228b91..fc122b60e622 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -6,24 +6,23 @@ # PORTNAME= PrintServer -PORTVERSION= 4.2.1 -PORTREVISION= 1 +PORTVERSION= 4.3.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= 4.2.0/:x \ +MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X420src-1.tgz:x \ +DISTFILES= X430src-1.tgz:x \ + X430src-2.tgz:x \ + X430src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X420src-1.tgz - -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= anholt/patches-4.2.0/ -PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz +EXTRACT_ONLY= X430src-1.tgz \ + X430src-2.tgz \ + X430src-3.tgz MAINTAINER= anholt@freebsd.org -COMMENT= XFree86-4 print Server +COMMENT= XFree86-4 print server XFREE86_VERSION= 4 USE_IMAKE= YES diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo index fde56e7c7696..86966f90fbd3 100644 --- a/x11-servers/XFree86-4-PrintServer/distinfo +++ b/x11-servers/XFree86-4-PrintServer/distinfo @@ -1,3 +1,4 @@ -MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f +MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af +MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 +MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure index 07a72d4d47ca..9d48ed85c7eb 100644 --- a/x11-servers/XFree86-4-PrintServer/scripts/configure +++ b/x11-servers/XFree86-4-PrintServer/scripts/configure @@ -1,14 +1,11 @@ #!/bin/sh # This script does the following: -# (1) cp current xf86site.def (it is created by the imake-4 port) +# (1) cp xf86site.def, installed by imake-4 port, # to ${WRKDIR}/xc/config/cf. -# this means this port uses imake-4's config for defaults. -# (2) Generate temporal config for compiling. -# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are -# used locally for compiling this port, so these configs will be generated -# by this script. These configs will be stored to the `host.def' file, -# but this host.def will never be installed. +# 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 @@ -16,18 +13,17 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def LOCALDEF=$WRKDIR/.config HOSTDEF=$WRKDIR/xc/config/cf/host.def -configure () { - # Use original host.def as initial config file - rm -f $LOCALDEF - grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF - echo "#define ProjectRoot $PREFIX" >> $LOCALDEF +# Use original host.def as initial config file +rm -f $LOCALDEF +grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF +echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - if [ X$InstallFSConfig = "X" ]; then - InstallFSConfig=YES - fi +# This is also defined in xf86site.def, but doesn't get +# picked up for some reason. +echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - # disable some configs: there are not used this ports - for i in BuildFonts \ +# disable some options +for i in BuildFonts \ Build75DpiFonts \ Build100DpiFonts \ BuildSpeedoFonts \ @@ -42,25 +38,23 @@ configure () { 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 +do \ + echo "#define $i NO" >> $LOCALDEF +done - # Copy ORIGDEF to DESTDEF - rm -f $DESTDEF - cp -f $ORIGDEF $DESTDEF +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 generated config to host.def - cp -f $LOCALDEF $HOSTDEF -} +# Copy ORIGDEF to DESTDEF +rm -f $DESTDEF +cp -f $ORIGDEF $DESTDEF + +# copy generated config to host.def +cp -f $LOCALDEF $HOSTDEF -cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf -configure exit 0 diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 141c8213eb58..fa27b5ccc63e 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: XFree86-Server +# New ports collection makefile for: XFree86-Server # Date created: 10 Oct 1999 # Whom: taguchi@tohoku.iij.ad.jp # @@ -6,48 +6,42 @@ # PORTNAME= Server -PORTVERSION= 4.2.1 -PORTREVISION= 7 +PORTVERSION= 4.3.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= 4.2.0/:x \ +MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X420src-1.tgz:x \ +DISTFILES= X430src-1.tgz:x \ + X430src-2.tgz:x \ + X430src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X420src-1.tgz - -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= anholt/patches-4.2.0/ -PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz \ - patch-nvchips.gz +EXTRACT_ONLY= X430src-1.tgz \ + X430src-2.tgz \ + X430src-3.tgz MAINTAINER= anholt@freebsd.org COMMENT= XFree86-4 X server and related programs XFREE86_VERSION= 4 USE_IMAKE= YES +INSTALLS_SHLIB= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files -.for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \ - patch-i810_driver.c patch-mga_driver.c patch-r128_driver.c \ - patch-alp_xaam.c -EXTRA_PATCHES+= ${.CURDIR}/files/${pf} +.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h +EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor SCRIPTS_ENV= OSVERSION=${OSVERSION} \ - HasSecureRPC=${HasSecureRPC} \ - HasPam=${HasPam} \ - ExtendedInputDevices=${ExtendedInputDevices} \ BuildXF86DRI=${BuildXF86DRI} \ - HasGlide3=${HasGlide3} \ - HaveMatroxHal=${HaveMatroxHal} \ + WITH_DEBUG="${WITH_DEBUG}" \ CC="${CC}" \ CXX="${CXX}" \ CFLAGS="${CFLAGS}" MAN1= XFree86.1 \ Xserver.1 \ + gtf.1 \ kbd_mode.1 \ pcitweak.1 \ xf86cfg.1 \ @@ -55,29 +49,45 @@ MAN1= XFree86.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= mga.4 \ - tdfx.4 \ +MAN4= citron.4 \ + dynapro.4 \ + elographics.4 \ glint.4 \ - s3virge.4 \ + kbd.4 \ + keyboard.4 \ + mga.4 \ + microtouch.4 \ + mouse.4 \ + mutouch.4 \ + nv.4 \ r128.4 \ rendition.4 \ + s3virge.4 \ savage.4 \ - nv.4 \ siliconmotion.4 \ + tdfx.4 \ vga.4 \ - keyboard.4 \ - mouse.4 + void.4 \ + wacom.4 MAN5= XF86Config.5 PKGMESSAGE= ${WRKDIR}/.pkg-message XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver @@ -87,36 +97,16 @@ XINSTALL_MAN_DIRS= programs/Xserver .include <bsd.port.pre.mk> -# XFree86 User Config: -# --- -# Name Default Meaning -# ---------------------------------------------------------------------------- -# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later) -# HasPam YES support PAM (require FreeBSD-3.1 or later) -# ExtendedInputDevices YES support extended input devices -HasSecureRPC?= DEFAULT -HasPam?= DEFAULT -ExtendedInputDevices?= DEFAULT - -.if ${ARCH} == i386 +.if ${ARCH} == i386 || ${ARCH} == alpha BuildXF86DRI= YES PLIST_SUB+= DRI="" -DISTFILES+= freebsd-glide3headers.tar.gz:local -HasGlide3= YES -XBUILD_DIRS+= lib/XThrStub lib/X11 lib/GL +XBUILD_DIRS+= lib/XThrStub lib/X11 lib/Xext lib/GL XINSTALL_DIRS+= lib/GL/mesa/src/drv -post-extract:: - @(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \ - tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz) .else -pre-fetch:: - @${ECHO_MSG} "DRI only built on i386" BuildXF86DRI= NO -HasGlide3= NO PLIST_SUB+= DRI="@comment " .endif # i386 -# Some things are not applicable if this machine is an alpha .if ${ARCH} == alpha PLIST_SUB+= ALPHA_NA="@comment " .else @@ -124,14 +114,24 @@ PLIST_SUB+= ALPHA_NA="" MAN1+= scanpci.1 .endif +.if ${ARCH} == alpha +PLIST_SUB+= IA64_NA="@comment " +.else +PLIST_SUB+= IA64_NA="" +.endif + +.if ${ARCH} == sparc64 +PLIST_SUB+= SPARC64_NA="@comment " +.else +PLIST_SUB+= SPARC64_NA="" +.endif + .if ${ARCH} == i386 -PLIST_SUB+= I386:="" +PLIST_SUB+= I386="" MAN4+= apm.4 \ chips.4 \ cirrus.4 \ cyrix.4 \ - fbdev.4 \ - fbdevhw.4 \ i128.4 \ i740.4 \ i810.4 \ @@ -142,51 +142,7 @@ MAN4+= apm.4 \ vesa.4 \ vmware.4 .else -PLIST_SUB+= I386:="@comment " -.endif - -.if ${ExtendedInputDevices} == DEFAULT || ${ExtendedInputDevices} == YES -PLIST_SUB+= XIE:="" -MAN4+= citron.4 \ - dynapro.4 \ - elographics.4 \ - microtouch.4 \ - mutouch.4 \ - wacom.4 \ - void.4 -.else -PLIST_SUB+= XIE:="@comment " -.endif - -.if ${ARCH} == i386 -.if !defined(WITH_MATROX_GXX_DRIVER) -HaveMatroxHal= NO -PLIST_SUB+= MATROX="@comment " -pre-fetch:: - @${ECHO_MSG} "********************************************************" - @${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to include Matrox's extra" - @${ECHO_MSG} "\"HALLIB\" binary driver" - @${ECHO_MSG} "********************************************************" -.else -NO_PACKAGE= "Matrox drivers may not be distributed" -RESTRICTED= "Matrox drivers may not be distributed." -HaveMatroxHal= YES -MGA_DRIVER_VERSION= 2.0 -MASTER_SITES+= ftp://ftp.matrox.com/pub/mga/archive/linux/2002/:mga -DISTFILES+= mgadrivers-${MGA_DRIVER_VERSION}-src.tgz:mga -EXTRACT_ONLY+= mgadrivers-${MGA_DRIVER_VERSION}-src.tgz -RESTRICTED_FILES= mgadrivers-${MGA_DRIVER_VERSION}-src.tgz -PLIST_SUB+= MATROX="" -post-extract:: - ${MV} ${WRKDIR}/mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src/HALlib/* \ - ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/HALlib/ -post-install:: - ${INSTALL_DATA} ${WRKDIR}/mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src/README_HALLIB \ - ${PREFIX}/lib/X11/doc/README.mga_HALLIB -.endif # !WITH_MATROX_GXX_DRIVER -.else -HaveMatroxHal= NO -PLIST_SUB+= MATROX="@comment " +PLIST_SUB+= I386="@comment " .endif post-extract:: @@ -199,11 +155,9 @@ post-build: post-install:: @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} - strip ${PREFIX}/bin/XFree86 @if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \ - ln -sf Xwrapper-4 ${PREFIX}/bin/X; \ + ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ fi; - .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo index 8f0a7fd2bf19..86966f90fbd3 100644 --- a/x11-servers/XFree86-4-Server-snap/distinfo +++ b/x11-servers/XFree86-4-Server-snap/distinfo @@ -1,6 +1,4 @@ -MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f +MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af +MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 +MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b -MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d -MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 -MD5 (xc/patch-nvchips.gz) = bcb190d3f2c26d993a3a3c1512cf9bc9 diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h new file mode 100644 index 000000000000..f7286b494cea --- /dev/null +++ b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h @@ -0,0 +1,13 @@ +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Tue Mar 4 16:42:16 2003 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Tue Mar 4 16:42:21 2003 +@@ -230,6 +230,10 @@ + # define ARCH_PCI_INIT linuxPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN ++# elif defined(FreeBSD) ++# define ARCH_PCI_INIT freebsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN + # endif + # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper + #elif defined(__i386__) diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-alp_xaam.c b/x11-servers/XFree86-4-Server-snap/files/patch-alp_xaam.c deleted file mode 100644 index b819e10fc8e8..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-alp_xaam.c +++ /dev/null @@ -1,9 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c.orig Thu Oct 17 19:22:24 2002 -+++ programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c Thu Oct 17 19:22:31 2002 -@@ -1,5 +1,5 @@ - /* (c) Itai Nahshon */ --#define DEBUG -+ - /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ - - #include "xf86.h" diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c new file mode 100644 index 000000000000..741664e27713 --- /dev/null +++ b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c @@ -0,0 +1,35 @@ +--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Tue Oct 29 15:19:13 2002 ++++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Tue Mar 4 16:28:04 2003 +@@ -33,7 +33,10 @@ + #include <sys/param.h> + #ifndef __NetBSD__ + # include <sys/sysctl.h> +-# else ++# ifdef __FreeBSD__ ++# include <machine/sysarch.h> ++# endif ++#else + # include <machine/sysarch.h> + #endif + #include "xf86Axp.h" +@@ -51,6 +54,8 @@ + #define MAP_FAILED ((caddr_t)-1) + #endif + ++axpDevice bsdGetAXP(void); ++ + #ifndef __NetBSD__ + extern unsigned long dense_base(void); + +@@ -260,10 +265,10 @@ + #endif /* __OpenBSD__ */ + + xf86ErrorF("\tlinear framebuffer access unavailable\n"); ++#endif + } + useDevMem = FALSE; + return; +-#endif + } + + void diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c deleted file mode 100644 index c8fce6b6a564..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Sat Jan 11 21:08:42 2003 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Sat Jan 11 21:08:49 2003 -@@ -177,7 +177,7 @@ - "XAACachePlanarMonoStipple", - "XAACreateInfoRec", - "XAADestroyInfoRec", -- "XAAFillSolidRects" -+ "XAAFillSolidRects", - "XAAInit", - "XAAOverlayFBfuncs", - "XAAScreenIndex", diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c deleted file mode 100644 index b33035d4ffef..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Thu Sep 19 00:12:42 2002 -+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Sep 19 00:13:56 2002 -@@ -2745,6 +2745,7 @@ - case PCI_CHIP_MGAG200: - case PCI_CHIP_MGAG200_PCI: - case PCI_CHIP_MGAG400: -+ case PCI_CHIP_MGAG550: - if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) { - outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, - pMga->FbCursorOffset >> 10); diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c deleted file mode 100644 index a308f0a01eca..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Sat Jan 11 05:45:34 2003 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Sat Jan 11 05:45:41 2003 -@@ -277,6 +277,7 @@ - "drmAgpUnbind", - "drmAgpVendorId", - "drmAvailable", -+ "drmFreeBufs", - "drmFreeVersion", - "drmGetVersion", - "drmMap", -@@ -287,6 +288,7 @@ - "drmR128ResetCCE", - "drmR128StartCCE", - "drmR128StopCCE", -+ "drmR128TextureBlit", - "drmR128WaitForIdleCCE", - "drmR128FlushIndirectBuffer", - "drmScatterGatherAlloc", diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id b/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id new file mode 100644 index 000000000000..f7396543d878 --- /dev/null +++ b/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id @@ -0,0 +1,87 @@ +--- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes 2003-01-08 04:28:57.000000000 -0500 ++++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-01-08 05:28:02.000000000 -0500 +@@ -457,21 +457,34 @@ + #define PCI_CHIP_TRIO64V2_DXGX 0x8901 + #define PCI_CHIP_PLATO_PX 0x8902 + #define PCI_CHIP_Trio3D 0x8904 +-#define PCI_CHIP_Trio3D_2X 0x8A13 + #define PCI_CHIP_VIRGE_DXGX 0x8A01 + #define PCI_CHIP_VIRGE_GX2 0x8A10 ++#define PCI_CHIP_Trio3D_2X 0x8A13 + #define PCI_CHIP_SAVAGE3D 0x8A20 + #define PCI_CHIP_SAVAGE3D_MV 0x8A21 + #define PCI_CHIP_SAVAGE4 0x8A22 +-#define PCI_CHIP_VIRGE_MX 0x8C01 +-#define PCI_CHIP_VIRGE_MXPLUS 0x8C01 +-#define PCI_CHIP_VIRGE_MXP 0x8C03 + #define PCI_CHIP_PROSAVAGE_PM 0x8A25 + #define PCI_CHIP_PROSAVAGE_KM 0x8A26 ++#define PCI_CHIP_VIRGE_MX 0x8C01 ++#define PCI_CHIP_VIRGE_MXPLUS 0x8C02 ++#define PCI_CHIP_VIRGE_MXP 0x8C03 + #define PCI_CHIP_SAVAGE_MX_MV 0x8C10 + #define PCI_CHIP_SAVAGE_MX 0x8C11 + #define PCI_CHIP_SAVAGE_IX_MV 0x8C12 + #define PCI_CHIP_SAVAGE_IX 0x8C13 ++#define PCI_CHIP_SUPSAV_MX128 0x8C22 ++#define PCI_CHIP_SUPSAV_MX64 0x8C24 ++#define PCI_CHIP_SUPSAV_MX64C 0x8C26 ++#define PCI_CHIP_SUPSAV_IX128SDR 0x8C2A ++#define PCI_CHIP_SUPSAV_IX128DDR 0x8C2B ++#define PCI_CHIP_SUPSAV_IX64SDR 0x8C2C ++#define PCI_CHIP_SUPSAV_IX64DDR 0x8C2D ++#define PCI_CHIP_SUPSAV_IXCSDR 0x8C2E ++#define PCI_CHIP_SUPSAV_IXCDDR 0x8C2F ++#define PCI_CHIP_S3TWISTER_P 0x8D01 ++#define PCI_CHIP_S3TWISTER_K 0x8D02 ++#define PCI_CHIP_PROSAVAGE_DDR 0x8D03 ++#define PCI_CHIP_PROSAVAGE_DDRK 0x8D04 + #define PCI_CHIP_SAVAGE2000 0x9102 + + /* ARK Logic */ +--- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes 2003-01-08 05:31:06.000000000 -0500 ++++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2003-01-08 05:31:25.000000000 -0500 +@@ -3,30 +3,6 @@ + #ifndef _SAVAGE_REGS_H + #define _SAVAGE_REGS_H + +-/* These are here until xf86PciInfo.h is updated. */ +- +-#ifndef PCI_CHIP_S3TWISTER_P +-#define PCI_CHIP_S3TWISTER_P 0x8d01 +-#endif +-#ifndef PCI_CHIP_S3TWISTER_K +-#define PCI_CHIP_S3TWISTER_K 0x8d02 +-#endif +-#ifndef PCI_CHIP_SUPSAV_MX128 +-#define PCI_CHIP_SUPSAV_MX128 0x8c22 +-#define PCI_CHIP_SUPSAV_MX64 0x8c24 +-#define PCI_CHIP_SUPSAV_MX64C 0x8c26 +-#define PCI_CHIP_SUPSAV_IX128SDR 0x8c2a +-#define PCI_CHIP_SUPSAV_IX128DDR 0x8c2b +-#define PCI_CHIP_SUPSAV_IX64SDR 0x8c2c +-#define PCI_CHIP_SUPSAV_IX64DDR 0x8c2d +-#define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e +-#define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f +-#endif +-#ifndef PCI_CHIP_PROSAVAGE_DDR +-#define PCI_CHIP_PROSAVAGE_DDR 0x8d03 +-#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04 +-#endif +- + #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) + + #define S3_SAVAGE4_SERIES(chip) ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE)) +--- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes 2003-01-08 06:28:59.000000000 -0500 ++++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-08 06:33:02.000000000 -0500 +@@ -123,8 +123,8 @@ + { PCI_CHIP_SAVAGE_IX, "Savage/IX" }, + { PCI_CHIP_PROSAVAGE_PM, "ProSavage PM133" }, + { PCI_CHIP_PROSAVAGE_KM, "ProSavage KM133" }, +- { PCI_CHIP_S3TWISTER_P, "ProSavage PN133" }, +- { PCI_CHIP_S3TWISTER_K, "ProSavage KN133" }, ++ { PCI_CHIP_S3TWISTER_P, "Twister PN133" }, ++ { PCI_CHIP_S3TWISTER_K, "Twister KN133" }, + { PCI_CHIP_SUPSAV_MX128, "SuperSavage/MX 128" }, + { PCI_CHIP_SUPSAV_MX64, "SuperSavage/MX 64" }, + { PCI_CHIP_SUPSAV_MX64C, "SuperSavage/MX 64C" }, diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-text-mode.c b/x11-servers/XFree86-4-Server-snap/files/patch-text-mode.c deleted file mode 100644 index 8b566c325118..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-text-mode.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86cfg/text-mode.c.orig Wed Oct 31 14:50:30 2001 -+++ programs/Xserver/hw/xfree86/xf86cfg/text-mode.c Fri Jun 7 15:47:18 2002 -@@ -498,6 +498,8 @@ - if (str == NULL) - #ifdef WSCONS_SUPPORT - str = "/dev/wsmouse"; -+#elif defined(__FreeBSD__) -+ str = "/dev/sysmouse"; - #else - str = "/dev/mouse"; - #endif diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xf86Configure.c b/x11-servers/XFree86-4-Server-snap/files/patch-xf86Configure.c deleted file mode 100644 index 79113ee6fd70..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xf86Configure.c +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86Configure.c.orig Sat Jun 8 18:48:54 2002 -+++ programs/Xserver/hw/xfree86/common/xf86Configure.c Sat Jun 8 18:50:09 2002 -@@ -79,6 +79,9 @@ - #elif defined(__QNXNTO__) - static char *DFLT_MOUSE_PROTO = "OSMouse"; - static char *DFLT_MOUSE_DEV = "/dev/devi/mouse0"; -+#elif defined(__FreeBSD__) -+static char *DFLT_MOUSE_DEV = "/dev/sysmouse"; -+static char *DFLT_MOUSE_PROTO = "MouseSystems"; - #else - static char *DFLT_MOUSE_DEV = "/dev/mouse"; - static char *DFLT_MOUSE_PROTO = "auto"; diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xf86config.c b/x11-servers/XFree86-4-Server-snap/files/patch-xf86config.c deleted file mode 100644 index bb986f1b782a..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xf86config.c +++ /dev/null @@ -1,37 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig Sat Oct 27 20:34:09 2001 -+++ programs/Xserver/hw/xfree86/xf86config/xf86config.c Sat Jun 8 11:35:18 2002 -@@ -382,7 +382,7 @@ - - static char *mousetype_name[] = { - "Microsoft compatible (2-button protocol)", -- "Mouse Systems (3-button protocol)", -+ "Mouse Systems (3-button protocol) & FreeBSD moused protocol", - "Bus Mouse", - "PS/2 Mouse", - "Logitech Mouse (serial, old type, Logitech protocol)", -@@ -401,6 +401,9 @@ - #ifdef WSCONS_SUPPORT - "On systems with wscons, the default is /dev/wsmouse.\n" - #endif -+#ifdef __FreeBSD__ -+"On FreeBSD, the default is /dev/sysmouse.\n" -+#endif - "\n"; - - static char *mousecomment_text = -@@ -544,10 +547,12 @@ - printf("Mouse device: "); - getstring(s); - if (strlen(s) == 0) --#ifndef WSCONS_SUPPORT -- config_pointerdevice = "/dev/mouse"; --#else -+#ifdef WSCONS_SUPPORT - config_pointerdevice = "/dev/wsmouse"; -+#elif defined(__FreeBSD__) -+ config_pointerdevice = "/dev/sysmouse"; -+#else -+ config_pointerdevice = "/dev/mouse"; - #endif - else { - config_pointerdevice = Malloc(strlen(s) + 1); diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist index 1baaee262b6e..efc379a420dd 100644 --- a/x11-servers/XFree86-4-Server-snap/pkg-plist +++ b/x11-servers/XFree86-4-Server-snap/pkg-plist @@ -1,7 +1,16 @@ bin/X bin/XFree86 -%%XIE:%%bin/joycal +bin/gtf +bin/inb +bin/inl +bin/inw +bin/ioport bin/kbd_mode +bin/mmapr +bin/mmapw +bin/outb +bin/outl +bin/outw bin/pcitweak %%ALPHA_NA%%bin/scanpci bin/xf86cfg @@ -23,11 +32,11 @@ include/X11/pixmaps/computer.xpm include/X11/pixmaps/keyboard.xpm include/X11/pixmaps/monitor.xpm include/X11/pixmaps/mouse.xpm -lib/X11/app-defaults/XF86Cfg lib/X11/Cards lib/X11/Options lib/X11/XF86Config.98 lib/X11/XF86Config.eg +lib/X11/app-defaults/XF86Cfg lib/X11/doc/BUILD lib/X11/doc/BugReport lib/X11/doc/DESIGN @@ -38,23 +47,24 @@ lib/X11/doc/README.DECtga lib/X11/doc/README.DGA lib/X11/doc/README.DRI lib/X11/doc/README.DRIcomp -%%I386:%%lib/X11/doc/README.I128 -%%I386:%%lib/X11/doc/README.SiS -%%I386:%%lib/X11/doc/README.apm +%%I386%%lib/X11/doc/README.I128 +%%I386%%lib/X11/doc/README.SiS +lib/X11/doc/README.XKB-Config +lib/X11/doc/README.XKB-Enhancing +%%I386%%lib/X11/doc/README.apm lib/X11/doc/README.ati -%%I386:%%lib/X11/doc/README.chips -%%I386:%%lib/X11/doc/README.cyrix +%%I386%%lib/X11/doc/README.chips +%%I386%%lib/X11/doc/README.cyrix lib/X11/doc/README.dps lib/X11/doc/README.fonts -%%I386:%%lib/X11/doc/README.i740 -%%I386:%%lib/X11/doc/README.i810 -%%MATROX%%lib/X11/doc/README.mga_HALLIB +%%I386%%lib/X11/doc/README.i740 +%%I386%%lib/X11/doc/README.i810 lib/X11/doc/README.mouse -%%I386:%%lib/X11/doc/README.newport -%%I386:%%lib/X11/doc/README.r128 +%%I386%%lib/X11/doc/README.newport +lib/X11/doc/README.r128 lib/X11/doc/README.rapidaccess -lib/X11/doc/README.rendition -lib/X11/doc/README.s3virge +%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition +%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge lib/X11/doc/RELNOTES lib/X11/doc/ServersOnly lib/X11/doc/Status @@ -65,6 +75,9 @@ lib/X11/etc/sun.termcap lib/X11/etc/sun.terminfo lib/X11/etc/xmodmap.std lib/X11/xserver/SecurityPolicy +lib/libXfont.a +lib/libXfont.so +lib/libXfont.so.1 lib/modules/codeconv/libARABIC.a lib/modules/codeconv/libARMSCII8.a lib/modules/codeconv/libBIG5.a @@ -96,54 +109,51 @@ lib/modules/codeconv/libMULEENCODING.a lib/modules/codeconv/libTCVN.a lib/modules/codeconv/libVISCII.a %%DRI%%lib/modules/dri/gamma_dri.so -%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so -%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so +%%I386%%%%DRI%%lib/modules/dri/i810_dri.so +%%I386%%%%DRI%%lib/modules/dri/i830_dri.so %%DRI%%lib/modules/dri/mga_dri.so %%DRI%%lib/modules/dri/radeon_dri.so +%%DRI%%lib/modules/dri/r200_dri.so %%DRI%%lib/modules/dri/r128_dri.so -%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so %%DRI%%lib/modules/dri/tdfx_dri.so -%%I386:%%lib/modules/drivers/apm_drv.o -%%I386:%%lib/modules/drivers/ark_drv.o +%%I386%%lib/modules/drivers/apm_drv.o +%%I386%%lib/modules/drivers/ark_drv.o lib/modules/drivers/ati_drv.o lib/modules/drivers/atimisc_drv.o -%%I386:%%lib/modules/drivers/chips_drv.o -%%I386:%%lib/modules/drivers/cirrus_alpine.o -%%I386:%%lib/modules/drivers/cirrus_drv.o -%%I386:%%lib/modules/drivers/cirrus_laguna.o -%%I386:%%lib/modules/drivers/cyrix_drv.o -%%I386:%%lib/modules/drivers/fbdev_drv.o -lib/modules/drivers/glint_drv.o -%%I386:%%lib/modules/drivers/i128_drv.o -%%I386:%%lib/modules/drivers/i740_drv.o -%%I386:%%lib/modules/drivers/i810_drv.o -lib/modules/drivers/mga_drv.o -%%MATROX%%lib/modules/drivers/mga_hal_drv.o -%%I386:%%lib/modules/drivers/neomagic_drv.o +%%I386%%lib/modules/drivers/chips_drv.o +%%I386%%lib/modules/drivers/cirrus_alpine.o +%%I386%%lib/modules/drivers/cirrus_drv.o +%%I386%%lib/modules/drivers/cirrus_laguna.o +%%I386%%lib/modules/drivers/cyrix_drv.o +%%SPARC64_NA%%lib/modules/drivers/glint_drv.o +%%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 +%%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 -lib/modules/drivers/rendition_drv.o -lib/modules/drivers/s3_drv.o -lib/modules/drivers/s3virge_drv.o -lib/modules/drivers/savage_drv.o -lib/modules/drivers/siliconmotion_drv.o -%%I386:%%lib/modules/drivers/sis_drv.o -lib/modules/drivers/tdfx_drv.o -lib/modules/drivers/tga_drv.o -%%I386:%%lib/modules/drivers/trident_drv.o -%%I386:%%lib/modules/drivers/tseng_drv.o -%%I386:%%lib/modules/drivers/vesa_drv.o -lib/modules/drivers/vga_drv.o -%%I386:%%lib/modules/drivers/vmware_drv.o +%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.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 +%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o +%%I386%%lib/modules/drivers/sis_drv.o +%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o +%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o +%%I386%%lib/modules/drivers/trident_drv.o +%%I386%%lib/modules/drivers/tseng_drv.o +%%I386%%lib/modules/drivers/vesa_drv.o +%%SPARC64_NA%%lib/modules/drivers/vga_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/libpex5.a lib/modules/extensions/librecord.a -lib/modules/extensions/libxie.a lib/modules/extensions/libxtrap.a lib/modules/fonts/libbitmap.a lib/modules/fonts/libfreetype.a @@ -151,20 +161,20 @@ lib/modules/fonts/libspeedo.a lib/modules/fonts/libtype1.a lib/modules/fonts/libxtt.a %%DRI%%lib/modules/freebsd/libdrm.a -%%XIE:%%lib/modules/input/citron_drv.o -%%XIE:%%lib/modules/input/digitaledge_drv.o -%%XIE:%%lib/modules/input/dynapro_drv.o -%%XIE:%%lib/modules/input/elo2300_drv.o -%%XIE:%%lib/modules/input/elographics_drv.o -%%XIE:%%lib/modules/input/joystick_drv.o -%%XIE:%%lib/modules/input/magellan_drv.o -%%XIE:%%lib/modules/input/microtouch_drv.o +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 -%%XIE:%%lib/modules/input/mutouch_drv.o -%%XIE:%%lib/modules/input/spaceorb_drv.o -%%XIE:%%lib/modules/input/summa_drv.o -%%XIE:%%lib/modules/input/void_drv.o -%%XIE:%%lib/modules/input/wacom_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 %%ALPHA_NA%%lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index c6a337bedb1e..85ee63af6364 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -1,14 +1,11 @@ #!/bin/sh # This script does the following: -# (1) cp current xf86site.def (it is created by the imake-4 port) +# (1) cp xf86site.def, installed by imake-4 port, # to ${WRKDIR}/xc/config/cf. -# this means this port uses imake-4's config for defaults. -# (2) Generate temporal config for compiling. -# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are -# used locally for compiling this port, so these configs will be generated -# by this script. These configs will be stored to the `host.def' file, -# but this host.def will never be installed. +# 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 @@ -16,45 +13,29 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def LOCALDEF=$WRKDIR/.config HOSTDEF=$WRKDIR/xc/config/cf/host.def -configure () { - # Use original host.def as initial config file - rm -f $LOCALDEF - grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF - echo "#define ProjectRoot $PREFIX" >> $LOCALDEF +# Use original host.def as initial config file +rm -f $LOCALDEF +grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF +echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - # It's good for FreeBSD ports/packages system. - echo "#define NothingOutsideProjectRoot YES" >> $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 <trevor@jpj.net> - echo "#define InstallXserverSetUID NO" >> $LOCALDEF +# Now, we can use this configuration. +# Thanks, Trevor Johnson <trevor@jpj.net> +echo "#define InstallXserverSetUID NO" >> $LOCALDEF - # User Config. - if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then - echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF - fi - if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then - echo "#define HasPam $HasPam" >> $LOCALDEF - fi - if [ X$ExtendedInputDevices = XDEFAULT -o X$ExtendedInputDevices = XYES ]; then - echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \ - elographics magellan \ - microtouch mutouch spaceorb summa \ - wacom void citron" >> $LOCALDEF - echo "#define JoystickSupport YES" >> $LOCALDEF - else - echo "#define XInputDrivers mouse" >> $LOCALDEF - fi - echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF - echo "#define BuildXF86DRM NO" >> $LOCALDEF - echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF - echo "#define Glide3IncDir glide3" >> $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 - # Matrox driver support - echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF - - # disable some configs: there are not used this ports - for i in \ +# disable some options +for i in \ BuildFonts \ Build75DpiFonts \ Build100DpiFonts \ @@ -62,6 +43,7 @@ configure () { BuildType1Fonts \ BuildCIDFonts \ BuildCyrillicFonts \ + JoystickSupport \ XnestServer \ BuildFontServer \ XVirtualFramebufferServer \ @@ -70,52 +52,55 @@ configure () { LibInstall \ ForceNormalLib \ XTrueTypeInstallCConvHeaders - do \ - echo "#define $i NO" >> $LOCALDEF - done - 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 BuildXFree86ConfigTools 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 +do \ + echo "#define $i NO" >> $LOCALDEF +done + +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 UseInstalledPrograms YES" >> $LOCALDEF +echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF - # More of the i386 drivers could probably move to XF86CardDrivers. - # Is fbdev driver useful to us? - # GlideDriver was left out because we have no Glide2 package. - cat >> $LOCALDEF <<END -#ifndef XF86CardDrivers -#ifdef i386Architecture -#define ArchSpecificDrivers apm ark chips cirrus cyrix fbdev i740 \ - i128 i810 neomagic sis trident tseng \ - vesa vmware -#define DriDrivers gamma tdfx mga i810 i830 r128 radeon sis +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 <<END +#if defined(i386Architecture) +# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ + neomagic i740 tdfx savage \ + cirrus vmware tseng trident chips apm \ + i128 nsc ati i810 ark cyrix siliconmotion \ + vesa vga +#elif defined(ia64Architecture) +# define XF86CardDrivers mga nv tdfx glint ati vga #elif defined(AlphaArchitecture) -#define ArchSpecificDrivers -#define DriDrivers gamma tdfx mga r128 radeon -#endif -#define XF86CardDrivers ati glint mga nv rendition s3 s3virge \ - savage siliconmotion tdfx tga vga \ - ArchSpecificDrivers DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers +# define XF86CardDrivers mga glint nv tga s3 s3virge rendition \ + tdfx savage cirrus ati siliconmotion vga +#elif defined(Sparc64Architecture) +# define XF86CardDrivers nv ati sunffb #endif END - echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF +echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF - # Copy ORIGDEF to DESTDEF - rm -f $DESTDEF - cp -f $ORIGDEF $DESTDEF +# Copy ORIGDEF to DESTDEF +rm -f $DESTDEF +cp -f $ORIGDEF $DESTDEF - # copy generated config to host.def - cp -f $LOCALDEF $HOSTDEF -} +# copy generated config to host.def +cp -f $LOCALDEF $HOSTDEF -cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf -configure exit 0 diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 141c8213eb58..fa27b5ccc63e 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: XFree86-Server +# New ports collection makefile for: XFree86-Server # Date created: 10 Oct 1999 # Whom: taguchi@tohoku.iij.ad.jp # @@ -6,48 +6,42 @@ # PORTNAME= Server -PORTVERSION= 4.2.1 -PORTREVISION= 7 +PORTVERSION= 4.3.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= 4.2.0/:x \ +MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X420src-1.tgz:x \ +DISTFILES= X430src-1.tgz:x \ + X430src-2.tgz:x \ + X430src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X420src-1.tgz - -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= anholt/patches-4.2.0/ -PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz \ - patch-nvchips.gz +EXTRACT_ONLY= X430src-1.tgz \ + X430src-2.tgz \ + X430src-3.tgz MAINTAINER= anholt@freebsd.org COMMENT= XFree86-4 X server and related programs XFREE86_VERSION= 4 USE_IMAKE= YES +INSTALLS_SHLIB= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files -.for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \ - patch-i810_driver.c patch-mga_driver.c patch-r128_driver.c \ - patch-alp_xaam.c -EXTRA_PATCHES+= ${.CURDIR}/files/${pf} +.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h +EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor SCRIPTS_ENV= OSVERSION=${OSVERSION} \ - HasSecureRPC=${HasSecureRPC} \ - HasPam=${HasPam} \ - ExtendedInputDevices=${ExtendedInputDevices} \ BuildXF86DRI=${BuildXF86DRI} \ - HasGlide3=${HasGlide3} \ - HaveMatroxHal=${HaveMatroxHal} \ + WITH_DEBUG="${WITH_DEBUG}" \ CC="${CC}" \ CXX="${CXX}" \ CFLAGS="${CFLAGS}" MAN1= XFree86.1 \ Xserver.1 \ + gtf.1 \ kbd_mode.1 \ pcitweak.1 \ xf86cfg.1 \ @@ -55,29 +49,45 @@ MAN1= XFree86.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= mga.4 \ - tdfx.4 \ +MAN4= citron.4 \ + dynapro.4 \ + elographics.4 \ glint.4 \ - s3virge.4 \ + kbd.4 \ + keyboard.4 \ + mga.4 \ + microtouch.4 \ + mouse.4 \ + mutouch.4 \ + nv.4 \ r128.4 \ rendition.4 \ + s3virge.4 \ savage.4 \ - nv.4 \ siliconmotion.4 \ + tdfx.4 \ vga.4 \ - keyboard.4 \ - mouse.4 + void.4 \ + wacom.4 MAN5= XF86Config.5 PKGMESSAGE= ${WRKDIR}/.pkg-message XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver @@ -87,36 +97,16 @@ XINSTALL_MAN_DIRS= programs/Xserver .include <bsd.port.pre.mk> -# XFree86 User Config: -# --- -# Name Default Meaning -# ---------------------------------------------------------------------------- -# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later) -# HasPam YES support PAM (require FreeBSD-3.1 or later) -# ExtendedInputDevices YES support extended input devices -HasSecureRPC?= DEFAULT -HasPam?= DEFAULT -ExtendedInputDevices?= DEFAULT - -.if ${ARCH} == i386 +.if ${ARCH} == i386 || ${ARCH} == alpha BuildXF86DRI= YES PLIST_SUB+= DRI="" -DISTFILES+= freebsd-glide3headers.tar.gz:local -HasGlide3= YES -XBUILD_DIRS+= lib/XThrStub lib/X11 lib/GL +XBUILD_DIRS+= lib/XThrStub lib/X11 lib/Xext lib/GL XINSTALL_DIRS+= lib/GL/mesa/src/drv -post-extract:: - @(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \ - tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz) .else -pre-fetch:: - @${ECHO_MSG} "DRI only built on i386" BuildXF86DRI= NO -HasGlide3= NO PLIST_SUB+= DRI="@comment " .endif # i386 -# Some things are not applicable if this machine is an alpha .if ${ARCH} == alpha PLIST_SUB+= ALPHA_NA="@comment " .else @@ -124,14 +114,24 @@ PLIST_SUB+= ALPHA_NA="" MAN1+= scanpci.1 .endif +.if ${ARCH} == alpha +PLIST_SUB+= IA64_NA="@comment " +.else +PLIST_SUB+= IA64_NA="" +.endif + +.if ${ARCH} == sparc64 +PLIST_SUB+= SPARC64_NA="@comment " +.else +PLIST_SUB+= SPARC64_NA="" +.endif + .if ${ARCH} == i386 -PLIST_SUB+= I386:="" +PLIST_SUB+= I386="" MAN4+= apm.4 \ chips.4 \ cirrus.4 \ cyrix.4 \ - fbdev.4 \ - fbdevhw.4 \ i128.4 \ i740.4 \ i810.4 \ @@ -142,51 +142,7 @@ MAN4+= apm.4 \ vesa.4 \ vmware.4 .else -PLIST_SUB+= I386:="@comment " -.endif - -.if ${ExtendedInputDevices} == DEFAULT || ${ExtendedInputDevices} == YES -PLIST_SUB+= XIE:="" -MAN4+= citron.4 \ - dynapro.4 \ - elographics.4 \ - microtouch.4 \ - mutouch.4 \ - wacom.4 \ - void.4 -.else -PLIST_SUB+= XIE:="@comment " -.endif - -.if ${ARCH} == i386 -.if !defined(WITH_MATROX_GXX_DRIVER) -HaveMatroxHal= NO -PLIST_SUB+= MATROX="@comment " -pre-fetch:: - @${ECHO_MSG} "********************************************************" - @${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to include Matrox's extra" - @${ECHO_MSG} "\"HALLIB\" binary driver" - @${ECHO_MSG} "********************************************************" -.else -NO_PACKAGE= "Matrox drivers may not be distributed" -RESTRICTED= "Matrox drivers may not be distributed." -HaveMatroxHal= YES -MGA_DRIVER_VERSION= 2.0 -MASTER_SITES+= ftp://ftp.matrox.com/pub/mga/archive/linux/2002/:mga -DISTFILES+= mgadrivers-${MGA_DRIVER_VERSION}-src.tgz:mga -EXTRACT_ONLY+= mgadrivers-${MGA_DRIVER_VERSION}-src.tgz -RESTRICTED_FILES= mgadrivers-${MGA_DRIVER_VERSION}-src.tgz -PLIST_SUB+= MATROX="" -post-extract:: - ${MV} ${WRKDIR}/mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src/HALlib/* \ - ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/HALlib/ -post-install:: - ${INSTALL_DATA} ${WRKDIR}/mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src/README_HALLIB \ - ${PREFIX}/lib/X11/doc/README.mga_HALLIB -.endif # !WITH_MATROX_GXX_DRIVER -.else -HaveMatroxHal= NO -PLIST_SUB+= MATROX="@comment " +PLIST_SUB+= I386="@comment " .endif post-extract:: @@ -199,11 +155,9 @@ post-build: post-install:: @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} - strip ${PREFIX}/bin/XFree86 @if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \ - ln -sf Xwrapper-4 ${PREFIX}/bin/X; \ + ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ fi; - .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo index 8f0a7fd2bf19..86966f90fbd3 100644 --- a/x11-servers/XFree86-4-Server/distinfo +++ b/x11-servers/XFree86-4-Server/distinfo @@ -1,6 +1,4 @@ -MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f +MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af +MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 +MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b -MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d -MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 -MD5 (xc/patch-nvchips.gz) = bcb190d3f2c26d993a3a3c1512cf9bc9 diff --git a/x11-servers/XFree86-4-Server/files/patch-Pci.h b/x11-servers/XFree86-4-Server/files/patch-Pci.h new file mode 100644 index 000000000000..f7286b494cea --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-Pci.h @@ -0,0 +1,13 @@ +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Tue Mar 4 16:42:16 2003 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Tue Mar 4 16:42:21 2003 +@@ -230,6 +230,10 @@ + # define ARCH_PCI_INIT linuxPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN ++# elif defined(FreeBSD) ++# define ARCH_PCI_INIT freebsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN + # endif + # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper + #elif defined(__i386__) diff --git a/x11-servers/XFree86-4-Server/files/patch-alp_xaam.c b/x11-servers/XFree86-4-Server/files/patch-alp_xaam.c deleted file mode 100644 index b819e10fc8e8..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-alp_xaam.c +++ /dev/null @@ -1,9 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c.orig Thu Oct 17 19:22:24 2002 -+++ programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c Thu Oct 17 19:22:31 2002 -@@ -1,5 +1,5 @@ - /* (c) Itai Nahshon */ --#define DEBUG -+ - /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ - - #include "xf86.h" diff --git a/x11-servers/XFree86-4-Server/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server/files/patch-alpha_video.c new file mode 100644 index 000000000000..741664e27713 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-alpha_video.c @@ -0,0 +1,35 @@ +--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Tue Oct 29 15:19:13 2002 ++++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Tue Mar 4 16:28:04 2003 +@@ -33,7 +33,10 @@ + #include <sys/param.h> + #ifndef __NetBSD__ + # include <sys/sysctl.h> +-# else ++# ifdef __FreeBSD__ ++# include <machine/sysarch.h> ++# endif ++#else + # include <machine/sysarch.h> + #endif + #include "xf86Axp.h" +@@ -51,6 +54,8 @@ + #define MAP_FAILED ((caddr_t)-1) + #endif + ++axpDevice bsdGetAXP(void); ++ + #ifndef __NetBSD__ + extern unsigned long dense_base(void); + +@@ -260,10 +265,10 @@ + #endif /* __OpenBSD__ */ + + xf86ErrorF("\tlinear framebuffer access unavailable\n"); ++#endif + } + useDevMem = FALSE; + return; +-#endif + } + + void diff --git a/x11-servers/XFree86-4-Server/files/patch-i810_driver.c b/x11-servers/XFree86-4-Server/files/patch-i810_driver.c deleted file mode 100644 index c8fce6b6a564..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-i810_driver.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Sat Jan 11 21:08:42 2003 -+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Sat Jan 11 21:08:49 2003 -@@ -177,7 +177,7 @@ - "XAACachePlanarMonoStipple", - "XAACreateInfoRec", - "XAADestroyInfoRec", -- "XAAFillSolidRects" -+ "XAAFillSolidRects", - "XAAInit", - "XAAOverlayFBfuncs", - "XAAScreenIndex", 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 b33035d4ffef..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-mga_driver.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Thu Sep 19 00:12:42 2002 -+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Sep 19 00:13:56 2002 -@@ -2745,6 +2745,7 @@ - case PCI_CHIP_MGAG200: - case PCI_CHIP_MGAG200_PCI: - case PCI_CHIP_MGAG400: -+ case PCI_CHIP_MGAG550: - if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) { - outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, - pMga->FbCursorOffset >> 10); diff --git a/x11-servers/XFree86-4-Server/files/patch-r128_driver.c b/x11-servers/XFree86-4-Server/files/patch-r128_driver.c deleted file mode 100644 index a308f0a01eca..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-r128_driver.c +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Sat Jan 11 05:45:34 2003 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Sat Jan 11 05:45:41 2003 -@@ -277,6 +277,7 @@ - "drmAgpUnbind", - "drmAgpVendorId", - "drmAvailable", -+ "drmFreeBufs", - "drmFreeVersion", - "drmGetVersion", - "drmMap", -@@ -287,6 +288,7 @@ - "drmR128ResetCCE", - "drmR128StartCCE", - "drmR128StopCCE", -+ "drmR128TextureBlit", - "drmR128WaitForIdleCCE", - "drmR128FlushIndirectBuffer", - "drmScatterGatherAlloc", diff --git a/x11-servers/XFree86-4-Server/files/patch-savage-pci-id b/x11-servers/XFree86-4-Server/files/patch-savage-pci-id new file mode 100644 index 000000000000..f7396543d878 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-savage-pci-id @@ -0,0 +1,87 @@ +--- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes 2003-01-08 04:28:57.000000000 -0500 ++++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-01-08 05:28:02.000000000 -0500 +@@ -457,21 +457,34 @@ + #define PCI_CHIP_TRIO64V2_DXGX 0x8901 + #define PCI_CHIP_PLATO_PX 0x8902 + #define PCI_CHIP_Trio3D 0x8904 +-#define PCI_CHIP_Trio3D_2X 0x8A13 + #define PCI_CHIP_VIRGE_DXGX 0x8A01 + #define PCI_CHIP_VIRGE_GX2 0x8A10 ++#define PCI_CHIP_Trio3D_2X 0x8A13 + #define PCI_CHIP_SAVAGE3D 0x8A20 + #define PCI_CHIP_SAVAGE3D_MV 0x8A21 + #define PCI_CHIP_SAVAGE4 0x8A22 +-#define PCI_CHIP_VIRGE_MX 0x8C01 +-#define PCI_CHIP_VIRGE_MXPLUS 0x8C01 +-#define PCI_CHIP_VIRGE_MXP 0x8C03 + #define PCI_CHIP_PROSAVAGE_PM 0x8A25 + #define PCI_CHIP_PROSAVAGE_KM 0x8A26 ++#define PCI_CHIP_VIRGE_MX 0x8C01 ++#define PCI_CHIP_VIRGE_MXPLUS 0x8C02 ++#define PCI_CHIP_VIRGE_MXP 0x8C03 + #define PCI_CHIP_SAVAGE_MX_MV 0x8C10 + #define PCI_CHIP_SAVAGE_MX 0x8C11 + #define PCI_CHIP_SAVAGE_IX_MV 0x8C12 + #define PCI_CHIP_SAVAGE_IX 0x8C13 ++#define PCI_CHIP_SUPSAV_MX128 0x8C22 ++#define PCI_CHIP_SUPSAV_MX64 0x8C24 ++#define PCI_CHIP_SUPSAV_MX64C 0x8C26 ++#define PCI_CHIP_SUPSAV_IX128SDR 0x8C2A ++#define PCI_CHIP_SUPSAV_IX128DDR 0x8C2B ++#define PCI_CHIP_SUPSAV_IX64SDR 0x8C2C ++#define PCI_CHIP_SUPSAV_IX64DDR 0x8C2D ++#define PCI_CHIP_SUPSAV_IXCSDR 0x8C2E ++#define PCI_CHIP_SUPSAV_IXCDDR 0x8C2F ++#define PCI_CHIP_S3TWISTER_P 0x8D01 ++#define PCI_CHIP_S3TWISTER_K 0x8D02 ++#define PCI_CHIP_PROSAVAGE_DDR 0x8D03 ++#define PCI_CHIP_PROSAVAGE_DDRK 0x8D04 + #define PCI_CHIP_SAVAGE2000 0x9102 + + /* ARK Logic */ +--- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes 2003-01-08 05:31:06.000000000 -0500 ++++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2003-01-08 05:31:25.000000000 -0500 +@@ -3,30 +3,6 @@ + #ifndef _SAVAGE_REGS_H + #define _SAVAGE_REGS_H + +-/* These are here until xf86PciInfo.h is updated. */ +- +-#ifndef PCI_CHIP_S3TWISTER_P +-#define PCI_CHIP_S3TWISTER_P 0x8d01 +-#endif +-#ifndef PCI_CHIP_S3TWISTER_K +-#define PCI_CHIP_S3TWISTER_K 0x8d02 +-#endif +-#ifndef PCI_CHIP_SUPSAV_MX128 +-#define PCI_CHIP_SUPSAV_MX128 0x8c22 +-#define PCI_CHIP_SUPSAV_MX64 0x8c24 +-#define PCI_CHIP_SUPSAV_MX64C 0x8c26 +-#define PCI_CHIP_SUPSAV_IX128SDR 0x8c2a +-#define PCI_CHIP_SUPSAV_IX128DDR 0x8c2b +-#define PCI_CHIP_SUPSAV_IX64SDR 0x8c2c +-#define PCI_CHIP_SUPSAV_IX64DDR 0x8c2d +-#define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e +-#define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f +-#endif +-#ifndef PCI_CHIP_PROSAVAGE_DDR +-#define PCI_CHIP_PROSAVAGE_DDR 0x8d03 +-#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04 +-#endif +- + #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) + + #define S3_SAVAGE4_SERIES(chip) ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE)) +--- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes 2003-01-08 06:28:59.000000000 -0500 ++++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-08 06:33:02.000000000 -0500 +@@ -123,8 +123,8 @@ + { PCI_CHIP_SAVAGE_IX, "Savage/IX" }, + { PCI_CHIP_PROSAVAGE_PM, "ProSavage PM133" }, + { PCI_CHIP_PROSAVAGE_KM, "ProSavage KM133" }, +- { PCI_CHIP_S3TWISTER_P, "ProSavage PN133" }, +- { PCI_CHIP_S3TWISTER_K, "ProSavage KN133" }, ++ { PCI_CHIP_S3TWISTER_P, "Twister PN133" }, ++ { PCI_CHIP_S3TWISTER_K, "Twister KN133" }, + { PCI_CHIP_SUPSAV_MX128, "SuperSavage/MX 128" }, + { PCI_CHIP_SUPSAV_MX64, "SuperSavage/MX 64" }, + { PCI_CHIP_SUPSAV_MX64C, "SuperSavage/MX 64C" }, diff --git a/x11-servers/XFree86-4-Server/files/patch-text-mode.c b/x11-servers/XFree86-4-Server/files/patch-text-mode.c deleted file mode 100644 index 8b566c325118..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-text-mode.c +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86cfg/text-mode.c.orig Wed Oct 31 14:50:30 2001 -+++ programs/Xserver/hw/xfree86/xf86cfg/text-mode.c Fri Jun 7 15:47:18 2002 -@@ -498,6 +498,8 @@ - if (str == NULL) - #ifdef WSCONS_SUPPORT - str = "/dev/wsmouse"; -+#elif defined(__FreeBSD__) -+ str = "/dev/sysmouse"; - #else - str = "/dev/mouse"; - #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86Configure.c b/x11-servers/XFree86-4-Server/files/patch-xf86Configure.c deleted file mode 100644 index 79113ee6fd70..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-xf86Configure.c +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86Configure.c.orig Sat Jun 8 18:48:54 2002 -+++ programs/Xserver/hw/xfree86/common/xf86Configure.c Sat Jun 8 18:50:09 2002 -@@ -79,6 +79,9 @@ - #elif defined(__QNXNTO__) - static char *DFLT_MOUSE_PROTO = "OSMouse"; - static char *DFLT_MOUSE_DEV = "/dev/devi/mouse0"; -+#elif defined(__FreeBSD__) -+static char *DFLT_MOUSE_DEV = "/dev/sysmouse"; -+static char *DFLT_MOUSE_PROTO = "MouseSystems"; - #else - static char *DFLT_MOUSE_DEV = "/dev/mouse"; - static char *DFLT_MOUSE_PROTO = "auto"; diff --git a/x11-servers/XFree86-4-Server/files/patch-xf86config.c b/x11-servers/XFree86-4-Server/files/patch-xf86config.c deleted file mode 100644 index bb986f1b782a..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-xf86config.c +++ /dev/null @@ -1,37 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig Sat Oct 27 20:34:09 2001 -+++ programs/Xserver/hw/xfree86/xf86config/xf86config.c Sat Jun 8 11:35:18 2002 -@@ -382,7 +382,7 @@ - - static char *mousetype_name[] = { - "Microsoft compatible (2-button protocol)", -- "Mouse Systems (3-button protocol)", -+ "Mouse Systems (3-button protocol) & FreeBSD moused protocol", - "Bus Mouse", - "PS/2 Mouse", - "Logitech Mouse (serial, old type, Logitech protocol)", -@@ -401,6 +401,9 @@ - #ifdef WSCONS_SUPPORT - "On systems with wscons, the default is /dev/wsmouse.\n" - #endif -+#ifdef __FreeBSD__ -+"On FreeBSD, the default is /dev/sysmouse.\n" -+#endif - "\n"; - - static char *mousecomment_text = -@@ -544,10 +547,12 @@ - printf("Mouse device: "); - getstring(s); - if (strlen(s) == 0) --#ifndef WSCONS_SUPPORT -- config_pointerdevice = "/dev/mouse"; --#else -+#ifdef WSCONS_SUPPORT - config_pointerdevice = "/dev/wsmouse"; -+#elif defined(__FreeBSD__) -+ config_pointerdevice = "/dev/sysmouse"; -+#else -+ config_pointerdevice = "/dev/mouse"; - #endif - else { - config_pointerdevice = Malloc(strlen(s) + 1); diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index 1baaee262b6e..efc379a420dd 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -1,7 +1,16 @@ bin/X bin/XFree86 -%%XIE:%%bin/joycal +bin/gtf +bin/inb +bin/inl +bin/inw +bin/ioport bin/kbd_mode +bin/mmapr +bin/mmapw +bin/outb +bin/outl +bin/outw bin/pcitweak %%ALPHA_NA%%bin/scanpci bin/xf86cfg @@ -23,11 +32,11 @@ include/X11/pixmaps/computer.xpm include/X11/pixmaps/keyboard.xpm include/X11/pixmaps/monitor.xpm include/X11/pixmaps/mouse.xpm -lib/X11/app-defaults/XF86Cfg lib/X11/Cards lib/X11/Options lib/X11/XF86Config.98 lib/X11/XF86Config.eg +lib/X11/app-defaults/XF86Cfg lib/X11/doc/BUILD lib/X11/doc/BugReport lib/X11/doc/DESIGN @@ -38,23 +47,24 @@ lib/X11/doc/README.DECtga lib/X11/doc/README.DGA lib/X11/doc/README.DRI lib/X11/doc/README.DRIcomp -%%I386:%%lib/X11/doc/README.I128 -%%I386:%%lib/X11/doc/README.SiS -%%I386:%%lib/X11/doc/README.apm +%%I386%%lib/X11/doc/README.I128 +%%I386%%lib/X11/doc/README.SiS +lib/X11/doc/README.XKB-Config +lib/X11/doc/README.XKB-Enhancing +%%I386%%lib/X11/doc/README.apm lib/X11/doc/README.ati -%%I386:%%lib/X11/doc/README.chips -%%I386:%%lib/X11/doc/README.cyrix +%%I386%%lib/X11/doc/README.chips +%%I386%%lib/X11/doc/README.cyrix lib/X11/doc/README.dps lib/X11/doc/README.fonts -%%I386:%%lib/X11/doc/README.i740 -%%I386:%%lib/X11/doc/README.i810 -%%MATROX%%lib/X11/doc/README.mga_HALLIB +%%I386%%lib/X11/doc/README.i740 +%%I386%%lib/X11/doc/README.i810 lib/X11/doc/README.mouse -%%I386:%%lib/X11/doc/README.newport -%%I386:%%lib/X11/doc/README.r128 +%%I386%%lib/X11/doc/README.newport +lib/X11/doc/README.r128 lib/X11/doc/README.rapidaccess -lib/X11/doc/README.rendition -lib/X11/doc/README.s3virge +%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition +%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge lib/X11/doc/RELNOTES lib/X11/doc/ServersOnly lib/X11/doc/Status @@ -65,6 +75,9 @@ lib/X11/etc/sun.termcap lib/X11/etc/sun.terminfo lib/X11/etc/xmodmap.std lib/X11/xserver/SecurityPolicy +lib/libXfont.a +lib/libXfont.so +lib/libXfont.so.1 lib/modules/codeconv/libARABIC.a lib/modules/codeconv/libARMSCII8.a lib/modules/codeconv/libBIG5.a @@ -96,54 +109,51 @@ lib/modules/codeconv/libMULEENCODING.a lib/modules/codeconv/libTCVN.a lib/modules/codeconv/libVISCII.a %%DRI%%lib/modules/dri/gamma_dri.so -%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so -%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so +%%I386%%%%DRI%%lib/modules/dri/i810_dri.so +%%I386%%%%DRI%%lib/modules/dri/i830_dri.so %%DRI%%lib/modules/dri/mga_dri.so %%DRI%%lib/modules/dri/radeon_dri.so +%%DRI%%lib/modules/dri/r200_dri.so %%DRI%%lib/modules/dri/r128_dri.so -%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so %%DRI%%lib/modules/dri/tdfx_dri.so -%%I386:%%lib/modules/drivers/apm_drv.o -%%I386:%%lib/modules/drivers/ark_drv.o +%%I386%%lib/modules/drivers/apm_drv.o +%%I386%%lib/modules/drivers/ark_drv.o lib/modules/drivers/ati_drv.o lib/modules/drivers/atimisc_drv.o -%%I386:%%lib/modules/drivers/chips_drv.o -%%I386:%%lib/modules/drivers/cirrus_alpine.o -%%I386:%%lib/modules/drivers/cirrus_drv.o -%%I386:%%lib/modules/drivers/cirrus_laguna.o -%%I386:%%lib/modules/drivers/cyrix_drv.o -%%I386:%%lib/modules/drivers/fbdev_drv.o -lib/modules/drivers/glint_drv.o -%%I386:%%lib/modules/drivers/i128_drv.o -%%I386:%%lib/modules/drivers/i740_drv.o -%%I386:%%lib/modules/drivers/i810_drv.o -lib/modules/drivers/mga_drv.o -%%MATROX%%lib/modules/drivers/mga_hal_drv.o -%%I386:%%lib/modules/drivers/neomagic_drv.o +%%I386%%lib/modules/drivers/chips_drv.o +%%I386%%lib/modules/drivers/cirrus_alpine.o +%%I386%%lib/modules/drivers/cirrus_drv.o +%%I386%%lib/modules/drivers/cirrus_laguna.o +%%I386%%lib/modules/drivers/cyrix_drv.o +%%SPARC64_NA%%lib/modules/drivers/glint_drv.o +%%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 +%%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 -lib/modules/drivers/rendition_drv.o -lib/modules/drivers/s3_drv.o -lib/modules/drivers/s3virge_drv.o -lib/modules/drivers/savage_drv.o -lib/modules/drivers/siliconmotion_drv.o -%%I386:%%lib/modules/drivers/sis_drv.o -lib/modules/drivers/tdfx_drv.o -lib/modules/drivers/tga_drv.o -%%I386:%%lib/modules/drivers/trident_drv.o -%%I386:%%lib/modules/drivers/tseng_drv.o -%%I386:%%lib/modules/drivers/vesa_drv.o -lib/modules/drivers/vga_drv.o -%%I386:%%lib/modules/drivers/vmware_drv.o +%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.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 +%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o +%%I386%%lib/modules/drivers/sis_drv.o +%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o +%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o +%%I386%%lib/modules/drivers/trident_drv.o +%%I386%%lib/modules/drivers/tseng_drv.o +%%I386%%lib/modules/drivers/vesa_drv.o +%%SPARC64_NA%%lib/modules/drivers/vga_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/libpex5.a lib/modules/extensions/librecord.a -lib/modules/extensions/libxie.a lib/modules/extensions/libxtrap.a lib/modules/fonts/libbitmap.a lib/modules/fonts/libfreetype.a @@ -151,20 +161,20 @@ lib/modules/fonts/libspeedo.a lib/modules/fonts/libtype1.a lib/modules/fonts/libxtt.a %%DRI%%lib/modules/freebsd/libdrm.a -%%XIE:%%lib/modules/input/citron_drv.o -%%XIE:%%lib/modules/input/digitaledge_drv.o -%%XIE:%%lib/modules/input/dynapro_drv.o -%%XIE:%%lib/modules/input/elo2300_drv.o -%%XIE:%%lib/modules/input/elographics_drv.o -%%XIE:%%lib/modules/input/joystick_drv.o -%%XIE:%%lib/modules/input/magellan_drv.o -%%XIE:%%lib/modules/input/microtouch_drv.o +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 -%%XIE:%%lib/modules/input/mutouch_drv.o -%%XIE:%%lib/modules/input/spaceorb_drv.o -%%XIE:%%lib/modules/input/summa_drv.o -%%XIE:%%lib/modules/input/void_drv.o -%%XIE:%%lib/modules/input/wacom_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 %%ALPHA_NA%%lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index c6a337bedb1e..85ee63af6364 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -1,14 +1,11 @@ #!/bin/sh # This script does the following: -# (1) cp current xf86site.def (it is created by the imake-4 port) +# (1) cp xf86site.def, installed by imake-4 port, # to ${WRKDIR}/xc/config/cf. -# this means this port uses imake-4's config for defaults. -# (2) Generate temporal config for compiling. -# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are -# used locally for compiling this port, so these configs will be generated -# by this script. These configs will be stored to the `host.def' file, -# but this host.def will never be installed. +# 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 @@ -16,45 +13,29 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def LOCALDEF=$WRKDIR/.config HOSTDEF=$WRKDIR/xc/config/cf/host.def -configure () { - # Use original host.def as initial config file - rm -f $LOCALDEF - grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF - echo "#define ProjectRoot $PREFIX" >> $LOCALDEF +# Use original host.def as initial config file +rm -f $LOCALDEF +grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF +echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - # It's good for FreeBSD ports/packages system. - echo "#define NothingOutsideProjectRoot YES" >> $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 <trevor@jpj.net> - echo "#define InstallXserverSetUID NO" >> $LOCALDEF +# Now, we can use this configuration. +# Thanks, Trevor Johnson <trevor@jpj.net> +echo "#define InstallXserverSetUID NO" >> $LOCALDEF - # User Config. - if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then - echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF - fi - if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then - echo "#define HasPam $HasPam" >> $LOCALDEF - fi - if [ X$ExtendedInputDevices = XDEFAULT -o X$ExtendedInputDevices = XYES ]; then - echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \ - elographics magellan \ - microtouch mutouch spaceorb summa \ - wacom void citron" >> $LOCALDEF - echo "#define JoystickSupport YES" >> $LOCALDEF - else - echo "#define XInputDrivers mouse" >> $LOCALDEF - fi - echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF - echo "#define BuildXF86DRM NO" >> $LOCALDEF - echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF - echo "#define Glide3IncDir glide3" >> $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 - # Matrox driver support - echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF - - # disable some configs: there are not used this ports - for i in \ +# disable some options +for i in \ BuildFonts \ Build75DpiFonts \ Build100DpiFonts \ @@ -62,6 +43,7 @@ configure () { BuildType1Fonts \ BuildCIDFonts \ BuildCyrillicFonts \ + JoystickSupport \ XnestServer \ BuildFontServer \ XVirtualFramebufferServer \ @@ -70,52 +52,55 @@ configure () { LibInstall \ ForceNormalLib \ XTrueTypeInstallCConvHeaders - do \ - echo "#define $i NO" >> $LOCALDEF - done - 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 BuildXFree86ConfigTools 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 +do \ + echo "#define $i NO" >> $LOCALDEF +done + +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 UseInstalledPrograms YES" >> $LOCALDEF +echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF - # More of the i386 drivers could probably move to XF86CardDrivers. - # Is fbdev driver useful to us? - # GlideDriver was left out because we have no Glide2 package. - cat >> $LOCALDEF <<END -#ifndef XF86CardDrivers -#ifdef i386Architecture -#define ArchSpecificDrivers apm ark chips cirrus cyrix fbdev i740 \ - i128 i810 neomagic sis trident tseng \ - vesa vmware -#define DriDrivers gamma tdfx mga i810 i830 r128 radeon sis +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 <<END +#if defined(i386Architecture) +# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ + neomagic i740 tdfx savage \ + cirrus vmware tseng trident chips apm \ + i128 nsc ati i810 ark cyrix siliconmotion \ + vesa vga +#elif defined(ia64Architecture) +# define XF86CardDrivers mga nv tdfx glint ati vga #elif defined(AlphaArchitecture) -#define ArchSpecificDrivers -#define DriDrivers gamma tdfx mga r128 radeon -#endif -#define XF86CardDrivers ati glint mga nv rendition s3 s3virge \ - savage siliconmotion tdfx tga vga \ - ArchSpecificDrivers DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers +# define XF86CardDrivers mga glint nv tga s3 s3virge rendition \ + tdfx savage cirrus ati siliconmotion vga +#elif defined(Sparc64Architecture) +# define XF86CardDrivers nv ati sunffb #endif END - echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF +echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF - # Copy ORIGDEF to DESTDEF - rm -f $DESTDEF - cp -f $ORIGDEF $DESTDEF +# Copy ORIGDEF to DESTDEF +rm -f $DESTDEF +cp -f $ORIGDEF $DESTDEF - # copy generated config to host.def - cp -f $LOCALDEF $HOSTDEF -} +# copy generated config to host.def +cp -f $LOCALDEF $HOSTDEF -cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf -configure exit 0 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index 60e81e443844..8a1ec165acb3 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -6,24 +6,23 @@ # PORTNAME= VirtualFramebufferServer -PORTVERSION= 4.2.1 -PORTREVISION= 1 +PORTVERSION= 4.3.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= 4.2.0/:x \ +MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ anholt/:local PKGNAMEPREFIX= XFree86- -DISTFILES= X420src-1.tgz:x \ +DISTFILES= X430src-1.tgz:x \ + X430src-2.tgz:x \ + X430src-3.tgz:x \ Wraphelp2.gz:local -EXTRACT_ONLY= X420src-1.tgz - -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= anholt/patches-4.2.0/ -PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz +EXTRACT_ONLY= X430src-1.tgz \ + X430src-2.tgz \ + X430src-3.tgz MAINTAINER= anholt@freebsd.org -COMMENT= XFree86-4 Virtual Framebuffer Server +COMMENT= XFree86-4 virtual framebuffer server RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo index fde56e7c7696..86966f90fbd3 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo @@ -1,3 +1,4 @@ -MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f +MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af +MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 +MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure index 7065ae6b3640..337ae27342e8 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure @@ -1,14 +1,11 @@ #!/bin/sh # This script does the following: -# (1) cp current xf86site.def (it is created by the imake-4 port) +# (1) cp xf86site.def, installed by imake-4 port, # to ${WRKDIR}/xc/config/cf. -# this means this port uses imake-4's config for defaults. -# (2) Generate temporal config for compiling. -# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are -# used locally for compiling this port, so these configs will be generated -# by this script. These configs will be stored to the `host.def' file, -# but this host.def will never be installed. +# 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 @@ -16,18 +13,18 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def LOCALDEF=$WRKDIR/.config HOSTDEF=$WRKDIR/xc/config/cf/host.def -configure () { - # Use original host.def as initial config file - rm -f $LOCALDEF - grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF - echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - if [ X$InstallFSConfig = "X" ]; then - InstallFSConfig=YES - fi +# Use original host.def as initial config file +rm -f $LOCALDEF +grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF +echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - # disable some configs: there are not used this ports - for i in BuildFonts \ +# 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 \ @@ -42,26 +39,24 @@ configure () { LibHeaders \ ForceNormalLib \ 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 -} +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 -cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf -configure exit 0 |