aboutsummaryrefslogtreecommitdiff
path: root/net/miredo
diff options
context:
space:
mode:
authorMunechika SUMIKAWA <sumikawa@FreeBSD.org>2013-06-11 03:42:47 +0000
committerMunechika SUMIKAWA <sumikawa@FreeBSD.org>2013-06-11 03:42:47 +0000
commite8db1107615d5a0082d1bf7736337c4d0eb1adac (patch)
tree56a032a4c812f06d1c1ad83c81ff0757bfff54ec /net/miredo
parent9e7a282ae05008c545914288e482f7fdf4c81305 (diff)
downloadports-e8db1107615d5a0082d1bf7736337c4d0eb1adac.tar.gz
ports-e8db1107615d5a0082d1bf7736337c4d0eb1adac.zip
- Remove unnecesary patch
- Fix @exec/@unexec on pkg-plist
Notes
Notes: svn path=/head/; revision=320529
Diffstat (limited to 'net/miredo')
-rw-r--r--net/miredo/Makefile4
-rw-r--r--net/miredo/files/patch-misc_Makefile.in9
-rw-r--r--net/miredo/pkg-plist4
3 files changed, 3 insertions, 14 deletions
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 322e7f0d1cd6..77d08bb2c1eb 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= miredo
-PORTVERSION= 1.2.6
-PORTREVISION= 1
+PORTVERSION= 1.2.6
+PORTREVISION= 2
CATEGORIES= net ipv6
MASTER_SITES= http://www.remlab.net/files/miredo/archive/
diff --git a/net/miredo/files/patch-misc_Makefile.in b/net/miredo/files/patch-misc_Makefile.in
index a818e105d265..98a03a91f708 100644
--- a/net/miredo/files/patch-misc_Makefile.in
+++ b/net/miredo/files/patch-misc_Makefile.in
@@ -1,14 +1,5 @@
--- 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|^.*/||'`; \
diff --git a/net/miredo/pkg-plist b/net/miredo/pkg-plist
index b35ac53b75d7..40ecf7438278 100644
--- a/net/miredo/pkg-plist
+++ b/net/miredo/pkg-plist
@@ -18,10 +18,8 @@ include/libtun6/tun6.h
etc/miredo/client-hook
@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
+@exec [ -f %D/etc/miredo/miredo.conf ] || cp %B/miredo.conf %D/etc/miredo/miredo.conf
%%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