pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/freeradius Use libtool PLIST handling, it works no...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/12e2fa5fea8f
branches:  trunk
changeset: 510022:12e2fa5fea8f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Mar 22 20:53:41 2006 +0000

description:
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.

diffstat:

 net/freeradius/Makefile         |   12 ++-
 net/freeradius/PLIST            |  107 +---------------------------------------
 net/freeradius/PLIST.dbm        |    5 +-
 net/freeradius/PLIST.gdbm       |    5 +-
 net/freeradius/PLIST.ldap       |    6 +-
 net/freeradius/PLIST.mysql      |    6 +-
 net/freeradius/PLIST.pgsql      |    6 +-
 net/freeradius/distinfo         |    4 +-
 net/freeradius/patches/patch-ai |   81 +++++++++++++++++++++++++++++-
 9 files changed, 98 insertions(+), 134 deletions(-)

diffs (truncated from 396 to 300 lines):

diff -r 0cfb59b8fb70 -r 12e2fa5fea8f net/freeradius/Makefile
--- a/net/freeradius/Makefile   Wed Mar 22 19:57:54 2006 +0000
+++ b/net/freeradius/Makefile   Wed Mar 22 20:53:41 2006 +0000
@@ -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 @@
 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 @@
 .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 -r 0cfb59b8fb70 -r 12e2fa5fea8f net/freeradius/PLIST
--- a/net/freeradius/PLIST      Wed Mar 22 19:57:54 2006 +0000
+++ b/net/freeradius/PLIST      Wed Mar 22 20:53:41 2006 +0000
@@ -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/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 -r 0cfb59b8fb70 -r 12e2fa5fea8f net/freeradius/PLIST.dbm
--- a/net/freeradius/PLIST.dbm  Wed Mar 22 19:57:54 2006 +0000
+++ b/net/freeradius/PLIST.dbm  Wed Mar 22 20:53:41 2006 +0000
@@ -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 -r 0cfb59b8fb70 -r 12e2fa5fea8f net/freeradius/PLIST.gdbm
--- a/net/freeradius/PLIST.gdbm Wed Mar 22 19:57:54 2006 +0000
+++ b/net/freeradius/PLIST.gdbm Wed Mar 22 20:53:41 2006 +0000
@@ -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 -r 0cfb59b8fb70 -r 12e2fa5fea8f net/freeradius/PLIST.ldap
--- a/net/freeradius/PLIST.ldap Wed Mar 22 19:57:54 2006 +0000
+++ b/net/freeradius/PLIST.ldap Wed Mar 22 20:53:41 2006 +0000
@@ -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 -r 0cfb59b8fb70 -r 12e2fa5fea8f net/freeradius/PLIST.mysql
--- a/net/freeradius/PLIST.mysql        Wed Mar 22 19:57:54 2006 +0000
+++ b/net/freeradius/PLIST.mysql        Wed Mar 22 20:53:41 2006 +0000
@@ -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 -r 0cfb59b8fb70 -r 12e2fa5fea8f net/freeradius/PLIST.pgsql
--- a/net/freeradius/PLIST.pgsql        Wed Mar 22 19:57:54 2006 +0000
+++ b/net/freeradius/PLIST.pgsql        Wed Mar 22 20:53:41 2006 +0000
@@ -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 -r 0cfb59b8fb70 -r 12e2fa5fea8f net/freeradius/distinfo
--- a/net/freeradius/distinfo   Wed Mar 22 19:57:54 2006 +0000
+++ b/net/freeradius/distinfo   Wed Mar 22 20:53:41 2006 +0000
@@ -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



Home | Main Index | Thread Index | Old Index