5 files changed, 28 insertions, 15 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index d14fe82556a3..37d90aa2a92c 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		miredo
-PORTVERSION=	 	1.2.5
-PORTREVISION=		2
+PORTVERSION=	 	1.2.6
 CATEGORIES=		net ipv6
 MASTER_SITES=		http://www.remlab.net/files/miredo/archive/
 
@@ -23,7 +22,7 @@ POLICYTABLE_DESC=	Install policy table to support teredo
 MAN1=			teredo-mire.1
 MAN5=			miredo-server.conf.5 miredo.conf.5
 MAN8=			miredo-server.8 miredo.8 miredo-checkconf.8
-USE_RC_SUBR=		miredo_server miredo
+USE_RC_SUBR=		miredo-server miredo
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index 9ba62a086059..ec12c9f0060a 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (miredo-1.2.5.tar.xz) = 9d6c6aacfbde0e152481273cda4dc9a62f8724c4c941fa8e0806e89ab9992262
-SIZE (miredo-1.2.5.tar.xz) = 474236
+SHA256 (miredo-1.2.6.tar.xz) = fa26d2f4a405415833669e2e2e22677b225d8f83600844645d5683535ea43149
+SIZE (miredo-1.2.6.tar.xz) = 477668
diff --git a/net/miredo/files/miredo_server.in b/net/miredo/files/miredo-server.in
index 605e82f25e2e..0d49ad9ad66e 100644
--- a/net/miredo/files/miredo_server.in
+++ b/net/miredo/files/miredo-server.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 #
 
-# PROVIDE: miredo_server
+# PROVIDE: miredo-server
 # REQUIRE: NETWORKING
 # KEYWORD: shutdown
 
@@ -12,12 +12,12 @@
 #
 #miredo_server_enable="YES"
 #
-miredo_server_enable="${miredo_server_enable-NO}"
+miredo_server_enable="${miredo-server_enable-NO}"
 
 . /etc/rc.subr
 
-name=miredo_server
-rcvar=miredo_server_enable
+name=miredo-server
+rcvar=miredo-server_enable
 
 command=%%PREFIX%%/sbin/${name}
 required_files=%%PREFIX%%/etc/miredo/miredo-server.conf
diff --git a/net/miredo/files/patch-misc_Makefile.in b/net/miredo/files/patch-misc_Makefile.in
index 971d6203dc2e..a818e105d265 100644
--- a/net/miredo/files/patch-misc_Makefile.in
+++ b/net/miredo/files/patch-misc_Makefile.in
@@ -1,13 +1,25 @@
---- ./misc/Makefile.in.orig	2012-03-03 12:07:43.000000000 +0100
-+++ ./misc/Makefile.in	2012-03-06 21:44:16.210698683 +0100
-@@ -367,24 +367,11 @@
+--- misc/Makefile.in.orig	2013-05-24 00:51:51.000000000 +0900
++++ misc/Makefile.in	2013-05-30 21:43:05.059112147 +0900
+@@ -18,7 +18,7 @@
+ # Makefile.am - misc Makefile for miredo
+ 
+ # ***********************************************************************
+-# *  Copyright © 2004-2009 Rémi Denis-Courmont.                         *
++# *  Copyright 息 2004-2009 R辿mi Denis-Courmont.                         *
+ # *  This program is free software; you can redistribute and/or modify  *
+ # *  it under the terms of the GNU General Public License as published  *
+ # *  by the Free Software Foundation; version 2 of the license, or (at  *
+@@ -395,27 +395,11 @@
  	@list='$(examples_DATA)'; test -n "$(examplesdir)" || list=; \
  	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
  	dir='$(DESTDIR)$(examplesdir)'; $(am__uninstall_files_from_dir)
 -install-systemdDATA: $(systemd_DATA)
 -	@$(NORMAL_INSTALL)
--	test -z "$(systemddir)" || $(MKDIR_P) "$(DESTDIR)$(systemddir)"
 -	@list='$(systemd_DATA)'; test -n "$(systemddir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(systemddir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(systemddir)" || exit 1; \
+-	fi; \
 -	for p in $$list; do \
 -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -	  echo "$$d$$p"; \
diff --git a/net/miredo/pkg-plist b/net/miredo/pkg-plist
index 631e4db4ebfc..e6cea4478580 100644
--- a/net/miredo/pkg-plist
+++ b/net/miredo/pkg-plist
@@ -15,11 +15,13 @@ include/libteredo/teredo.h
 include/libteredo/teredo-udp.h
 include/libteredo/tunnel.h
 include/libtun6/tun6.h
-@unexec [ -f %D/etc/miredo/miredo.conf ] && cmp -s %D/etc/miredo/miredo.conf %D/%%%EXAMPLESDIR%%/miredo.conf && rm %D/etc/miredo/miredo.conf || true
 etc/miredo/client-hook
-@exec [ -f %B/miredo/miredo.conf ] || cp %F %B/miredo/miredo.conf
+@unexec [ -f %D/etc/miredo/miredo.conf ] && cmp -s %D/etc/miredo/miredo.conf %D/%%%EXAMPLESDIR%%/miredo.conf && rm %D/etc/miredo/miredo.conf || true
 %%EXAMPLESDIR%%/miredo.conf
+@exec [ -f %B/miredo.conf ] || cp %F %B/miredo.conf
+@unexec [ -f %D/etc/miredo/miredo-server.conf ] && cmp -s %D/etc/miredo/miredo-server.conf %D/%%%EXAMPLESDIR%%/miredo-server.conf && rm %D/etc/miredo/miredo-server.conf || true
 %%EXAMPLESDIR%%/miredo-server.conf
+@exec [ -f %B/miredo-server.conf ] || cp %F %B/miredo-server.conf
 %%NLS%%share/locale/en/LC_MESSAGES/miredo.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/miredo.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/miredo.mo