1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

Upgrade to version 3.2

This commit is contained in:
Jean-Marc Zucconi 1996-11-06 13:38:22 +00:00
parent 9022bd9b15
commit 2ce979f7da
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=4313
36 changed files with 390 additions and 13986 deletions

View File

@ -1,9 +1,9 @@
# New ports collection makefile for: XFree86
# Version required: 3.1.2
# Version required: 3.2
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.18 1996/07/19 14:35:11 jmz Exp $
# $Id: Makefile,v 1.17 1996/02/15 00:53:15 jmz Exp $
#
#######################################################################
@ -12,115 +12,29 @@
# #
#######################################################################
#
# uncomment one of the 2 lines below!
#
# X11_ON_CDROM means you have either X-Consortium CDROM or O'Reilly's
# 'X-Companion' CDROM, X11_VIA_FTP means you have the FreeBSD CDROM
# or want to ftp the whole thing _*BIG*_)
#
#X11_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
# the patch files are
X11FIXES = ${DISTDIR}
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
# Define FORCE_PACKAGE from the command line if you want to override
# this and build a package
NO_PACKAGE = yes
#######################################################################
DISTNAME = xc
PKGNAME = XFree86-3.1.2
PKGNAME = XFree86-3.2
CATEGORIES = x11
IS_INTERACTIVE= yes
IS_INTERACTIVE = yes
PREFIX = /usr/X11R6
MAINTAINER= jmz@FreeBSD.ORG
USE_X11 = yes
DIST_SUBDIR = xc
.if defined(DISTDIR)
.if exists (${DISTDIR}/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.elif defined(PORTSDIR)
.if exists (${PORTSDIR}/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.else
.if exists (/usr/ports/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.endif
.if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
DISTFILES= # to prevent checksum
do-build:
.if defined(REMOVE_NOT_ESSENTIAL)
@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
.endif
@(cd ${WRKSRC}; echo Good night...; make World)
@(cd ${WRKSRC}; echo Good night...; make World 2>&1 | tee world.log)
@touch ${WRKDIR}/.build_done
do-install:
@(cd ${WRKSRC}; make install; make install.man)
.if defined(X11_ON_CDROM)
@find /usr/X11R6/ -name 00_TRANS.TBL -exec rm -f {} ';'
.endif
.endif
@touch ${WRKDIR}/.install_done
.if defined(X11_ON_CDROM)
.if !defined (X11FIXES)
do-configure:
@echo Edit the makefile and set X11FIXES !!!!
@exit 1;
.endif
do-fetch:
@echo -n
do-extract:
@rm -rf ${WRKDIR}
@mkdir -p ${WRKDIR}
@echo ${X11FIXES} > ${WRKDIR}/.cdrom
.elif defined(X11_VIA_FTP)
DISTFILES1 = xc-1.tar.gz xc-2.tar.gz xc-3.tar.gz
DISTFILES2 = fix-12 \
XFree86-3.1.2.diff.gz \
3.1.2-3.1.2-S.diff.gz
DISTFILES = ${DISTFILES1} ${DISTFILES2}
MASTER_SITES = \
ftp://ftp.x.org/pub/R6/ \
ftp://ftp.EU.net/X11/R6/ \
ftp://ftp.x.org/pub/R6/fixes/ \
ftp://ftp.EU.net/X11/R6/fixes/ \
ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.1.2/patches/ \
ftp://ftp.xfree86.org/pub/XFree86/3.1.2/patches/
EXTRACT_ONLY = ${DISTFILES1}
pre-patch:
@echo ${DISTDIR} > ${WRKDIR}/.ftp
.else
do-fetch:
@echo Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@echo -n
do-configure:
@echo -n
do-build:
@echo Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:
@echo -n
.endif
.include "Makefile.ftp"
post-install:
ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>

View File

@ -1,6 +1,3 @@
MD5 (xc-1.tar.gz) = b5ae499273bddce4add5b62fc2b0b810
MD5 (xc-2.tar.gz) = e81d2d235dd517c3e36f588221910b03
MD5 (xc-3.tar.gz) = 01bb42c399a542395f0e17a182ba0e96
MD5 (fix-12) = c1c86fcb0305089ce758b92b623ab24d
MD5 (XFree86-3.1.2.diff.gz) = cbb4ca154ed0882b1ee75326089ef4b5
MD5 (3.1.2-3.1.2-S.diff.gz) = 773acfe51ebbb4e557f4a14905b28f3f
MD5 (X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e
MD5 (X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a
MD5 (X32contrib.tgz) = 5145fbc4c28e6dbb14450b36c5f3f56a

View File

@ -1 +1 @@
X Window System for x86-based architectures.
X11R6.1/XFree86 version 3.2

View File

@ -1,6 +1,6 @@
XFree86 is a added-value pack for X11R6 that supports several versions
of Intel-based Unix and Unix-like operating systems. XFree86-3.0 was
part of the X11R6 core distribution. This release of XFree86-3.1.2
part of the X11R6 core distribution. This release of XFree86-3.2
consists of many new features and performance improvements as well as
many bug fixes. The release is available as source patches against
the X Consortium X11R6 code, as well as binary distributions for many

File diff suppressed because it is too large Load Diff

View File

@ -18,12 +18,13 @@ yesno () {
F=$WRKDIR/.config
configure () {
rm -f $F
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
considerable compile time.
END
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 I8514 Mach8 Mach32 Mach64 P9000 AGX W32"
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128"
for i in $servers; do
yesno "Do you want to build the $i server? [YES] "
echo "#undef XF86${i}Server" >>$F
@ -38,17 +39,22 @@ if [ $answ != none ]; then
echo "#define ServerToInstall XF86_$answ" >>$F
fi
echo
yesno "Do you want to build Xvfb? [YES] "
echo "#define XVirtualFramebufferServer $answ" >>$F
cat >> $F <<END
#define XF86SvgaDrivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak mx al2101 ali cl64xx \
video7 chips generic
#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 mga oak al2101 ali cl64xx \
video7 chips ark mx realtek apm generic
#define XF86Vga16Drivers et4000 ncr77c22 ati tvga8900 oak cl64xx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo hercules
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo
#define XF86W32Drivers et4000w32
@ -62,18 +68,23 @@ cat <<END
on a first time build.
END
yesno "Install xdm config? [YES] "
echo "#undef InstallXdmConfig" >> $F
echo "#define InstallXdmConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXdmConfig $answ" >> $F
fi
yesno "Install xinit config? [YES] "
echo "#undef InstallXinitConfig" >> $F
echo "#define InstallXinitConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXinitConfig $answ" >> $F
fi
yesno "Install xfs config? [YES] "
if [ $answ = YES ]; then
echo "#define InstallFSConfig $answ" >> $F
fi
yesno "Do you want to include support for the FontServer? [YES] "
echo "#undef BuildFontServer" >>$F
echo "#define BuildFontServer $answ" >>$F
echo "#undef InstallFSConfig" >>$F
echo "#define InstallFSConfig $answ" >>$F
echo "#define BuildCyrillicFonts NO" >>$F
cat <<'END'
Do you want to Build Fonts (Usually you only want to build and install
@ -84,6 +95,14 @@ yesno "Build fonts? [YES] "
if [ $answ = NO ]; then
echo "#define BuildFonts NO" >> $F
fi
yesno "Build the servers with Extended input devices? [YES] "
if [ $answ = NO ]; then
echo "#undef BuildXInputExt" >> $F
echo "#define BuildXInputExt NO" >> $F
else
echo "#define JoystickSupport YES" >> $F
fi
yesno "Build PEX? [YES] "
if [ $answ = NO ]; then
echo "#define BuildPexExt NO" >> $F
@ -94,6 +113,10 @@ if [ $answ = NO ]; then
fi
echo
echo "Build static libraries in addition to shared libraries? [YES] "
if [ $answ = YES ]; then
echo "#define ForceNormalLib YES" >> $F
fi
cat <<'END'
MIT supplies an authentication mechanism that relies upon DES, this is
@ -117,10 +140,10 @@ cat <<'END'
END
yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
cpwh=NO
if [ $answ = YES ]; then
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
cpwh=NO
if [ -f $WH ] ; then
echo "==> $WH found in source distribution."
elif [ -f $X11FIXES/Wraphelp.c ] ; then
@ -130,137 +153,25 @@ if [ $answ = YES ]; then
echo "==> Wraphelp.c found in files directory, copying to source tree."
cpwh=$FILESDIR/Wraphelp.c
else
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
else
cpwh=NO
fi
echo "#undef HadXdmAuth" >> $F
echo "#define HasXdmAuth $answ" >> $F
cat <<'END'
Additional support for Kerberos V4 is available should you chose to
install it. If you choose to install the Kerberos V4 patches, you
will also be asked if you want to enable Kerberos V4 support.
END
if [ ! -f /usr/lib/libkrb.a ]; then
echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
k4patch=NO
else
yesno "Do you want to add the Kerberos V4 support patches? [YES] "
k4patch=$answ
if [ $k4patch = YES ] ; then
echo
yesno "Do you want to enable Kerberos V4 support? [YES] "
echo "#undef HasKrb4" >>$F
echo "#define HasKrb4 $answ" >>$F
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
fi
if [ $cpwh != NO ]; then
echo "#define HasXdmAuth $answ" >> $F
fi
echo
echo "End of configuration questions. No more user input required"
echo
}
if [ -f $WRKDIR/.cdrom ]; then
X11FIXES=`cat $WRKDIR/.cdrom`
echo -n 'Where is the "xc" directory on the cdrom? [/cdrom] '
read X11R6; if [ X$X11R6 = X ]; then X11R6=/cdrom; fi
if [ ! -d $X11R6/xc/config/cf ]; then
echo "Can't find X11R6 in $X11R6"
exit 1
fi
yesno "Is your cdrom distibution already patched? [y] ";
if [ $answ = YES ]; then
echo -n "What is the patchlevel of the distribution? [3] ";
read pl; if [ X$pl = X ]; then pl=3; fi
pl=`expr $pl + 1`
if [ $pl -lt 10 ]; then pl=0$pl; fi
else
pl=01
fi
ok=0
err=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
if [ ! -f $X11FIXES/fix-$i ]; then
echo "can't find $X11FIXES/fix-$i !!!"
err=1
fi
if [ $i = 10 ]; then
if [ ! -f $X11FIXES/fix10fonts.Z ]; then
echo "can't find $X11FIXES/fix10fonts.Z !!!"
err=1
fi
fi
if [ $i = 11 ]; then
if [ ! -f $X11FIXES/XFree86-3.1.1.tar.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.1.tar.gz !!!"
err=1
fi
fi
fi
done
if [ ! -f $X11FIXES/XFree86-3.1.2.diff.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.2.diff.gz !!!"
err=1
fi
if [ ! -f $X11FIXES/3.1.2-3.1.2-S.diff.gz ]; then
echo "can't find $X11FIXES/3.1.2-3.1.2-S.diff.gz !!!"
err=1
fi
if [ $err = 1 ]; then exit 1; fi
configure
echo "==> building the tree"
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12
configure
fi
configure
if [ X$cpwh != XNO ]; then
cp $cpwh $WH
fi
echo -n "==> applying XC patches"
ok=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
echo -n .;
patch -d $WRKSRC --forward --quiet -E -p1 < $X11FIXES/fix-$i
if [ $i = 10 ]; then
zcat $X11FIXES/fix10fonts.Z | patch -d $WRKSRC --forward --quiet -E -p1
fi
if [ $i = 11 ]; then
rm -rf $WRKDIR/xc/programs/Xserver/hw/xfree86
(cd $WRKDIR; gunzip -c $X11FIXES/XFree86-3.1.1.tar.gz | tar xpf -)
fi
if [ $i = 12 ]; then
rm -f $WRKDIR/xc/lib/Xt/Shell.h
rm -f $WRKDIR/xc/lib/StringDefs.h
rm -f $WRKDIR/xc/lib/StringDefs.c
fi
fi
done
echo
echo "==> applying XFree86 patches"
zcat $X11FIXES/XFree86-3.1.2.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
zcat $X11FIXES/3.1.2-3.1.2-S.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
if [ $k4patch = YES ] ; then
echo
echo "==> applying Kerberos-V4 support patch"
cat $FILESDIR/kerberos4.diffs | \
patch -d $WRKSRC --forward --quiet -E -p1
fi
cat $F >> $WRKSRC/config/cf/xf86site.def
cd $WRKSRC/config/cf/ || exit 1;
@ -268,11 +179,10 @@ cd $WRKSRC/config/cf/ || exit 1;
version=`uname -r`
set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'`
mv FreeBSD.cf FreeBSD.cf.old
sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
-e "s/UseGnuMalloc.*YES/UseGnuMalloc NO/" \
sed -e "s/2.1.5/$version/" \
-e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \
-e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \
-e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \
<FreeBSD.cf.old >FreeBSD.cf
exit 0

View File

@ -1,9 +1,9 @@
# New ports collection makefile for: XFree86
# Version required: 3.1.2
# Version required: 3.2
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.18 1996/07/19 14:35:11 jmz Exp $
# $Id: Makefile,v 1.17 1996/02/15 00:53:15 jmz Exp $
#
#######################################################################
@ -12,115 +12,29 @@
# #
#######################################################################
#
# uncomment one of the 2 lines below!
#
# X11_ON_CDROM means you have either X-Consortium CDROM or O'Reilly's
# 'X-Companion' CDROM, X11_VIA_FTP means you have the FreeBSD CDROM
# or want to ftp the whole thing _*BIG*_)
#
#X11_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
# the patch files are
X11FIXES = ${DISTDIR}
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
# Define FORCE_PACKAGE from the command line if you want to override
# this and build a package
NO_PACKAGE = yes
#######################################################################
DISTNAME = xc
PKGNAME = XFree86-3.1.2
PKGNAME = XFree86-3.2
CATEGORIES = x11
IS_INTERACTIVE= yes
IS_INTERACTIVE = yes
PREFIX = /usr/X11R6
MAINTAINER= jmz@FreeBSD.ORG
USE_X11 = yes
DIST_SUBDIR = xc
.if defined(DISTDIR)
.if exists (${DISTDIR}/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.elif defined(PORTSDIR)
.if exists (${PORTSDIR}/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.else
.if exists (/usr/ports/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.endif
.if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
DISTFILES= # to prevent checksum
do-build:
.if defined(REMOVE_NOT_ESSENTIAL)
@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
.endif
@(cd ${WRKSRC}; echo Good night...; make World)
@(cd ${WRKSRC}; echo Good night...; make World 2>&1 | tee world.log)
@touch ${WRKDIR}/.build_done
do-install:
@(cd ${WRKSRC}; make install; make install.man)
.if defined(X11_ON_CDROM)
@find /usr/X11R6/ -name 00_TRANS.TBL -exec rm -f {} ';'
.endif
.endif
@touch ${WRKDIR}/.install_done
.if defined(X11_ON_CDROM)
.if !defined (X11FIXES)
do-configure:
@echo Edit the makefile and set X11FIXES !!!!
@exit 1;
.endif
do-fetch:
@echo -n
do-extract:
@rm -rf ${WRKDIR}
@mkdir -p ${WRKDIR}
@echo ${X11FIXES} > ${WRKDIR}/.cdrom
.elif defined(X11_VIA_FTP)
DISTFILES1 = xc-1.tar.gz xc-2.tar.gz xc-3.tar.gz
DISTFILES2 = fix-12 \
XFree86-3.1.2.diff.gz \
3.1.2-3.1.2-S.diff.gz
DISTFILES = ${DISTFILES1} ${DISTFILES2}
MASTER_SITES = \
ftp://ftp.x.org/pub/R6/ \
ftp://ftp.EU.net/X11/R6/ \
ftp://ftp.x.org/pub/R6/fixes/ \
ftp://ftp.EU.net/X11/R6/fixes/ \
ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.1.2/patches/ \
ftp://ftp.xfree86.org/pub/XFree86/3.1.2/patches/
EXTRACT_ONLY = ${DISTFILES1}
pre-patch:
@echo ${DISTDIR} > ${WRKDIR}/.ftp
.else
do-fetch:
@echo Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@echo -n
do-configure:
@echo -n
do-build:
@echo Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:
@echo -n
.endif
.include "Makefile.ftp"
post-install:
ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>

View File

@ -1,6 +1,3 @@
MD5 (xc-1.tar.gz) = b5ae499273bddce4add5b62fc2b0b810
MD5 (xc-2.tar.gz) = e81d2d235dd517c3e36f588221910b03
MD5 (xc-3.tar.gz) = 01bb42c399a542395f0e17a182ba0e96
MD5 (fix-12) = c1c86fcb0305089ce758b92b623ab24d
MD5 (XFree86-3.1.2.diff.gz) = cbb4ca154ed0882b1ee75326089ef4b5
MD5 (3.1.2-3.1.2-S.diff.gz) = 773acfe51ebbb4e557f4a14905b28f3f
MD5 (X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e
MD5 (X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a
MD5 (X32contrib.tgz) = 5145fbc4c28e6dbb14450b36c5f3f56a

View File

@ -1 +1 @@
X Window System for x86-based architectures.
X11R6.1/XFree86 version 3.2

View File

@ -1,6 +1,6 @@
XFree86 is a added-value pack for X11R6 that supports several versions
of Intel-based Unix and Unix-like operating systems. XFree86-3.0 was
part of the X11R6 core distribution. This release of XFree86-3.1.2
part of the X11R6 core distribution. This release of XFree86-3.2
consists of many new features and performance improvements as well as
many bug fixes. The release is available as source patches against
the X Consortium X11R6 code, as well as binary distributions for many

File diff suppressed because it is too large Load Diff

View File

@ -18,12 +18,13 @@ yesno () {
F=$WRKDIR/.config
configure () {
rm -f $F
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
considerable compile time.
END
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 I8514 Mach8 Mach32 Mach64 P9000 AGX W32"
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128"
for i in $servers; do
yesno "Do you want to build the $i server? [YES] "
echo "#undef XF86${i}Server" >>$F
@ -38,17 +39,22 @@ if [ $answ != none ]; then
echo "#define ServerToInstall XF86_$answ" >>$F
fi
echo
yesno "Do you want to build Xvfb? [YES] "
echo "#define XVirtualFramebufferServer $answ" >>$F
cat >> $F <<END
#define XF86SvgaDrivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak mx al2101 ali cl64xx \
video7 chips generic
#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 mga oak al2101 ali cl64xx \
video7 chips ark mx realtek apm generic
#define XF86Vga16Drivers et4000 ncr77c22 ati tvga8900 oak cl64xx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo hercules
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo
#define XF86W32Drivers et4000w32
@ -62,18 +68,23 @@ cat <<END
on a first time build.
END
yesno "Install xdm config? [YES] "
echo "#undef InstallXdmConfig" >> $F
echo "#define InstallXdmConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXdmConfig $answ" >> $F
fi
yesno "Install xinit config? [YES] "
echo "#undef InstallXinitConfig" >> $F
echo "#define InstallXinitConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXinitConfig $answ" >> $F
fi
yesno "Install xfs config? [YES] "
if [ $answ = YES ]; then
echo "#define InstallFSConfig $answ" >> $F
fi
yesno "Do you want to include support for the FontServer? [YES] "
echo "#undef BuildFontServer" >>$F
echo "#define BuildFontServer $answ" >>$F
echo "#undef InstallFSConfig" >>$F
echo "#define InstallFSConfig $answ" >>$F
echo "#define BuildCyrillicFonts NO" >>$F
cat <<'END'
Do you want to Build Fonts (Usually you only want to build and install
@ -84,6 +95,14 @@ yesno "Build fonts? [YES] "
if [ $answ = NO ]; then
echo "#define BuildFonts NO" >> $F
fi
yesno "Build the servers with Extended input devices? [YES] "
if [ $answ = NO ]; then
echo "#undef BuildXInputExt" >> $F
echo "#define BuildXInputExt NO" >> $F
else
echo "#define JoystickSupport YES" >> $F
fi
yesno "Build PEX? [YES] "
if [ $answ = NO ]; then
echo "#define BuildPexExt NO" >> $F
@ -94,6 +113,10 @@ if [ $answ = NO ]; then
fi
echo
echo "Build static libraries in addition to shared libraries? [YES] "
if [ $answ = YES ]; then
echo "#define ForceNormalLib YES" >> $F
fi
cat <<'END'
MIT supplies an authentication mechanism that relies upon DES, this is
@ -117,10 +140,10 @@ cat <<'END'
END
yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
cpwh=NO
if [ $answ = YES ]; then
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
cpwh=NO
if [ -f $WH ] ; then
echo "==> $WH found in source distribution."
elif [ -f $X11FIXES/Wraphelp.c ] ; then
@ -130,137 +153,25 @@ if [ $answ = YES ]; then
echo "==> Wraphelp.c found in files directory, copying to source tree."
cpwh=$FILESDIR/Wraphelp.c
else
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
else
cpwh=NO
fi
echo "#undef HadXdmAuth" >> $F
echo "#define HasXdmAuth $answ" >> $F
cat <<'END'
Additional support for Kerberos V4 is available should you chose to
install it. If you choose to install the Kerberos V4 patches, you
will also be asked if you want to enable Kerberos V4 support.
END
if [ ! -f /usr/lib/libkrb.a ]; then
echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
k4patch=NO
else
yesno "Do you want to add the Kerberos V4 support patches? [YES] "
k4patch=$answ
if [ $k4patch = YES ] ; then
echo
yesno "Do you want to enable Kerberos V4 support? [YES] "
echo "#undef HasKrb4" >>$F
echo "#define HasKrb4 $answ" >>$F
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
fi
if [ $cpwh != NO ]; then
echo "#define HasXdmAuth $answ" >> $F
fi
echo
echo "End of configuration questions. No more user input required"
echo
}
if [ -f $WRKDIR/.cdrom ]; then
X11FIXES=`cat $WRKDIR/.cdrom`
echo -n 'Where is the "xc" directory on the cdrom? [/cdrom] '
read X11R6; if [ X$X11R6 = X ]; then X11R6=/cdrom; fi
if [ ! -d $X11R6/xc/config/cf ]; then
echo "Can't find X11R6 in $X11R6"
exit 1
fi
yesno "Is your cdrom distibution already patched? [y] ";
if [ $answ = YES ]; then
echo -n "What is the patchlevel of the distribution? [3] ";
read pl; if [ X$pl = X ]; then pl=3; fi
pl=`expr $pl + 1`
if [ $pl -lt 10 ]; then pl=0$pl; fi
else
pl=01
fi
ok=0
err=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
if [ ! -f $X11FIXES/fix-$i ]; then
echo "can't find $X11FIXES/fix-$i !!!"
err=1
fi
if [ $i = 10 ]; then
if [ ! -f $X11FIXES/fix10fonts.Z ]; then
echo "can't find $X11FIXES/fix10fonts.Z !!!"
err=1
fi
fi
if [ $i = 11 ]; then
if [ ! -f $X11FIXES/XFree86-3.1.1.tar.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.1.tar.gz !!!"
err=1
fi
fi
fi
done
if [ ! -f $X11FIXES/XFree86-3.1.2.diff.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.2.diff.gz !!!"
err=1
fi
if [ ! -f $X11FIXES/3.1.2-3.1.2-S.diff.gz ]; then
echo "can't find $X11FIXES/3.1.2-3.1.2-S.diff.gz !!!"
err=1
fi
if [ $err = 1 ]; then exit 1; fi
configure
echo "==> building the tree"
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12
configure
fi
configure
if [ X$cpwh != XNO ]; then
cp $cpwh $WH
fi
echo -n "==> applying XC patches"
ok=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
echo -n .;
patch -d $WRKSRC --forward --quiet -E -p1 < $X11FIXES/fix-$i
if [ $i = 10 ]; then
zcat $X11FIXES/fix10fonts.Z | patch -d $WRKSRC --forward --quiet -E -p1
fi
if [ $i = 11 ]; then
rm -rf $WRKDIR/xc/programs/Xserver/hw/xfree86
(cd $WRKDIR; gunzip -c $X11FIXES/XFree86-3.1.1.tar.gz | tar xpf -)
fi
if [ $i = 12 ]; then
rm -f $WRKDIR/xc/lib/Xt/Shell.h
rm -f $WRKDIR/xc/lib/StringDefs.h
rm -f $WRKDIR/xc/lib/StringDefs.c
fi
fi
done
echo
echo "==> applying XFree86 patches"
zcat $X11FIXES/XFree86-3.1.2.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
zcat $X11FIXES/3.1.2-3.1.2-S.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
if [ $k4patch = YES ] ; then
echo
echo "==> applying Kerberos-V4 support patch"
cat $FILESDIR/kerberos4.diffs | \
patch -d $WRKSRC --forward --quiet -E -p1
fi
cat $F >> $WRKSRC/config/cf/xf86site.def
cd $WRKSRC/config/cf/ || exit 1;
@ -268,11 +179,10 @@ cd $WRKSRC/config/cf/ || exit 1;
version=`uname -r`
set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'`
mv FreeBSD.cf FreeBSD.cf.old
sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
-e "s/UseGnuMalloc.*YES/UseGnuMalloc NO/" \
sed -e "s/2.1.5/$version/" \
-e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \
-e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \
-e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \
<FreeBSD.cf.old >FreeBSD.cf
exit 0

View File

@ -1,9 +1,9 @@
# New ports collection makefile for: XFree86
# Version required: 3.1.2
# Version required: 3.2
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.18 1996/07/19 14:35:11 jmz Exp $
# $Id: Makefile,v 1.17 1996/02/15 00:53:15 jmz Exp $
#
#######################################################################
@ -12,115 +12,29 @@
# #
#######################################################################
#
# uncomment one of the 2 lines below!
#
# X11_ON_CDROM means you have either X-Consortium CDROM or O'Reilly's
# 'X-Companion' CDROM, X11_VIA_FTP means you have the FreeBSD CDROM
# or want to ftp the whole thing _*BIG*_)
#
#X11_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
# the patch files are
X11FIXES = ${DISTDIR}
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
# Define FORCE_PACKAGE from the command line if you want to override
# this and build a package
NO_PACKAGE = yes
#######################################################################
DISTNAME = xc
PKGNAME = XFree86-3.1.2
PKGNAME = XFree86-3.2
CATEGORIES = x11
IS_INTERACTIVE= yes
IS_INTERACTIVE = yes
PREFIX = /usr/X11R6
MAINTAINER= jmz@FreeBSD.ORG
USE_X11 = yes
DIST_SUBDIR = xc
.if defined(DISTDIR)
.if exists (${DISTDIR}/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.elif defined(PORTSDIR)
.if exists (${PORTSDIR}/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.else
.if exists (/usr/ports/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.endif
.if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
DISTFILES= # to prevent checksum
do-build:
.if defined(REMOVE_NOT_ESSENTIAL)
@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
.endif
@(cd ${WRKSRC}; echo Good night...; make World)
@(cd ${WRKSRC}; echo Good night...; make World 2>&1 | tee world.log)
@touch ${WRKDIR}/.build_done
do-install:
@(cd ${WRKSRC}; make install; make install.man)
.if defined(X11_ON_CDROM)
@find /usr/X11R6/ -name 00_TRANS.TBL -exec rm -f {} ';'
.endif
.endif
@touch ${WRKDIR}/.install_done
.if defined(X11_ON_CDROM)
.if !defined (X11FIXES)
do-configure:
@echo Edit the makefile and set X11FIXES !!!!
@exit 1;
.endif
do-fetch:
@echo -n
do-extract:
@rm -rf ${WRKDIR}
@mkdir -p ${WRKDIR}
@echo ${X11FIXES} > ${WRKDIR}/.cdrom
.elif defined(X11_VIA_FTP)
DISTFILES1 = xc-1.tar.gz xc-2.tar.gz xc-3.tar.gz
DISTFILES2 = fix-12 \
XFree86-3.1.2.diff.gz \
3.1.2-3.1.2-S.diff.gz
DISTFILES = ${DISTFILES1} ${DISTFILES2}
MASTER_SITES = \
ftp://ftp.x.org/pub/R6/ \
ftp://ftp.EU.net/X11/R6/ \
ftp://ftp.x.org/pub/R6/fixes/ \
ftp://ftp.EU.net/X11/R6/fixes/ \
ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.1.2/patches/ \
ftp://ftp.xfree86.org/pub/XFree86/3.1.2/patches/
EXTRACT_ONLY = ${DISTFILES1}
pre-patch:
@echo ${DISTDIR} > ${WRKDIR}/.ftp
.else
do-fetch:
@echo Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@echo -n
do-configure:
@echo -n
do-build:
@echo Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:
@echo -n
.endif
.include "Makefile.ftp"
post-install:
ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>

View File

@ -1,6 +1,3 @@
MD5 (xc-1.tar.gz) = b5ae499273bddce4add5b62fc2b0b810
MD5 (xc-2.tar.gz) = e81d2d235dd517c3e36f588221910b03
MD5 (xc-3.tar.gz) = 01bb42c399a542395f0e17a182ba0e96
MD5 (fix-12) = c1c86fcb0305089ce758b92b623ab24d
MD5 (XFree86-3.1.2.diff.gz) = cbb4ca154ed0882b1ee75326089ef4b5
MD5 (3.1.2-3.1.2-S.diff.gz) = 773acfe51ebbb4e557f4a14905b28f3f
MD5 (X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e
MD5 (X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a
MD5 (X32contrib.tgz) = 5145fbc4c28e6dbb14450b36c5f3f56a

View File

@ -1 +1 @@
X Window System for x86-based architectures.
X11R6.1/XFree86 version 3.2

View File

@ -1,6 +1,6 @@
XFree86 is a added-value pack for X11R6 that supports several versions
of Intel-based Unix and Unix-like operating systems. XFree86-3.0 was
part of the X11R6 core distribution. This release of XFree86-3.1.2
part of the X11R6 core distribution. This release of XFree86-3.2
consists of many new features and performance improvements as well as
many bug fixes. The release is available as source patches against
the X Consortium X11R6 code, as well as binary distributions for many

File diff suppressed because it is too large Load Diff

View File

@ -18,12 +18,13 @@ yesno () {
F=$WRKDIR/.config
configure () {
rm -f $F
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
considerable compile time.
END
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 I8514 Mach8 Mach32 Mach64 P9000 AGX W32"
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128"
for i in $servers; do
yesno "Do you want to build the $i server? [YES] "
echo "#undef XF86${i}Server" >>$F
@ -38,17 +39,22 @@ if [ $answ != none ]; then
echo "#define ServerToInstall XF86_$answ" >>$F
fi
echo
yesno "Do you want to build Xvfb? [YES] "
echo "#define XVirtualFramebufferServer $answ" >>$F
cat >> $F <<END
#define XF86SvgaDrivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak mx al2101 ali cl64xx \
video7 chips generic
#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 mga oak al2101 ali cl64xx \
video7 chips ark mx realtek apm generic
#define XF86Vga16Drivers et4000 ncr77c22 ati tvga8900 oak cl64xx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo hercules
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo
#define XF86W32Drivers et4000w32
@ -62,18 +68,23 @@ cat <<END
on a first time build.
END
yesno "Install xdm config? [YES] "
echo "#undef InstallXdmConfig" >> $F
echo "#define InstallXdmConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXdmConfig $answ" >> $F
fi
yesno "Install xinit config? [YES] "
echo "#undef InstallXinitConfig" >> $F
echo "#define InstallXinitConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXinitConfig $answ" >> $F
fi
yesno "Install xfs config? [YES] "
if [ $answ = YES ]; then
echo "#define InstallFSConfig $answ" >> $F
fi
yesno "Do you want to include support for the FontServer? [YES] "
echo "#undef BuildFontServer" >>$F
echo "#define BuildFontServer $answ" >>$F
echo "#undef InstallFSConfig" >>$F
echo "#define InstallFSConfig $answ" >>$F
echo "#define BuildCyrillicFonts NO" >>$F
cat <<'END'
Do you want to Build Fonts (Usually you only want to build and install
@ -84,6 +95,14 @@ yesno "Build fonts? [YES] "
if [ $answ = NO ]; then
echo "#define BuildFonts NO" >> $F
fi
yesno "Build the servers with Extended input devices? [YES] "
if [ $answ = NO ]; then
echo "#undef BuildXInputExt" >> $F
echo "#define BuildXInputExt NO" >> $F
else
echo "#define JoystickSupport YES" >> $F
fi
yesno "Build PEX? [YES] "
if [ $answ = NO ]; then
echo "#define BuildPexExt NO" >> $F
@ -94,6 +113,10 @@ if [ $answ = NO ]; then
fi
echo
echo "Build static libraries in addition to shared libraries? [YES] "
if [ $answ = YES ]; then
echo "#define ForceNormalLib YES" >> $F
fi
cat <<'END'
MIT supplies an authentication mechanism that relies upon DES, this is
@ -117,10 +140,10 @@ cat <<'END'
END
yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
cpwh=NO
if [ $answ = YES ]; then
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
cpwh=NO
if [ -f $WH ] ; then
echo "==> $WH found in source distribution."
elif [ -f $X11FIXES/Wraphelp.c ] ; then
@ -130,137 +153,25 @@ if [ $answ = YES ]; then
echo "==> Wraphelp.c found in files directory, copying to source tree."
cpwh=$FILESDIR/Wraphelp.c
else
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
else
cpwh=NO
fi
echo "#undef HadXdmAuth" >> $F
echo "#define HasXdmAuth $answ" >> $F
cat <<'END'
Additional support for Kerberos V4 is available should you chose to
install it. If you choose to install the Kerberos V4 patches, you
will also be asked if you want to enable Kerberos V4 support.
END
if [ ! -f /usr/lib/libkrb.a ]; then
echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
k4patch=NO
else
yesno "Do you want to add the Kerberos V4 support patches? [YES] "
k4patch=$answ
if [ $k4patch = YES ] ; then
echo
yesno "Do you want to enable Kerberos V4 support? [YES] "
echo "#undef HasKrb4" >>$F
echo "#define HasKrb4 $answ" >>$F
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
fi
if [ $cpwh != NO ]; then
echo "#define HasXdmAuth $answ" >> $F
fi
echo
echo "End of configuration questions. No more user input required"
echo
}
if [ -f $WRKDIR/.cdrom ]; then
X11FIXES=`cat $WRKDIR/.cdrom`
echo -n 'Where is the "xc" directory on the cdrom? [/cdrom] '
read X11R6; if [ X$X11R6 = X ]; then X11R6=/cdrom; fi
if [ ! -d $X11R6/xc/config/cf ]; then
echo "Can't find X11R6 in $X11R6"
exit 1
fi
yesno "Is your cdrom distibution already patched? [y] ";
if [ $answ = YES ]; then
echo -n "What is the patchlevel of the distribution? [3] ";
read pl; if [ X$pl = X ]; then pl=3; fi
pl=`expr $pl + 1`
if [ $pl -lt 10 ]; then pl=0$pl; fi
else
pl=01
fi
ok=0
err=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
if [ ! -f $X11FIXES/fix-$i ]; then
echo "can't find $X11FIXES/fix-$i !!!"
err=1
fi
if [ $i = 10 ]; then
if [ ! -f $X11FIXES/fix10fonts.Z ]; then
echo "can't find $X11FIXES/fix10fonts.Z !!!"
err=1
fi
fi
if [ $i = 11 ]; then
if [ ! -f $X11FIXES/XFree86-3.1.1.tar.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.1.tar.gz !!!"
err=1
fi
fi
fi
done
if [ ! -f $X11FIXES/XFree86-3.1.2.diff.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.2.diff.gz !!!"
err=1
fi
if [ ! -f $X11FIXES/3.1.2-3.1.2-S.diff.gz ]; then
echo "can't find $X11FIXES/3.1.2-3.1.2-S.diff.gz !!!"
err=1
fi
if [ $err = 1 ]; then exit 1; fi
configure
echo "==> building the tree"
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12
configure
fi
configure
if [ X$cpwh != XNO ]; then
cp $cpwh $WH
fi
echo -n "==> applying XC patches"
ok=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
echo -n .;
patch -d $WRKSRC --forward --quiet -E -p1 < $X11FIXES/fix-$i
if [ $i = 10 ]; then
zcat $X11FIXES/fix10fonts.Z | patch -d $WRKSRC --forward --quiet -E -p1
fi
if [ $i = 11 ]; then
rm -rf $WRKDIR/xc/programs/Xserver/hw/xfree86
(cd $WRKDIR; gunzip -c $X11FIXES/XFree86-3.1.1.tar.gz | tar xpf -)
fi
if [ $i = 12 ]; then
rm -f $WRKDIR/xc/lib/Xt/Shell.h
rm -f $WRKDIR/xc/lib/StringDefs.h
rm -f $WRKDIR/xc/lib/StringDefs.c
fi
fi
done
echo
echo "==> applying XFree86 patches"
zcat $X11FIXES/XFree86-3.1.2.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
zcat $X11FIXES/3.1.2-3.1.2-S.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
if [ $k4patch = YES ] ; then
echo
echo "==> applying Kerberos-V4 support patch"
cat $FILESDIR/kerberos4.diffs | \
patch -d $WRKSRC --forward --quiet -E -p1
fi
cat $F >> $WRKSRC/config/cf/xf86site.def
cd $WRKSRC/config/cf/ || exit 1;
@ -268,11 +179,10 @@ cd $WRKSRC/config/cf/ || exit 1;
version=`uname -r`
set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'`
mv FreeBSD.cf FreeBSD.cf.old
sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
-e "s/UseGnuMalloc.*YES/UseGnuMalloc NO/" \
sed -e "s/2.1.5/$version/" \
-e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \
-e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \
-e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \
<FreeBSD.cf.old >FreeBSD.cf
exit 0

View File

@ -1,9 +1,9 @@
# New ports collection makefile for: XFree86
# Version required: 3.1.2
# Version required: 3.2
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.18 1996/07/19 14:35:11 jmz Exp $
# $Id: Makefile,v 1.17 1996/02/15 00:53:15 jmz Exp $
#
#######################################################################
@ -12,115 +12,29 @@
# #
#######################################################################
#
# uncomment one of the 2 lines below!
#
# X11_ON_CDROM means you have either X-Consortium CDROM or O'Reilly's
# 'X-Companion' CDROM, X11_VIA_FTP means you have the FreeBSD CDROM
# or want to ftp the whole thing _*BIG*_)
#
#X11_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
# the patch files are
X11FIXES = ${DISTDIR}
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
# Define FORCE_PACKAGE from the command line if you want to override
# this and build a package
NO_PACKAGE = yes
#######################################################################
DISTNAME = xc
PKGNAME = XFree86-3.1.2
PKGNAME = XFree86-3.2
CATEGORIES = x11
IS_INTERACTIVE= yes
IS_INTERACTIVE = yes
PREFIX = /usr/X11R6
MAINTAINER= jmz@FreeBSD.ORG
USE_X11 = yes
DIST_SUBDIR = xc
.if defined(DISTDIR)
.if exists (${DISTDIR}/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.elif defined(PORTSDIR)
.if exists (${PORTSDIR}/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.else
.if exists (/usr/ports/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.endif
.if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
DISTFILES= # to prevent checksum
do-build:
.if defined(REMOVE_NOT_ESSENTIAL)
@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
.endif
@(cd ${WRKSRC}; echo Good night...; make World)
@(cd ${WRKSRC}; echo Good night...; make World 2>&1 | tee world.log)
@touch ${WRKDIR}/.build_done
do-install:
@(cd ${WRKSRC}; make install; make install.man)
.if defined(X11_ON_CDROM)
@find /usr/X11R6/ -name 00_TRANS.TBL -exec rm -f {} ';'
.endif
.endif
@touch ${WRKDIR}/.install_done
.if defined(X11_ON_CDROM)
.if !defined (X11FIXES)
do-configure:
@echo Edit the makefile and set X11FIXES !!!!
@exit 1;
.endif
do-fetch:
@echo -n
do-extract:
@rm -rf ${WRKDIR}
@mkdir -p ${WRKDIR}
@echo ${X11FIXES} > ${WRKDIR}/.cdrom
.elif defined(X11_VIA_FTP)
DISTFILES1 = xc-1.tar.gz xc-2.tar.gz xc-3.tar.gz
DISTFILES2 = fix-12 \
XFree86-3.1.2.diff.gz \
3.1.2-3.1.2-S.diff.gz
DISTFILES = ${DISTFILES1} ${DISTFILES2}
MASTER_SITES = \
ftp://ftp.x.org/pub/R6/ \
ftp://ftp.EU.net/X11/R6/ \
ftp://ftp.x.org/pub/R6/fixes/ \
ftp://ftp.EU.net/X11/R6/fixes/ \
ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.1.2/patches/ \
ftp://ftp.xfree86.org/pub/XFree86/3.1.2/patches/
EXTRACT_ONLY = ${DISTFILES1}
pre-patch:
@echo ${DISTDIR} > ${WRKDIR}/.ftp
.else
do-fetch:
@echo Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@echo -n
do-configure:
@echo -n
do-build:
@echo Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:
@echo -n
.endif
.include "Makefile.ftp"
post-install:
ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>

View File

@ -1,6 +1,3 @@
MD5 (xc-1.tar.gz) = b5ae499273bddce4add5b62fc2b0b810
MD5 (xc-2.tar.gz) = e81d2d235dd517c3e36f588221910b03
MD5 (xc-3.tar.gz) = 01bb42c399a542395f0e17a182ba0e96
MD5 (fix-12) = c1c86fcb0305089ce758b92b623ab24d
MD5 (XFree86-3.1.2.diff.gz) = cbb4ca154ed0882b1ee75326089ef4b5
MD5 (3.1.2-3.1.2-S.diff.gz) = 773acfe51ebbb4e557f4a14905b28f3f
MD5 (X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e
MD5 (X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a
MD5 (X32contrib.tgz) = 5145fbc4c28e6dbb14450b36c5f3f56a

View File

@ -1 +1 @@
X Window System for x86-based architectures.
X11R6.1/XFree86 version 3.2

View File

@ -1,6 +1,6 @@
XFree86 is a added-value pack for X11R6 that supports several versions
of Intel-based Unix and Unix-like operating systems. XFree86-3.0 was
part of the X11R6 core distribution. This release of XFree86-3.1.2
part of the X11R6 core distribution. This release of XFree86-3.2
consists of many new features and performance improvements as well as
many bug fixes. The release is available as source patches against
the X Consortium X11R6 code, as well as binary distributions for many

File diff suppressed because it is too large Load Diff

View File

@ -18,12 +18,13 @@ yesno () {
F=$WRKDIR/.config
configure () {
rm -f $F
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
considerable compile time.
END
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 I8514 Mach8 Mach32 Mach64 P9000 AGX W32"
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128"
for i in $servers; do
yesno "Do you want to build the $i server? [YES] "
echo "#undef XF86${i}Server" >>$F
@ -38,17 +39,22 @@ if [ $answ != none ]; then
echo "#define ServerToInstall XF86_$answ" >>$F
fi
echo
yesno "Do you want to build Xvfb? [YES] "
echo "#define XVirtualFramebufferServer $answ" >>$F
cat >> $F <<END
#define XF86SvgaDrivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak mx al2101 ali cl64xx \
video7 chips generic
#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 mga oak al2101 ali cl64xx \
video7 chips ark mx realtek apm generic
#define XF86Vga16Drivers et4000 ncr77c22 ati tvga8900 oak cl64xx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo hercules
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo
#define XF86W32Drivers et4000w32
@ -62,18 +68,23 @@ cat <<END
on a first time build.
END
yesno "Install xdm config? [YES] "
echo "#undef InstallXdmConfig" >> $F
echo "#define InstallXdmConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXdmConfig $answ" >> $F
fi
yesno "Install xinit config? [YES] "
echo "#undef InstallXinitConfig" >> $F
echo "#define InstallXinitConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXinitConfig $answ" >> $F
fi
yesno "Install xfs config? [YES] "
if [ $answ = YES ]; then
echo "#define InstallFSConfig $answ" >> $F
fi
yesno "Do you want to include support for the FontServer? [YES] "
echo "#undef BuildFontServer" >>$F
echo "#define BuildFontServer $answ" >>$F
echo "#undef InstallFSConfig" >>$F
echo "#define InstallFSConfig $answ" >>$F
echo "#define BuildCyrillicFonts NO" >>$F
cat <<'END'
Do you want to Build Fonts (Usually you only want to build and install
@ -84,6 +95,14 @@ yesno "Build fonts? [YES] "
if [ $answ = NO ]; then
echo "#define BuildFonts NO" >> $F
fi
yesno "Build the servers with Extended input devices? [YES] "
if [ $answ = NO ]; then
echo "#undef BuildXInputExt" >> $F
echo "#define BuildXInputExt NO" >> $F
else
echo "#define JoystickSupport YES" >> $F
fi
yesno "Build PEX? [YES] "
if [ $answ = NO ]; then
echo "#define BuildPexExt NO" >> $F
@ -94,6 +113,10 @@ if [ $answ = NO ]; then
fi
echo
echo "Build static libraries in addition to shared libraries? [YES] "
if [ $answ = YES ]; then
echo "#define ForceNormalLib YES" >> $F
fi
cat <<'END'
MIT supplies an authentication mechanism that relies upon DES, this is
@ -117,10 +140,10 @@ cat <<'END'
END
yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
cpwh=NO
if [ $answ = YES ]; then
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
cpwh=NO
if [ -f $WH ] ; then
echo "==> $WH found in source distribution."
elif [ -f $X11FIXES/Wraphelp.c ] ; then
@ -130,137 +153,25 @@ if [ $answ = YES ]; then
echo "==> Wraphelp.c found in files directory, copying to source tree."
cpwh=$FILESDIR/Wraphelp.c
else
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
else
cpwh=NO
fi
echo "#undef HadXdmAuth" >> $F
echo "#define HasXdmAuth $answ" >> $F
cat <<'END'
Additional support for Kerberos V4 is available should you chose to
install it. If you choose to install the Kerberos V4 patches, you
will also be asked if you want to enable Kerberos V4 support.
END
if [ ! -f /usr/lib/libkrb.a ]; then
echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
k4patch=NO
else
yesno "Do you want to add the Kerberos V4 support patches? [YES] "
k4patch=$answ
if [ $k4patch = YES ] ; then
echo
yesno "Do you want to enable Kerberos V4 support? [YES] "
echo "#undef HasKrb4" >>$F
echo "#define HasKrb4 $answ" >>$F
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
fi
if [ $cpwh != NO ]; then
echo "#define HasXdmAuth $answ" >> $F
fi
echo
echo "End of configuration questions. No more user input required"
echo
}
if [ -f $WRKDIR/.cdrom ]; then
X11FIXES=`cat $WRKDIR/.cdrom`
echo -n 'Where is the "xc" directory on the cdrom? [/cdrom] '
read X11R6; if [ X$X11R6 = X ]; then X11R6=/cdrom; fi
if [ ! -d $X11R6/xc/config/cf ]; then
echo "Can't find X11R6 in $X11R6"
exit 1
fi
yesno "Is your cdrom distibution already patched? [y] ";
if [ $answ = YES ]; then
echo -n "What is the patchlevel of the distribution? [3] ";
read pl; if [ X$pl = X ]; then pl=3; fi
pl=`expr $pl + 1`
if [ $pl -lt 10 ]; then pl=0$pl; fi
else
pl=01
fi
ok=0
err=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
if [ ! -f $X11FIXES/fix-$i ]; then
echo "can't find $X11FIXES/fix-$i !!!"
err=1
fi
if [ $i = 10 ]; then
if [ ! -f $X11FIXES/fix10fonts.Z ]; then
echo "can't find $X11FIXES/fix10fonts.Z !!!"
err=1
fi
fi
if [ $i = 11 ]; then
if [ ! -f $X11FIXES/XFree86-3.1.1.tar.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.1.tar.gz !!!"
err=1
fi
fi
fi
done
if [ ! -f $X11FIXES/XFree86-3.1.2.diff.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.2.diff.gz !!!"
err=1
fi
if [ ! -f $X11FIXES/3.1.2-3.1.2-S.diff.gz ]; then
echo "can't find $X11FIXES/3.1.2-3.1.2-S.diff.gz !!!"
err=1
fi
if [ $err = 1 ]; then exit 1; fi
configure
echo "==> building the tree"
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12
configure
fi
configure
if [ X$cpwh != XNO ]; then
cp $cpwh $WH
fi
echo -n "==> applying XC patches"
ok=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
echo -n .;
patch -d $WRKSRC --forward --quiet -E -p1 < $X11FIXES/fix-$i
if [ $i = 10 ]; then
zcat $X11FIXES/fix10fonts.Z | patch -d $WRKSRC --forward --quiet -E -p1
fi
if [ $i = 11 ]; then
rm -rf $WRKDIR/xc/programs/Xserver/hw/xfree86
(cd $WRKDIR; gunzip -c $X11FIXES/XFree86-3.1.1.tar.gz | tar xpf -)
fi
if [ $i = 12 ]; then
rm -f $WRKDIR/xc/lib/Xt/Shell.h
rm -f $WRKDIR/xc/lib/StringDefs.h
rm -f $WRKDIR/xc/lib/StringDefs.c
fi
fi
done
echo
echo "==> applying XFree86 patches"
zcat $X11FIXES/XFree86-3.1.2.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
zcat $X11FIXES/3.1.2-3.1.2-S.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
if [ $k4patch = YES ] ; then
echo
echo "==> applying Kerberos-V4 support patch"
cat $FILESDIR/kerberos4.diffs | \
patch -d $WRKSRC --forward --quiet -E -p1
fi
cat $F >> $WRKSRC/config/cf/xf86site.def
cd $WRKSRC/config/cf/ || exit 1;
@ -268,11 +179,10 @@ cd $WRKSRC/config/cf/ || exit 1;
version=`uname -r`
set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'`
mv FreeBSD.cf FreeBSD.cf.old
sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
-e "s/UseGnuMalloc.*YES/UseGnuMalloc NO/" \
sed -e "s/2.1.5/$version/" \
-e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \
-e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \
-e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \
<FreeBSD.cf.old >FreeBSD.cf
exit 0

View File

@ -1,9 +1,9 @@
# New ports collection makefile for: XFree86
# Version required: 3.1.2
# Version required: 3.2
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.18 1996/07/19 14:35:11 jmz Exp $
# $Id: Makefile,v 1.17 1996/02/15 00:53:15 jmz Exp $
#
#######################################################################
@ -12,115 +12,29 @@
# #
#######################################################################
#
# uncomment one of the 2 lines below!
#
# X11_ON_CDROM means you have either X-Consortium CDROM or O'Reilly's
# 'X-Companion' CDROM, X11_VIA_FTP means you have the FreeBSD CDROM
# or want to ftp the whole thing _*BIG*_)
#
#X11_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
# the patch files are
X11FIXES = ${DISTDIR}
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
# Define FORCE_PACKAGE from the command line if you want to override
# this and build a package
NO_PACKAGE = yes
#######################################################################
DISTNAME = xc
PKGNAME = XFree86-3.1.2
PKGNAME = XFree86-3.2
CATEGORIES = x11
IS_INTERACTIVE= yes
IS_INTERACTIVE = yes
PREFIX = /usr/X11R6
MAINTAINER= jmz@FreeBSD.ORG
USE_X11 = yes
DIST_SUBDIR = xc
.if defined(DISTDIR)
.if exists (${DISTDIR}/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.elif defined(PORTSDIR)
.if exists (${PORTSDIR}/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.else
.if exists (/usr/ports/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.endif
.if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
DISTFILES= # to prevent checksum
do-build:
.if defined(REMOVE_NOT_ESSENTIAL)
@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
.endif
@(cd ${WRKSRC}; echo Good night...; make World)
@(cd ${WRKSRC}; echo Good night...; make World 2>&1 | tee world.log)
@touch ${WRKDIR}/.build_done
do-install:
@(cd ${WRKSRC}; make install; make install.man)
.if defined(X11_ON_CDROM)
@find /usr/X11R6/ -name 00_TRANS.TBL -exec rm -f {} ';'
.endif
.endif
@touch ${WRKDIR}/.install_done
.if defined(X11_ON_CDROM)
.if !defined (X11FIXES)
do-configure:
@echo Edit the makefile and set X11FIXES !!!!
@exit 1;
.endif
do-fetch:
@echo -n
do-extract:
@rm -rf ${WRKDIR}
@mkdir -p ${WRKDIR}
@echo ${X11FIXES} > ${WRKDIR}/.cdrom
.elif defined(X11_VIA_FTP)
DISTFILES1 = xc-1.tar.gz xc-2.tar.gz xc-3.tar.gz
DISTFILES2 = fix-12 \
XFree86-3.1.2.diff.gz \
3.1.2-3.1.2-S.diff.gz
DISTFILES = ${DISTFILES1} ${DISTFILES2}
MASTER_SITES = \
ftp://ftp.x.org/pub/R6/ \
ftp://ftp.EU.net/X11/R6/ \
ftp://ftp.x.org/pub/R6/fixes/ \
ftp://ftp.EU.net/X11/R6/fixes/ \
ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.1.2/patches/ \
ftp://ftp.xfree86.org/pub/XFree86/3.1.2/patches/
EXTRACT_ONLY = ${DISTFILES1}
pre-patch:
@echo ${DISTDIR} > ${WRKDIR}/.ftp
.else
do-fetch:
@echo Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@echo -n
do-configure:
@echo -n
do-build:
@echo Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:
@echo -n
.endif
.include "Makefile.ftp"
post-install:
ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>

View File

@ -1,6 +1,3 @@
MD5 (xc-1.tar.gz) = b5ae499273bddce4add5b62fc2b0b810
MD5 (xc-2.tar.gz) = e81d2d235dd517c3e36f588221910b03
MD5 (xc-3.tar.gz) = 01bb42c399a542395f0e17a182ba0e96
MD5 (fix-12) = c1c86fcb0305089ce758b92b623ab24d
MD5 (XFree86-3.1.2.diff.gz) = cbb4ca154ed0882b1ee75326089ef4b5
MD5 (3.1.2-3.1.2-S.diff.gz) = 773acfe51ebbb4e557f4a14905b28f3f
MD5 (X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e
MD5 (X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a
MD5 (X32contrib.tgz) = 5145fbc4c28e6dbb14450b36c5f3f56a

View File

@ -1 +1 @@
X Window System for x86-based architectures.
X11R6.1/XFree86 version 3.2

View File

@ -1,6 +1,6 @@
XFree86 is a added-value pack for X11R6 that supports several versions
of Intel-based Unix and Unix-like operating systems. XFree86-3.0 was
part of the X11R6 core distribution. This release of XFree86-3.1.2
part of the X11R6 core distribution. This release of XFree86-3.2
consists of many new features and performance improvements as well as
many bug fixes. The release is available as source patches against
the X Consortium X11R6 code, as well as binary distributions for many

File diff suppressed because it is too large Load Diff

View File

@ -18,12 +18,13 @@ yesno () {
F=$WRKDIR/.config
configure () {
rm -f $F
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
considerable compile time.
END
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 I8514 Mach8 Mach32 Mach64 P9000 AGX W32"
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128"
for i in $servers; do
yesno "Do you want to build the $i server? [YES] "
echo "#undef XF86${i}Server" >>$F
@ -38,17 +39,22 @@ if [ $answ != none ]; then
echo "#define ServerToInstall XF86_$answ" >>$F
fi
echo
yesno "Do you want to build Xvfb? [YES] "
echo "#define XVirtualFramebufferServer $answ" >>$F
cat >> $F <<END
#define XF86SvgaDrivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak mx al2101 ali cl64xx \
video7 chips generic
#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 mga oak al2101 ali cl64xx \
video7 chips ark mx realtek apm generic
#define XF86Vga16Drivers et4000 ncr77c22 ati tvga8900 oak cl64xx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo hercules
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo
#define XF86W32Drivers et4000w32
@ -62,18 +68,23 @@ cat <<END
on a first time build.
END
yesno "Install xdm config? [YES] "
echo "#undef InstallXdmConfig" >> $F
echo "#define InstallXdmConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXdmConfig $answ" >> $F
fi
yesno "Install xinit config? [YES] "
echo "#undef InstallXinitConfig" >> $F
echo "#define InstallXinitConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXinitConfig $answ" >> $F
fi
yesno "Install xfs config? [YES] "
if [ $answ = YES ]; then
echo "#define InstallFSConfig $answ" >> $F
fi
yesno "Do you want to include support for the FontServer? [YES] "
echo "#undef BuildFontServer" >>$F
echo "#define BuildFontServer $answ" >>$F
echo "#undef InstallFSConfig" >>$F
echo "#define InstallFSConfig $answ" >>$F
echo "#define BuildCyrillicFonts NO" >>$F
cat <<'END'
Do you want to Build Fonts (Usually you only want to build and install
@ -84,6 +95,14 @@ yesno "Build fonts? [YES] "
if [ $answ = NO ]; then
echo "#define BuildFonts NO" >> $F
fi
yesno "Build the servers with Extended input devices? [YES] "
if [ $answ = NO ]; then
echo "#undef BuildXInputExt" >> $F
echo "#define BuildXInputExt NO" >> $F
else
echo "#define JoystickSupport YES" >> $F
fi
yesno "Build PEX? [YES] "
if [ $answ = NO ]; then
echo "#define BuildPexExt NO" >> $F
@ -94,6 +113,10 @@ if [ $answ = NO ]; then
fi
echo
echo "Build static libraries in addition to shared libraries? [YES] "
if [ $answ = YES ]; then
echo "#define ForceNormalLib YES" >> $F
fi
cat <<'END'
MIT supplies an authentication mechanism that relies upon DES, this is
@ -117,10 +140,10 @@ cat <<'END'
END
yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
cpwh=NO
if [ $answ = YES ]; then
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
cpwh=NO
if [ -f $WH ] ; then
echo "==> $WH found in source distribution."
elif [ -f $X11FIXES/Wraphelp.c ] ; then
@ -130,137 +153,25 @@ if [ $answ = YES ]; then
echo "==> Wraphelp.c found in files directory, copying to source tree."
cpwh=$FILESDIR/Wraphelp.c
else
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
else
cpwh=NO
fi
echo "#undef HadXdmAuth" >> $F
echo "#define HasXdmAuth $answ" >> $F
cat <<'END'
Additional support for Kerberos V4 is available should you chose to
install it. If you choose to install the Kerberos V4 patches, you
will also be asked if you want to enable Kerberos V4 support.
END
if [ ! -f /usr/lib/libkrb.a ]; then
echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
k4patch=NO
else
yesno "Do you want to add the Kerberos V4 support patches? [YES] "
k4patch=$answ
if [ $k4patch = YES ] ; then
echo
yesno "Do you want to enable Kerberos V4 support? [YES] "
echo "#undef HasKrb4" >>$F
echo "#define HasKrb4 $answ" >>$F
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
fi
if [ $cpwh != NO ]; then
echo "#define HasXdmAuth $answ" >> $F
fi
echo
echo "End of configuration questions. No more user input required"
echo
}
if [ -f $WRKDIR/.cdrom ]; then
X11FIXES=`cat $WRKDIR/.cdrom`
echo -n 'Where is the "xc" directory on the cdrom? [/cdrom] '
read X11R6; if [ X$X11R6 = X ]; then X11R6=/cdrom; fi
if [ ! -d $X11R6/xc/config/cf ]; then
echo "Can't find X11R6 in $X11R6"
exit 1
fi
yesno "Is your cdrom distibution already patched? [y] ";
if [ $answ = YES ]; then
echo -n "What is the patchlevel of the distribution? [3] ";
read pl; if [ X$pl = X ]; then pl=3; fi
pl=`expr $pl + 1`
if [ $pl -lt 10 ]; then pl=0$pl; fi
else
pl=01
fi
ok=0
err=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
if [ ! -f $X11FIXES/fix-$i ]; then
echo "can't find $X11FIXES/fix-$i !!!"
err=1
fi
if [ $i = 10 ]; then
if [ ! -f $X11FIXES/fix10fonts.Z ]; then
echo "can't find $X11FIXES/fix10fonts.Z !!!"
err=1
fi
fi
if [ $i = 11 ]; then
if [ ! -f $X11FIXES/XFree86-3.1.1.tar.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.1.tar.gz !!!"
err=1
fi
fi
fi
done
if [ ! -f $X11FIXES/XFree86-3.1.2.diff.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.2.diff.gz !!!"
err=1
fi
if [ ! -f $X11FIXES/3.1.2-3.1.2-S.diff.gz ]; then
echo "can't find $X11FIXES/3.1.2-3.1.2-S.diff.gz !!!"
err=1
fi
if [ $err = 1 ]; then exit 1; fi
configure
echo "==> building the tree"
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12
configure
fi
configure
if [ X$cpwh != XNO ]; then
cp $cpwh $WH
fi
echo -n "==> applying XC patches"
ok=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
echo -n .;
patch -d $WRKSRC --forward --quiet -E -p1 < $X11FIXES/fix-$i
if [ $i = 10 ]; then
zcat $X11FIXES/fix10fonts.Z | patch -d $WRKSRC --forward --quiet -E -p1
fi
if [ $i = 11 ]; then
rm -rf $WRKDIR/xc/programs/Xserver/hw/xfree86
(cd $WRKDIR; gunzip -c $X11FIXES/XFree86-3.1.1.tar.gz | tar xpf -)
fi
if [ $i = 12 ]; then
rm -f $WRKDIR/xc/lib/Xt/Shell.h
rm -f $WRKDIR/xc/lib/StringDefs.h
rm -f $WRKDIR/xc/lib/StringDefs.c
fi
fi
done
echo
echo "==> applying XFree86 patches"
zcat $X11FIXES/XFree86-3.1.2.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
zcat $X11FIXES/3.1.2-3.1.2-S.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
if [ $k4patch = YES ] ; then
echo
echo "==> applying Kerberos-V4 support patch"
cat $FILESDIR/kerberos4.diffs | \
patch -d $WRKSRC --forward --quiet -E -p1
fi
cat $F >> $WRKSRC/config/cf/xf86site.def
cd $WRKSRC/config/cf/ || exit 1;
@ -268,11 +179,10 @@ cd $WRKSRC/config/cf/ || exit 1;
version=`uname -r`
set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'`
mv FreeBSD.cf FreeBSD.cf.old
sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
-e "s/UseGnuMalloc.*YES/UseGnuMalloc NO/" \
sed -e "s/2.1.5/$version/" \
-e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \
-e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \
-e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \
<FreeBSD.cf.old >FreeBSD.cf
exit 0

View File

@ -1,9 +1,9 @@
# New ports collection makefile for: XFree86
# Version required: 3.1.2
# Version required: 3.2
# Date created: 5 January 1995
# Whom: jmz
#
# $Id: Makefile,v 1.18 1996/07/19 14:35:11 jmz Exp $
# $Id: Makefile,v 1.17 1996/02/15 00:53:15 jmz Exp $
#
#######################################################################
@ -12,115 +12,29 @@
# #
#######################################################################
#
# uncomment one of the 2 lines below!
#
# X11_ON_CDROM means you have either X-Consortium CDROM or O'Reilly's
# 'X-Companion' CDROM, X11_VIA_FTP means you have the FreeBSD CDROM
# or want to ftp the whole thing _*BIG*_)
#
#X11_ON_CDROM = yes
#X11_VIA_FTP = yes
#if you are compiling from a cdrom, set the directory where the
# the patch files are
X11FIXES = ${DISTDIR}
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
# Define FORCE_PACKAGE from the command line if you want to override
# this and build a package
NO_PACKAGE = yes
#######################################################################
DISTNAME = xc
PKGNAME = XFree86-3.1.2
PKGNAME = XFree86-3.2
CATEGORIES = x11
IS_INTERACTIVE= yes
IS_INTERACTIVE = yes
PREFIX = /usr/X11R6
MAINTAINER= jmz@FreeBSD.ORG
USE_X11 = yes
DIST_SUBDIR = xc
.if defined(DISTDIR)
.if exists (${DISTDIR}/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.elif defined(PORTSDIR)
.if exists (${PORTSDIR}/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.else
.if exists (/usr/ports/distfiles/xc/xc-1.tar.gz)
X11_VIA_FTP = yes
.endif
.endif
.if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
DISTFILES= # to prevent checksum
do-build:
.if defined(REMOVE_NOT_ESSENTIAL)
@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
.endif
@(cd ${WRKSRC}; echo Good night...; make World)
@(cd ${WRKSRC}; echo Good night...; make World 2>&1 | tee world.log)
@touch ${WRKDIR}/.build_done
do-install:
@(cd ${WRKSRC}; make install; make install.man)
.if defined(X11_ON_CDROM)
@find /usr/X11R6/ -name 00_TRANS.TBL -exec rm -f {} ';'
.endif
.endif
@touch ${WRKDIR}/.install_done
.if defined(X11_ON_CDROM)
.if !defined (X11FIXES)
do-configure:
@echo Edit the makefile and set X11FIXES !!!!
@exit 1;
.endif
do-fetch:
@echo -n
do-extract:
@rm -rf ${WRKDIR}
@mkdir -p ${WRKDIR}
@echo ${X11FIXES} > ${WRKDIR}/.cdrom
.elif defined(X11_VIA_FTP)
DISTFILES1 = xc-1.tar.gz xc-2.tar.gz xc-3.tar.gz
DISTFILES2 = fix-12 \
XFree86-3.1.2.diff.gz \
3.1.2-3.1.2-S.diff.gz
DISTFILES = ${DISTFILES1} ${DISTFILES2}
MASTER_SITES = \
ftp://ftp.x.org/pub/R6/ \
ftp://ftp.EU.net/X11/R6/ \
ftp://ftp.x.org/pub/R6/fixes/ \
ftp://ftp.EU.net/X11/R6/fixes/ \
ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.1.2/patches/ \
ftp://ftp.xfree86.org/pub/XFree86/3.1.2/patches/
EXTRACT_ONLY = ${DISTFILES1}
pre-patch:
@echo ${DISTDIR} > ${WRKDIR}/.ftp
.else
do-fetch:
@echo Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-extract:
@echo -n
do-configure:
@echo -n
do-build:
@echo Please set one of the 2 variables X11_ON_X_CDROM or X11_VIA_FTP
@echo before building ${PKGNAME}
@false
do-install:
@echo -n
.endif
.include "Makefile.ftp"
post-install:
ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>

View File

@ -1,6 +1,3 @@
MD5 (xc-1.tar.gz) = b5ae499273bddce4add5b62fc2b0b810
MD5 (xc-2.tar.gz) = e81d2d235dd517c3e36f588221910b03
MD5 (xc-3.tar.gz) = 01bb42c399a542395f0e17a182ba0e96
MD5 (fix-12) = c1c86fcb0305089ce758b92b623ab24d
MD5 (XFree86-3.1.2.diff.gz) = cbb4ca154ed0882b1ee75326089ef4b5
MD5 (3.1.2-3.1.2-S.diff.gz) = 773acfe51ebbb4e557f4a14905b28f3f
MD5 (X32src-1.tgz) = 0fe3b4741e31c1ee210b27d5ce987b3e
MD5 (X32src-2.tgz) = 36cdf4ed5d58bbde30f6d95de6a8653a
MD5 (X32contrib.tgz) = 5145fbc4c28e6dbb14450b36c5f3f56a

View File

@ -1 +1 @@
X Window System for x86-based architectures.
X11R6.1/XFree86 version 3.2

View File

@ -1,6 +1,6 @@
XFree86 is a added-value pack for X11R6 that supports several versions
of Intel-based Unix and Unix-like operating systems. XFree86-3.0 was
part of the X11R6 core distribution. This release of XFree86-3.1.2
part of the X11R6 core distribution. This release of XFree86-3.2
consists of many new features and performance improvements as well as
many bug fixes. The release is available as source patches against
the X Consortium X11R6 code, as well as binary distributions for many

File diff suppressed because it is too large Load Diff

View File

@ -18,12 +18,13 @@ yesno () {
F=$WRKDIR/.config
configure () {
rm -f $F
cat <<END
Which servers do you wish to build, you can save a lot of disk space
by only compiling the server you will be using. It will also save you
considerable compile time.
END
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 I8514 Mach8 Mach32 Mach64 P9000 AGX W32"
servers="SVGA VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128"
for i in $servers; do
yesno "Do you want to build the $i server? [YES] "
echo "#undef XF86${i}Server" >>$F
@ -38,17 +39,22 @@ if [ $answ != none ]; then
echo "#define ServerToInstall XF86_$answ" >>$F
fi
echo
yesno "Do you want to build Xvfb? [YES] "
echo "#define XVirtualFramebufferServer $answ" >>$F
cat >> $F <<END
#define XF86SvgaDrivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak mx al2101 ali cl64xx \
video7 chips generic
#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 mga oak al2101 ali cl64xx \
video7 chips ark mx realtek apm generic
#define XF86Vga16Drivers et4000 ncr77c22 ati tvga8900 oak cl64xx generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
ncr77c22 compaq oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo hercules
#define XF86Vga2Drivers et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 oak cl64xx generic
#define XF86MonoDrivers hgc1280 sigma apollo
#define XF86W32Drivers et4000w32
@ -62,18 +68,23 @@ cat <<END
on a first time build.
END
yesno "Install xdm config? [YES] "
echo "#undef InstallXdmConfig" >> $F
echo "#define InstallXdmConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXdmConfig $answ" >> $F
fi
yesno "Install xinit config? [YES] "
echo "#undef InstallXinitConfig" >> $F
echo "#define InstallXinitConfig $answ" >> $F
if [ $answ = YES ]; then
echo "#define InstallXinitConfig $answ" >> $F
fi
yesno "Install xfs config? [YES] "
if [ $answ = YES ]; then
echo "#define InstallFSConfig $answ" >> $F
fi
yesno "Do you want to include support for the FontServer? [YES] "
echo "#undef BuildFontServer" >>$F
echo "#define BuildFontServer $answ" >>$F
echo "#undef InstallFSConfig" >>$F
echo "#define InstallFSConfig $answ" >>$F
echo "#define BuildCyrillicFonts NO" >>$F
cat <<'END'
Do you want to Build Fonts (Usually you only want to build and install
@ -84,6 +95,14 @@ yesno "Build fonts? [YES] "
if [ $answ = NO ]; then
echo "#define BuildFonts NO" >> $F
fi
yesno "Build the servers with Extended input devices? [YES] "
if [ $answ = NO ]; then
echo "#undef BuildXInputExt" >> $F
echo "#define BuildXInputExt NO" >> $F
else
echo "#define JoystickSupport YES" >> $F
fi
yesno "Build PEX? [YES] "
if [ $answ = NO ]; then
echo "#define BuildPexExt NO" >> $F
@ -94,6 +113,10 @@ if [ $answ = NO ]; then
fi
echo
echo "Build static libraries in addition to shared libraries? [YES] "
if [ $answ = YES ]; then
echo "#define ForceNormalLib YES" >> $F
fi
cat <<'END'
MIT supplies an authentication mechanism that relies upon DES, this is
@ -117,10 +140,10 @@ cat <<'END'
END
yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
cpwh=NO
if [ $answ = YES ]; then
WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
cpwh=NO
if [ -f $WH ] ; then
echo "==> $WH found in source distribution."
elif [ -f $X11FIXES/Wraphelp.c ] ; then
@ -130,137 +153,25 @@ if [ $answ = YES ]; then
echo "==> Wraphelp.c found in files directory, copying to source tree."
cpwh=$FILESDIR/Wraphelp.c
else
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
else
cpwh=NO
fi
echo "#undef HadXdmAuth" >> $F
echo "#define HasXdmAuth $answ" >> $F
cat <<'END'
Additional support for Kerberos V4 is available should you chose to
install it. If you choose to install the Kerberos V4 patches, you
will also be asked if you want to enable Kerberos V4 support.
END
if [ ! -f /usr/lib/libkrb.a ]; then
echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
k4patch=NO
else
yesno "Do you want to add the Kerberos V4 support patches? [YES] "
k4patch=$answ
if [ $k4patch = YES ] ; then
echo
yesno "Do you want to enable Kerberos V4 support? [YES] "
echo "#undef HasKrb4" >>$F
echo "#define HasKrb4 $answ" >>$F
echo "==> Wraphelp.c not found, DES support NOT enabled."
cpwh=NO
fi
fi
if [ $cpwh != NO ]; then
echo "#define HasXdmAuth $answ" >> $F
fi
echo
echo "End of configuration questions. No more user input required"
echo
}
if [ -f $WRKDIR/.cdrom ]; then
X11FIXES=`cat $WRKDIR/.cdrom`
echo -n 'Where is the "xc" directory on the cdrom? [/cdrom] '
read X11R6; if [ X$X11R6 = X ]; then X11R6=/cdrom; fi
if [ ! -d $X11R6/xc/config/cf ]; then
echo "Can't find X11R6 in $X11R6"
exit 1
fi
yesno "Is your cdrom distibution already patched? [y] ";
if [ $answ = YES ]; then
echo -n "What is the patchlevel of the distribution? [3] ";
read pl; if [ X$pl = X ]; then pl=3; fi
pl=`expr $pl + 1`
if [ $pl -lt 10 ]; then pl=0$pl; fi
else
pl=01
fi
ok=0
err=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
if [ ! -f $X11FIXES/fix-$i ]; then
echo "can't find $X11FIXES/fix-$i !!!"
err=1
fi
if [ $i = 10 ]; then
if [ ! -f $X11FIXES/fix10fonts.Z ]; then
echo "can't find $X11FIXES/fix10fonts.Z !!!"
err=1
fi
fi
if [ $i = 11 ]; then
if [ ! -f $X11FIXES/XFree86-3.1.1.tar.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.1.tar.gz !!!"
err=1
fi
fi
fi
done
if [ ! -f $X11FIXES/XFree86-3.1.2.diff.gz ]; then
echo "can't find $X11FIXES/XFree86-3.1.2.diff.gz !!!"
err=1
fi
if [ ! -f $X11FIXES/3.1.2-3.1.2-S.diff.gz ]; then
echo "can't find $X11FIXES/3.1.2-3.1.2-S.diff.gz !!!"
err=1
fi
if [ $err = 1 ]; then exit 1; fi
configure
echo "==> building the tree"
(cd $WRKDIR; sh $FILESDIR/maketree $X11R6)
else
X11FIXES=`cat $WRKDIR/.ftp`
pl=12
configure
fi
configure
if [ X$cpwh != XNO ]; then
cp $cpwh $WH
fi
echo -n "==> applying XC patches"
ok=0
for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
if [ $i = $pl ]; then ok=1; fi
if [ $ok = 1 ]; then
echo -n .;
patch -d $WRKSRC --forward --quiet -E -p1 < $X11FIXES/fix-$i
if [ $i = 10 ]; then
zcat $X11FIXES/fix10fonts.Z | patch -d $WRKSRC --forward --quiet -E -p1
fi
if [ $i = 11 ]; then
rm -rf $WRKDIR/xc/programs/Xserver/hw/xfree86
(cd $WRKDIR; gunzip -c $X11FIXES/XFree86-3.1.1.tar.gz | tar xpf -)
fi
if [ $i = 12 ]; then
rm -f $WRKDIR/xc/lib/Xt/Shell.h
rm -f $WRKDIR/xc/lib/StringDefs.h
rm -f $WRKDIR/xc/lib/StringDefs.c
fi
fi
done
echo
echo "==> applying XFree86 patches"
zcat $X11FIXES/XFree86-3.1.2.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
zcat $X11FIXES/3.1.2-3.1.2-S.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
if [ $k4patch = YES ] ; then
echo
echo "==> applying Kerberos-V4 support patch"
cat $FILESDIR/kerberos4.diffs | \
patch -d $WRKSRC --forward --quiet -E -p1
fi
cat $F >> $WRKSRC/config/cf/xf86site.def
cd $WRKSRC/config/cf/ || exit 1;
@ -268,11 +179,10 @@ cd $WRKSRC/config/cf/ || exit 1;
version=`uname -r`
set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'`
mv FreeBSD.cf FreeBSD.cf.old
sed -e "s/2.0.5/$version/" \
-e "s/OSMajorVersion *2/OSMajorVersion $1/" \
-e "s/OSMinorVersion *0/OSMinorVersion $2/" \
-e "s/OSTeenyVersion *5/OSTeenyVersion $3/" \
-e "s/UseGnuMalloc.*YES/UseGnuMalloc NO/" \
sed -e "s/2.1.5/$version/" \
-e "s/#define OSMajorVersion.*2/#define OSMajorVersion $1/" \
-e "s/#define OSMinorVersion.*1/#define OSMinorVersion $2/" \
-e "s/#define OSTeenyVersion.*5/#define OSTeenyVersion $3/" \
<FreeBSD.cf.old >FreeBSD.cf
exit 0