- update devel/py-liblarch to 2.1.0

- remove devel/py-liblarch_gtk because it was merged into devel/py-liblarch
  itself
- add UPDATING entry for deskutils/gtg users

Feature safe:	yes

10 files changed, 27 insertions, 49 deletions

diff --git a/MOVED b/MOVED
index c27f745a15e2..0b6ed513515c 100644
--- a/MOVED
+++ b/MOVED
@@ -3838,3 +3838,4 @@ textproc/xerces-c||2012-11-05|Has expired: No more supported upstream, consider
 x11-wm/wampager||2012-11-05|Has expired: Development ceased
 x11-wm/waimea||2012-11-05|Has expired: Development ceased
 x11-wm/waimea-devel||2012-11-05|Has expired: Development ceased
+devel/py-liblarch_gtk||2012-11-09|Merged into devel/py-liblarch
diff --git a/UPDATING b/UPDATING
index d777c9590263..8a8daec4d5f2 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,14 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20121109:
+  AFFECTS: users of devel/py-liblarch_gtk deskutils/gtg
+  AUTHOR: rm@FreeBSD.org
+
+  Code of py-liblarch_gtk has been merged into py-liblarch 2.1.0. To avoid
+  any conflicts, user need to remove py-liblarch_gtk before the update of
+  py-liblarch.
+
 20121105:
   AFFECTS: users of mail/postfix-current
   AUTHOR: sahil@FreeBSD.org
diff --git a/devel/py-liblarch/Makefile b/devel/py-liblarch/Makefile
index fde418d8c9fa..58e1454140f7 100644
--- a/devel/py-liblarch/Makefile
+++ b/devel/py-liblarch/Makefile
@@ -1,15 +1,9 @@
-# New ports collection makefile for:	py-liblarch
-# Date created:				13 February 2012
-# Whom:					Ruslan Mahmatkhanov <rm@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	liblarch
-PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://gtg.fritalk.com/publique/gtg.fritalk.com/${PORTNAME}/0.1/
+MASTER_SITES=	http://gtg.fritalk.com/publique/gtg.fritalk.com/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rm@FreeBSD.org
diff --git a/devel/py-liblarch/distinfo b/devel/py-liblarch/distinfo
index f2a136f29832..a2d67cd52010 100644
--- a/devel/py-liblarch/distinfo
+++ b/devel/py-liblarch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liblarch-0.1.0.tar.gz) = 43fcf260fe74c52c30f197b229254bbd95c101eedcc04ec17976212436a2fdc2
-SIZE (liblarch-0.1.0.tar.gz) = 19129
+SHA256 (liblarch-2.1.0.tar.gz) = f55b8ce2c6350b614f46acf826c323b03bd64890288dd25b31cda3ccdb59d49b
+SIZE (liblarch-2.1.0.tar.gz) = 26829
diff --git a/devel/py-liblarch/pkg-descr b/devel/py-liblarch/pkg-descr
index e53270029be7..af98643e278c 100644
--- a/devel/py-liblarch/pkg-descr
+++ b/devel/py-liblarch/pkg-descr
@@ -1,4 +1,4 @@
 Liblarch is a python library built to easily handle data structure such are
 lists, trees and acyclic graphs (tree where nodes can have multiple parents).
 
-WWW:	https://live.gnome.org/liblarch
+WWW: https://live.gnome.org/liblarch
diff --git a/devel/py-liblarch/pkg-plist b/devel/py-liblarch/pkg-plist
index 424d8811a12c..8215f6fe2419 100644
--- a/devel/py-liblarch/pkg-plist
+++ b/devel/py-liblarch/pkg-plist
@@ -16,4 +16,17 @@
 %%PYTHON_SITELIBDIR%%/liblarch/treenode.py
 %%PYTHON_SITELIBDIR%%/liblarch/treenode.pyc
 %%PYTHON_SITELIBDIR%%/liblarch/treenode.pyo
+%%PYTHON_SITELIBDIR%%/liblarch/viewcount.py
+%%PYTHON_SITELIBDIR%%/liblarch/viewcount.pyc
+%%PYTHON_SITELIBDIR%%/liblarch/viewcount.pyo
+%%PYTHON_SITELIBDIR%%/liblarch/viewtree.py
+%%PYTHON_SITELIBDIR%%/liblarch/viewtree.pyc
+%%PYTHON_SITELIBDIR%%/liblarch/viewtree.pyo
+%%PYTHON_SITELIBDIR%%/liblarch_gtk/__init__.py
+%%PYTHON_SITELIBDIR%%/liblarch_gtk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/liblarch_gtk/__init__.pyo
+%%PYTHON_SITELIBDIR%%/liblarch_gtk/treemodel.py
+%%PYTHON_SITELIBDIR%%/liblarch_gtk/treemodel.pyc
+%%PYTHON_SITELIBDIR%%/liblarch_gtk/treemodel.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/liblarch_gtk
 @dirrm %%PYTHON_SITELIBDIR%%/liblarch
diff --git a/devel/py-liblarch_gtk/Makefile b/devel/py-liblarch_gtk/Makefile
deleted file mode 100644
index 6eb704a4f5d2..000000000000
--- a/devel/py-liblarch_gtk/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# New ports collection makefile for:	py-liblarch_gtk
-# Date created:				13 February 2012
-# Whom:					Ruslan Mahmatkhanov <rm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	liblarch_gtk
-PORTVERSION=	0.1.0
-PORTREVISION=	1
-CATEGORIES=	devel python
-MASTER_SITES=	http://gtg.fritalk.com/publique/gtg.fritalk.com/liblarch/0.1/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	rm@FreeBSD.org
-COMMENT=	GTK binding for Liblarch
-
-LICENSE=	LGPL3
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}liblarch>=0:${PORTSDIR}/devel/py-liblarch
-
-USE_GNOME=	pygobject pygtk2
-USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	yes
-
-.include <bsd.port.mk>
diff --git a/devel/py-liblarch_gtk/distinfo b/devel/py-liblarch_gtk/distinfo
deleted file mode 100644
index 615edc454bd7..000000000000
--- a/devel/py-liblarch_gtk/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (liblarch_gtk-0.1.0.tar.gz) = e0dfb2dbe47a49cbf9fe3a1d8f44b7da34d5572532dfe2960561ccafb142e7bc
-SIZE (liblarch_gtk-0.1.0.tar.gz) = 11479
diff --git a/devel/py-liblarch_gtk/pkg-descr b/devel/py-liblarch_gtk/pkg-descr
deleted file mode 100644
index a58f7d503616..000000000000
--- a/devel/py-liblarch_gtk/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-GTK binding for Liblarch.
-
-WWW:	https://live.gnome.org/liblarch
diff --git a/devel/py-liblarch_gtk/pkg-plist b/devel/py-liblarch_gtk/pkg-plist
deleted file mode 100644
index 21be3215c3f5..000000000000
--- a/devel/py-liblarch_gtk/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PYTHON_SITELIBDIR%%/liblarch_gtk/__init__.py
-%%PYTHON_SITELIBDIR%%/liblarch_gtk/__init__.pyc
-%%PYTHON_SITELIBDIR%%/liblarch_gtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/liblarch_gtk/treemodel.py
-%%PYTHON_SITELIBDIR%%/liblarch_gtk/treemodel.pyc
-%%PYTHON_SITELIBDIR%%/liblarch_gtk/treemodel.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/liblarch_gtk