mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-07 11:49:40 +00:00
Code Issues Releases Activity

Rename the file that the interactive configure script produces

Browse Source 
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.
This commit is contained in:
Sheldon Hearn 2000-07-31 12:30:45 +00:00
parent 7c7638c998
commit c779ad377c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=31164
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11/XFree86/Makefile
View File

@ -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}

15
x11/XFree86/scripts/configure vendored
View File

@ -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