Use libtool PLIST handling, it works now. Add some missing symlinks

for libtool archives, remove the .a and .so entries. Bump revision.
Add DragonFly detection for shared libraries. Always try to find -lssl
with -lcrypto, unbreaking the test at least on DragonFly, but should
not harm elsewhere.

9 files changed, 98 insertions, 134 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index ea3dbfdf3e1..a5a9c955f91 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2006/03/22 15:07:41 adrianp Exp $
+# $NetBSD: Makefile,v 1.46 2006/03/22 20:53:41 joerg Exp $
 
 DISTNAME=	freeradius-1.1.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -15,7 +15,6 @@ COMMENT=	Free RADIUS server implementation
 CONFLICTS+=		radiusd-cistron*
 USE_TOOLS+=		gmake perl:run
 GNU_CONFIGURE=		YES
-LIBTOOLIZE_PLIST=	NO
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 FILES_SUBST+=		ROOT_USER=${ROOT_USER:Q}
 FILES_SUBST+=		ROOT_GROUP=${ROOT_GROUP:Q}
@@ -93,12 +92,15 @@ CONFIGURE_ARGS+=	--without-threads
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
 .include "../../devel/pthread-sem/buildlink3.mk"
 SUBST_SED.make+= 	-e "s|@ldap_ldflags@|@ldap_ldflags@ \
-				-lpthread -lsemaphore|g"
+			${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lsemaphore|g"
 .endif
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
 SUBST_SED.make+= 	-e "s|@ldap_ldflags@|@ldap_ldflags@ \
-				-lpthread|g"
+			${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g"
+.endif
+
+.if ${OPSYS} == "DragonFly"
 .endif
 
 .if ${MACHINE_ARCH} == "amd64"
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index 28a5140bc58..23fcd04c889 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/03/21 23:08:08 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/03/22 20:53:41 joerg Exp $
 bin/radclient
 bin/radeapclient
 bin/radlast
@@ -8,180 +8,75 @@ bin/radwho
 bin/radzap
 bin/smbencrypt
 lib/libeap-${PKGVERSION}.la
-lib/libeap-${PKGVERSION}.so
-lib/libeap.a
 lib/libeap.la
-lib/libeap.so
 lib/libradius-${PKGVERSION}.la
-lib/libradius-${PKGVERSION}.so
-lib/libradius.a
 lib/libradius.la
-lib/libradius.so
 lib/rlm_acct_unique-${PKGVERSION}.la
-lib/rlm_acct_unique-${PKGVERSION}.so
-lib/rlm_acct_unique.a
 lib/rlm_acct_unique.la
-lib/rlm_acct_unique.so
 lib/rlm_always-${PKGVERSION}.la
-lib/rlm_always-${PKGVERSION}.so
-lib/rlm_always.a
 lib/rlm_always.la
-lib/rlm_always.so
 lib/rlm_attr_filter-${PKGVERSION}.la
-lib/rlm_attr_filter-${PKGVERSION}.so
-lib/rlm_attr_filter.a
 lib/rlm_attr_filter.la
-lib/rlm_attr_filter.so
 lib/rlm_attr_rewrite-${PKGVERSION}.la
-lib/rlm_attr_rewrite-${PKGVERSION}.so
-lib/rlm_attr_rewrite.a
 lib/rlm_attr_rewrite.la
-lib/rlm_attr_rewrite.so
 lib/rlm_chap-${PKGVERSION}.la
-lib/rlm_chap-${PKGVERSION}.so
-lib/rlm_chap.a
 lib/rlm_chap.la
-lib/rlm_chap.so
 lib/rlm_checkval-${PKGVERSION}.la
-lib/rlm_checkval-${PKGVERSION}.so
-lib/rlm_checkval.a
 lib/rlm_checkval.la
-lib/rlm_checkval.so
 lib/rlm_detail-${PKGVERSION}.la
-lib/rlm_detail-${PKGVERSION}.so
-lib/rlm_detail.a
 lib/rlm_detail.la
-lib/rlm_detail.so
 lib/rlm_digest-${PKGVERSION}.la
-lib/rlm_digest-${PKGVERSION}.so
-lib/rlm_digest.a
 lib/rlm_digest.la
-lib/rlm_digest.so
 lib/rlm_eap-${PKGVERSION}.la
-lib/rlm_eap-${PKGVERSION}.so
-lib/rlm_eap.a
 lib/rlm_eap.la
-lib/rlm_eap.so
 lib/rlm_eap_gtc-${PKGVERSION}.la
-lib/rlm_eap_gtc-${PKGVERSION}.so
-lib/rlm_eap_gtc.a
 lib/rlm_eap_gtc.la
-lib/rlm_eap_gtc.so
 lib/rlm_eap_leap-${PKGVERSION}.la
-lib/rlm_eap_leap-${PKGVERSION}.so
-lib/rlm_eap_leap.a
 lib/rlm_eap_leap.la
-lib/rlm_eap_leap.so
 lib/rlm_eap_md5-${PKGVERSION}.la
-lib/rlm_eap_md5-${PKGVERSION}.so
-lib/rlm_eap_md5.a
 lib/rlm_eap_md5.la
-lib/rlm_eap_md5.so
 lib/rlm_eap_mschapv2-${PKGVERSION}.la
-lib/rlm_eap_mschapv2-${PKGVERSION}.so
-lib/rlm_eap_mschapv2.a
 lib/rlm_eap_mschapv2.la
-lib/rlm_eap_mschapv2.so
 lib/rlm_eap_peap-${PKGVERSION}.la
-lib/rlm_eap_peap-${PKGVERSION}.so
-lib/rlm_eap_peap.a
 lib/rlm_eap_peap.la
-lib/rlm_eap_peap.so
 lib/rlm_eap_sim-${PKGVERSION}.la
-lib/rlm_eap_sim-${PKGVERSION}.so
-lib/rlm_eap_sim.a
 lib/rlm_eap_sim.la
-lib/rlm_eap_sim.so
 lib/rlm_eap_tls-${PKGVERSION}.la
-lib/rlm_eap_tls-${PKGVERSION}.so
-lib/rlm_eap_tls.a
 lib/rlm_eap_tls.la
-lib/rlm_eap_tls.so
 lib/rlm_eap_ttls-${PKGVERSION}.la
-lib/rlm_eap_ttls-${PKGVERSION}.so
-lib/rlm_eap_ttls.a
 lib/rlm_eap_ttls.la
-lib/rlm_eap_ttls.so
 lib/rlm_exec-${PKGVERSION}.la
-lib/rlm_exec-${PKGVERSION}.so
-lib/rlm_exec.a
 lib/rlm_exec.la
-lib/rlm_exec.so
 lib/rlm_expr-${PKGVERSION}.la
-lib/rlm_expr-${PKGVERSION}.so
-lib/rlm_expr.a
 lib/rlm_expr.la
-lib/rlm_expr.so
 lib/rlm_fastusers-${PKGVERSION}.la
-lib/rlm_fastusers-${PKGVERSION}.so
-lib/rlm_fastusers.a
 lib/rlm_fastusers.la
-lib/rlm_fastusers.so
 lib/rlm_files-${PKGVERSION}.la
-lib/rlm_files-${PKGVERSION}.so
-lib/rlm_files.a
 lib/rlm_files.la
-lib/rlm_files.so
 lib/rlm_mschap-${PKGVERSION}.la
-lib/rlm_mschap-${PKGVERSION}.so
-lib/rlm_mschap.a
 lib/rlm_mschap.la
-lib/rlm_mschap.so
 lib/rlm_ns_mta_md5-${PKGVERSION}.la
-lib/rlm_ns_mta_md5-${PKGVERSION}.so
-lib/rlm_ns_mta_md5.a
 lib/rlm_ns_mta_md5.la
-lib/rlm_ns_mta_md5.so
 lib/rlm_otp-${PKGVERSION}.la
-lib/rlm_otp-${PKGVERSION}.so
-lib/rlm_otp.a
 lib/rlm_otp.la
-lib/rlm_otp.so
 lib/rlm_pap-${PKGVERSION}.la
-lib/rlm_pap-${PKGVERSION}.so
-lib/rlm_pap.a
 lib/rlm_pap.la
-lib/rlm_pap.so
 lib/rlm_passwd-${PKGVERSION}.la
-lib/rlm_passwd-${PKGVERSION}.so
-lib/rlm_passwd.a
 lib/rlm_passwd.la
-lib/rlm_passwd.so
 lib/rlm_preprocess-${PKGVERSION}.la
-lib/rlm_preprocess-${PKGVERSION}.so
-lib/rlm_preprocess.a
 lib/rlm_preprocess.la
-lib/rlm_preprocess.so
 lib/rlm_radutmp-${PKGVERSION}.la
-lib/rlm_radutmp-${PKGVERSION}.so
-lib/rlm_radutmp.a
 lib/rlm_radutmp.la
-lib/rlm_radutmp.so
 lib/rlm_realm-${PKGVERSION}.la
-lib/rlm_realm-${PKGVERSION}.so
-lib/rlm_realm.a
 lib/rlm_realm.la
-lib/rlm_realm.so
 lib/rlm_sql-${PKGVERSION}.la
-lib/rlm_sql-${PKGVERSION}.so
-lib/rlm_sql.a
 lib/rlm_sql.la
-lib/rlm_sql.so
 lib/rlm_sql_log-${PKGVERSION}.la
-lib/rlm_sql_log-${PKGVERSION}.so
-lib/rlm_sql_log.a
 lib/rlm_sql_log.la
-lib/rlm_sql_log.so
 lib/rlm_sqlcounter-${PKGVERSION}.la
-lib/rlm_sqlcounter-${PKGVERSION}.so
-lib/rlm_sqlcounter.a
 lib/rlm_sqlcounter.la
-lib/rlm_sqlcounter.so
 lib/rlm_unix-${PKGVERSION}.la
-lib/rlm_unix-${PKGVERSION}.so
-lib/rlm_unix.a
 lib/rlm_unix.la
-lib/rlm_unix.so
 man/man1/radclient.1
 man/man1/radeapclient.1
 man/man1/radlast.1
diff --git a/net/freeradius/PLIST.dbm b/net/freeradius/PLIST.dbm
index 67e2caa084d..4ce83b9a330 100644
--- a/net/freeradius/PLIST.dbm
+++ b/net/freeradius/PLIST.dbm
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST.dbm,v 1.2 2005/09/22 16:13:17 adrianp Exp $
+@comment $NetBSD: PLIST.dbm,v 1.3 2006/03/22 20:53:41 joerg Exp $
 bin/rlm_dbm_cat
 bin/rlm_dbm_parser
 lib/rlm_dbm-${PKGVERSION}.la
-lib/rlm_dbm-${PKGVERSION}.so
-lib/rlm_dbm.a
 lib/rlm_dbm.la
-lib/rlm_dbm.so
diff --git a/net/freeradius/PLIST.gdbm b/net/freeradius/PLIST.gdbm
index 6a752bee688..1e799e087c0 100644
--- a/net/freeradius/PLIST.gdbm
+++ b/net/freeradius/PLIST.gdbm
@@ -1,6 +1,3 @@
-@comment $NetBSD: PLIST.gdbm,v 1.2 2005/09/22 16:13:17 adrianp Exp $
+@comment $NetBSD: PLIST.gdbm,v 1.3 2006/03/22 20:53:41 joerg Exp $
 lib/rlm_counter-${PKGVERSION}.la
-lib/rlm_counter-${PKGVERSION}.so
-lib/rlm_counter.a
 lib/rlm_counter.la
-lib/rlm_counter.so
diff --git a/net/freeradius/PLIST.ldap b/net/freeradius/PLIST.ldap
index 63e3cf3c330..62902759ea4 100644
--- a/net/freeradius/PLIST.ldap
+++ b/net/freeradius/PLIST.ldap
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST.ldap,v 1.1 2004/10/02 12:06:03 adrianp Exp $
-lib/rlm_ldap-${PKGVERSION}.so
-lib/rlm_ldap.a
+@comment $NetBSD: PLIST.ldap,v 1.2 2006/03/22 20:53:41 joerg Exp $
+lib/rlm_ldap-${PKGVERSION}.la
 lib/rlm_ldap.la
-lib/rlm_ldap.so
diff --git a/net/freeradius/PLIST.mysql b/net/freeradius/PLIST.mysql
index 56a8efa2a58..eaac7c79f23 100644
--- a/net/freeradius/PLIST.mysql
+++ b/net/freeradius/PLIST.mysql
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST.mysql,v 1.1 2004/10/02 12:06:03 adrianp Exp $
-lib/rlm_sql_mysql-${PKGVERSION}.so
-lib/rlm_sql_mysql.a
+@comment $NetBSD: PLIST.mysql,v 1.2 2006/03/22 20:53:41 joerg Exp $
+lib/rlm_sql_mysql-${PKGVERSION}.la
 lib/rlm_sql_mysql.la
-lib/rlm_sql_mysql.so
diff --git a/net/freeradius/PLIST.pgsql b/net/freeradius/PLIST.pgsql
index 1f93ca4f067..22faf8703a6 100644
--- a/net/freeradius/PLIST.pgsql
+++ b/net/freeradius/PLIST.pgsql
@@ -1,5 +1,3 @@
-@comment $NetBSD: PLIST.pgsql,v 1.1 2004/10/02 12:06:03 adrianp Exp $
-lib/rlm_sql_postgresql-${PKGVERSION}.so
-lib/rlm_sql_postgresql.a
+@comment $NetBSD: PLIST.pgsql,v 1.2 2006/03/22 20:53:41 joerg Exp $
+lib/rlm_sql_postgresql-${PKGVERSION}.la
 lib/rlm_sql_postgresql.la
-lib/rlm_sql_postgresql.so
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index ab4b826ca33..9797f38f328 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2006/03/21 23:08:08 adrianp Exp $
+$NetBSD: distinfo,v 1.20 2006/03/22 20:53:41 joerg Exp $
 
 SHA1 (freeradius-1.1.1.tar.gz) = efc52b20fa88148b8ebf58fa0ae5c36df204b703
 RMD160 (freeradius-1.1.1.tar.gz) = f9947c299ec2a7d0189d0718edf10c8dc5783119
 Size (freeradius-1.1.1.tar.gz) = 2358196 bytes
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
 SHA1 (patch-ae) = 0c1b6c79329f41c35e3a783e61cc205cb78a4773
-SHA1 (patch-ai) = 849010c6a1516d4073ab6c620df308b14a5e5140
+SHA1 (patch-ai) = b8259ea89acc0bd9e14fe4c84ecc79c6ce98bea3
 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
diff --git a/net/freeradius/patches/patch-ai b/net/freeradius/patches/patch-ai
index 476fbda19ef..9487dcb127b 100644
--- a/net/freeradius/patches/patch-ai
+++ b/net/freeradius/patches/patch-ai
@@ -1,7 +1,68 @@
-$NetBSD: patch-ai,v 1.5 2006/03/21 23:08:08 adrianp Exp $
+$NetBSD: patch-ai,v 1.6 2006/03/22 20:53:41 joerg Exp $
 
 --- configure.orig	2006-02-06 12:55:53.000000000 +0000
 +++ configure
+@@ -1934,13 +1934,13 @@ darwin* | rhapsody*)
+   esac
+   ;;
+ 
+-freebsd*)
++freebsd*|dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|DragonFly|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -3700,7 +3700,7 @@ else
+     ;;
+ 
+   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-  freebsd*)
++  freebsd*|dragonfly*)
+     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+     hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+@@ -4155,7 +4155,7 @@ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
++freebsd*|dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -6252,14 +6252,14 @@ fi
+ done
+ 
+ 
+-  echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:6257: checking for pthread_create in -lpthread" >&5
++  echo $ac_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}""... $ac_c" 1>&6
++echo "configure:6257: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 6265 "configure"
+ #include "confdefs.h"
+@@ -6288,7 +6288,7 @@ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+    CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
+-                  LIBS="$LIBS -lpthread" 
++                  LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" 
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
 @@ -6372,7 +6372,7 @@ else
    cat conftest.$ac_ext >&5
  fi
@@ -11,3 +72,21 @@ $NetBSD: patch-ai,v 1.5 2006/03/21 23:08:08 adrianp Exp $
  LIBS="-l$i  $ac_func_search_save_LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 6379 "configure"
+@@ -6605,7 +6605,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lssl  $LIBS"
++LIBS="-lssl -lcrypto $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 6611 "configure"
+ #include "confdefs.h"
+@@ -8407,7 +8407,7 @@ gethostbyaddrrstyle=""
+ echo $ac_n "checking gethostbyaddr_r() syntax""... $ac_c" 1>&6
+ echo "configure:8409: checking gethostbyaddr_r() syntax" >&5
+ case "$host" in
+-*-freebsd*)
++*-freebsd* | *-dragonfly*)
+ 	cat >> confdefs.h <<\EOF
+ #define GETHOSTBYADDRRSTYLE BSDSTYLE
+ EOF