From e84ca4f0e9bb2c91be15e8ba6b19581dee1c08f3 Mon Sep 17 00:00:00 2001
From: danh <danh@openbsd.org>
Date: Tue, 13 Feb 2001 02:10:57 +0000
Subject: [PATCH] - respect CC and CFLAGS. - /etc -> SYSCONFDIR - cleanup
 Makefile and DESCR.

---
 net/radiusd-lucent/Makefile      | 21 +++++++++------------
 net/radiusd-lucent/files/OpenBSD |  6 ------
 net/radiusd-lucent/pkg/DEINSTALL | 11 +++++------
 net/radiusd-lucent/pkg/DESCR     |  7 ++++---
 net/radiusd-lucent/pkg/MESSAGE   |  2 +-
 5 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 net/radiusd-lucent/files/OpenBSD

diff --git a/net/radiusd-lucent/Makefile b/net/radiusd-lucent/Makefile
index ac055acb67f..278b3fba573 100644
--- a/net/radiusd-lucent/Makefile
+++ b/net/radiusd-lucent/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2000/09/23 19:59:53 danh Exp $
+# $OpenBSD: Makefile,v 1.4 2001/02/13 02:10:57 danh Exp $
 
 DISTNAME=	radius21
 PKGNAME=	radiusd-lucent-2.1
@@ -16,19 +16,16 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WRKDIST=	${WRKDIR}/radius
 WRKSRC=		${WRKDIST}/src
-MAKE_FLAGS=	EXT='OpenBSD'
-
-post-extract:
-	@cp ${FILESDIR}/OpenBSD ${WRKSRC}/conf/OpenBSD
+MAKE_FLAGS+=	CC="${CC}" CFLAGS="${CFLAGS} -DNOSHADOW -DNDBM" LIBS=""
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/OpenBSD/builddbm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/OpenBSD/dbmkeys ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/OpenBSD/dbmrec ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/OpenBSD/md5test ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/OpenBSD/radtest ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/OpenBSD/testuser ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/OpenBSD/radiusd ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/builddbm ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/dbmkeys ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/dbmrec ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/md5test ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/radtest ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/testuser ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/radiusd ${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/radiusd-lucent
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/radiusd-lucent/menus
 	${INSTALL_DATA} ${WRKDIST}/raddb/clients \
diff --git a/net/radiusd-lucent/files/OpenBSD b/net/radiusd-lucent/files/OpenBSD
deleted file mode 100644
index ba17b381c8d..00000000000
--- a/net/radiusd-lucent/files/OpenBSD
+++ /dev/null
@@ -1,6 +0,0 @@
-# $OpenBSD: OpenBSD,v 1.1.1.1 2000/08/18 01:15:04 danh Exp $
-#
-CC=		gcc
-COPT= 		-O2
-CPPFLAGS=	-DNOSHADOW -DNDBM
-LIBS=
diff --git a/net/radiusd-lucent/pkg/DEINSTALL b/net/radiusd-lucent/pkg/DEINSTALL
index 44ce2958897..b6934af46de 100644
--- a/net/radiusd-lucent/pkg/DEINSTALL
+++ b/net/radiusd-lucent/pkg/DEINSTALL
@@ -1,13 +1,13 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2001/02/13 00:48:51 danh Exp $
+# $OpenBSD: DEINSTALL,v 1.4 2001/02/13 02:10:58 danh Exp $
 
 set -e
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
 PREFIX="${PKG_PREFIX:-/usr/local}"
 CONFIG_DIR="${SYSCONFDIR}/raddb"
+RADACCT_DIR="/var/log/radacct"
 
-if [ -d ${CONFIG_DIR} -o -d /var/log/radacct ]; then
-	echo 
+if [ -d ${CONFIG_DIR} -o -d ${RADACCT_DIR} ]; then
 	echo "+---------------"
 	echo "| If you do not plan on re-installing this package and have"
 	echo "| no more use for the previous configuration or data, then"
@@ -16,11 +16,10 @@ if [ -d ${CONFIG_DIR} -o -d /var/log/radacct ]; then
 	if [ -d ${CONFIG_DIR} ]; then
 		echo "|      ${CONFIG_DIR}"
 	fi
-	if [ -d /var/log/radacct ]; then
-		echo "|      /var/log/radacct"
+	if [ -d ${RADACCT_DIR} ]; then
+		echo "|      ${RADACCT_DIR}"
 	fi
 	echo "+---------------"
-	echo
 fi
 
 exit 0
diff --git a/net/radiusd-lucent/pkg/DESCR b/net/radiusd-lucent/pkg/DESCR
index 74f41f17db2..e58aa6dc165 100644
--- a/net/radiusd-lucent/pkg/DESCR
+++ b/net/radiusd-lucent/pkg/DESCR
@@ -1,4 +1,5 @@
-The Lucent Remote Access RADIUS server 2.1 with support for RADIUS
-proxy, iPass roaming, and ActivCard. 
+The  Lucent Remote Access RADIUS server 2.1 with support for
+RADIUS proxy, iPass roaming, and ActivCard.
 
-This port does not use iPass roaming or ActivCard at this time.  
+This port does not use iPass roaming or  ActivCard  at  this
+time.
diff --git a/net/radiusd-lucent/pkg/MESSAGE b/net/radiusd-lucent/pkg/MESSAGE
index 80e3eae2909..2e1a350d867 100644
--- a/net/radiusd-lucent/pkg/MESSAGE
+++ b/net/radiusd-lucent/pkg/MESSAGE
@@ -1,5 +1,5 @@
 +---------------
-| The RADIUS configuration files belong in /etc/raddb.  Examples
+| The RADIUS configuration files belong in ${SYSCONFDIR}/raddb.  Examples
 | and extra documentation can be found in the following locations:
 |
 |     ${PREFIX}/share/examples/radiusd-lucent