Make two patches apply cleanly again (whatever happened here...).

Use RCD_SCRIPTS for gated rc.d script. Set USE_BUILDLINK3. Add missing dirrm to PLIST.

5 files changed, 26 insertions, 23 deletions

diff --git a/net/gated/Makefile b/net/gated/Makefile
index 72b4a92f516..5a9bff86f71 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 22:51:11 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/07/10 21:00:00 wiz Exp $
 # FreeBSD Id: Makefile,v 1.17 1998/04/26 18:47:12 peter Exp
 #
 
@@ -19,13 +19,16 @@ NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+RCD_SCRIPTS=		gated
+RCD_SCRIPT_SRC.gated=	${FILESDIR}/gated
+
 ALL_TARGET=	gated
 
 post-extract:
 	@${SED} -e 's#@PREFIX@#${PREFIX}#' <${FILESDIR}/configuration \
 	    >${WRKSRC}/src/configs/netbsd
-	${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/gated \
-		> ${WRKDIR}/gated
 
 do-configure:
 	cd ${WRKSRC}/src; 						\
@@ -39,6 +42,5 @@ post-install:
 	cd ${WRKSRC}/doc && ${PAX} -rw -pe . ${PREFIX}/share/doc/gated
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/doc/gated
 	${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/doc/gated
-	${INSTALL_SCRIPT} ${WRKDIR}/gated ${PREFIX}/etc/rc.d
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gated/PLIST b/net/gated/PLIST
index d6b9a7cc923..064e230ef39 100644
--- a/net/gated/PLIST
+++ b/net/gated/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:24 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/07/10 21:00:00 wiz Exp $
 bin/gdc
 bin/ospf_monitor
 bin/ripquery
@@ -99,3 +99,4 @@ share/doc/gated/warning.gif
 @dirrm share/doc/gated/member_info/membership
 @dirrm share/doc/gated/member_info
 @dirrm share/doc/gated/operation_guide
+@dirrm share/doc/gated
diff --git a/net/gated/distinfo b/net/gated/distinfo
index 18aa6c7c5e5..177f651ea10 100644
--- a/net/gated/distinfo
+++ b/net/gated/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2003/12/06 01:52:10 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2004/07/10 21:00:00 wiz Exp $
 
 SHA1 (gated-3-5-11.tar.gz) = a6abdc59beb881dee06c9433b690fa6eab99fe07
 Size (gated-3-5-11.tar.gz) = 1565263 bytes
-SHA1 (patch-aa) = bd025a19b4a8bff4ed080a4b30524adfd48a7de6
-SHA1 (patch-ab) = 55043a19003b28c3a23d8281733341786a0e1936
+SHA1 (patch-aa) = a20b1fec1c1a4ae559610457ad7b0d6cb01b9b51
+SHA1 (patch-ab) = cd5c46845530d6c746e5255fb7685ce5da6c1de3
 SHA1 (patch-ad) = 0338ffe0160d72daf45c1fb641cae7baee82e13e
 SHA1 (patch-ae) = c02081fa9281cbe5adfab53f24c3c662fcdf9beb
 SHA1 (patch-af) = 3b27a9b1e13533f4dd6dc6c2dc7d23c0a3ae725e
diff --git a/net/gated/patches/patch-aa b/net/gated/patches/patch-aa
index 448da42bc05..43ece4d4b79 100644
--- a/net/gated/patches/patch-aa
+++ b/net/gated/patches/patch-aa
@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.3 1999/07/06 06:35:47 christos Exp $
+$NetBSD: patch-aa,v 1.4 2004/07/10 21:00:00 wiz Exp $
 
---- src/configs/netbsd.orig	Tue Jul  6 01:34:41 1999
-+++ src/configs/netbsd	Tue Jul  6 01:35:20 1999
-@@ -11,8 +11,8 @@
+--- src/configs/netbsd.orig	2004-07-10 22:21:01.000000000 +0200
++++ src/configs/netbsd
+@@ -11,8 +11,8 @@ mantype bsd42
  
- cc      cc
+ cc	cc
  #cflags -g
 -cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow
--cflags  -O -g
+-cflags	-O -g
 +#cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow
-+cflags  -O -g -DUSE_MMAP
++cflags	-O -g -DUSE_MMAP
  
  ldflags -lkvm
  
-@@ -40,4 +40,4 @@
- path_version    /var/run/%s.version
+@@ -40,4 +40,4 @@ path_pid	/var/run/%s.pid
+ path_version	/var/run/%s.version
  path_unix	/netbsd
  
 -protocols	bgp egp hello icmp rip ospf iso slsp isis rdisc
diff --git a/net/gated/patches/patch-ab b/net/gated/patches/patch-ab
index ea2e497a7b6..fc952d24794 100644
--- a/net/gated/patches/patch-ab
+++ b/net/gated/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:10:39 agc Exp $
+$NetBSD: patch-ab,v 1.3 2004/07/10 21:00:00 wiz Exp $
 
---- src/task.c.orig	Fri Jul 18 06:45:02 1997
-+++ src/task.c	Wed Oct  1 21:40:45 1997
-@@ -5868,12 +5868,20 @@
+--- src/task.c.orig	1999-02-18 00:32:18.000000000 +0100
++++ src/task.c
+@@ -5903,12 +5903,20 @@ task_daemonize __PF0(void)
  	}
  
  	/* Remove our association with a controling tty */
@@ -24,7 +24,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:10:39 agc Exp $
  
  	task_signal_ignore(SIGHUP);
  
-@@ -5892,7 +5900,7 @@
+@@ -5927,7 +5935,7 @@ task_daemonize __PF0(void)
  	    /* Parent */
  	    exit(0);
  	}
@@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:10:39 agc Exp $
  	t = setpgrp(0, getpid());
  	if (t < 0) {
  	    perror("task_daemonize: setpgrp");
-@@ -5907,7 +5915,7 @@
+@@ -5942,7 +5950,7 @@ task_daemonize __PF0(void)
  	    }
  	    (void) close(t);
  	}