4 files changed, 139 insertions, 10 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 948b685bb303..5462bb21f6dc 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dia
-DISTVERSION=	0.95-1
+DISTVERSION=	0.96
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 4c0357e57b74..796fafee2316 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dia-0.95-1.tar.bz2) = bd4d5bd71b60b9ce11610256534e4d82
-SHA256 (gnome2/dia-0.95-1.tar.bz2) = 809d00268b6f6ab02fb666c70ba0b8f556d258825e004ab4386103bcac4b7bc5
-SIZE (gnome2/dia-0.95-1.tar.bz2) = 4203188
+MD5 (gnome2/dia-0.96.tar.bz2) = 0c173dd5f46672efb77952ecbd884bfd
+SHA256 (gnome2/dia-0.96.tar.bz2) = bd056115e51a87abd01fc3f05a2a1ab2c749574a41f4630452cb7d82e3d0504c
+SIZE (gnome2/dia-0.96.tar.bz2) = 4443875
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index c4029e041f68..4c8240597995 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -1,6 +1,15 @@
---- configure.orig	Thu Aug 19 23:59:15 2004
-+++ configure	Fri Aug 20 00:02:09 2004
-@@ -21542,7 +21542,7 @@
+--- configure.orig	Sun Mar 25 15:18:59 2007
++++ configure	Sun Mar 25 15:20:01 2007
+@@ -20515,7 +20515,7 @@ if test "${with_freetype+set}" = set; th
+ else
+   with_freetype=yes
+ fi;
+-if test "x$with_freetype" == "xyes"; then
++if test "x$with_freetype" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for PANGOFT2" >&5
+@@ -20835,7 +20835,7 @@ _ACEOF
  
  
  cat >>confdefs.h <<_ACEOF
@@ -9,7 +18,25 @@
  _ACEOF
  
      have_gnome=true
-@@ -25231,7 +25231,7 @@
+@@ -20989,7 +20989,7 @@ if test "${with_gnomeprint+set}" = set; 
+ else
+   with_gnomeprint=no
+ fi;
+-if test "x$with_gnomeprint" == "xyes"; then
++if test "x$with_gnomeprint" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GNOMEPRINT" >&5
+@@ -21927,7 +21927,7 @@ else
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-if test "$XGETTEXT" == none ; then
++if test "$XGETTEXT" = none ; then
+    { { echo "$as_me:$LINENO: error: xgettext program not found: $XGETTEXT." >&5
+ echo "$as_me: error: xgettext program not found: $XGETTEXT." >&2;}
+    { (exit 1); exit 1; }; }
+@@ -25011,7 +25011,7 @@ echo $ECHO_N "checking local Python conf
  
    fi
  
@@ -18,7 +45,7 @@
  
    PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"`
  
-@@ -25293,12 +25293,12 @@
+@@ -25073,12 +25073,12 @@ except ImportError:
  except:
          sys.exit(0)
  sys.exit(0)"
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index 98f7413b8776..71c6974d053e 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -55,6 +55,8 @@ lib/dia/libsvg_filter.la
 lib/dia/libsvg_filter.so
 lib/dia/libuml_objects.la
 lib/dia/libuml_objects.so
+lib/dia/libvdx_filter.la
+lib/dia/libvdx_filter.so
 lib/dia/libwpg_filter.la
 lib/dia/libwpg_filter.so
 lib/dia/libxfig_filter.la
@@ -65,10 +67,12 @@ share/gnome/applications/dia.desktop
 share/gnome/dia/dia.xpm
 share/gnome/dia/dia_logo.png
 %%PYTHON:%%share/gnome/dia/python-startup.py
+%%PYTHON:%%share/gnome/dia/python/aobjects.py
 %%PYTHON:%%share/gnome/dia/python/codegen.py
 %%PYTHON:%%share/gnome/dia/python/diasvg.py
 %%PYTHON:%%share/gnome/dia/python/diasvg_import.py
 %%PYTHON:%%share/gnome/dia/python/dot.py
+%%PYTHON:%%share/gnome/dia/python/doxrev.py
 %%PYTHON:%%share/gnome/dia/python/group_props.py
 %%PYTHON:%%share/gnome/dia/python/gtkcons.py
 %%PYTHON:%%share/gnome/dia/python/otypes.py
@@ -157,6 +161,90 @@ share/gnome/dia/shapes/Assorted/triangle-isoceles.png
 share/gnome/dia/shapes/Assorted/triangle-isoceles.shape
 share/gnome/dia/shapes/Assorted/triangle-rightangle.png
 share/gnome/dia/shapes/Assorted/triangle-rightangle.shape
+share/gnome/dia/shapes/BPMN/Activity-Looping.png
+share/gnome/dia/shapes/BPMN/Activity-Looping.shape
+share/gnome/dia/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.png
+share/gnome/dia/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape
+share/gnome/dia/shapes/BPMN/Collapsed-Sub-Process.png
+share/gnome/dia/shapes/BPMN/Collapsed-Sub-Process.shape
+share/gnome/dia/shapes/BPMN/Compensation-Collapsed-Sub-Process.png
+share/gnome/dia/shapes/BPMN/Compensation-Collapsed-Sub-Process.shape
+share/gnome/dia/shapes/BPMN/Compensation.png
+share/gnome/dia/shapes/BPMN/Compensation.shape
+share/gnome/dia/shapes/BPMN/Data-Object.png
+share/gnome/dia/shapes/BPMN/Data-Object.shape
+share/gnome/dia/shapes/BPMN/End-Event-Cancel.png
+share/gnome/dia/shapes/BPMN/End-Event-Cancel.shape
+share/gnome/dia/shapes/BPMN/End-Event-Compensation.png
+share/gnome/dia/shapes/BPMN/End-Event-Compensation.shape
+share/gnome/dia/shapes/BPMN/End-Event-Error.png
+share/gnome/dia/shapes/BPMN/End-Event-Error.shape
+share/gnome/dia/shapes/BPMN/End-Event-Link.png
+share/gnome/dia/shapes/BPMN/End-Event-Link.shape
+share/gnome/dia/shapes/BPMN/End-Event-Message.png
+share/gnome/dia/shapes/BPMN/End-Event-Message.shape
+share/gnome/dia/shapes/BPMN/End-Event-Multiple.png
+share/gnome/dia/shapes/BPMN/End-Event-Multiple.shape
+share/gnome/dia/shapes/BPMN/End-Event-Terminate.png
+share/gnome/dia/shapes/BPMN/End-Event-Terminate.shape
+share/gnome/dia/shapes/BPMN/End-Event.png
+share/gnome/dia/shapes/BPMN/End-Event.shape
+share/gnome/dia/shapes/BPMN/Gateway-Complex.png
+share/gnome/dia/shapes/BPMN/Gateway-Complex.shape
+share/gnome/dia/shapes/BPMN/Gateway-Exclusive-XOR-Data-Based.png
+share/gnome/dia/shapes/BPMN/Gateway-Exclusive-XOR-Data-Based.shape
+share/gnome/dia/shapes/BPMN/Gateway-Exclusive-XOR-Event-Based.png
+share/gnome/dia/shapes/BPMN/Gateway-Exclusive-XOR-Event-Based.shape
+share/gnome/dia/shapes/BPMN/Gateway-Inclusive-OR.png
+share/gnome/dia/shapes/BPMN/Gateway-Inclusive-OR.shape
+share/gnome/dia/shapes/BPMN/Gateway-Parallel-AND.png
+share/gnome/dia/shapes/BPMN/Gateway-Parallel-AND.shape
+share/gnome/dia/shapes/BPMN/Gateway.png
+share/gnome/dia/shapes/BPMN/Gateway.shape
+share/gnome/dia/shapes/BPMN/Group.png
+share/gnome/dia/shapes/BPMN/Group.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Cancel.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Cancel.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Compensation.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Compensation.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Error.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Error.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Link.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Link.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Message.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Message.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Multiple.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Multiple.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Rule.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Rule.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Timer.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event-Timer.shape
+share/gnome/dia/shapes/BPMN/Intermediate-Event.png
+share/gnome/dia/shapes/BPMN/Intermediate-Event.shape
+share/gnome/dia/shapes/BPMN/Looping-Collapsed-Sub-Process.png
+share/gnome/dia/shapes/BPMN/Looping-Collapsed-Sub-Process.shape
+share/gnome/dia/shapes/BPMN/Multiple-Instance-Collapsed-Sub-Process.png
+share/gnome/dia/shapes/BPMN/Multiple-Instance-Collapsed-Sub-Process.shape
+share/gnome/dia/shapes/BPMN/Multiple-Instance-Task.png
+share/gnome/dia/shapes/BPMN/Multiple-Instance-Task.shape
+share/gnome/dia/shapes/BPMN/Start-Event-Link.png
+share/gnome/dia/shapes/BPMN/Start-Event-Link.shape
+share/gnome/dia/shapes/BPMN/Start-Event-Message.png
+share/gnome/dia/shapes/BPMN/Start-Event-Message.shape
+share/gnome/dia/shapes/BPMN/Start-Event-Multiple.png
+share/gnome/dia/shapes/BPMN/Start-Event-Multiple.shape
+share/gnome/dia/shapes/BPMN/Start-Event-Rule.png
+share/gnome/dia/shapes/BPMN/Start-Event-Rule.shape
+share/gnome/dia/shapes/BPMN/Start-Event-Timer.png
+share/gnome/dia/shapes/BPMN/Start-Event-Timer.shape
+share/gnome/dia/shapes/BPMN/Start-Event.png
+share/gnome/dia/shapes/BPMN/Start-Event.shape
+share/gnome/dia/shapes/BPMN/Task.png
+share/gnome/dia/shapes/BPMN/Task.shape
+share/gnome/dia/shapes/BPMN/Text-Annotation.png
+share/gnome/dia/shapes/BPMN/Text-Annotation.shape
+share/gnome/dia/shapes/BPMN/Transaction.png
+share/gnome/dia/shapes/BPMN/Transaction.shape
 share/gnome/dia/shapes/ChemEng/ACgen.png
 share/gnome/dia/shapes/ChemEng/ACgen.shape
 share/gnome/dia/shapes/ChemEng/SaT-fixedtube.png
@@ -1169,6 +1257,8 @@ share/gnome/dia/shapes/Electric/vrelay.png
 share/gnome/dia/shapes/Electric/vrelay.shape
 share/gnome/dia/shapes/Flowchart/collate.png
 share/gnome/dia/shapes/Flowchart/collate.shape
+share/gnome/dia/shapes/Flowchart/datasource.png
+share/gnome/dia/shapes/Flowchart/datasource.shape
 share/gnome/dia/shapes/Flowchart/delay.png
 share/gnome/dia/shapes/Flowchart/delay.shape
 share/gnome/dia/shapes/Flowchart/display.png
@@ -1501,11 +1591,11 @@ share/gnome/dia/shapes/sybase/stableq.png
 share/gnome/dia/shapes/sybase/stableq.shape
 share/gnome/dia/sheets/AADL.sheet
 share/gnome/dia/sheets/Assorted.sheet
+share/gnome/dia/sheets/BPMN.sheet
 share/gnome/dia/sheets/ChemEng.sheet
 share/gnome/dia/sheets/Circuit.sheet
 share/gnome/dia/sheets/Contact.sheet
 share/gnome/dia/sheets/Cybernetics.sheet
-share/gnome/dia/sheets/EML.sheet
 share/gnome/dia/sheets/ER.sheet
 share/gnome/dia/sheets/ER/weakentity.png
 share/gnome/dia/sheets/Electric.sheet
@@ -1576,6 +1666,9 @@ share/gnome/dia/sheets/civil.sheet
 share/gnome/dia/sheets/jigsaw.sheet
 share/gnome/dia/sheets/network.sheet
 share/gnome/dia/sheets/sybase.sheet
+share/gnome/dia/ui/display-ui.xml
+share/gnome/dia/ui/popup-ui.xml
+share/gnome/dia/ui/toolbox-ui.xml
 share/gnome/dia/xslt/dia-uml.xsl
 share/gnome/dia/xslt/dia-uml2c++.xsl
 share/gnome/dia/xslt/dia-uml2componentlist.xsl
@@ -1617,6 +1710,7 @@ share/gnome/mime-info/dia.mime
 share/gnome/pixmaps/dia-diagram.png
 share/gnome/pixmaps/dia_gnome_icon.png
 share/locale/am/LC_MESSAGES/dia.mo
+share/locale/ar/LC_MESSAGES/dia.mo
 share/locale/az/LC_MESSAGES/dia.mo
 share/locale/be/LC_MESSAGES/dia.mo
 share/locale/bg/LC_MESSAGES/dia.mo
@@ -1633,6 +1727,7 @@ share/locale/eu/LC_MESSAGES/dia.mo
 share/locale/fi/LC_MESSAGES/dia.mo
 share/locale/fr/LC_MESSAGES/dia.mo
 share/locale/ga/LC_MESSAGES/dia.mo
+share/locale/gl/LC_MESSAGES/dia.mo
 share/locale/gu/LC_MESSAGES/dia.mo
 share/locale/hr/LC_MESSAGES/dia.mo
 share/locale/hu/LC_MESSAGES/dia.mo
@@ -1641,6 +1736,8 @@ share/locale/is/LC_MESSAGES/dia.mo
 share/locale/it/LC_MESSAGES/dia.mo
 share/locale/ja/LC_MESSAGES/dia.mo
 share/locale/ko/LC_MESSAGES/dia.mo
+share/locale/lt/LC_MESSAGES/dia.mo
+share/locale/lv/LC_MESSAGES/dia.mo
 share/locale/mk/LC_MESSAGES/dia.mo
 share/locale/ml/LC_MESSAGES/dia.mo
 share/locale/mn/LC_MESSAGES/dia.mo
@@ -1661,6 +1758,7 @@ share/locale/sq/LC_MESSAGES/dia.mo
 share/locale/sr/LC_MESSAGES/dia.mo
 share/locale/sr@Latn/LC_MESSAGES/dia.mo
 share/locale/sv/LC_MESSAGES/dia.mo
+share/locale/th/LC_MESSAGES/dia.mo
 share/locale/tr/LC_MESSAGES/dia.mo
 share/locale/uk/LC_MESSAGES/dia.mo
 share/locale/vi/LC_MESSAGES/dia.mo
@@ -1692,6 +1790,8 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrmtry share/locale/ne
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
 @dirrmtry share/locale/fi/LC_MESSAGES
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/el/LC_MESSAGES
@@ -1711,6 +1811,7 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/help/dia/en
 @dirrm share/gnome/help/dia
 @dirrm share/gnome/dia/xslt
+@dirrm share/gnome/dia/ui
 @dirrm share/gnome/dia/sheets/UML
 @dirrm share/gnome/dia/sheets/KAOS
 @dirrm share/gnome/dia/sheets/Jackson
@@ -1738,6 +1839,7 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/dia/shapes/Cisco
 @dirrm share/gnome/dia/shapes/Circuit
 @dirrm share/gnome/dia/shapes/ChemEng
+@dirrm share/gnome/dia/shapes/BPMN
 @dirrm share/gnome/dia/shapes/Assorted
 @dirrm share/gnome/dia/shapes
 %%PYTHON:%%@dirrm share/gnome/dia/python