general port clean up. removed explicit FAKE and renamed patches.

net/radiusd-cistron/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2000/07/10 20:28:02 danh Exp $
+# $OpenBSD: Makefile,v 1.3 2000/07/13 00:25:51 danh Exp $
 
 DISTNAME=	radiusd-cistron-1.6.3-stable
 PKGNAME=	radiusd-cistron-1.6.3
@@ -8,28 +8,27 @@ MAINTAINER=		danh@openbsd.org
 
 MASTER_SITES=	ftp://ftp.cistron.nl/pub/people/miquels/radius/
 
-LICENCE_TYPE=		GPL
 PERMIT_PACKAGE_CDROM=	Yes 
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM=	Yes 
 PERMIT_DISTFILES_FTP=	Yes 
 
-FAKE=			Yes
-
 WRKSRC=		${WRKDIST}/src
 MAKE_FILE=	Makefile.BSD
-MAKE_FLAGS+=	CFLAGS="-Wall -O2 -DNOSHADOW -DNDBM"
-MAKE_FLAGS+=	LCRYPT=""
-FAKE_FLAGS+=	RADIUS_DIR='${WRKINST}${PREFIX}/share/examples/radiusd-cistron'
-FAKE_FLAGS+=	SBINDIR='${WRKINST}${PREFIX}/sbin'
-FAKE_FLAGS+=	BINDIR='${WRKINST}${PREFIX}/bin'
+MAKE_FLAGS+=	CFLAGS="-Wall -O2 -DNOSHADOW -DNDBM" LCRYPT=""
+FAKE_FLAGS+=	BINDIR='${WRKINST}${PREFIX}/bin' \
+		SBINDIR='${WRKINST}${PREFIX}/sbin' \
+		RADIUS_DIR='${WRKINST}${PREFIX}/share/examples/radiusd-cistron'
 
 post-install:
-	@cd ${WRKDIST}/doc; ${INSTALL_MAN} naslist.5rad ${PREFIX}/man/man5/naslist.5
-	@cd ${WRKDIST}/doc; ${INSTALL_MAN} clients.5rad ${PREFIX}/man/man5/clients.5
-	@cd ${WRKDIST}/doc; ${INSTALL_MAN} builddbm.8rad ${PREFIX}/man/man8/builddbm.8
-	@cd ${WRKDIST}/doc; ${INSTALL_MAN} radiusd.8 ${PREFIX}/man/man8
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiusd-cistron
-	@cd ${WRKDIST}/doc; cp README* ${PREFIX}/share/doc/radiusd-cistron
+	${INSTALL_MAN} ${WRKDIST}/doc/naslist.5rad ${PREFIX}/man/man5/naslist.5
+	${INSTALL_MAN} ${WRKDIST}/doc/clients.5rad ${PREFIX}/man/man5/clients.5
+	${INSTALL_MAN} ${WRKDIST}/doc/builddbm.8rad \
+		${PREFIX}/man/man8/builddbm.8
+	${INSTALL_MAN} ${WRKDIST}/doc/radiusd.8 ${PREFIX}/man/man8
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiusd-cistron
+	@for file in ${WRKDIST}/doc/README* ; do \
+		${INSTALL_DATA} $$file ${PREFIX}/share/doc/radiusd-cistron; \
+	done
 
 .include <bsd.port.mk>

net/radiusd-cistron/patches/patch-ac

@@ -1,12 +0,0 @@
---- src/version.c.orig	Wed May  3 21:28:50 2000
-+++ src/version.c	Wed May  3 21:29:29 2000
-@@ -90,6 +90,9 @@
- #if defined(bsdi)
- 	fprintf(stderr," bsdi");
- #endif
-+#if defined(__OpenBSD__)
-+	fprintf(stderr," openbsd");
-+#endif
- #if defined(sun)
- 	fprintf(stderr," sun");
- #endif

net/radiusd-cistron/patches/patch-src_acct_c

@@ -1,6 +1,7 @@
+$OpenBSD: patch-src_acct_c,v 1.1 2000/07/13 00:25:52 danh Exp $
 --- src/acct.c.orig	Thu Mar  2 08:24:45 2000
-+++ src/acct.c	Wed May  3 21:25:29 2000
-@@ -598,7 +598,7 @@
++++ src/acct.c	Wed Jul 12 01:28:45 2000
+@@ -598,7 +598,7 @@ int rad_accounting_orig(AUTH_REQ *authre
  	VALUE_PAIR	*pair;
  	UINT4		nas;
  	NAS		*cl;
@@ -9,7 +10,7 @@
  	int		ret = 0;
  	struct stat	st;
  
-@@ -670,7 +670,7 @@
+@@ -670,7 +670,7 @@ int rad_accounting_orig(AUTH_REQ *authre
  		/*
  		 *	Add non-protocol attibutes.
  		 */

net/radiusd-cistron/patches/patch-src_sysdep_h

@@ -1,6 +1,7 @@
---- src/sysdep.h.old	Wed May  3 21:19:34 2000
-+++ src/sysdep.h	Wed May  3 21:21:33 2000
-@@ -20,7 +20,7 @@
+$OpenBSD: patch-src_sysdep_h,v 1.1 2000/07/13 00:25:52 danh Exp $
+--- src/sysdep.h.orig	Wed Mar 29 09:47:14 2000
++++ src/sysdep.h	Wed Jul 12 01:34:55 2000
+@@ -20,7 +20,7 @@ typedef unsigned long	UINT4;
  #include        <string.h>
  #endif
  
@@ -9,21 +10,17 @@
  # include        <stdlib.h>
  #else
  # include        <malloc.h>
-@@ -58,9 +58,16 @@
- #    define __hpux__
+@@ -64,5 +64,13 @@ typedef unsigned long	UINT4;
  #  endif
+ #  define ut_user ut_name
  #endif
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi) 
- #  ifndef UTMP_FILE
- #    define UTMP_FILE "/var/run/utmp"
-+#  endif
-+#  define ut_user ut_name
-+#endif
 +#if defined(__OpenBSD__)
 +#  include <utmp.h>
 +#  ifndef UTMP_FILE
 +#    define UTMP_FILE _PATH_UTMP
- #  endif
- #  define ut_user ut_name
- #endif
++#  endif
++#  define ut_user ut_name
++#endif
++
+ 
+ #endif /* SYSDEP_H_INCLUDED */

net/radiusd-cistron/patches/patch-src_version_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_version_c,v 1.1 2000/07/13 00:25:52 danh Exp $
+--- src/version.c.orig	Sun Apr  2 11:58:14 2000
++++ src/version.c	Wed Jul 12 01:28:45 2000
+@@ -90,6 +90,9 @@ void version(void)
+ #if defined(bsdi)
+ 	fprintf(stderr," bsdi");
+ #endif
++#if defined(__OpenBSD__)
++	fprintf(stderr," openbsd");
++#endif
+ #if defined(sun)
+ 	fprintf(stderr," sun");
+ #endif

net/radiusd-cistron/pkg/DESCR

@@ -1,8 +1,3 @@
-  This is version 1.6.3 of the Cistron Radius daemon. Most of
-  the code was taken from radius-1.16 by Livingston Enterprises,
-  available from ftp.livingston.com.  It is taken from the 1.5.4.3
-  release, with a few patches.
-
   The server is mostly compatible with livingston radiusd-2.01
   (no menus or s/key support though) but with more feautures, such as:
 
@@ -20,3 +15,4 @@
     o Supports Vendor-Specific attributes
     o No good documentation at all, just like the original radiusd 
 
+WWW: ${HOMEPAGE}

net/radiusd-cistron/pkg/MESSAGE

@@ -2,14 +2,14 @@
 | The RADIUS configuration files belong in /etc/raddb.  Examples
 | and extra documentation can be found in the following locations:
 |
-|     /usr/local/share/examples/radiusd-cistron
-|     /usr/local/share/doc/radiusd-cistron.
+|     ${PREFIX}/share/examples/radiusd-cistron
+|     ${PREFIX}/share/doc/radiusd-cistron
 |
 | You will need to edit /etc/rc.local as appropriate and add a
 | section similiar to the following:
 |
-|     if [ -x /usr/local/sbin/radiusd ]; then
-|             /usr/local/sbin/radiusd -y && echo -n ' radiusd'
+|     if [ -x ${PREFIX}/sbin/radiusd ]; then
+|             ${PREFIX}/sbin/radiusd -y && echo -n ' radiusd'
 |     fi
 |
 | (see radiusd(8) for available options)