From owner-freebsd-ports  Mon Sep 21 16:14:42 1998
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id QAA08346
          for freebsd-ports-outgoing; Mon, 21 Sep 1998 16:14:42 -0700 (PDT)
          (envelope-from owner-freebsd-ports@FreeBSD.ORG)
Received: from mail.HiWAAY.net (fly.HiWAAY.net [208.147.154.56])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id QAA08138;
          Mon, 21 Sep 1998 16:13:43 -0700 (PDT)
          (envelope-from sprice@hiwaay.net)
Received: from localhost (sprice@localhost)
	by mail.HiWAAY.net (8.9.0/8.9.0) with SMTP id SAA03888;
	Mon, 21 Sep 1998 18:11:48 -0500 (CDT)
Date: Mon, 21 Sep 1998 18:11:48 -0500 (CDT)
From: Steve Price <sprice@hiwaay.net>
To: Mark Murray <mark@grondar.za>
cc: ports@FreeBSD.ORG, current@FreeBSD.ORG
Subject: Re: Patch to build XFree86 w/ Krb4 in an ELF world 
In-Reply-To: <199809212019.WAA01084@gratis.grondar.za>
Message-ID: <Pine.OSF.4.02.9809211744470.3309-100000@fly.HiWAAY.net>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

On Mon, 21 Sep 1998, Mark Murray wrote:

# Better! Please let me know if it works, and I'll commit ASAP.
# (Can't now - I have 3 other test compiles running...)

Works great here.  I didn't do any exhaustive tests
but it does compile, install, etc.  I've also attached
the patch I used just in case.  It's not much different
than your original one, but it does incorporate the nit we
talked about and also enables the question about Krb4
support now that it appears to work again. :)

Thanks, Steve

# M
# --
# Mark Murray
# Join the anti-SPAM movement: http://www.cauce.org
# 

Index: files/kerberos4.diffs
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86/files/kerberos4.diffs,v
retrieving revision 1.3
diff -u -r1.3 kerberos4.diffs
--- kerberos4.diffs	1998/04/13 14:28:58	1.3
+++ kerberos4.diffs	1998/09/21 20:28:17
@@ -34,7 +34,7 @@
 +#define Krb4Includes /**/
 +#endif
 +#ifndef Krb4Libraries
-+#define Krb4Libraries -lkrb -ldes
++#define Krb4Libraries -lkrb -ldes -lcrypt
 +#endif
 +#else
 +#undef Krb4Includes
Index: scripts/configure
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86/scripts/configure,v
retrieving revision 1.35
diff -u -r1.35 configure
--- configure	1998/09/21 00:04:36	1.35
+++ configure	1998/09/21 23:25:27
@@ -230,6 +230,14 @@
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
+# ELF detection
+if [ `sysctl -n kern.osreldate` -ge 300004 -a X`objformat` = Xelf ]; then
+  ELF=yes
+  echo "#define UseElfFormat		YES" >> $F
+else
+  ELF=no
+fi
+
 cat <<'END'
 
  XDM can be built so that it will get a KerberosIV TGT for your users
@@ -246,10 +254,16 @@
  will not be enabled if the kerberos libraries are unavailable.
 
 END
-#yesno "Do you want to enable KerberosIV support? [YES] "
-answ=NO
+yesno "Do you want to enable KerberosIV support? [YES] "
 cpkb=NO
 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
     LIBKRB=/usr/lib/libkrb.a
     K4PATCH=$FILESDIR/kerberos4.diffs
     K4XDM="$FILESDIR/krb4auth.c $FILESDIR/krb4auth.h"
@@ -267,11 +281,6 @@
 if [ $cpkb != NO ]; then
   echo "#define	HasKrb4		$answ"	>> $F
 fi
-
-# ELF detection
-test `sysctl -n kern.osreldate` -ge 300004 &&
-  test `objformat` = elf &&
-  echo "#define UseElfFormat		YES" >> $F
 
 echo
 echo "End of configuration questions. No more user input required"


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message