Make this package build again. Fixes PR pkg/8891 by Damon Brodie.

3 files changed, 38 insertions, 23 deletions

diff --git a/net/radius/Makefile b/net/radius/Makefile
index e402b5fb286..415ab9090a8 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -1,34 +1,34 @@
-# $NetBSD: Makefile,v 1.13 1999/09/14 02:32:26 kim Exp $
+# $NetBSD: Makefile,v 1.14 1999/12/05 22:46:42 tron Exp $
 #
 # Tempted to install another radius package?
 #
 #	Please consider e-mailing ${MAINTAINER} first with your concerns.
 #	It would be nice to just fold new extensions into this code, and
 #	avoid a myriad of incompatible radiusd incarnations.
-#
 
-DISTNAME=	radius-3.6B
+DISTNAME=	radius.3.6B
+PKGNAME=	${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.merit.edu/radius/releases/ \
 		http://www.mr.net/~bradley/radius/
-DISTFILES=	radius.3.6B.basic.tar.gz \
-		radius.3.6B-skey.tar.gz \
-		radius.3.6B-ftp.tar \
-		radius.3.6B-simultd.tar
+DISTFILES=	${DISTNAME}.basic.tar.gz \
+		${DISTNAME}-skey.tar.gz \
+		${DISTNAME}-ftp.tar \
+		${DISTNAME}-simultd.tar
 
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.merit.edu/aaa/
 
-DECOMPRESS_CMD=	${GZCAT} -f
 DIST_SUBDIR=	radius
-INSTALL_TARGET=	man-install install util-install config-install
-MESSAGE_FILE=   ${WRKDIR}/MESSAGE
-WRKSRC=		${WRKDIR}
 
 CFLAGS+=	-DHAVE_SETVBUF -DNOSHADOW
+DECOMPRESS_CMD=	${GZCAT} -f
+INSTALL_TARGET=	man-install install util-install config-install
 MAKE_ENV+=	RADLIBS="${RADLIBS} -lskey" LIBS=-lcrypt \
 		GNUZIP="`${ECHO} ${GZIP_CMD} | ${AWK} '{print $$1}'`" \
 		INSTALL="${INSTALL} -c"
+MESSAGE_FILE=   ${WRKDIR}/MESSAGE
+WRKSRC=		${WRKDIR}
 
 # XXX Kerberos IV support is known to be broken.
 #.if defined(KERBEROS) && ${KERBEROS} == 4
@@ -40,8 +40,10 @@ MAKE_ENV+=	RADLIBS="${RADLIBS} -lskey" LIBS=-lcrypt \
 .include "../../mk/bsd.prefs.mk"
 
 pre-patch:
-.for FILE in prediff rad.ftp rad.simult rad.skey
-	@cd ${WRKSRC}; ${PATCH} -sp <${FILE}.diff
+.for FILE in prediff rad.simult rad.ftp rad.skey
+	@cd ${WRKSRC} && \
+	${SED} -e 's#^--- ${DISTNAME}.patched/#--- #' ${FILE}.diff | \
+	${PATCH} -s
 .endfor
 
 post-build:
diff --git a/net/radius/files/patch-sum b/net/radius/files/patch-sum
index ddfb8e070e5..deff21962a9 100644
--- a/net/radius/files/patch-sum
+++ b/net/radius/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:27 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/12/05 22:46:45 tron Exp $
 
-MD5 (patch-aa) = b02e16e1847f7741ed021929b12351a9
+MD5 (patch-aa) = 5df18b1c6c2502cf9a3e97263d3e8146
 MD5 (patch-ab) = a2269194a11069fbe29ad2c16410f42a
 MD5 (patch-ac) = 5a9588d4690d4ef121e72d3e6bd4c47c
 MD5 (patch-ad) = c392b80190ad6c4dec2b5e82c6d5f5db
diff --git a/net/radius/patches/patch-aa b/net/radius/patches/patch-aa
index 31babffd78e..776c82b738f 100644
--- a/net/radius/patches/patch-aa
+++ b/net/radius/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1999/04/24 23:47:09 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/12/05 22:46:45 tron Exp $
 
---- Makefile.orig	Sun Apr 25 01:43:46 1999
-+++ Makefile	Sun Apr 25 01:44:41 1999
+--- Makefile.orig	Sun Dec  5 23:41:31 1999
++++ Makefile	Sun Dec  5 23:43:38 1999
 @@ -51,11 +51,12 @@
  # Where the configuration files live.
  RADDB		= ./raddb
@@ -68,16 +68,29 @@ $NetBSD: patch-aa,v 1.3 1999/04/24 23:47:09 tron Exp $
  #
  #--------------------------------------------------------------------------
 -DEFS	  = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \
-+#DEFS	  = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \
- # end local defs additions
+-            -DMODVERSION
 -RADLIBS	  = ./logdaemon-5.6/skey/libskey.a
 -INCS	  = -I./logdaemon-5.6/skey
++#DEFS	  = -DHAVE_SETVBUF -DNOSHADOW $(MERIT) $(STUFF) \
++#            -DMODVERSION
 +#RADLIBS	  = ./logdaemon-5.6/skey/libskey.a
 +#INCS	  = -I./logdaemon-5.6/skey
  
  #
  # mkerb
-@@ -237,12 +238,12 @@
+@@ -186,9 +187,9 @@
+ 	$(OBJ)/fsm.o $(OBJ)/fwd2nas.o $(OBJ)/nas_reb.o $(OBJ)/res_qry.o       \
+ 	$(OBJ)/rf_req.o $(OBJ)/rf_resp.o $(OBJ)/arades.o $(OBJ)/cache.o       \
+ 	$(OBJ)/pooladdr.o $(OBJ)/rad.bsd.o                                    \
++	$(OBJ)/rad.simult.o \
+ 	$(OBJ)/rad.skey.o \
+-	$(OBJ)/rad.ftp.o \
+-	$(OBJ)/modversion.o
++	$(OBJ)/rad.ftp.o
+ 
+ LIB_OBJS  = $(OBJ)/des.o $(OBJ)/dict.o $(OBJ)/filters.o $(OBJ)/funcs.o        \
+ 	$(OBJ)/md5.o $(OBJ)/sendserver.o $(OBJ)/users.o $(OBJ)/resources.o    \
+@@ -236,12 +237,12 @@
  #
  #--------------------------------------------------------------------------
  
@@ -96,7 +109,7 @@ $NetBSD: patch-aa,v 1.3 1999/04/24 23:47:09 tron Exp $
  
  #
  # Solaris 2.x [[NB: if BIND/named not SMCC, try CFLAGS = ... -DBSD=1 ...]]
-@@ -439,6 +440,8 @@
+@@ -438,6 +439,8 @@
  
  # You must un-comment one, and only one, of the above sections!
  
@@ -105,7 +118,7 @@ $NetBSD: patch-aa,v 1.3 1999/04/24 23:47:09 tron Exp $
  # No modifications are necessary below this line except possibly near line 500.
  
  all:	notice $(RADIUS) utils
-@@ -697,26 +700,26 @@
+@@ -696,26 +699,26 @@
  						$(MAN_INSDIR)/man8/radpwtst.8
  
  config-install: $(CONFIGS)