svn commit: r319422 - in head/net/miredo: . files
Munechika SUMIKAWA
sumikawa at FreeBSD.org
Thu May 30 12:48:44 UTC 2013
Author: sumikawa
Date: Thu May 30 12:48:42 2013
New Revision: 319422
URL: http://svnweb.freebsd.org/changeset/ports/319422
Log:
Upgrade to 1.2.6.
Added:
head/net/miredo/files/miredo-server.in
- copied, changed from r315928, head/net/miredo/files/miredo_server.in
Deleted:
head/net/miredo/files/miredo_server.in
Modified:
head/net/miredo/Makefile
head/net/miredo/distinfo
head/net/miredo/files/patch-misc_Makefile.in
head/net/miredo/pkg-plist
Modified: head/net/miredo/Makefile
==============================================================================
--- head/net/miredo/Makefile Thu May 30 12:43:02 2013 (r319421)
+++ head/net/miredo/Makefile Thu May 30 12:48:42 2013 (r319422)
@@ -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 t
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
Modified: head/net/miredo/distinfo
==============================================================================
--- head/net/miredo/distinfo Thu May 30 12:43:02 2013 (r319421)
+++ head/net/miredo/distinfo Thu May 30 12:48:42 2013 (r319422)
@@ -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
Copied and modified: head/net/miredo/files/miredo-server.in (from r315928, head/net/miredo/files/miredo_server.in)
==============================================================================
--- head/net/miredo/files/miredo_server.in Wed Apr 17 05:45:56 2013 (r315928, copy source)
+++ head/net/miredo/files/miredo-server.in Thu May 30 12:48:42 2013 (r319422)
@@ -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
Modified: head/net/miredo/files/patch-misc_Makefile.in
==============================================================================
--- head/net/miredo/files/patch-misc_Makefile.in Thu May 30 12:43:02 2013 (r319421)
+++ head/net/miredo/files/patch-misc_Makefile.in Thu May 30 12:48:42 2013 (r319422)
@@ -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"; \
Modified: head/net/miredo/pkg-plist
==============================================================================
--- head/net/miredo/pkg-plist Thu May 30 12:43:02 2013 (r319421)
+++ head/net/miredo/pkg-plist Thu May 30 12:48:42 2013 (r319422)
@@ -15,11 +15,13 @@ include/libteredo/teredo.h
include/libteredo/teredo-udp.h
include/libteredo/tunnel.h
include/libtun6/tun6.h
- at 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
- at exec [ -f %B/miredo/miredo.conf ] || cp %F %B/miredo/miredo.conf
+ at 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
+ at exec [ -f %B/miredo.conf ] || cp %F %B/miredo.conf
+ at 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
+ at 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
More information about the svn-ports-all
mailing list