Update from 0.7.0.1 to 0.7.1

PR:		ports/90867
Submitted by:	Boris B. Samorodov <bsam@ipt.ru>
Approved by:	maintainer feedback timeout (100+ days)

5 files changed, 54 insertions, 24 deletions

diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index 34ab2f6e3ae5..a1f227663641 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	gaphor
-PORTVERSION=	0.7.0.1
-PORTREVISION=	2
-#PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,15 +15,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	rehsack@liwing.de
 COMMENT=	UML modeling environment written in Python
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/diacanvas/_canvasmodule.so:${PORTSDIR}/graphics/diacanvas2
+BUILD_DEPENDS=	diacanvas2>=0:${PORTSDIR}/graphics/diacanvas2
 RUN_DEPENDS=	${BUILD_DEPENDS}
 .if defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
-BROKEN=		"Does not build"
 .endif
 
 USE_PYTHON=	2.2+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\\.[0-9]+$//}
 
 do-configure:
 	@cd ${WRKSRC}; ${PYTHON_CMD} setup.py config
diff --git a/devel/gaphor/distinfo b/devel/gaphor/distinfo
index 6acffe53e041..2d87641ca4fb 100644
--- a/devel/gaphor/distinfo
+++ b/devel/gaphor/distinfo
@@ -1,3 +1,4 @@
-MD5 (gnome2/gaphor-0.7.0.1.tar.gz) = 77bcfd7872743b0f59d9e678d4019727
-SHA256 (gnome2/gaphor-0.7.0.1.tar.gz) = 67b1f9b35d2b2be62c2421594a7b45a5eae386bcdfa97cf8e7bcd80d03c34970
+MD5 (gnome2/gaphor-0.7.1.tar.gz) = 2f6d15a5637688439aca9837107a22f0
+SHA256 (gnome2/gaphor-0.7.1.tar.gz) = ce247553b075d716c9edb305ea2a2450d923d8d4b11282cda4a0c4fc8a54cbf2
+SIZE (gnome2/gaphor-0.7.1.tar.gz) = 322884
 SIZE (gnome2/gaphor-0.7.0.1.tar.gz) = 292968
diff --git a/devel/gaphor/files/patch-setup.py b/devel/gaphor/files/patch-setup.py
new file mode 100644
index 000000000000..1bd381c5572d
--- /dev/null
+++ b/devel/gaphor/files/patch-setup.py
@@ -0,0 +1,12 @@
+--- setup.py.orig	Sat Dec 24 01:34:18 2005
++++ setup.py	Sat Dec 24 01:34:48 2005
+@@ -390,8 +390,7 @@
+       scripts=['bin/gaphor'],
+ 
+       distclass=Distribution,
+-      cmdclass={'config': config_Gaphor,
+-                'build_py': build_py_Gaphor,
++      cmdclass={'build_py': build_py_Gaphor,
+                 #'install_schemas': install_schemas,
+                 'build': build_Gaphor,
+ #                'build_ext': BuildExt,
diff --git a/devel/gaphor/files/patch-utils::msgfmt.py b/devel/gaphor/files/patch-utils::msgfmt.py
deleted file mode 100644
index 225f55e1d2eb..000000000000
--- a/devel/gaphor/files/patch-utils::msgfmt.py
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r1.2 -r1.3
---- utils/msgfmt.py	2004/12/07 13:42:35	1.2
-+++ utils/msgfmt.py	2004/12/15 08:36:32	1.3
-@@ -82,8 +82,8 @@
-         koffsets += [l1, o1+keystart]
-         voffsets += [l2, o2+valuestart]
-     offsets = koffsets + voffsets
--    output = struct.pack("iiiiiii",
--                         0x950412de,        # Magic
-+    output = struct.pack("Iiiiiii",
-+                         0x950412deL,       # Magic
-                          0,                 # Version
-                          len(keys),         # # of entries
-                          7*4,               # start of key index
diff --git a/devel/gaphor/pkg-plist b/devel/gaphor/pkg-plist
index 02f00f29ac5b..27f2720dee30 100644
--- a/devel/gaphor/pkg-plist
+++ b/devel/gaphor/pkg-plist
@@ -21,8 +21,12 @@ bin/gaphor
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/action.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/action.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/activitynodes.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/activitynodes.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/actor.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/actor.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/artifact.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/artifact.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/association.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/association.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/attribute.py
@@ -57,6 +61,8 @@ bin/gaphor
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/implementation.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/include.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/include.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/interaction.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/interaction.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/interface.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/interface.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/itemactions.py
@@ -65,6 +71,10 @@ bin/gaphor
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/itemtool.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/klass.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/klass.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/lifeline.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/lifeline.pyc
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/message.py
+%%PYTHON_SITELIBDIR%%/gaphor/diagram/message.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/nameditem.py
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/nameditem.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/diagram/node.py
@@ -131,8 +141,6 @@ bin/gaphor
 %%PYTHON_SITELIBDIR%%/gaphor/ui/diagramtab.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/ui/diagramview.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/diagramview.pyc
-%%PYTHON_SITELIBDIR%%/gaphor/ui/diagramwindow.py
-%%PYTHON_SITELIBDIR%%/gaphor/ui/diagramwindow.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/ui/editoractions.py
 %%PYTHON_SITELIBDIR%%/gaphor/ui/editoractions.pyc
 %%PYTHON_SITELIBDIR%%/gaphor/ui/editorwindow.py
@@ -159,6 +167,7 @@ bin/gaphor
 %%DATADIR%%/pixmaps/action24.png
 %%DATADIR%%/pixmaps/activityfinalnode24.png
 %%DATADIR%%/pixmaps/actor24.png
+%%DATADIR%%/pixmaps/artifact24.png
 %%DATADIR%%/pixmaps/association24.png
 %%DATADIR%%/pixmaps/attribute24.png
 %%DATADIR%%/pixmaps/class24.png
@@ -175,14 +184,22 @@ bin/gaphor
 %%DATADIR%%/pixmaps/implementation24.png
 %%DATADIR%%/pixmaps/include24.png
 %%DATADIR%%/pixmaps/initialnode24.png
+%%DATADIR%%/pixmaps/interaction24.png
 %%DATADIR%%/pixmaps/interface24.png
+%%DATADIR%%/pixmaps/lifeline24.png
 %%DATADIR%%/pixmaps/logo.png
+%%DATADIR%%/pixmaps/node24.png
 %%DATADIR%%/pixmaps/operation24.png
 %%DATADIR%%/pixmaps/package24.png
 %%DATADIR%%/pixmaps/pointer24.png
 %%DATADIR%%/pixmaps/profile24.png
 %%DATADIR%%/pixmaps/stereotype24.png
 %%DATADIR%%/pixmaps/usecase24.png
+%%DATADIR%%/plugins/alignment/__init__.py
+%%DATADIR%%/plugins/alignment/__init__.pyc
+%%DATADIR%%/plugins/alignment/alignment.py
+%%DATADIR%%/plugins/alignment/alignment.pyc
+%%DATADIR%%/plugins/alignment/plugin.xml
 %%DATADIR%%/plugins/checkmetamodel/__init__.py
 %%DATADIR%%/plugins/checkmetamodel/__init__.pyc
 %%DATADIR%%/plugins/checkmetamodel/checkmodel.py
@@ -205,6 +222,11 @@ bin/gaphor
 %%DATADIR%%/plugins/plugineditor/plugin.xml
 %%DATADIR%%/plugins/plugineditor/plugineditor.py
 %%DATADIR%%/plugins/plugineditor/plugineditor.pyc
+%%DATADIR%%/plugins/pngexport/__init__.py
+%%DATADIR%%/plugins/pngexport/__init__.pyc
+%%DATADIR%%/plugins/pngexport/plugin.xml
+%%DATADIR%%/plugins/pngexport/pngexport.py
+%%DATADIR%%/plugins/pngexport/pngexport.pyc
 %%DATADIR%%/plugins/pynsource/__init__.py
 %%DATADIR%%/plugins/pynsource/__init__.pyc
 %%DATADIR%%/plugins/pynsource/engineer.py
@@ -214,12 +236,25 @@ bin/gaphor
 %%DATADIR%%/plugins/pynsource/plugin.xml
 %%DATADIR%%/plugins/pynsource/pynsource.py
 %%DATADIR%%/plugins/pynsource/pynsource.pyc
+%%DATADIR%%/plugins/svgexport/__init__.py
+%%DATADIR%%/plugins/svgexport/__init__.pyc
+%%DATADIR%%/plugins/svgexport/plugin.xml
+%%DATADIR%%/plugins/xmiexport/__init__.py
+%%DATADIR%%/plugins/xmiexport/__init__.pyc
+%%DATADIR%%/plugins/xmiexport/exportmodel.py
+%%DATADIR%%/plugins/xmiexport/exportmodel.pyc
+%%DATADIR%%/plugins/xmiexport/plugin.xml
 share/locale/nl/LC_MESSAGES/gaphor.mo
+share/locale/es/LC_MESSAGES/gaphor.mo
+@dirrm %%DATADIR%%/plugins/alignment
 @dirrm %%DATADIR%%/plugins/pynsource
 @dirrm %%DATADIR%%/plugins/plugineditor
+@dirrm %%DATADIR%%/plugins/pngexport
 @dirrm %%DATADIR%%/plugins/liveobjectbrowser
 @dirrm %%DATADIR%%/plugins/diagramlayout
 @dirrm %%DATADIR%%/plugins/checkmetamodel
+@dirrm %%DATADIR%%/plugins/svgexport
+@dirrm %%DATADIR%%/plugins/xmiexport
 @dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%