Update to 2.8. Changes:

o The code is now modularised. The distribution contains 'Mirmon.pm',
  an OO interface for mirmon objects. Program 'mirmon' still contains
  all the code ; it is split into 'Mirmon.pm' and 'mirmon.pl'.

o The mirror list can now have rsync urls.
o The algorithm to balance the probe load over the hourly mirmon runs
  is improved ; from completely skewed to balanced takes some 5 days.

5 files changed, 59 insertions, 103 deletions

diff --git a/misc/mirmon/Makefile b/misc/mirmon/Makefile
index d7fa865c1e0..7c413b65b7d 100644
--- a/misc/mirmon/Makefile
+++ b/misc/mirmon/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2013/05/31 12:41:27 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/07/21 10:44:03 shattered Exp $
 #
 
-DISTNAME=		mirmon-1.36
-PKGREVISION=		2
+DISTNAME=		mirmon-2.8
 CATEGORIES=		misc
-MASTER_SITES=		http://people.cs.uu.nl/henkp/mirmon/src/
+MASTER_SITES=		http://www.staff.science.uu.nl/~penni101/mirmon/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://people.cs.uu.nl/henkp/mirmon/
+HOMEPAGE=		http://www.staff.science.uu.nl/~penni101/mirmon/
 COMMENT=		Monitor the state of mirror servers
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/misc/mirmon/PLIST b/misc/mirmon/PLIST
index f0ed47745d8..4da923734ce 100644
--- a/misc/mirmon/PLIST
+++ b/misc/mirmon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:07:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/07/21 10:44:03 shattered Exp $
 bin/mirmon
 man/man1/mirmon.1
 share/examples/mirmon/mirmon.conf
@@ -106,3 +106,5 @@ share/mirmon/icons/mmz11.gif
 share/mirmon/icons/mmz12.gif
 share/mirmon/icons/mmz13.gif
 share/mirmon/icons/mmz14.gif
+share/mirmon/icons/vbrb.gif
+share/mirmon/icons/vbrw.gif
diff --git a/misc/mirmon/distinfo b/misc/mirmon/distinfo
index 32016fca949..89bca15c52e 100644
--- a/misc/mirmon/distinfo
+++ b/misc/mirmon/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/21 13:15:22 heinz Exp $
+$NetBSD: distinfo,v 1.2 2013/07/21 10:44:03 shattered Exp $
 
-SHA1 (mirmon-1.36.tar.gz) = 035e4e2d125c4d260a9348c1c29cc7365afdefbf
-RMD160 (mirmon-1.36.tar.gz) = d40d7843c4291afe33a788df4a719c1470bc87e3
-Size (mirmon-1.36.tar.gz) = 25858 bytes
-SHA1 (patch-aa) = 8a6c586269d4c08ed8fb97856d0bbd94f18a3141
-SHA1 (patch-ab) = bf7f76576b8ed125b1476b7a30e9b883819b4169
+SHA1 (mirmon-2.8.tar.gz) = d751d510525f69bc8d45292b18e6827d1189ae2f
+RMD160 (mirmon-2.8.tar.gz) = 2c0785e0be4d8a36a392d8fd71eae01895890271
+Size (mirmon-2.8.tar.gz) = 72061 bytes
+SHA1 (patch-ab) = 9ab2fd130a36b14c8c9200cb6fd36a80455ba0ee
diff --git a/misc/mirmon/patches/patch-aa b/misc/mirmon/patches/patch-aa
deleted file mode 100644
index e222dee1e45..00000000000
--- a/misc/mirmon/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/07/21 13:15:22 heinz Exp $
-
---- mirmon.orig	2006-07-20 11:03:07.000000000 +0200
-+++ mirmon
-@@ -1116,6 +1116,7 @@ sub get_date 
-     unless ( defined $time ) { return err $url, 'no time' ; }
- 
-     $time = ( split ' ', $time ) [ 0 ] ;
-+    $time = '' unless defined $time;
- 
-     if ( $time eq '' )
-       { err $url, "empty" ; }
diff --git a/misc/mirmon/patches/patch-ab b/misc/mirmon/patches/patch-ab
index 9676b4f3b83..f377c60a62e 100644
--- a/misc/mirmon/patches/patch-ab
+++ b/misc/mirmon/patches/patch-ab
@@ -1,82 +1,50 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/07/21 13:15:22 heinz Exp $
+$NetBSD: patch-ab,v 1.2 2013/07/21 10:44:03 shattered Exp $
 
---- countries.list.orig	2004-12-28 18:54:57.000000000 +0100
+--- countries.list.orig	2013-06-10 21:28:01.000000000 +0000
 +++ countries.list
 @@ -1,3 +1,4 @@
-+ac - ascension island

- ad - andorra

- ae - united arab emirates

- af - afghanistan

-@@ -14,6 +15,7 @@ at - austria
- au - australia

- aw - aruba

- az - azerbaijan

-+ax - aland islands

- ba - bosnia and herzegovina

- bb - barbados

- bd - bangladesh

-@@ -37,7 +39,7 @@ ca - canada
- cc - cocos (keeling) islands

- cd - congo, the democratic republic of the

- cf - central african republic

--cg - congo

-+cg - congo, republic of

- ch - switzerland

- ci - cote d'ivoire

- ck - cook islands

-@@ -65,6 +67,7 @@ eh - western sahara
- er - eritrea

- es - spain

- et - ethiopia

-+eu - european union

- fi - finland

- fj - fiji

- fk - falkland islands (malvinas)

-@@ -76,6 +79,7 @@ gb - united kingdom
- gd - grenada

- ge - georgia

- gf - french guiana

-+gg - guernsey

- gh - ghana

- gi - gibraltar

- gl - greenland

-@@ -98,12 +102,14 @@ hu - hungary
- id - indonesia

- ie - ireland

- il - israel

-+im - isle of man

- in - india

- io - british indian ocean territory

- iq - iraq

- ir - iran, islamic republic of

- is - iceland

- it - italy

-+je - jersey

- jm - jamaica

- jo - jordan

- jp - japan

-@@ -212,6 +218,7 @@ tl - timor-leste
- tm - turkmenistan

- tn - tunisia

- to - tonga

-+tp - east timor

- tr - turkey

- tt - trinidad and tobago

- tv - tuvalu

-@@ -219,7 +226,7 @@ tw - taiwan, province of china
- tz - tanzania, united republic of

- ua - ukraine

- ug - uganda

--uk - united kingdom
-+uk - united kingdom

- um - united states minor outlying islands

- us - united states

- uy - uruguay

-@@ -235,6 +242,7 @@ wf - wallis and futuna
- ws - samoa

- ye - yemen

- yt - mayotte

-+yu - yugoslavia

- za - south africa

- zm - zambia

- zw - zimbabwe

+ # based on : http://www.iso.org/iso/list-en1-semic-3.txt
++ac - ascension island
+ ad - Andorra
+ ae - United Arab Emirates
+@@ -40,7 +41,7 @@ ca - Canada
+ cc - Cocos (Keeling) Islands
+ cd - Congo
+ cf - Central African Republic
+-cg - Congo
++cg - Congo, Republic of
+ ch - Switzerland
+ ci - Côte d'Ivoire
+ ck - Cook Islands
+@@ -68,6 +69,7 @@ eh - Western Sahara
+ er - Eritrea
+ es - Spain
+ et - Ethiopia
++eu - European Union
+ fi - Finland
+ fj - Fiji
+ fk - Falkland Islands (Malvinas)
+@@ -207,6 +209,7 @@ so - Somalia
+ sr - Suriname
+ ss - South Sudan
+ st - Sao Tome and Principe
++su - Soviet Union
+ sv - El Salvador
+ sx - Sint Maarten (Dutch Part)
+ sy - Syrian Arab Republic
+@@ -222,6 +225,7 @@ tl - Timor-Leste
+ tm - Turkmenistan
+ tn - Tunisia
+ to - Tonga
++tp - East Timor
+ tr - Turkey
+ tt - Trinidad and Tobago
+ tv - Tuvalu
+@@ -245,6 +249,7 @@ wf - Wallis and Futuna
+ ws - Samoa
+ ye - Yemen
+ yt - Mayotte
++yu - Yugoslavia
+ za - South Africa
+ zm - Zambia
+ zw - Zimbabwe