client-hook isn't an rc.d script, and the binary doesn't look for it in

that location anyway.  Add it to CONF_FILES instead.  Fixes builds with
INIT_SYSTEM=rc.d.

Bump PKGREVISION.

4 files changed, 13 insertions, 9 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 2ea9bb980d5..5790a12bfbb 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2013/02/06 19:30:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2014/05/06 14:59:18 jperkin Exp $
 
 DISTNAME=	miredo-1.2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.remlab.net/files/miredo/
 EXTRACT_SUFX=	.tar.bz2
@@ -26,6 +26,7 @@ EGDIR=		${PREFIX}/share/examples/miredo
 CONF_FILES=	${EGDIR}/miredo.conf ${PKG_SYSCONFDIR}/miredo.conf
 CONF_FILES+=	${EGDIR}/miredo-server.conf \
 		${PKG_SYSCONFDIR}/miredo-server.conf
+CONF_FILES+=	${EGDIR}/client-hook ${PKG_SYSCONFDIR}/client-hook
 
 RCD_SCRIPTS=	miredo
 
diff --git a/net/miredo/PLIST b/net/miredo/PLIST
index 633a350261c..44b3f587557 100644
--- a/net/miredo/PLIST
+++ b/net/miredo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2014/03/11 14:05:09 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/05/06 14:59:18 jperkin Exp $
 bin/teredo-mire
 include/libteredo/teredo-udp.h
 include/libteredo/teredo.h
@@ -16,5 +16,6 @@ man/man8/miredo.8
 sbin/miredo
 sbin/miredo-checkconf
 sbin/miredo-server
+share/examples/miredo/client-hook
 share/examples/miredo/miredo-server.conf
 share/examples/miredo/miredo.conf
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index d65dd848b56..9864f3561f1 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2012/12/25 21:04:15 joerg Exp $
+$NetBSD: distinfo,v 1.13 2014/05/06 14:59:18 jperkin Exp $
 
 SHA1 (miredo-1.2.2.tar.bz2) = 9facd2ef23ae7a9969dfbe179a6c3ebddd87a2cc
 RMD160 (miredo-1.2.2.tar.bz2) = 16c9ec08d5ae935027a49153dc44745e2cc916c7
 Size (miredo-1.2.2.tar.bz2) = 529200 bytes
 SHA1 (patch-ab) = b9b1ed3d47ebe992e3eb33dec46a7419273e7d3c
-SHA1 (patch-ah) = 2091460b84a8a84a4e7595e5ec4fa13b03287c4f
+SHA1 (patch-ah) = 306c1a289d5a0221231a25b427a754ffc308f814
 SHA1 (patch-libteredo_tunnel.h) = 0706d37f83d94b1b3b4dfedaf5e484a4dcc2eb4a
diff --git a/net/miredo/patches/patch-ah b/net/miredo/patches/patch-ah
index 1e9294db976..618b827f875 100644
--- a/net/miredo/patches/patch-ah
+++ b/net/miredo/patches/patch-ah
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2010/06/15 23:49:30 pettai Exp $
+$NetBSD: patch-ah,v 1.3 2014/05/06 14:59:18 jperkin Exp $
+
+Install client-hook to the correct location.
 
 --- misc/Makefile.in.orig	2009-11-05 20:03:42.000000000 +0100
 +++ misc/Makefile.in	2010-06-08 23:15:53.000000000 +0200
@@ -7,7 +9,7 @@ $NetBSD: patch-ah,v 1.2 2010/06/15 23:49:30 pettai Exp $
  install-confSCRIPTS: $(conf_SCRIPTS)
  	@$(NORMAL_INSTALL)
 -	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
-+	test -z "$(examplesdir)/../rc.d" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)/../rc.d"
++	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
  	@list='$(conf_SCRIPTS)'; test -n "$(confdir)" || list=; \
  	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -17,8 +19,8 @@ $NetBSD: patch-ah,v 1.2 2010/06/15 23:49:30 pettai Exp $
  	     test -z "$$files" || { \
 -	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(confdir)$$dir'"; \
 -	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(confdir)$$dir" || exit $$?; \
-+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(examplesdir)/../rc.d/$$dir'"; \
-+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(examplesdir)/../rc.d/$$dir" || exit $$?; \
++	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(examplesdir)$$dir'"; \
++	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(examplesdir)$$dir" || exit $$?; \
  	     } \
  	; done