aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-servers/XFree86-4-NestServer/scripts/configure32
-rw-r--r--x11-servers/XFree86-4-PrintServer/scripts/configure32
-rw-r--r--x11-servers/XFree86-4-Server-snap/scripts/configure35
-rw-r--r--x11-servers/XFree86-4-Server/scripts/configure35
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure32
-rw-r--r--x11/XFree86-4-clients/scripts/configure35
-rw-r--r--x11/XFree86-4-libraries/scripts/configure34
7 files changed, 139 insertions, 96 deletions
diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure
index a26747aa19f2..4f644af47812 100644
--- a/x11-servers/XFree86-4-NestServer/scripts/configure
+++ b/x11-servers/XFree86-4-NestServer/scripts/configure
@@ -50,26 +50,34 @@ configure () {
echo "#define BuildServersOnly YES" >> $LOCALDEF
# Check Wraphelp.c
- WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
- cpwh=NO
- if [ -f $WH ] ; then
- cpwh=SOURCE
- elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
- cpwh=$DISTDIR/xc/Wraphelp.c
- else
- echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
+ if [ $HasXdmAuth = DEFAULT ]; then
+ HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
fi
- if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
- tr -d '\r' < $cpwh > $WH
+
+ cpwh=NO
+ if [ $HasXdmAuth = YES ]; then
+ WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
+ if [ -f $WH ] ; then
+ cpwh=SOURCE
+ elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
+ cpwh=$DISTDIR/xc/Wraphelp.c
+ else
+ echo "==> You must fetch USA-legal Wraphelp.c manually"
+ echo "==> and put it to ${DISTDIR}/xc/."
+ exit 1
+ fi
+ if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
+ tr -d '\r' < $cpwh > $WH
+ fi
fi
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF
+ grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
if [ $cpwh = NO ] ; then
- grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
echo "#define HasXdmAuth NO" >> $DESTDEF
else
- cp -f $ORIGDEF $DESTDEF
+ echo "#define HasXdmAuth YES" >> $DESTDEF
fi
# copy generated config to host.def
diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure
index 3b0033a70c0a..6fa4795d48f2 100644
--- a/x11-servers/XFree86-4-PrintServer/scripts/configure
+++ b/x11-servers/XFree86-4-PrintServer/scripts/configure
@@ -50,26 +50,34 @@ configure () {
echo "#define BuildServersOnly YES" >> $LOCALDEF
# Check Wraphelp.c
- WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
- cpwh=NO
- if [ -f $WH ] ; then
- cpwh=SOURCE
- elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
- cpwh=$DISTDIR/xc/Wraphelp.c
- else
- echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
+ if [ $HasXdmAuth = DEFAULT ]; then
+ HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
fi
- if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
- tr -d '\r' < $cpwh > $WH
+
+ cpwh=NO
+ if [ $HasXdmAuth = YES ]; then
+ WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
+ if [ -f $WH ] ; then
+ cpwh=SOURCE
+ elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
+ cpwh=$DISTDIR/xc/Wraphelp.c
+ else
+ echo "==> You must fetch USA-legal Wraphelp.c manually"
+ echo "==> and put it to ${DISTDIR}/xc/."
+ exit 1
+ fi
+ if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
+ tr -d '\r' < $cpwh > $WH
+ fi
fi
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF
+ grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
if [ $cpwh = NO ] ; then
- grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
echo "#define HasXdmAuth NO" >> $DESTDEF
else
- cp -f $ORIGDEF $DESTDEF
+ echo "#define HasXdmAuth YES" >> $DESTDEF
fi
# copy generated config to host.def
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 501dcebd2d8c..1d95a8262adf 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -100,29 +100,34 @@ END
echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
# Check Wraphelp.c
- WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
- cpwh=NO
- if [ -f $WH ] ; then
- cpwh=SOURCE
- elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
- cpwh=$DISTDIR/xc/Wraphelp.c
- else
- echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
+ if [ $HasXdmAuth = DEFAULT ]; then
+ HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
fi
- if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
- tr -d '\r' < $cpwh > $WH
+
+ cpwh=NO
+ if [ $HasXdmAuth = YES ]; then
+ WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
+ if [ -f $WH ] ; then
+ cpwh=SOURCE
+ elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
+ cpwh=$DISTDIR/xc/Wraphelp.c
+ else
+ echo "==> You must fetch USA-legal Wraphelp.c manually"
+ echo "==> and put it to ${DISTDIR}/xc/."
+ exit 1
+ fi
+ if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
+ tr -d '\r' < $cpwh > $WH
+ fi
fi
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF
+ grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
if [ $cpwh = NO ] ; then
- grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
echo "#define HasXdmAuth NO" >> $DESTDEF
else
- if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
- echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
- fi
- cp -f $ORIGDEF $DESTDEF
+ echo "#define HasXdmAuth YES" >> $DESTDEF
fi
# copy generated config to host.def
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 501dcebd2d8c..1d95a8262adf 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -100,29 +100,34 @@ END
echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
# Check Wraphelp.c
- WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
- cpwh=NO
- if [ -f $WH ] ; then
- cpwh=SOURCE
- elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
- cpwh=$DISTDIR/xc/Wraphelp.c
- else
- echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
+ if [ $HasXdmAuth = DEFAULT ]; then
+ HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
fi
- if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
- tr -d '\r' < $cpwh > $WH
+
+ cpwh=NO
+ if [ $HasXdmAuth = YES ]; then
+ WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
+ if [ -f $WH ] ; then
+ cpwh=SOURCE
+ elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
+ cpwh=$DISTDIR/xc/Wraphelp.c
+ else
+ echo "==> You must fetch USA-legal Wraphelp.c manually"
+ echo "==> and put it to ${DISTDIR}/xc/."
+ exit 1
+ fi
+ if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
+ tr -d '\r' < $cpwh > $WH
+ fi
fi
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF
+ grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
if [ $cpwh = NO ] ; then
- grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
echo "#define HasXdmAuth NO" >> $DESTDEF
else
- if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
- echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
- fi
- cp -f $ORIGDEF $DESTDEF
+ echo "#define HasXdmAuth YES" >> $DESTDEF
fi
# copy generated config to host.def
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
index d057918ca004..917a76ead3ff 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
@@ -50,26 +50,34 @@ configure () {
echo "#define BuildServersOnly YES" >> $LOCALDEF
# Check Wraphelp.c
- WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
- cpwh=NO
- if [ -f $WH ] ; then
- cpwh=SOURCE
- elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
- cpwh=$DISTDIR/xc/Wraphelp.c
- else
- echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
+ if [ $HasXdmAuth = DEFAULT ]; then
+ HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
fi
- if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
- tr -d '\r' < $cpwh > $WH
+
+ cpwh=NO
+ if [ $HasXdmAuth = YES ]; then
+ WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
+ if [ -f $WH ] ; then
+ cpwh=SOURCE
+ elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
+ cpwh=$DISTDIR/xc/Wraphelp.c
+ else
+ echo "==> You must fetch USA-legal Wraphelp.c manually"
+ echo "==> and put it to ${DISTDIR}/xc/."
+ exit 1
+ fi
+ if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
+ tr -d '\r' < $cpwh > $WH
+ fi
fi
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF
+ grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
if [ $cpwh = NO ] ; then
- grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
echo "#define HasXdmAuth NO" >> $DESTDEF
else
- cp -f $ORIGDEF $DESTDEF
+ echo "#define HasXdmAuth YES" >> $DESTDEF
fi
# copy generated config to host.def
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 3e9586fbad85..b1db6e5c4e7c 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -72,29 +72,34 @@ configure () {
echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
# Check Wraphelp.c
- WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
- cpwh=NO
- if [ -f $WH ] ; then
- cpwh=SOURCE
- elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
- cpwh=$DISTDIR/xc/Wraphelp.c
- else
- echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
+ if [ $HasXdmAuth = DEFAULT ]; then
+ HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
fi
- if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
- tr -d '\r' < $cpwh > $WH
+
+ cpwh=NO
+ if [ $HasXdmAuth = YES ]; then
+ WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
+ if [ -f $WH ] ; then
+ cpwh=SOURCE
+ elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
+ cpwh=$DISTDIR/xc/Wraphelp.c
+ else
+ echo "==> You must fetch USA-legal Wraphelp.c manually"
+ echo "==> and put it to ${DISTDIR}/xc/."
+ exit 1
+ fi
+ if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
+ tr -d '\r' < $cpwh > $WH
+ fi
fi
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF
+ grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
if [ $cpwh = NO ] ; then
- grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
echo "#define HasXdmAuth NO" >> $DESTDEF
else
- if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
- echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
- fi
- cp -f $ORIGDEF $DESTDEF
+ echo "#define HasXdmAuth YES" >> $DESTDEF
fi
# copy generated config to host.def
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 432fdb8665c9..3d5393dbc7f6 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -74,29 +74,33 @@ configure () {
echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF
# Check Wraphelp.c
- WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
- cpwh=NO
- if [ -f $WH ] ; then
- cpwh=SOURCE
- elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
- cpwh=$DISTDIR/xc/Wraphelp.c
- else
- echo "==> Warnning: Wraphelp.c not found, DES support NOT enabled."
+ if [ $HasXdmAuth = DEFAULT ]; then
+ HasXdmAuth=$(awk '/^#define.*HasXdmAuth/ {print $3}' $ORIGDEF|tail -1)
fi
- if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
- tr -d '\r' < $cpwh > $WH
+ cpwh=NO
+ if [ $HasXdmAuth = YES ]; then
+ WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
+ if [ -f $WH ] ; then
+ cpwh=SOURCE
+ elif [ -f $DISTDIR/xc/Wraphelp.c ] ; then
+ cpwh=$DISTDIR/xc/Wraphelp.c
+ else
+ echo "==> You must fetch USA-legal Wraphelp.c manually"
+ echo "==> and put it to ${DISTDIR}/xc/."
+ exit 1
+ fi
+ if [ X$cpwh != XNO -a X$cpwh != XSOURCE ]; then
+ tr -d '\r' < $cpwh > $WH
+ fi
fi
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF
+ grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
if [ $cpwh = NO ] ; then
- grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
echo "#define HasXdmAuth NO" >> $DESTDEF
else
- if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
- echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
- fi
- cp -f $ORIGDEF $DESTDEF
+ echo "#define HasXdmAuth YES" >> $DESTDEF
fi
# copy generated config to host.def
generated by cgit (git 2.34.1) at 2024-11-06 19:27:29 +0800