Fix long-standing bug of this ports: support HasXdmAuth correctly.

Previously, devel/imake-4 disables XDM-AUTHORIZATION-1 support whether
HasXdmAuth is set to YES or NO if you don't have Wraphelp.c in local
${DISTDIR}.

devel/imake-4: rip off meaningless existent check for Wraphelp.c.
x11/XFree86-4-libraries: imake-4 change affects libXdmcp.a. ++REVISION.
x11/XFree86-4-clients: xdm and chooser depends on libXdmcp.a. ++REVISION.
x11-servers/XFree86-{Nest,Print,Server,VFB}:
	add Wraphelp.c retrieval code. depends on libXdmcp.a. ++REVISION.

Reported by:	Alan Eldridge <alane@geeksrus.net>
Reviewed by:	maintainer
This commit is contained in:
FUJISHIMA Satsuki 2001-12-15 02:58:35 +00:00
parent d3a6f89bee
commit bfadd1fd9b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=51544
14 changed files with 99 additions and 6 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= imake
PORTVERSION= 4.1.0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0

View file

@ -23,11 +23,9 @@ if [ $OSVERSION -ge 300000 -a X$HasSecureRPC != "X" ]; then
echo "#endif" >> $F
fi
if [ X$HasXdmAuth != "X" ]; then
if [ -f $WRKDIR/xc/lib/Xdmcp/Wraphelp.c -o -f $DISTDIR/xc/Wraphelp.c ]; then
echo "#ifndef HasXdmAuth" >> $F
echo "#define HasXdmAuth $HasXdmAuth" >> $F
echo "#endif" >> $F
fi
echo "#ifndef HasXdmAuth" >> $F
echo "#define HasXdmAuth $HasXdmAuth" >> $F
echo "#endif" >> $F
fi
if [ $OSVERSION -ge 310000 -a X$HasPam != "X" ]; then
echo "#ifndef HasPam" >> $F

View file

@ -7,6 +7,7 @@
PORTNAME= NestServer
PORTVERSION= 4.1.0
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0
@ -26,6 +27,23 @@ INSTALL_TARGET= installXnest installXserver.man
MANCOMPRESSED= yes
MAN1= Xnest.1 Xserver.1
HasXdmAuth?= DEFAULT
.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
pre-fetch:
@${ECHO}
@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
.else
MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
EXTRACT_ONLY= X410src-1.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
.endif
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure

View file

@ -1 +1,2 @@
MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
MD5 (xc/Wraphelp.c) = IGNORE

View file

@ -7,6 +7,7 @@
PORTNAME= PrintServer
PORTVERSION= 4.1.0
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0
@ -24,6 +25,23 @@ MAKE_ENV= MAN_INSTALL_TARGET=NOOP
ALL_TARGET= FreeBSDPortsBuild
INSTALL_TARGET= installXprt
HasXdmAuth?= DEFAULT
.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
pre-fetch:
@${ECHO}
@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
.else
MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
EXTRACT_ONLY= X410src-1.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
.endif
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure

View file

@ -1 +1,2 @@
MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
MD5 (xc/Wraphelp.c) = IGNORE

View file

@ -154,6 +154,23 @@ post-install::
.endif # !WITH_MATROX_GXX_DRIVER
.endif
HasXdmAuth?= DEFAULT
.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
pre-fetch:
@${ECHO}
@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
.else
MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
EXTRACT_ONLY= X410src-1.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
.endif
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure

View file

@ -1,2 +1,3 @@
MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
MD5 (xc/Wraphelp.c) = IGNORE
MD5 (xc/mga-133_143-source.tgz) = 849bf57f23f1684fea970459f919d1f2

View file

@ -154,6 +154,23 @@ post-install::
.endif # !WITH_MATROX_GXX_DRIVER
.endif
HasXdmAuth?= DEFAULT
.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
pre-fetch:
@${ECHO}
@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
.else
MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
EXTRACT_ONLY= X410src-1.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
.endif
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure

View file

@ -1,2 +1,3 @@
MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
MD5 (xc/Wraphelp.c) = IGNORE
MD5 (xc/mga-133_143-source.tgz) = 849bf57f23f1684fea970459f919d1f2

View file

@ -7,6 +7,7 @@
PORTNAME= VirtualFramebufferServer
PORTVERSION= 4.1.0
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0
@ -25,6 +26,23 @@ INSTALL_TARGET= installXvfb installXserver.man
MAKE_ENV= MAN_INSTALL_TARGET=installXvfb.man
MAN1= Xserver.1 Xvfb.1
HasXdmAuth?= DEFAULT
.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
pre-fetch:
@${ECHO}
@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
.else
MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
EXTRACT_ONLY= X410src-1.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif
.endif
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure

View file

@ -1 +1,2 @@
MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
MD5 (xc/Wraphelp.c) = IGNORE

View file

@ -7,7 +7,7 @@
PORTNAME= clients
PORTVERSION= 4.1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0

View file

@ -7,6 +7,7 @@
PORTNAME= libraries
PORTVERSION= 4.1.0
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0