13 files changed, 47 insertions, 276 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 0ee98864689e..c450f394a9dd 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
-NO_PACKAGE=	package available from XFree86
+#NO_PACKAGE=	package available from XFree86
 .endif
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index f45e2e3b0ceb..e9d18f564837 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -354,47 +354,12 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-cat <<'END'
-
- XDM can be built so that it will get a KerberosIV TGT for your users
- when they log in. This requires that you have Kerberos on your system
- when you do this build.
-
- Source code for this authentication mechanism may not be exported from
- the United States, however, there are compatible replacements for this
- mechanism available elsewhere.  Also, while this scheme is not used for
- general purpose encryption,  some countries restrict the use of strong
- cryptography.
-
- Even if you answer YES to the following question, KerberosIV support
- will not be enabled if the kerberos libraries are unavailable.
-
-END
-yesno "Do you want to enable KerberosIV support?"
-cpkb=NO
+echo
+yesno "Do you want to compile with PAM support?"
 if [ $answ = YES ]; then
-    if [ $ELF = yes ]; then
-      LIBKRB=/usr/lib/libkrb.a
-    elif [ -d /usr/lib/aout ]; then
-      LIBKRB=/usr/lib/aout/libkrb.a
-    else
-      LIBKRB=/usr/lib/libkrb.a
-    fi
-    K4PATCH=$FILESDIR/kerberos4.diffs
-    K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
-    XDMDIR=$WRKDIR/xc/programs/xdm/
-
-    if [ -f $LIBKRB ] ; then
-      echo "==> KerberosIV found in system libraries."
-      cpkb=YES
-    else
-      echo "==> Kerberos libraries not found on system."
-      echo "==> KerberosIV support NOT enabled."
-      cpkb=NO
-    fi
-fi
-if [ $cpkb != NO ]; then
-  echo "#define	HasKrb4		$answ"	>> $F
+  echo "#define	HasPam			YES"	>> $F
+else
+  echo "#define	HasPam			NO"	>> $F
 fi
 
 echo
@@ -415,11 +380,6 @@ if [ X$cpwh != XNO ]; then
   cp $cpwh $WH
 fi
 
-if [ X$cpkb != XNO ]; then
-  cp $K4XDM $XDMDIR
-  echo "===>  Applying KerberosIV patches"
-  patch -s -d $WRKDIR/xc -E -p0 < $K4PATCH
-fi
 if [ X$THREADS_PATCH != X ]; then
     echo "===>  Applying threads patches"
     patch -s -d $WRKDIR  -E -p0 <  $THREADS_PATCH
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 0ee98864689e..c450f394a9dd 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
-NO_PACKAGE=	package available from XFree86
+#NO_PACKAGE=	package available from XFree86
 .endif
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index f45e2e3b0ceb..e9d18f564837 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -354,47 +354,12 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-cat <<'END'
-
- XDM can be built so that it will get a KerberosIV TGT for your users
- when they log in. This requires that you have Kerberos on your system
- when you do this build.
-
- Source code for this authentication mechanism may not be exported from
- the United States, however, there are compatible replacements for this
- mechanism available elsewhere.  Also, while this scheme is not used for
- general purpose encryption,  some countries restrict the use of strong
- cryptography.
-
- Even if you answer YES to the following question, KerberosIV support
- will not be enabled if the kerberos libraries are unavailable.
-
-END
-yesno "Do you want to enable KerberosIV support?"
-cpkb=NO
+echo
+yesno "Do you want to compile with PAM support?"
 if [ $answ = YES ]; then
-    if [ $ELF = yes ]; then
-      LIBKRB=/usr/lib/libkrb.a
-    elif [ -d /usr/lib/aout ]; then
-      LIBKRB=/usr/lib/aout/libkrb.a
-    else
-      LIBKRB=/usr/lib/libkrb.a
-    fi
-    K4PATCH=$FILESDIR/kerberos4.diffs
-    K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
-    XDMDIR=$WRKDIR/xc/programs/xdm/
-
-    if [ -f $LIBKRB ] ; then
-      echo "==> KerberosIV found in system libraries."
-      cpkb=YES
-    else
-      echo "==> Kerberos libraries not found on system."
-      echo "==> KerberosIV support NOT enabled."
-      cpkb=NO
-    fi
-fi
-if [ $cpkb != NO ]; then
-  echo "#define	HasKrb4		$answ"	>> $F
+  echo "#define	HasPam			YES"	>> $F
+else
+  echo "#define	HasPam			NO"	>> $F
 fi
 
 echo
@@ -415,11 +380,6 @@ if [ X$cpwh != XNO ]; then
   cp $cpwh $WH
 fi
 
-if [ X$cpkb != XNO ]; then
-  cp $K4XDM $XDMDIR
-  echo "===>  Applying KerberosIV patches"
-  patch -s -d $WRKDIR/xc -E -p0 < $K4PATCH
-fi
 if [ X$THREADS_PATCH != X ]; then
     echo "===>  Applying threads patches"
     patch -s -d $WRKDIR  -E -p0 <  $THREADS_PATCH
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 0ee98864689e..c450f394a9dd 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
-NO_PACKAGE=	package available from XFree86
+#NO_PACKAGE=	package available from XFree86
 .endif
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index f45e2e3b0ceb..e9d18f564837 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -354,47 +354,12 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-cat <<'END'
-
- XDM can be built so that it will get a KerberosIV TGT for your users
- when they log in. This requires that you have Kerberos on your system
- when you do this build.
-
- Source code for this authentication mechanism may not be exported from
- the United States, however, there are compatible replacements for this
- mechanism available elsewhere.  Also, while this scheme is not used for
- general purpose encryption,  some countries restrict the use of strong
- cryptography.
-
- Even if you answer YES to the following question, KerberosIV support
- will not be enabled if the kerberos libraries are unavailable.
-
-END
-yesno "Do you want to enable KerberosIV support?"
-cpkb=NO
+echo
+yesno "Do you want to compile with PAM support?"
 if [ $answ = YES ]; then
-    if [ $ELF = yes ]; then
-      LIBKRB=/usr/lib/libkrb.a
-    elif [ -d /usr/lib/aout ]; then
-      LIBKRB=/usr/lib/aout/libkrb.a
-    else
-      LIBKRB=/usr/lib/libkrb.a
-    fi
-    K4PATCH=$FILESDIR/kerberos4.diffs
-    K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
-    XDMDIR=$WRKDIR/xc/programs/xdm/
-
-    if [ -f $LIBKRB ] ; then
-      echo "==> KerberosIV found in system libraries."
-      cpkb=YES
-    else
-      echo "==> Kerberos libraries not found on system."
-      echo "==> KerberosIV support NOT enabled."
-      cpkb=NO
-    fi
-fi
-if [ $cpkb != NO ]; then
-  echo "#define	HasKrb4		$answ"	>> $F
+  echo "#define	HasPam			YES"	>> $F
+else
+  echo "#define	HasPam			NO"	>> $F
 fi
 
 echo
@@ -415,11 +380,6 @@ if [ X$cpwh != XNO ]; then
   cp $cpwh $WH
 fi
 
-if [ X$cpkb != XNO ]; then
-  cp $K4XDM $XDMDIR
-  echo "===>  Applying KerberosIV patches"
-  patch -s -d $WRKDIR/xc -E -p0 < $K4PATCH
-fi
 if [ X$THREADS_PATCH != X ]; then
     echo "===>  Applying threads patches"
     patch -s -d $WRKDIR  -E -p0 <  $THREADS_PATCH
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 0ee98864689e..c450f394a9dd 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
-NO_PACKAGE=	package available from XFree86
+#NO_PACKAGE=	package available from XFree86
 .endif
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index f45e2e3b0ceb..e9d18f564837 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -354,47 +354,12 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-cat <<'END'
-
- XDM can be built so that it will get a KerberosIV TGT for your users
- when they log in. This requires that you have Kerberos on your system
- when you do this build.
-
- Source code for this authentication mechanism may not be exported from
- the United States, however, there are compatible replacements for this
- mechanism available elsewhere.  Also, while this scheme is not used for
- general purpose encryption,  some countries restrict the use of strong
- cryptography.
-
- Even if you answer YES to the following question, KerberosIV support
- will not be enabled if the kerberos libraries are unavailable.
-
-END
-yesno "Do you want to enable KerberosIV support?"
-cpkb=NO
+echo
+yesno "Do you want to compile with PAM support?"
 if [ $answ = YES ]; then
-    if [ $ELF = yes ]; then
-      LIBKRB=/usr/lib/libkrb.a
-    elif [ -d /usr/lib/aout ]; then
-      LIBKRB=/usr/lib/aout/libkrb.a
-    else
-      LIBKRB=/usr/lib/libkrb.a
-    fi
-    K4PATCH=$FILESDIR/kerberos4.diffs
-    K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
-    XDMDIR=$WRKDIR/xc/programs/xdm/
-
-    if [ -f $LIBKRB ] ; then
-      echo "==> KerberosIV found in system libraries."
-      cpkb=YES
-    else
-      echo "==> Kerberos libraries not found on system."
-      echo "==> KerberosIV support NOT enabled."
-      cpkb=NO
-    fi
-fi
-if [ $cpkb != NO ]; then
-  echo "#define	HasKrb4		$answ"	>> $F
+  echo "#define	HasPam			YES"	>> $F
+else
+  echo "#define	HasPam			NO"	>> $F
 fi
 
 echo
@@ -415,11 +380,6 @@ if [ X$cpwh != XNO ]; then
   cp $cpwh $WH
 fi
 
-if [ X$cpkb != XNO ]; then
-  cp $K4XDM $XDMDIR
-  echo "===>  Applying KerberosIV patches"
-  patch -s -d $WRKDIR/xc -E -p0 < $K4PATCH
-fi
 if [ X$THREADS_PATCH != X ]; then
     echo "===>  Applying threads patches"
     patch -s -d $WRKDIR  -E -p0 <  $THREADS_PATCH
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 0ee98864689e..c450f394a9dd 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
-NO_PACKAGE=	package available from XFree86
+#NO_PACKAGE=	package available from XFree86
 .endif
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index f45e2e3b0ceb..e9d18f564837 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -354,47 +354,12 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-cat <<'END'
-
- XDM can be built so that it will get a KerberosIV TGT for your users
- when they log in. This requires that you have Kerberos on your system
- when you do this build.
-
- Source code for this authentication mechanism may not be exported from
- the United States, however, there are compatible replacements for this
- mechanism available elsewhere.  Also, while this scheme is not used for
- general purpose encryption,  some countries restrict the use of strong
- cryptography.
-
- Even if you answer YES to the following question, KerberosIV support
- will not be enabled if the kerberos libraries are unavailable.
-
-END
-yesno "Do you want to enable KerberosIV support?"
-cpkb=NO
+echo
+yesno "Do you want to compile with PAM support?"
 if [ $answ = YES ]; then
-    if [ $ELF = yes ]; then
-      LIBKRB=/usr/lib/libkrb.a
-    elif [ -d /usr/lib/aout ]; then
-      LIBKRB=/usr/lib/aout/libkrb.a
-    else
-      LIBKRB=/usr/lib/libkrb.a
-    fi
-    K4PATCH=$FILESDIR/kerberos4.diffs
-    K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
-    XDMDIR=$WRKDIR/xc/programs/xdm/
-
-    if [ -f $LIBKRB ] ; then
-      echo "==> KerberosIV found in system libraries."
-      cpkb=YES
-    else
-      echo "==> Kerberos libraries not found on system."
-      echo "==> KerberosIV support NOT enabled."
-      cpkb=NO
-    fi
-fi
-if [ $cpkb != NO ]; then
-  echo "#define	HasKrb4		$answ"	>> $F
+  echo "#define	HasPam			YES"	>> $F
+else
+  echo "#define	HasPam			NO"	>> $F
 fi
 
 echo
@@ -415,11 +380,6 @@ if [ X$cpwh != XNO ]; then
   cp $cpwh $WH
 fi
 
-if [ X$cpkb != XNO ]; then
-  cp $K4XDM $XDMDIR
-  echo "===>  Applying KerberosIV patches"
-  patch -s -d $WRKDIR/xc -E -p0 < $K4PATCH
-fi
 if [ X$THREADS_PATCH != X ]; then
     echo "===>  Applying threads patches"
     patch -s -d $WRKDIR  -E -p0 <  $THREADS_PATCH
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 0ee98864689e..c450f394a9dd 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	jmz@FreeBSD.org
 
 IS_INTERACTIVE=	yes	# configure script asks questions
 .if (${MACHINE} != "alpha")
-NO_PACKAGE=	package available from XFree86
+#NO_PACKAGE=	package available from XFree86
 .endif
 ALL_TARGET=	World
 INSTALL_TARGET=	install install.man
diff --git a/x11/XFree86/files/patch-aa b/x11/XFree86/files/patch-aa
new file mode 100644
index 000000000000..def1d4dd3fb6
--- /dev/null
+++ b/x11/XFree86/files/patch-aa
@@ -0,0 +1,11 @@
+--- programs/Xserver/Imakefile.ORIG	Sun Nov 14 18:16:17 1999
++++ programs/Xserver/Imakefile	Sun Nov 14 18:17:24 1999
+@@ -161,7 +161,7 @@
+         SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries DBMLibrary $(EXTRASYSLIBS)
+ #endif
+ #if HasPam
+-	PAMLIBS = -lpam -lpam_misc -ldl
++        PAMLIBS = -lpam
+ #endif
+            CBRT = mi/LibraryTargetName(cbrt)
+         STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS)
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index f45e2e3b0ceb..e9d18f564837 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -354,47 +354,12 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-cat <<'END'
-
- XDM can be built so that it will get a KerberosIV TGT for your users
- when they log in. This requires that you have Kerberos on your system
- when you do this build.
-
- Source code for this authentication mechanism may not be exported from
- the United States, however, there are compatible replacements for this
- mechanism available elsewhere.  Also, while this scheme is not used for
- general purpose encryption,  some countries restrict the use of strong
- cryptography.
-
- Even if you answer YES to the following question, KerberosIV support
- will not be enabled if the kerberos libraries are unavailable.
-
-END
-yesno "Do you want to enable KerberosIV support?"
-cpkb=NO
+echo
+yesno "Do you want to compile with PAM support?"
 if [ $answ = YES ]; then
-    if [ $ELF = yes ]; then
-      LIBKRB=/usr/lib/libkrb.a
-    elif [ -d /usr/lib/aout ]; then
-      LIBKRB=/usr/lib/aout/libkrb.a
-    else
-      LIBKRB=/usr/lib/libkrb.a
-    fi
-    K4PATCH=$FILESDIR/kerberos4.diffs
-    K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
-    XDMDIR=$WRKDIR/xc/programs/xdm/
-
-    if [ -f $LIBKRB ] ; then
-      echo "==> KerberosIV found in system libraries."
-      cpkb=YES
-    else
-      echo "==> Kerberos libraries not found on system."
-      echo "==> KerberosIV support NOT enabled."
-      cpkb=NO
-    fi
-fi
-if [ $cpkb != NO ]; then
-  echo "#define	HasKrb4		$answ"	>> $F
+  echo "#define	HasPam			YES"	>> $F
+else
+  echo "#define	HasPam			NO"	>> $F
 fi
 
 echo
@@ -415,11 +380,6 @@ if [ X$cpwh != XNO ]; then
   cp $cpwh $WH
 fi
 
-if [ X$cpkb != XNO ]; then
-  cp $K4XDM $XDMDIR
-  echo "===>  Applying KerberosIV patches"
-  patch -s -d $WRKDIR/xc -E -p0 < $K4PATCH
-fi
 if [ X$THREADS_PATCH != X ]; then
     echo "===>  Applying threads patches"
     patch -s -d $WRKDIR  -E -p0 <  $THREADS_PATCH