diff options
| author | Sheldon Hearn <sheldonh@FreeBSD.org> | 2000-07-31 12:30:45 +0000 |
|---|---|---|
| committer | Sheldon Hearn <sheldonh@FreeBSD.org> | 2000-07-31 12:30:45 +0000 |
| commit | c779ad377cf6aaa45c032d1242a131f8c0e7dbbb (patch) | |
| tree | c1510bfc98ad60f1dc11f7026884b8022b6a8490 | |
| parent | 7c7638c998d456deaa78283628f5f6a11e02a3c3 (diff) | |
| download | ports-c779ad377cf6aaa45c032d1242a131f8c0e7dbbb.tar.gz ports-c779ad377cf6aaa45c032d1242a131f8c0e7dbbb.zip | |
Notes
| -rw-r--r-- | x11/XFree86/Makefile | 9 | ||||
| -rw-r--r-- | x11/XFree86/scripts/configure | 15 |
2 files changed, 19 insertions, 5 deletions
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile index b0fcca22111d..f4b801df1362 100644 --- a/x11/XFree86/Makefile +++ b/x11/XFree86/Makefile @@ -25,7 +25,6 @@ PATCHFILES= fix-01-r128 MAINTAINER= jmz@FreeBSD.org WRKSRC= ${WRKDIR}/${DIST_SUBDIR} -IS_INTERACTIVE= yes # configure script asks questions INSTALLS_SHLIB= yes .if (${MACHINE} != "alpha") #NO_PACKAGE= package available from XFree86 @@ -71,9 +70,17 @@ pre-fetch: post-extract: @${MV} ${WRKSRC}/programs/Xserver/hw/xfree86/vga256/drivers/i810/os-support/linux/agpgart.h ${WRKSRC}/programs/Xserver/hw/xfree86/vga256/drivers/i810/ + @if [ -r ${FILESDIR}/config ]; then \ + ${ECHO} Using your existing ${FILESDIR}/config ; \ + ${CP} ${FILESDIR}/config ${WRKDIR}/config ; \ + fi .include <bsd.port.pre.mk> +.if !exists(${FILESDIR}/config) +IS_INTERACTIVE= yes # configure script asks questions +.endif + pre-install: ${MKDIR} ${X11BASE} diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure index 371de6289885..44af2053f22c 100644 --- a/x11/XFree86/scripts/configure +++ b/x11/XFree86/scripts/configure @@ -30,7 +30,8 @@ noyes() { esac done } -F=$WRKDIR/.config +F=$WRKDIR/config +WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c configure () { rm -f $F @@ -354,8 +355,6 @@ END yesno "Do you want to enable XDM-AUTHORIZATION-1 support?" cpwh=NO if [ $answ = YES ]; then - WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c - if [ -f $WH ] ; then echo "==> $WH found in source distribution." elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then @@ -387,7 +386,15 @@ echo "End of configuration questions. No more user input required" echo } -configure +if [ ! -r $F ]; then + configure +elif grep 'HasXdmAuth.*YES' $F >/dev/null; then + for i in $DISTDIR/xc $FILESDIR; do + if [ -r $i/Wraphelp.c ]; then + cpwh=$i/Wraphelp.c + fi + done +fi if [ X$cpwh != XNO ]; then tr -d '\r' < $cpwh > $WH |