aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorsheldonh <sheldonh@FreeBSD.org>2000-07-31 20:30:45 +0800
committersheldonh <sheldonh@FreeBSD.org>2000-07-31 20:30:45 +0800
commit6e550a55116afd66bfb58d51ca421a7c63c3a59b (patch)
tree4a425f6e4e5bc01fee02ada75a44b6ddfe21746f /x11
parentc43d7f0ebbf0036d45169f8e517bf94522768c2f (diff)
downloadfreebsd-ports-gnome-6e550a55116afd66bfb58d51ca421a7c63c3a59b.tar.gz
freebsd-ports-gnome-6e550a55116afd66bfb58d51ca421a7c63c3a59b.tar.zst
freebsd-ports-gnome-6e550a55116afd66bfb58d51ca421a7c63c3a59b.zip
Rename the file that the interactive configure script produces
from ${WRKDIR}/.config to ${WRKDIR}/config . Conditionalize the interactivity of the configure script on the existence of ${FILESDIR}/config . If the file exists, copy it to ${WRKDIR}/config and do not ask questions.
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86/Makefile9
-rw-r--r--x11/XFree86/scripts/configure15
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