aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorPaul Traina <pst@FreeBSD.org>1995-11-04 20:56:42 +0000
committerPaul Traina <pst@FreeBSD.org>1995-11-04 20:56:42 +0000
commitdcc3adbef223926df8654c227870baf998124a04 (patch)
treedbb79b49e93f50ccd6b8170459132562ee4c28e1 /x11-servers
parentc8d80a82753a76bcf8d298a7cabc80d3f546d365 (diff)
downloadports-dcc3adbef223926df8654c227870baf998124a04.tar.gz
ports-dcc3adbef223926df8654c227870baf998124a04.zip
Update our port to XFree86-3.1.2-S, which has the security update from
the XFree86 group (which is their flavor of XC fix 13). Reviewed by: jmz
Notes
Notes: svn path=/head/; revision=2391
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server-snap/scripts/configure18
-rw-r--r--x11-servers/XFree86-4-Server/scripts/configure18
2 files changed, 22 insertions, 14 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 3a997b35f82f..1d41e71a2f09 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -141,13 +141,17 @@ if [ -f $WRKDIR/.cdrom ]; then
fi
done
if [ ! -f $X11FIXES/XFree86-3.1.2.diff.gz ]; then
- echo "can't find $X11FIXES/XFree86-3.1.2.tar.gz !!!"
+ echo "can't find $X11FIXES/XFree86-3.1.2.diff.gz !!!"
err=1
fi
if [ ! -f $X11FIXES/cfont312.tgz ]; then
echo "can't find $X11FIXES/cfont312.tgz !!!"
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"
@@ -172,17 +176,18 @@ for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
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
+ 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
tar xzf $X11FIXES/cfont312.tgz -C $WRKDIR
+zcat $X11FIXES/3.1.2-3.1.2-S.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
cat $F >> $WRKSRC/config/cf/xf86site.def
@@ -201,4 +206,3 @@ sed -e "s/2.0.5/$version/" \
<FreeBSD.cf.old >FreeBSD.cf
exit 0
-
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 3a997b35f82f..1d41e71a2f09 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -141,13 +141,17 @@ if [ -f $WRKDIR/.cdrom ]; then
fi
done
if [ ! -f $X11FIXES/XFree86-3.1.2.diff.gz ]; then
- echo "can't find $X11FIXES/XFree86-3.1.2.tar.gz !!!"
+ echo "can't find $X11FIXES/XFree86-3.1.2.diff.gz !!!"
err=1
fi
if [ ! -f $X11FIXES/cfont312.tgz ]; then
echo "can't find $X11FIXES/cfont312.tgz !!!"
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"
@@ -172,17 +176,18 @@ for i in 01 02 03 04 05 06 07 08 09 10 11 12; do
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
+ 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
tar xzf $X11FIXES/cfont312.tgz -C $WRKDIR
+zcat $X11FIXES/3.1.2-3.1.2-S.diff.gz | patch -d $WRKSRC --forward --quiet -E -p1
cat $F >> $WRKSRC/config/cf/xf86site.def
@@ -201,4 +206,3 @@ sed -e "s/2.0.5/$version/" \
<FreeBSD.cf.old >FreeBSD.cf
exit 0
-