- Whitespace police

- Better handling of OpenSSL using USE_OLD_DES_API
- Fix builds on 1.6.2
- Bump to nb1

4 files changed, 10 insertions, 25 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 849a00641e6..335e0bda8d6 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/02/18 16:59:57 adrianp Exp $
+# $NetBSD: Makefile,v 1.25 2005/03/02 21:44:55 adrianp Exp $
 
 DISTNAME=	freeradius-1.0.2
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -21,6 +22,9 @@ LIBTOOLIZE_PLIST=	NO
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 FILES_SUBST+=		ROOT_USER=${ROOT_USER}
 FILES_SUBST+=		ROOT_GROUP=${ROOT_GROUP}
+USE_OLD_DES_API=	YES
+
+BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7
 
 # This package currently breaks using our libtool.  It does not appear to use
 # libtool properly/fully and as a result the daemon does not compile correctly.
@@ -97,12 +101,12 @@ 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" 
+				-lpthread -lsemaphore|g"
 .endif
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
 SUBST_SED.make+= 	-e "s|@ldap_ldflags@|@ldap_ldflags@ \
-				-lpthread|g" 
+				-lpthread|g"
 .endif
 
 pre-build:
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 3c02b559b78..523501eb240 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 12:13:46 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/03/02 21:44:55 adrianp Exp $
 
 SHA1 (freeradius-1.0.2.tar.gz) = 5703fd8abb4f28c15d716bd1ec1e9cfe2e1e6c90
 RMD160 (freeradius-1.0.2.tar.gz) = 796da74e64da189d7d7520201c7c4139f9f478c4
 Size (freeradius-1.0.2.tar.gz) = 2208884 bytes
 SHA1 (patch-ae) = 0c1b6c79329f41c35e3a783e61cc205cb78a4773
-SHA1 (patch-ah) = 49a5afd67ffea3bf871f57a3d8c2888baf765558
 SHA1 (patch-ai) = bb4dafd3f6b961403caa955c9a09c271468ada36
 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk
index 28fbc23f84f..00ca24bd245 100644
--- a/net/freeradius/options.mk
+++ b/net/freeradius/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/11/10 22:27:32 adrianp Exp $
+# $NetBSD: options.mk,v 1.4 2005/03/02 21:44:55 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.freeradius
 PKG_SUPPORTED_OPTIONS=	ldap postgresql73 postgresql74 mysql snmp
@@ -52,7 +52,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST.mysql
 ###
 ### Compile in SNMP support
 ###
-### Please note that snmp support is limited.  Freeradius looks like it's 
+### Please note that snmp support is limited.  Freeradius looks like it's
 ### after the old ucd-snmp (v4.x) headers and ucd-snmp isn't in pkgsrc any
 ### more.  Compatability mode on the current net-snmp (v5.x) does not seem
 ### to work either.  So it will find a few snmp utilites but other than that
diff --git a/net/freeradius/patches/patch-ah b/net/freeradius/patches/patch-ah
deleted file mode 100644
index 4d4cf1dcdee..00000000000
--- a/net/freeradius/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/09/23 19:51:22 adrianp Exp $
-
---- src/modules/rlm_x99_token/x99.h.orig	2004-09-23 10:44:09.000000000 +0100
-+++ src/modules/rlm_x99_token/x99.h	2004-09-23 10:44:30.000000000 +0100
-@@ -23,7 +23,12 @@
- #define X99_H
- 
- #include <inttypes.h>
--#include <openssl/des.h> /* des_cblock */
-+#include <openssl/opensslv.h>
-+#if OPENSSL_VERSION_NUMBER < 0x0090700fL
-+#include <openssl/des.h> /* des_cblock */
-+#else
-+#include <des.h> /* des_cblock */
-+#endif
- #include <time.h>        /* time_t */
- 
- /*