- Update to 2.0

- Remove one tab between variables and values

5 files changed, 229 insertions, 31 deletions

diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index e72300394347..aba552a503b5 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -5,24 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=		link-monitor-applet
-PORTVERSION=		1.3
-PORTREVISION=	3
-CATEGORIES=		net ipv6
-MASTER_SITES=		${MASTER_SITE_SAVANNAH}
+PORTNAME=	link-monitor-applet
+PORTVERSION=	2.0
+CATEGORIES=	net ipv6
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	link-monitor
 
-MAINTAINER=		jylefort@FreeBSD.org
-COMMENT=		A GNOME applet displaying the round-trip time to one or more hosts
+MAINTAINER=	jylefort@FreeBSD.org
+COMMENT=	A GNOME applet displaying the round-trip time to one or more hosts
 
-USE_X_PREFIX=		yes
-USE_GNOME=		gnomehack gnomeprefix gnomepanel eel2
-GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -Wl,-export-dynamic"
+LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
 
-GCONF_SCHEMAS=		link-monitor-applet.schemas
-INSTALLS_OMF=		yes
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomeprefix gnomepanel eel2 librsvg2
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	link-monitor-applet.schemas
+INSTALLS_OMF=	yes
 
 .include <bsd.port.mk>
diff --git a/net/link-monitor-applet/distinfo b/net/link-monitor-applet/distinfo
index d0d218cf6baa..73c187a54a98 100644
--- a/net/link-monitor-applet/distinfo
+++ b/net/link-monitor-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (link-monitor-applet-1.3.tar.gz) = 2ffa5473258069a276aa9ad60996f564
-SHA256 (link-monitor-applet-1.3.tar.gz) = fafa9d7169ddae7729f6d04673958afb1fe1457f4b3aba1df4a6af3d588bd93c
-SIZE (link-monitor-applet-1.3.tar.gz) = 198619
+MD5 (link-monitor-applet-2.0.tar.gz) = ce09e393924dd82e9efa4e620040d665
+SHA256 (link-monitor-applet-2.0.tar.gz) = 94b8dd1e7ff3022824c97fd8846f4af2a866ed5376f267f87fcc7712f8de89ed
+SIZE (link-monitor-applet-2.0.tar.gz) = 1065814
diff --git a/net/link-monitor-applet/files/patch-src_lm-util.c b/net/link-monitor-applet/files/patch-src_lm-util.c
deleted file mode 100644
index 4b3ae63c1ce2..000000000000
--- a/net/link-monitor-applet/files/patch-src_lm-util.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/lm-util.c.orig	Mon May  1 20:09:04 2006
-+++ src/lm-util.c	Mon May  1 20:09:10 2006
-@@ -273,8 +273,7 @@
- 				GTK_MESSAGE_ERROR,
- 				GTK_BUTTONS_OK,
- 				primary,
--				secondary,
--				NULL);
-+				secondary);
- 
-   if (blocking)
-     {
diff --git a/net/link-monitor-applet/pkg-descr b/net/link-monitor-applet/pkg-descr
index 39c0a09d34d5..6d8ce714031b 100644
--- a/net/link-monitor-applet/pkg-descr
+++ b/net/link-monitor-applet/pkg-descr
@@ -3,6 +3,8 @@ time to one or more hosts in a bar graph.
 
 Link Monitor Applet features include:
 
+	* Round-trip time plot graphs
+	* Country flags and names
 	* Full ICMP and ICMPv6 support
 	* Configurable scale and delays
 	* HIG 2.0 compliance
diff --git a/net/link-monitor-applet/pkg-plist b/net/link-monitor-applet/pkg-plist
index eaeff4024e54..e751e15183c5 100644
--- a/net/link-monitor-applet/pkg-plist
+++ b/net/link-monitor-applet/pkg-plist
@@ -6,13 +6,221 @@ share/gnome/help/link-monitor-applet/C/figures/link-monitor-applet-5hosts.png
 share/gnome/help/link-monitor-applet/C/figures/link-monitor-applet-empty.png
 share/gnome/help/link-monitor-applet/C/link-monitor-applet.xml
 share/gnome/help/link-monitor-applet/C/software-license.xml
-share/gnome/link-monitor-applet/ui/preferences.glade
+share/gnome/link-monitor-applet/flags/ad.svg
+share/gnome/link-monitor-applet/flags/ae.svg
+share/gnome/link-monitor-applet/flags/af.svg
+share/gnome/link-monitor-applet/flags/ag.svg
+share/gnome/link-monitor-applet/flags/ai.svg
+share/gnome/link-monitor-applet/flags/al.svg
+share/gnome/link-monitor-applet/flags/am.svg
+share/gnome/link-monitor-applet/flags/an.svg
+share/gnome/link-monitor-applet/flags/ao.svg
+share/gnome/link-monitor-applet/flags/ar.svg
+share/gnome/link-monitor-applet/flags/as.svg
+share/gnome/link-monitor-applet/flags/at.svg
+share/gnome/link-monitor-applet/flags/au.svg
+share/gnome/link-monitor-applet/flags/aw.svg
+share/gnome/link-monitor-applet/flags/az.svg
+share/gnome/link-monitor-applet/flags/ba.svg
+share/gnome/link-monitor-applet/flags/bb.svg
+share/gnome/link-monitor-applet/flags/bd.svg
+share/gnome/link-monitor-applet/flags/be.svg
+share/gnome/link-monitor-applet/flags/bf.svg
+share/gnome/link-monitor-applet/flags/bg.svg
+share/gnome/link-monitor-applet/flags/bh.svg
+share/gnome/link-monitor-applet/flags/bi.svg
+share/gnome/link-monitor-applet/flags/bj.svg
+share/gnome/link-monitor-applet/flags/bn.svg
+share/gnome/link-monitor-applet/flags/bo.svg
+share/gnome/link-monitor-applet/flags/br.svg
+share/gnome/link-monitor-applet/flags/bs.svg
+share/gnome/link-monitor-applet/flags/bt.svg
+share/gnome/link-monitor-applet/flags/bw.svg
+share/gnome/link-monitor-applet/flags/by.svg
+share/gnome/link-monitor-applet/flags/bz.svg
+share/gnome/link-monitor-applet/flags/ca.svg
+share/gnome/link-monitor-applet/flags/cd.svg
+share/gnome/link-monitor-applet/flags/cf.svg
+share/gnome/link-monitor-applet/flags/cg.svg
+share/gnome/link-monitor-applet/flags/ch.svg
+share/gnome/link-monitor-applet/flags/ci.svg
+share/gnome/link-monitor-applet/flags/ck.svg
+share/gnome/link-monitor-applet/flags/cl.svg
+share/gnome/link-monitor-applet/flags/cm.svg
+share/gnome/link-monitor-applet/flags/cn.svg
+share/gnome/link-monitor-applet/flags/co.svg
+share/gnome/link-monitor-applet/flags/cr.svg
+share/gnome/link-monitor-applet/flags/cs.svg
+share/gnome/link-monitor-applet/flags/cu.svg
+share/gnome/link-monitor-applet/flags/cv.svg
+share/gnome/link-monitor-applet/flags/cx.svg
+share/gnome/link-monitor-applet/flags/cy.svg
+share/gnome/link-monitor-applet/flags/cz.svg
+share/gnome/link-monitor-applet/flags/de.svg
+share/gnome/link-monitor-applet/flags/dj.svg
+share/gnome/link-monitor-applet/flags/dk.svg
+share/gnome/link-monitor-applet/flags/dm.svg
+share/gnome/link-monitor-applet/flags/do.svg
+share/gnome/link-monitor-applet/flags/dz.svg
+share/gnome/link-monitor-applet/flags/ec.svg
+share/gnome/link-monitor-applet/flags/ee.svg
+share/gnome/link-monitor-applet/flags/eg.svg
+share/gnome/link-monitor-applet/flags/eh.svg
+share/gnome/link-monitor-applet/flags/er.svg
+share/gnome/link-monitor-applet/flags/es.svg
+share/gnome/link-monitor-applet/flags/et.svg
+share/gnome/link-monitor-applet/flags/fi.svg
+share/gnome/link-monitor-applet/flags/fj.svg
+share/gnome/link-monitor-applet/flags/fm.svg
+share/gnome/link-monitor-applet/flags/fr.svg
+share/gnome/link-monitor-applet/flags/ga.svg
+share/gnome/link-monitor-applet/flags/gb.svg
+share/gnome/link-monitor-applet/flags/gd.svg
+share/gnome/link-monitor-applet/flags/ge.svg
+share/gnome/link-monitor-applet/flags/gh.svg
+share/gnome/link-monitor-applet/flags/gm.svg
+share/gnome/link-monitor-applet/flags/gn.svg
+share/gnome/link-monitor-applet/flags/gq.svg
+share/gnome/link-monitor-applet/flags/gr.svg
+share/gnome/link-monitor-applet/flags/gs.svg
+share/gnome/link-monitor-applet/flags/gt.svg
+share/gnome/link-monitor-applet/flags/gu.svg
+share/gnome/link-monitor-applet/flags/gw.svg
+share/gnome/link-monitor-applet/flags/gy.svg
+share/gnome/link-monitor-applet/flags/hn.svg
+share/gnome/link-monitor-applet/flags/hr.svg
+share/gnome/link-monitor-applet/flags/ht.svg
+share/gnome/link-monitor-applet/flags/hu.svg
+share/gnome/link-monitor-applet/flags/id.svg
+share/gnome/link-monitor-applet/flags/ie.svg
+share/gnome/link-monitor-applet/flags/il.svg
+share/gnome/link-monitor-applet/flags/in.svg
+share/gnome/link-monitor-applet/flags/iq.svg
+share/gnome/link-monitor-applet/flags/ir.svg
+share/gnome/link-monitor-applet/flags/is.svg
+share/gnome/link-monitor-applet/flags/it.svg
+share/gnome/link-monitor-applet/flags/jm.svg
+share/gnome/link-monitor-applet/flags/jo.svg
+share/gnome/link-monitor-applet/flags/jp.svg
+share/gnome/link-monitor-applet/flags/ke.svg
+share/gnome/link-monitor-applet/flags/kg.svg
+share/gnome/link-monitor-applet/flags/kh.svg
+share/gnome/link-monitor-applet/flags/ki.svg
+share/gnome/link-monitor-applet/flags/km.svg
+share/gnome/link-monitor-applet/flags/kn.svg
+share/gnome/link-monitor-applet/flags/kp.svg
+share/gnome/link-monitor-applet/flags/kr.svg
+share/gnome/link-monitor-applet/flags/kw.svg
+share/gnome/link-monitor-applet/flags/kz.svg
+share/gnome/link-monitor-applet/flags/la.svg
+share/gnome/link-monitor-applet/flags/lb.svg
+share/gnome/link-monitor-applet/flags/lc.svg
+share/gnome/link-monitor-applet/flags/li.svg
+share/gnome/link-monitor-applet/flags/lk.svg
+share/gnome/link-monitor-applet/flags/lr.svg
+share/gnome/link-monitor-applet/flags/ls.svg
+share/gnome/link-monitor-applet/flags/lt.svg
+share/gnome/link-monitor-applet/flags/lu.svg
+share/gnome/link-monitor-applet/flags/lv.svg
+share/gnome/link-monitor-applet/flags/ly.svg
+share/gnome/link-monitor-applet/flags/ma.svg
+share/gnome/link-monitor-applet/flags/mc.svg
+share/gnome/link-monitor-applet/flags/md.svg
+share/gnome/link-monitor-applet/flags/mg.svg
+share/gnome/link-monitor-applet/flags/mh.svg
+share/gnome/link-monitor-applet/flags/mk.svg
+share/gnome/link-monitor-applet/flags/ml.svg
+share/gnome/link-monitor-applet/flags/mm.svg
+share/gnome/link-monitor-applet/flags/mn.svg
+share/gnome/link-monitor-applet/flags/mp.svg
+share/gnome/link-monitor-applet/flags/mr.svg
+share/gnome/link-monitor-applet/flags/ms.svg
+share/gnome/link-monitor-applet/flags/mt.svg
+share/gnome/link-monitor-applet/flags/mu.svg
+share/gnome/link-monitor-applet/flags/mv.svg
+share/gnome/link-monitor-applet/flags/mw.svg
+share/gnome/link-monitor-applet/flags/mx.svg
+share/gnome/link-monitor-applet/flags/my.svg
+share/gnome/link-monitor-applet/flags/mz.svg
+share/gnome/link-monitor-applet/flags/na.svg
+share/gnome/link-monitor-applet/flags/ne.svg
+share/gnome/link-monitor-applet/flags/ng.svg
+share/gnome/link-monitor-applet/flags/ni.svg
+share/gnome/link-monitor-applet/flags/nl.svg
+share/gnome/link-monitor-applet/flags/no.svg
+share/gnome/link-monitor-applet/flags/np.svg
+share/gnome/link-monitor-applet/flags/nr.svg
+share/gnome/link-monitor-applet/flags/nu.svg
+share/gnome/link-monitor-applet/flags/nz.svg
+share/gnome/link-monitor-applet/flags/om.svg
+share/gnome/link-monitor-applet/flags/pa.svg
+share/gnome/link-monitor-applet/flags/pe.svg
+share/gnome/link-monitor-applet/flags/pg.svg
+share/gnome/link-monitor-applet/flags/ph.svg
+share/gnome/link-monitor-applet/flags/pk.svg
+share/gnome/link-monitor-applet/flags/pl.svg
+share/gnome/link-monitor-applet/flags/pn.svg
+share/gnome/link-monitor-applet/flags/pr.svg
+share/gnome/link-monitor-applet/flags/pt.svg
+share/gnome/link-monitor-applet/flags/pw.svg
+share/gnome/link-monitor-applet/flags/py.svg
+share/gnome/link-monitor-applet/flags/qa.svg
+share/gnome/link-monitor-applet/flags/ro.svg
+share/gnome/link-monitor-applet/flags/ru.svg
+share/gnome/link-monitor-applet/flags/rw.svg
+share/gnome/link-monitor-applet/flags/sa.svg
+share/gnome/link-monitor-applet/flags/sb.svg
+share/gnome/link-monitor-applet/flags/sc.svg
+share/gnome/link-monitor-applet/flags/sd.svg
+share/gnome/link-monitor-applet/flags/se.svg
+share/gnome/link-monitor-applet/flags/sg.svg
+share/gnome/link-monitor-applet/flags/si.svg
+share/gnome/link-monitor-applet/flags/sk.svg
+share/gnome/link-monitor-applet/flags/sl.svg
+share/gnome/link-monitor-applet/flags/sm.svg
+share/gnome/link-monitor-applet/flags/sn.svg
+share/gnome/link-monitor-applet/flags/so.svg
+share/gnome/link-monitor-applet/flags/sr.svg
+share/gnome/link-monitor-applet/flags/st.svg
+share/gnome/link-monitor-applet/flags/sv.svg
+share/gnome/link-monitor-applet/flags/sy.svg
+share/gnome/link-monitor-applet/flags/sz.svg
+share/gnome/link-monitor-applet/flags/td.svg
+share/gnome/link-monitor-applet/flags/tg.svg
+share/gnome/link-monitor-applet/flags/th.svg
+share/gnome/link-monitor-applet/flags/tj.svg
+share/gnome/link-monitor-applet/flags/tk.svg
+share/gnome/link-monitor-applet/flags/tm.svg
+share/gnome/link-monitor-applet/flags/tn.svg
+share/gnome/link-monitor-applet/flags/to.svg
+share/gnome/link-monitor-applet/flags/tp.svg
+share/gnome/link-monitor-applet/flags/tr.svg
+share/gnome/link-monitor-applet/flags/tt.svg
+share/gnome/link-monitor-applet/flags/tv.svg
+share/gnome/link-monitor-applet/flags/tz.svg
+share/gnome/link-monitor-applet/flags/ua.svg
+share/gnome/link-monitor-applet/flags/ug.svg
+share/gnome/link-monitor-applet/flags/us.svg
+share/gnome/link-monitor-applet/flags/uy.svg
+share/gnome/link-monitor-applet/flags/uz.svg
+share/gnome/link-monitor-applet/flags/va.svg
+share/gnome/link-monitor-applet/flags/vc.svg
+share/gnome/link-monitor-applet/flags/ve.svg
+share/gnome/link-monitor-applet/flags/vn.svg
+share/gnome/link-monitor-applet/flags/vu.svg
+share/gnome/link-monitor-applet/flags/ws.svg
+share/gnome/link-monitor-applet/flags/ye.svg
+share/gnome/link-monitor-applet/flags/za.svg
+share/gnome/link-monitor-applet/flags/zm.svg
+share/gnome/link-monitor-applet/flags/zw.svg
+share/gnome/link-monitor-applet/ui/preferences-dialog.glade
 share/gnome/omf/link-monitor-applet/link-monitor-applet-C.omf
 share/gnome/pixmaps/link-monitor-applet.png
 share/locale/fr/LC_MESSAGES/link-monitor-applet.mo
 @dirrm share/gnome/help/link-monitor-applet/C/figures
 @dirrm share/gnome/help/link-monitor-applet/C
 @dirrm share/gnome/help/link-monitor-applet
+@dirrm share/gnome/link-monitor-applet/flags
 @dirrm share/gnome/link-monitor-applet/ui
 @dirrm share/gnome/link-monitor-applet
 @dirrm share/gnome/omf/link-monitor-applet