Remove the installation of libltdl and make this use the already installed one

that libtool-base puts down. Also, fix one place in the freeradius code
where a config.h should have been emitted but wasn't.

Also, for NetBSD < 1.6N disable threads as this requires threads and
the posix semaphore headers which pth/etc don't provide and didn't appear
until 1.6N

5 files changed, 193 insertions, 10 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 8f2c329b3d0..9c462450b3c 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/02/27 11:30:00 darcy Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/12 05:56:49 jmc Exp $
 
 DISTNAME=	freeradius-0.7
 CATEGORIES=	net
+PKGREVISION=	1
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
 
@@ -12,9 +13,19 @@ COMMENT=	Free RADIUS server implementation
 CONFLICTS+=	radiusd-cistron*
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--quiet --with-logdir=/var/log
+CONFIGURE_ARGS=	--quiet --with-logdir=/var/log --disable-ltdl-install --with-ltdl-lib=${PREFIX}/lib --with-ltdl-include=${PREFIX}/include
 USE_BUILDLINK2= YES
 USE_LIBTOOL= YES
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+.include "../../mk/bsd.prefs.mk"
+
+# Needs semaphore functions as well as thread libs.
+.if ${OPSYS} == "NetBSD"
+.  if ${OS_VERSION:M1.[0-5]*} || ${OS_VERSION} == "1.6" || ${OS_VERSION:M1.6[A-M]*} || ${OS_VERSION:M1.6.1*}
+CONFIGURE_ARGS+=	--with-threads=no
+.  endif
+.endif
 
 RADDB=		acct_users attrs clients clients.conf dictionary \
 		dictionary.acc dictionary.aptis dictionary.ascend \
@@ -37,4 +48,5 @@ post-install:
 
 .include "../../databases/gdbm/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/libtool/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index 198b5e191a8..9464381f237 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2003/02/27 08:51:00 darcy Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/12 05:56:49 jmc Exp $
 bin/radclient
 bin/radlast
 bin/radrelay
@@ -89,12 +89,6 @@ etc/raddb/x99.conf
 etc/raddb/x99.conf.sample
 etc/raddb/x99passwd.sample
 etc/rc.d/radiusd
-include/ltdl.h
-lib/libltdl.a
-lib/libltdl.la
-lib/libltdl.so
-lib/libltdl.so.4
-lib/libltdl.so.4.0
 lib/libradius-${PKGVERSION}.la
 lib/libradius-${PKGVERSION}.so
 lib/libradius.a
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 88d9d93a6df..86ce09858e1 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2003/02/27 11:30:00 darcy Exp $
+$NetBSD: distinfo,v 1.3 2003/03/12 05:56:49 jmc Exp $
 
 SHA1 (freeradius-0.7.tar.gz) = 8f44f1f9fedf69b71aa4aed9c0b7222d012ee8d6
 Size (freeradius-0.7.tar.gz) = 1659035 bytes
 SHA1 (patch-aa) = dc2c8c62ed2d11ebf682f7d9fcbaf7a410cbce0d
 SHA1 (patch-ab) = 26092b974a27151d69ab87ae7ba42e67aeef448b
+SHA1 (patch-ac) = 1abcc1f5282bface89cd71b2854218d2b60fdc97
+SHA1 (patch-ad) = 8317bd7e8fa2c9efbb89a89140f019de6effa0b4
diff --git a/net/freeradius/patches/patch-ac b/net/freeradius/patches/patch-ac
new file mode 100644
index 00000000000..c2702c3816d
--- /dev/null
+++ b/net/freeradius/patches/patch-ac
@@ -0,0 +1,165 @@
+$NetBSD: patch-ac,v 1.1 2003/03/12 05:56:50 jmc Exp $
+
+--- src/modules/rlm_eap/types/rlm_eap_tls/configure.orig	Wed Mar 12 05:28:58 2003
++++ src/modules/rlm_eap/types/rlm_eap_tls/configure	Wed Mar 12 05:29:09 2003
+@@ -525,7 +525,7 @@
+ fi
+ 
+ 
+-# From configure.in Revision: 1.1 
++# From configure.in Revision: 1.2 
+ 
+ 
+ fail=
+@@ -1072,6 +1072,7 @@
+ 
+ 
+ 
++
+ trap '' 1 2 15
+ cat > confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+@@ -1135,19 +1136,7 @@
+ 
+ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
+ 
+-# Transform confdefs.h into DEFS.
+-# Protect against shell expansion while executing Makefile rules.
+-# Protect against Makefile macro expansion.
+-cat > conftest.defs <<\EOF
+-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
+-s%\[%\\&%g
+-s%\]%\\&%g
+-s%\$%$$%g
+-EOF
+-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+-rm -f conftest.defs
+-
++DEFS=-DHAVE_CONFIG_H
+ 
+ # Without the "./", some shells look in PATH for config.status.
+ : ${CONFIG_STATUS=./config.status}
+@@ -1184,7 +1173,7 @@
+ 
+ ac_given_srcdir=$srcdir
+ 
+-trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++trap 'rm -fr `echo "Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+ 
+@@ -1314,6 +1303,113 @@
+ " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+ fi; done
+ rm -f conftest.s*
++
++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
++# NAME is the cpp macro being defined and VALUE is the value it is being given.
++#
++# ac_d sets the value in "#define NAME VALUE" lines.
++ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
++ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
++ac_dC='\3'
++ac_dD='%g'
++# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
++ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_uB='\([ 	]\)%\1#\2define\3'
++ac_uC=' '
++ac_uD='\4%g'
++# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_eB='$%\1#\2define\3'
++ac_eC=' '
++ac_eD='%g'
++
++if test "${CONFIG_HEADERS+set}" != set; then
++EOF
++cat >> $CONFIG_STATUS <<EOF
++  CONFIG_HEADERS="config.h"
++EOF
++cat >> $CONFIG_STATUS <<\EOF
++fi
++for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case "$ac_file" in
++  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
++       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++  *) ac_file_in="${ac_file}.in" ;;
++  esac
++
++  echo creating $ac_file
++
++  rm -f conftest.frag conftest.in conftest.out
++  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
++  cat $ac_file_inputs > conftest.in
++
++EOF
++
++# Transform confdefs.h into a sed script conftest.vals that substitutes
++# the proper values into config.h.in to produce config.h.  And first:
++# Protect against being on the right side of a sed subst in config.status.
++# Protect against being in an unquoted here document in config.status.
++rm -f conftest.vals
++cat > conftest.hdr <<\EOF
++s/[\\&%]/\\&/g
++s%[\\$`]%\\&%g
++s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
++s%ac_d%ac_u%gp
++s%ac_u%ac_e%gp
++EOF
++sed -n -f conftest.hdr confdefs.h > conftest.vals
++rm -f conftest.hdr
++
++# This sed command replaces #undef with comments.  This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++cat >> conftest.vals <<\EOF
++s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
++EOF
++
++# Break up conftest.vals because some shells have a limit on
++# the size of here documents, and old seds have small limits too.
++
++rm -f conftest.tail
++while :
++do
++  ac_lines=`grep -c . conftest.vals`
++  # grep -c gives empty output for an empty file on some AIX systems.
++  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
++  # Write a limited-size here document to conftest.frag.
++  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
++  echo 'CEOF
++  sed -f conftest.frag conftest.in > conftest.out
++  rm -f conftest.in
++  mv conftest.out conftest.in
++' >> $CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
++  rm -f conftest.vals
++  mv conftest.tail conftest.vals
++done
++rm -f conftest.vals
++
++cat >> $CONFIG_STATUS <<\EOF
++  rm -f conftest.frag conftest.h
++  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
++  cat conftest.in >> conftest.h
++  rm -f conftest.in
++  if cmp -s $ac_file conftest.h 2>/dev/null; then
++    echo "$ac_file is unchanged"
++    rm -f conftest.h
++  else
++    # Remove last slash and all that follows it.  Not all systems have dirname.
++      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++      # The file is in a subdirectory.
++      test ! -d "$ac_dir" && mkdir "$ac_dir"
++    fi
++    rm -f $ac_file
++    mv conftest.h $ac_file
++  fi
++fi; done
+ 
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
diff --git a/net/freeradius/patches/patch-ad b/net/freeradius/patches/patch-ad
new file mode 100644
index 00000000000..5545a2a237a
--- /dev/null
+++ b/net/freeradius/patches/patch-ad
@@ -0,0 +1,10 @@
+$NetBSD: patch-ad,v 1.1 2003/03/12 05:56:50 jmc Exp $
+
+--- src/modules/rlm_eap/types/rlm_eap_tls/configure.in.orig	Wed Mar 12 05:29:05 2003
++++ src/modules/rlm_eap/types/rlm_eap_tls/configure.in	Wed Mar 12 05:29:08 2003
+@@ -88,4 +88,5 @@
+ AC_SUBST(eap_tls_ldflags)
+ AC_SUBST(eap_tls_cflags)
+ AC_SUBST(targetname)
++AC_CONFIG_HEADER(config.h)
+ AC_OUTPUT(Makefile)