diff options
| author | pst <pst@FreeBSD.org> | 1995-11-05 04:56:42 +0800 |
|---|---|---|
| committer | pst <pst@FreeBSD.org> | 1995-11-05 04:56:42 +0800 |
| commit | d29795d51b010fde61d18dfd9e97ec27cf1731bc (patch) | |
| tree | 88e785d616a218e7ece7e1028408e715392fe9fe /x11/XFree86/scripts | |
| parent | dd111dabebbfe32e77c3177ee89694c84917ab8b (diff) | |
| download | freebsd-ports-gnome-d29795d51b010fde61d18dfd9e97ec27cf1731bc.tar.gz freebsd-ports-gnome-d29795d51b010fde61d18dfd9e97ec27cf1731bc.tar.zst freebsd-ports-gnome-d29795d51b010fde61d18dfd9e97ec27cf1731bc.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
Diffstat (limited to 'x11/XFree86/scripts')
| -rw-r--r-- | x11/XFree86/scripts/configure | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure index 3a997b35f82f..1d41e71a2f09 100644 --- a/x11/XFree86/scripts/configure +++ b/x11/XFree86/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 - |