- re-organized Makefile.

- added package conflict with radiusd-cistron.
- cleaned up pkg/DEINSTALL.

net/radiusd-lucent/Makefile

@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2000/08/18 01:15:03 danh Exp $
+# $OpenBSD: Makefile,v 1.2 2000/08/29 16:47:00 danh Exp $
 
 DISTNAME=	radius21
 PKGNAME=	radiusd-lucent-2.1
 CATEGORIES=	net
 NEED_VERSION=	1.319
+MASTER_SITES=	ftp://ftp.livingston.com/pub/le/radius/
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	danh@openbsd.org
 
@@ -12,9 +14,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.livingston.com/pub/le/radius/
-EXTRACT_SUFX=	.tar.Z
-
 WRKDIST=	${WRKDIR}/radius
 WRKSRC=		${WRKDIST}/src
 MAKE_FLAGS=	EXT='OpenBSD'

net/radiusd-lucent/pkg/DEINSTALL

@@ -1,23 +1,21 @@
 #!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.2 2000/08/29 16:47:01 danh Exp $
 
 do-deinstall () 
 {
-	if [ -d /etc/raddb -o -d /var/log/radacct ]; then
-		echo "+------------"
-		echo "| If you are removing this package and not planning"
-		echo "| to re-install it at a future time, it is safe to"
-		echo "| remove the following:"
-		echo "|"
-		if [ -d /etc/raddb ]; then
-			echo "|		/etc/raddb"
-		fi
-		if [ -d /var/log/radacct ]; then
-			echo "|		/var/log/radacct"
-		fi
-		echo "|"
-		echo "+------------"
+	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"
+	echo "| the following may safely be deleted:"
+	echo "|"
+	if [ -d /etc/raddb ]; then
+		echo "|      /etc/raddb" 
 	fi
+	if [ -d /var/log/radacct ]; then
+		echo "|      /var/log/radacct"
+	fi
+	echo "+---------------"
 }
 
-do-deinstall
+[ -d /etc/raddb -o -d /var/log/radacct ] && do-deinstall
 exit 0

net/radiusd-lucent/pkg/PLIST

@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2000/08/18 01:15:04 danh Exp $
+@comment $OpenBSD: PLIST,v 1.2 2000/08/29 16:47:02 danh Exp $
+@pkgcfl radiusd-cistron-*
 bin/builddbm
 bin/dbmkeys
 bin/dbmrec