upgrade to 0.10.0

3 files changed, 25 insertions, 123 deletions

diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 7f635c154952..2dd24904d254 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	diacanvas2
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.10.0
+PORTREVISION=	0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	diacanvas
@@ -20,17 +20,32 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-to
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 
 USE_REINPLACE=	yes
-USE_PYTHON=	yes
-USE_GNOME=	gtk20 libgnomeprintui gnomeprefix gnomehack
+USE_PYTHON=	2.2+
+USE_GNOME=	gtk20 libgnomeprint libgnomeprintui gnomeprefix gnomehack \
+		libartlgpl2 libgnomecanvas
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-gnome-print	# supporting libgnomeprint too old (1.x)
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
-#post-patch:
-#	@${REINPLACE_CMD} -e "s|gnomeprint-2.0|gnomeprint-2.2|g" \
-#		-e "s|gnomeprintui-2.0|gnomeprintui-2.2|g" ${WRKSRC}/configure
+PORTDOCS=	*
+PLIST_FILES=	lib/libdiacanvas2.so lib/libdiacanvas2.so.0 \
+		libdata/pkgconfig/diacanvas2.pc \
+		share/locale/nl/LC_MESSAGES/diacanvas.mo \
+		share/pygtk/2.0/defs/dia-boxed.defs \
+		share/pygtk/2.0/defs/diacanvas.defs \
+		share/pygtk/2.0/defs/diageometry.defs \
+		share/pygtk/2.0/defs/diashape.defs \
+		share/pygtk/2.0/defs/diaview.defs
+
+post-install:
+	@${FIND} ${PREFIX}/include/diacanvas -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${ECHO_CMD} '@dirrm include/diacanvas' >> ${TMPPLIST}
+	@${FIND} ${PYTHON_SITELIBDIR}/diacanvas -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${PYTHON_SITELIBDIR}/diacanvas -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/graphics/diacanvas2/distinfo b/graphics/diacanvas2/distinfo
index e38f04706c41..968a5107fd7a 100644
--- a/graphics/diacanvas2/distinfo
+++ b/graphics/diacanvas2/distinfo
@@ -1,2 +1,2 @@
-MD5 (diacanvas2-0.9.2.tar.gz) = 4142c787f582311d01ef6ec8c4fb3c13
-SIZE (diacanvas2-0.9.2.tar.gz) = 678211
+MD5 (diacanvas2-0.10.0.tar.gz) = 26087d205ad833341fcfab047d70837f
+SIZE (diacanvas2-0.10.0.tar.gz) = 711831
diff --git a/graphics/diacanvas2/pkg-plist b/graphics/diacanvas2/pkg-plist
deleted file mode 100644
index 677c9dc9a5f6..000000000000
--- a/graphics/diacanvas2/pkg-plist
+++ /dev/null
@@ -1,113 +0,0 @@
-include/diacanvas/dia-canvas-box.h
-include/diacanvas/dia-canvas-element.h
-include/diacanvas/dia-canvas-i18n.h
-include/diacanvas/dia-canvas-image.h
-include/diacanvas/dia-canvas-line.h
-include/diacanvas/dia-canvas-text.h
-include/diacanvas/dia-canvas-view.h
-include/diacanvas/dia-canvas.h
-include/diacanvas/dia-constraint.h
-include/diacanvas/dia-event.h
-include/diacanvas/dia-export-print.h
-include/diacanvas/dia-export-svg.h
-include/diacanvas/dia-features.h
-include/diacanvas/dia-geometry.h
-include/diacanvas/dia-handle-layer.h
-include/diacanvas/dia-handle.h
-include/diacanvas/dia-placement-tool.h
-include/diacanvas/dia-selector.h
-include/diacanvas/dia-shape-art.h
-include/diacanvas/dia-shape-x.h
-include/diacanvas/dia-shape.h
-include/diacanvas/dia-solver.h
-include/diacanvas/dia-stack-tool.h
-include/diacanvas/dia-strength.h
-include/diacanvas/dia-tool.h
-include/diacanvas/dia-variable.h
-include/diacanvas/diamarshal.h
-include/diacanvas/diatypebuiltins.h
-@dirrm include/diacanvas
-lib/libdiacanvas2.so
-lib/libdiacanvas2.so.0
-libdata/pkgconfig/diacanvas2.pc
-share/locale/nl/LC_MESSAGES/diacanvas.mo
-%%PYTHON_SITELIBDIR%%/diacanvas/__init__.py
-%%PYTHON_SITELIBDIR%%/diacanvas/__init__.pyc
-%%PYTHON_SITELIBDIR%%/diacanvas/__init__.pyo
-%%PYTHON_SITELIBDIR%%/diacanvas/canvasmodule.so
-%%PYTHON_SITELIBDIR%%/diacanvas/geometrymodule.so
-%%PYTHON_SITELIBDIR%%/diacanvas/placementtool.py
-%%PYTHON_SITELIBDIR%%/diacanvas/placementtool.pyc
-%%PYTHON_SITELIBDIR%%/diacanvas/placementtool.pyo
-%%PYTHON_SITELIBDIR%%/diacanvas/shapemodule.so
-@dirrm %%PYTHON_SITELIBDIR%%/diacanvas
-%%DOCSDIR%%/DiaCanvas.html
-%%DOCSDIR%%/DiaCanvasBox.html
-%%DOCSDIR%%/DiaCanvasElement.html
-%%DOCSDIR%%/DiaCanvasGroup.html
-%%DOCSDIR%%/DiaCanvasGroupable.html
-%%DOCSDIR%%/DiaCanvasImage.html
-%%DOCSDIR%%/DiaCanvasItem.html
-%%DOCSDIR%%/DiaCanvasLine.html
-%%DOCSDIR%%/DiaCanvasText.html
-%%DOCSDIR%%/DiaCanvasView.html
-%%DOCSDIR%%/DiaCanvasViewItem.html
-%%DOCSDIR%%/DiaConstraint.html
-%%DOCSDIR%%/DiaHandle.html
-%%DOCSDIR%%/DiaHandleLayer.html
-%%DOCSDIR%%/DiaSolver.html
-%%DOCSDIR%%/DiaTool.html
-%%DOCSDIR%%/DiaVariable.html
-%%DOCSDIR%%/chap-DiaCanvas.html
-%%DOCSDIR%%/chap-Geometry.html
-%%DOCSDIR%%/chap-Objects.html
-%%DOCSDIR%%/chap-Python.html
-%%DOCSDIR%%/chap-Solver.html
-%%DOCSDIR%%/chap-Views.html
-%%DOCSDIR%%/chap-diacanvas.html
-%%DOCSDIR%%/chap-geometry.html
-%%DOCSDIR%%/chap-objects.html
-%%DOCSDIR%%/chap-python.html
-%%DOCSDIR%%/chap-solver.html
-%%DOCSDIR%%/chap-views.html
-%%DOCSDIR%%/diacanvas.html
-%%DOCSDIR%%/diacanvas2-DiaEvent.html
-%%DOCSDIR%%/diacanvas2-DiaExpression.html
-%%DOCSDIR%%/diacanvas2-DiaGeometry.html
-%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-LibArt-rendering.html
-%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-X11-rendering.html
-%%DOCSDIR%%/diacanvas2-DiaShape.html
-%%DOCSDIR%%/diacanvas2-DiaStrength.html
-%%DOCSDIR%%/diacanvas2-Exporting.html
-%%DOCSDIR%%/diacanvas2-diacanvasgroupable.html
-%%DOCSDIR%%/diacanvas2-diaevent.html
-%%DOCSDIR%%/diacanvas2-diaexpression.html
-%%DOCSDIR%%/diacanvas2-diageometry.html
-%%DOCSDIR%%/diacanvas2-diashape-functions-for-libart-rendering.html
-%%DOCSDIR%%/diacanvas2-diashape-functions-for-x11-rendering.html
-%%DOCSDIR%%/diacanvas2-diashape.html
-%%DOCSDIR%%/diacanvas2-diastrength.html
-%%DOCSDIR%%/diacanvas2-exporting.html
-%%DOCSDIR%%/diacanvasbox.html
-%%DOCSDIR%%/diacanvaselement.html
-%%DOCSDIR%%/diacanvasgroup.html
-%%DOCSDIR%%/diacanvasgroupable.html
-%%DOCSDIR%%/diacanvasimage.html
-%%DOCSDIR%%/diacanvasitem.html
-%%DOCSDIR%%/diacanvasline.html
-%%DOCSDIR%%/diacanvastext.html
-%%DOCSDIR%%/diacanvasview.html
-%%DOCSDIR%%/diacanvasviewitem.html
-%%DOCSDIR%%/diaconstraint.html
-%%DOCSDIR%%/diahandle.html
-%%DOCSDIR%%/diahandlelayer.html
-%%DOCSDIR%%/diasolver.html
-%%DOCSDIR%%/diatool.html
-%%DOCSDIR%%/diavariable.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-@dirrm %%DOCSDIR%%
-share/pygtk/2.0/defs/diacanvas.defs
-share/pygtk/2.0/defs/diacanvascallbacks.defs
-share/pygtk/2.0/defs/diageometry.defs
-share/pygtk/2.0/defs/diashape.defs