Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Jul 96 17:05:57 +0100
From:      Jean-Marc Zucconi <jmz@cabri.obs-besancon.fr>
To:        asami@cs.berkeley.edu
Cc:        ports@freebsd.org
Subject:   Re: Review request: x11/XFree86 port cleanup
Message-ID:  <9607171605.AA01486@cabri.obs-besancon.fr>
In-Reply-To: <199607170825.BAA02773@silvia.hip.berkeley.edu> (asami@cs.berkeley.edu)

next in thread | previous in thread | raw e-mail | index | archive | help
>>>>> Satoshi Asami writes:

 > I took a look at the Makefiles, it seems like most of the code
 > duplicates in Makefile.ftp is unnecessary 'cause bsd.port.mk handles
 > multiple distfiles from multiple sites/directories just fine.  Also,
 > DIST_SUBDIR can be used to specify that all files go to
 > /usr/ports/distfiles/xc.

Looks good. Makefile.ftp is small now - what do you think about
putting its content in Makefile and removing it?

 > I tried it here, it seems to build ok.  BTW, I get a "usage: cp ..."
 > if I answer "no" to the XDM-AUTH* question.  Also, if I answer "yes"
 > (default) to the Kerberos question even though I don't have libkrb, it
 > will just die, is it too much to make it not even ask the question if
 > the library doesn't exist?

Patch below (untested!)

Index: configure
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86/scripts/configure,v
retrieving revision 1.19
diff -u -r1.19 configure
--- configure	1996/03/22 11:49:28	1.19
+++ configure	1996/07/17 14:57:17
@@ -131,8 +131,10 @@
 	cpwh=$FILESDIR/Wraphelp.c
     else
 	echo "==> Wraphelp.c not found, DES support NOT enabled."
-	answ=NO
+	cpwh=NO
     fi
+else
+    cpwh=NO
 fi
 echo "#undef	HadXdmAuth"			>> $F
 echo "#define	HasXdmAuth		$answ"	>> $F
@@ -145,15 +147,19 @@
 
 END
 
-yesno "Do you want to add the Kerberos V4 support patches? [YES] "
-k4patch=$answ
-if [ $k4patch = YES ] ; then
-    echo
-    yesno "Do you want to enable Kerberos V4 support? [YES] "
-    echo "#undef	HasKrb4" >>$F
-    echo "#define	HasKrb4 $answ" >>$F
+if [ ! -f /usr/lib/libkrb.a ]; then
+    echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
+    k4patch=NO
+else
+    yesno "Do you want to add the Kerberos V4 support patches? [YES] "
+    k4patch=$answ
+    if [ $k4patch = YES ] ; then
+      echo
+      yesno "Do you want to enable Kerberos V4 support? [YES] "
+      echo "#undef	HasKrb4" >>$F
+      echo "#define	HasKrb4 $answ" >>$F
+    fi
 fi
-
 echo
 echo "End of configuration questions. No more user input required"
 echo

Jean-Marc
 _____________________________________________________________________________
 Jean-Marc Zucconi       Observatoire de Besancon       F 25010 Besancon cedex
                   PGP Key: finger jmz@cabri.obs-besancon.fr
 =============================================================================



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9607171605.AA01486>