- Upgrade to 1.2.2.

- Make compilable with build-in closefrom().

net/miredo/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		miredo
-PORTVERSION=	 	1.1.7
-PORTREVISION=		1
+PORTVERSION=	 	1.2.2
 CATEGORIES=		net ipv6
 MASTER_SITES=		http://www.remlab.net/files/miredo/archive/
 
@@ -38,10 +37,4 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=		NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700000
-BROKEN=		does not build
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

net/miredo/distinfo

@@ -1,3 +1,3 @@
-MD5 (miredo-1.1.7.tar.bz2) = 4fb5e7df6a6255528e4c5380401ad3ea
-SHA256 (miredo-1.1.7.tar.bz2) = ae4bf29022bc78447294dba61899d81478b39589f561759d343b640384aca3e8
-SIZE (miredo-1.1.7.tar.bz2) = 517231
+MD5 (miredo-1.2.2.tar.bz2) = a04a40c4b42869968e00495636ff6d82
+SHA256 (miredo-1.2.2.tar.bz2) = c0f597e3272975544c4d6f6296494ab17ff1e2dbdf58bd28d54e7fe1be365f9a
+SIZE (miredo-1.2.2.tar.bz2) = 529200

net/miredo/files/patch-libtun6-diag.c

@@ -1,14 +0,0 @@
---- libtun6/diag.c.orig	2009-07-16 02:16:51.000000000 +0900
-+++ libtun6/diag.c	2009-07-21 16:19:12.000000000 +0900
-@@ -98,10 +98,10 @@
- 			return -1;
- 	}
- #else
-+	const char tundev[] = "/dev/tun0";
- #if 1	/* BSD creates a tunnel even on stat() - skip diagnostics */
- 	return 0;
- #else
--	const char tundev[] = "/dev/tun0";
- 	struct stat st;
- 
- 	if (stat (tundev, &st) == 0)

net/miredo/files/patch-src-main.c

@@ -0,0 +1,20 @@
+--- src/main.c~	2009-12-02 11:09:42.000000000 +0900
++++ src/main.c	2009-12-02 11:10:23.000000000 +0900
+@@ -218,15 +218,13 @@
+ 	 * Those last 3 handles will be opened as /dev/null
+ 	 * by later daemon().
+ 	 */
+-	errno = 0;
+-	if (closefrom (3) && (errno != EBADF))
+-		return -1;
++	closefrom (3);
+ 
+ 	/*
+ 	 * Make sure 0, 1 and 2 are open.
+ 	 */
+ 	val = dup (2);
+-	if (val < 3)
++	if (val != 3)
+ 		return -1;
+ 	close (val);
+