svn commit: r306297 - in head/net/miredo: . files

[Munechika SUMIKAWA]

Author: sumikawa
Date: Tue Oct 23 07:55:30 2012
New Revision: 306297
URL: http://svn.freebsd.org/changeset/ports/306297

Log:
  - Use --enable-examplesdir
  - draft-ietf-6man-rfc3484bis now becomes RFC6724
  
  PR:             ports/165796
  Submitted by:   Tobias Rehbein <tobias.rehbein at web.de>
  Feature safe:	yes

Modified:
  head/net/miredo/Makefile
  head/net/miredo/files/ip6addrctl.conf
  head/net/miredo/pkg-plist

Modified: head/net/miredo/Makefile
==============================================================================
--- head/net/miredo/Makefile	Tue Oct 23 07:42:46 2012	(r306296)
+++ head/net/miredo/Makefile	Tue Oct 23 07:55:30 2012	(r306297)
@@ -7,7 +7,7 @@
 
 PORTNAME=		miredo
 PORTVERSION=	 	1.2.5
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		net ipv6
 MASTER_SITES=		http://www.remlab.net/files/miredo/archive/
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=		Judy.1:${PORTSDIR}/devel/j
 
 USE_XZ=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--localstatedir=/var
+CONFIGURE_ARGS=		--localstatedir=/var --enable-examplesdir=$(EXAMPLESDIR)
 USE_LDCONFIG=		yes
 
 OPTIONS=		POLICYTABLE	"Install policy table to support teredo"	off

Modified: head/net/miredo/files/ip6addrctl.conf
==============================================================================
--- head/net/miredo/files/ip6addrctl.conf	Tue Oct 23 07:42:46 2012	(r306296)
+++ head/net/miredo/files/ip6addrctl.conf	Tue Oct 23 07:55:30 2012	(r306297)
@@ -1,5 +1,5 @@
-# Revised default policy table to support teredo defined in the below draft
-# http://tools.ietf.org/id/draft-ietf-6man-rfc3484bis-06.txt
+# Revised default policy table to support teredo defined in RFC6724
+# http://www.rfc-editor.org/rfc/rfc6724.txt
 ::1/128               50     0
 ::/0                  40     1
 ::ffff:0:0/96         35     4

Modified: head/net/miredo/pkg-plist
==============================================================================
--- head/net/miredo/pkg-plist	Tue Oct 23 07:42:46 2012	(r306296)
+++ head/net/miredo/pkg-plist	Tue Oct 23 07:55:30 2012	(r306297)
@@ -15,16 +15,15 @@ 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/%%DOCSDIR%%/examples/miredo.conf && rm %D/etc/miredo/miredo.conf || true
+ 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
 @exec [ -f %B/miredo/miredo.conf ] || cp %F %B/miredo/miredo.conf
-%%DOCSDIR%%/examples/miredo-server.conf
-%%DOCSDIR%%/examples/miredo.conf
+%%EXAMPLESDIR%%/miredo.conf
+%%EXAMPLESDIR%%/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
- at dirrm %%DOCSDIR%%/examples
- at dirrm %%DOCSDIR%%
+ at dirrm %%EXAMPLESDIR%%
 @dirrmtry etc/miredo
 @dirrm include/libtun6
 @dirrm include/libteredo