3 files changed, 110 insertions, 25 deletions

diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile
index 7ccc4c8e5336..fca4f2ca9dc3 100644
--- a/graphics/diacanvas2/Makefile
+++ b/graphics/diacanvas2/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	diacanvas2
-PORTVERSION=	0.10.0
-PORTREVISION=	1
+PORTVERSION=	0.12.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	diacanvas
@@ -19,33 +18,25 @@ COMMENT=	A general drawing canvas from dia dialog editor
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
 
-USE_REINPLACE=	yes
+USE_GNOME=	gnomehack libgnomeprint libgnomeprintui libartlgpl2 \
+		libgnomecanvas
 USE_PYTHON=	2.2+
-USE_GNOME=	gtk20 libgnomeprint libgnomeprintui gnomeprefix gnomehack \
-		libartlgpl2 libgnomecanvas
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
-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-patch:
+	@${REINPLACE_CMD} -e \
+		's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in
 
 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}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/ref/html/*.png ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/diacanvas2/distinfo b/graphics/diacanvas2/distinfo
index 968a5107fd7a..5aa4189e6ada 100644
--- a/graphics/diacanvas2/distinfo
+++ b/graphics/diacanvas2/distinfo
@@ -1,2 +1,2 @@
-MD5 (diacanvas2-0.10.0.tar.gz) = 26087d205ad833341fcfab047d70837f
-SIZE (diacanvas2-0.10.0.tar.gz) = 711831
+MD5 (diacanvas2-0.12.0.tar.gz) = 0b98f1a25aab21413a25922d1654ef35
+SIZE (diacanvas2-0.12.0.tar.gz) = 709894
diff --git a/graphics/diacanvas2/pkg-plist b/graphics/diacanvas2/pkg-plist
new file mode 100644
index 000000000000..4768de806b71
--- /dev/null
+++ b/graphics/diacanvas2/pkg-plist
@@ -0,0 +1,94 @@
+include/diacanvas/dia-canvas-box.h
+include/diacanvas/dia-canvas-editable.h
+include/diacanvas/dia-canvas-element.h
+include/diacanvas/dia-canvas-group.h
+include/diacanvas/dia-canvas-groupable.h
+include/diacanvas/dia-canvas-i18n.h
+include/diacanvas/dia-canvas-image.h
+include/diacanvas/dia-canvas-item.h
+include/diacanvas/dia-canvas-iter.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
+lib/libdiacanvas2.so
+lib/libdiacanvas2.so.0
+%%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
+%%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.so
+libdata/pkgconfig/diacanvas2.pc
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvas.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasBox.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasEditable.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasElement.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasGroup.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasGroupable.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasImage.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasItem.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasLine.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasText.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasView.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaCanvasViewItem.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaConstraint.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaHandle.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaHandleLayer.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaSolver.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaTool.html
+%%PORTDOCS%%%%DOCSDIR%%/DiaVariable.html
+%%PORTDOCS%%%%DOCSDIR%%/arrowhead.png
+%%PORTDOCS%%%%DOCSDIR%%/chap-DiaCanvas.html
+%%PORTDOCS%%%%DOCSDIR%%/chap-Geometry.html
+%%PORTDOCS%%%%DOCSDIR%%/chap-Objects.html
+%%PORTDOCS%%%%DOCSDIR%%/chap-Python.html
+%%PORTDOCS%%%%DOCSDIR%%/chap-Solver.html
+%%PORTDOCS%%%%DOCSDIR%%/chap-Views.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas.png
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaEvent.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaExpression.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaGeometry.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-LibArt-rendering.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape-functions-for-X11-rendering.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaShape.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-DiaStrength.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvas2-Exporting.html
+%%PORTDOCS%%%%DOCSDIR%%/diacanvasview.png
+%%PORTDOCS%%%%DOCSDIR%%/diasolver.png
+%%PORTDOCS%%%%DOCSDIR%%/element.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/line.png
+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
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/diacanvas
+@dirrm include/diacanvas