Wed Dec 9 10:22:04 2009 UTC ()
update to 0.97
changes:
-High quality cross-platform print and pdf output by use of cairo
-Rotated text, but only with the new "Standard - Ouline" object
-Object properties dialog finally does handle multiple objects
-Improved text edit mode for consistent handling of the Delete key
-A new integrated user interface mode with diagrams in tabs
-Almost 200 bugs and feature requests resolved

pkgsrc note: the printing problem mentioned in TODO is resolved
 (some outdated nonsense in options.mk disabled use of "cairo")


(drochner)
diff -r1.54 -r1.55 pkgsrc/graphics/dia/Makefile
diff -r1.22 -r1.23 pkgsrc/graphics/dia/Makefile.common
diff -r1.22 -r1.23 pkgsrc/graphics/dia/distinfo
diff -r1.16 -r1.17 pkgsrc/graphics/dia/PLIST
diff -r1.7 -r1.8 pkgsrc/graphics/dia/options.mk
diff -r1.5 -r1.6 pkgsrc/graphics/dia/patches/patch-aa
diff -r1.5 -r0 pkgsrc/graphics/dia/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-ca
diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-cb
diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-cc
diff -r0 -r1.1 pkgsrc/graphics/dia/patches/patch-cd
diff -r1.2 -r1.3 pkgsrc/graphics/dia/patches/patch-da
cvs diff -r1.54 -r1.55 pkgsrc/graphics/dia/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/dia/Makefile 2009/10/29 23:32:22 1.54
+++ pkgsrc/graphics/dia/Makefile 2009/12/09 10:22:04 1.55
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
1# $NetBSD: Makefile,v 1.54 2009/10/29 23:32:22 drochner Exp $ 1# $NetBSD: Makefile,v 1.55 2009/12/09 10:22:04 drochner Exp $
2# 2#
3 3
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PKGREVISION= 4 
7 
8.include "options.mk" 6.include "options.mk"
9 7
10# just to convert the manpage 8# just to convert the manpage
11BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 9BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
12 10
13.include "../../sysutils/desktop-file-utils/desktopdb.mk" 11.include "../../sysutils/desktop-file-utils/desktopdb.mk"
14.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/graphics/dia/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/dia/Makefile.common 2009/03/08 15:56:45 1.22
+++ pkgsrc/graphics/dia/Makefile.common 2009/12/09 10:22:04 1.23
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile.common,v 1.22 2009/03/08 15:56:45 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.23 2009/12/09 10:22:04 drochner Exp $
2# 2#
3 3
4DISTNAME= dia-0.96.1 4DISTNAME= dia-0.97
5PKGNAME= ${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/} 5PKGNAME= ${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.96/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.97/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/projects/dia/ 10HOMEPAGE= http://www.gnome.org/projects/dia/
11COMMENT= Program for creating diagrams of all kinds 11COMMENT= Program for creating diagrams of all kinds
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DISTINFO_FILE= ${.CURDIR}/../../graphics/dia/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../graphics/dia/distinfo
16PATCHDIR= ${.CURDIR}/../../graphics/dia/patches 16PATCHDIR= ${.CURDIR}/../../graphics/dia/patches
17 17
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
19USE_TOOLS+= gmake intltool pkg-config msgfmt 19USE_TOOLS+= gmake intltool pkg-config msgfmt
20USE_LIBTOOL= YES 20USE_LIBTOOL= YES
cvs diff -r1.22 -r1.23 pkgsrc/graphics/dia/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/dia/distinfo 2007/11/17 14:14:01 1.22
+++ pkgsrc/graphics/dia/distinfo 2009/12/09 10:22:04 1.23
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.22 2007/11/17 14:14:01 rillig Exp $ 1$NetBSD: distinfo,v 1.23 2009/12/09 10:22:04 drochner Exp $
2 2
3SHA1 (dia-0.96.1.tar.gz) = 25efddb44cf78e94555ce31e9b36645a9aa7c8b9 3SHA1 (dia-0.97.tar.gz) = b3c48e83052f20df0213828a1ae4df7a12f5c70c
4RMD160 (dia-0.96.1.tar.gz) = b876a9e3760be1774bc0e69ab35d9a7f02a03ae0 4RMD160 (dia-0.97.tar.gz) = dc88b6673acf3afd30e95f770942471bd01a9857
5Size (dia-0.96.1.tar.gz) = 6463296 bytes 5Size (dia-0.97.tar.gz) = 8995310 bytes
6SHA1 (patch-aa) = 42d92644e11e49d7c70d6468768a275f4bd64c2d 6SHA1 (patch-aa) = fd7b07c56464f1dd05f3fdcc3f48531619586972
7SHA1 (patch-ab) = 01b09f193de697207c473940de3e9ffb695c0d70 
8SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff 7SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff
9SHA1 (patch-ca) = 48617d334d852253f858176bbe9222f61d379c37 8SHA1 (patch-ca) = 8737f3ff19244e2f87ffb571da21159bc2248648
10SHA1 (patch-cb) = fab6a63d25781fa9ab7c6a4f6e5ff43ff29aec6e 9SHA1 (patch-cb) = 02210139cbf38e91a61ad1e090f63f5635bb26ef
11SHA1 (patch-cc) = f2c58551d31ec577d25f9dfc62f48f28845d2dd7 10SHA1 (patch-cc) = 2dd4c822d8771e48ff1ac67946d765e5d8b85d50
12SHA1 (patch-da) = e61d7adeec3b1e5edffa422904551f686d9c7b8b 11SHA1 (patch-cd) = b7dd72a359fe6f36a56d2c16f94427c6977b0477
 12SHA1 (patch-da) = 4ed80c2a7eaa2dbbebd8265c8b74faac20c4f6c2
cvs diff -r1.16 -r1.17 pkgsrc/graphics/dia/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/dia/PLIST 2009/06/14 20:05:41 1.16
+++ pkgsrc/graphics/dia/PLIST 2009/12/09 10:22:04 1.17
@@ -1,49 +1,52 @@ @@ -1,49 +1,52 @@
1@comment $NetBSD: PLIST,v 1.16 2009/06/14 20:05:41 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.17 2009/12/09 10:22:04 drochner Exp $
2bin/dia 2bin/dia
3lib/dia/libaadl_objects.la 3lib/dia/libaadl_objects.la
4lib/dia/libbondgraph_objects.la 4lib/dia/libart_filter.la
5lib/dia/libcairo_filter.la 5lib/dia/libcairo_filter.la
6lib/dia/libcgm_filter.la 6lib/dia/libcgm_filter.la
7lib/dia/libchronogram_objects.la 7lib/dia/libchronogram_objects.la
 8lib/dia/libcustom_lines_objects.la
8lib/dia/libcustom_objects.la 9lib/dia/libcustom_objects.la
 10lib/dia/libdb_objects.la
9lib/dia/libdia.la 11lib/dia/libdia.la
10lib/dia/libdxf_filter.la 12lib/dia/libdxf_filter.la
11lib/dia/liber_objects.la 13lib/dia/liber_objects.la
12lib/dia/libflowchart_objects.la 14lib/dia/libflowchart_objects.la
13lib/dia/libfs_objects.la 15lib/dia/libfs_objects.la
14lib/dia/libgrafcet_objects.la 16lib/dia/libgrafcet_objects.la
15lib/dia/libhpgl_filter.la 17lib/dia/libhpgl_filter.la
16lib/dia/libistar_objects.la 18lib/dia/libistar_objects.la
17lib/dia/libjackson_objects.la 19lib/dia/libjackson_objects.la
18lib/dia/libkaos_objects.la 20lib/dia/libkaos_objects.la
19lib/dia/libmetapost_filter.la 21lib/dia/libmetapost_filter.la
20lib/dia/libmisc_objects.la 22lib/dia/libmisc_objects.la
21lib/dia/libnetwork_objects.la 23lib/dia/libnetwork_objects.la
22lib/dia/libpgf_filter.la 24lib/dia/libpgf_filter.la
23lib/dia/libpixbuf_filter.la 25lib/dia/libpixbuf_filter.la
 26lib/dia/libpostscript_filter.la
24lib/dia/libpstricks_filter.la 27lib/dia/libpstricks_filter.la
25lib/dia/libsadt_objects.la 28lib/dia/libsadt_objects.la
26lib/dia/libshape_filter.la 29lib/dia/libshape_filter.la
27lib/dia/libstandard_objects.la 30lib/dia/libstandard_objects.la
28lib/dia/libsvg_filter.la 31lib/dia/libsvg_filter.la
29lib/dia/libuml_objects.la 32lib/dia/libuml_objects.la
30lib/dia/libvdx_filter.la 33lib/dia/libvdx_filter.la
31lib/dia/libwpg_filter.la 34lib/dia/libwpg_filter.la
32lib/dia/libxfig_filter.la 35lib/dia/libxfig_filter.la
33lib/dia/libxslt_filter.la 36lib/dia/libxslt_filter.la
34man/man1/dia.1 37man/man1/dia.1
35share/applications/dia.desktop 38share/applications/dia.desktop
36share/dia/dia_logo.png 39share/dia/dia-splash.png
37share/dia/shapes/Assorted/arrow-chevron.png 40share/dia/shapes/Assorted/arrow-chevron.png
38share/dia/shapes/Assorted/arrow-chevron.shape 41share/dia/shapes/Assorted/arrow-chevron.shape
39share/dia/shapes/Assorted/arrow-down.png 42share/dia/shapes/Assorted/arrow-down.png
40share/dia/shapes/Assorted/arrow-down.shape 43share/dia/shapes/Assorted/arrow-down.shape
41share/dia/shapes/Assorted/arrow-left-notched.png 44share/dia/shapes/Assorted/arrow-left-notched.png
42share/dia/shapes/Assorted/arrow-left-notched.shape 45share/dia/shapes/Assorted/arrow-left-notched.shape
43share/dia/shapes/Assorted/arrow-left-right-up.png 46share/dia/shapes/Assorted/arrow-left-right-up.png
44share/dia/shapes/Assorted/arrow-left-right-up.shape 47share/dia/shapes/Assorted/arrow-left-right-up.shape
45share/dia/shapes/Assorted/arrow-left-right.png 48share/dia/shapes/Assorted/arrow-left-right.png
46share/dia/shapes/Assorted/arrow-left-right.shape 49share/dia/shapes/Assorted/arrow-left-right.shape
47share/dia/shapes/Assorted/arrow-left-up.png 50share/dia/shapes/Assorted/arrow-left-up.png
48share/dia/shapes/Assorted/arrow-left-up.shape 51share/dia/shapes/Assorted/arrow-left-up.shape
49share/dia/shapes/Assorted/arrow-left.png 52share/dia/shapes/Assorted/arrow-left.png
@@ -1258,26 +1261,52 @@ share/dia/shapes/Flowchart/terminal.png @@ -1258,26 +1261,52 @@ share/dia/shapes/Flowchart/terminal.png
1258share/dia/shapes/Flowchart/terminal.shape 1261share/dia/shapes/Flowchart/terminal.shape
1259share/dia/shapes/Flowchart/transaction.png 1262share/dia/shapes/Flowchart/transaction.png
1260share/dia/shapes/Flowchart/transaction.shape 1263share/dia/shapes/Flowchart/transaction.shape
1261share/dia/shapes/Flowchart/transmittape.png 1264share/dia/shapes/Flowchart/transmittape.png
1262share/dia/shapes/Flowchart/transmittape.shape 1265share/dia/shapes/Flowchart/transmittape.shape
1263share/dia/shapes/Gane_and_Sarson/alt-entity.png 1266share/dia/shapes/Gane_and_Sarson/alt-entity.png
1264share/dia/shapes/Gane_and_Sarson/alt-entity.shape 1267share/dia/shapes/Gane_and_Sarson/alt-entity.shape
1265share/dia/shapes/Gane_and_Sarson/data_store.png 1268share/dia/shapes/Gane_and_Sarson/data_store.png
1266share/dia/shapes/Gane_and_Sarson/data_store.shape 1269share/dia/shapes/Gane_and_Sarson/data_store.shape
1267share/dia/shapes/Gane_and_Sarson/entity.png 1270share/dia/shapes/Gane_and_Sarson/entity.png
1268share/dia/shapes/Gane_and_Sarson/entity.shape 1271share/dia/shapes/Gane_and_Sarson/entity.shape
1269share/dia/shapes/Gane_and_Sarson/process.png 1272share/dia/shapes/Gane_and_Sarson/process.png
1270share/dia/shapes/Gane_and_Sarson/process.shape 1273share/dia/shapes/Gane_and_Sarson/process.shape
 1274share/dia/shapes/Lights/ACL.png
 1275share/dia/shapes/Lights/ACL.shape
 1276share/dia/shapes/Lights/Blacklight.png
 1277share/dia/shapes/Lights/Blacklight.shape
 1278share/dia/shapes/Lights/Blinders.png
 1279share/dia/shapes/Lights/Blinders.shape
 1280share/dia/shapes/Lights/ERS.png
 1281share/dia/shapes/Lights/ERS.shape
 1282share/dia/shapes/Lights/Fresnel.png
 1283share/dia/shapes/Lights/Fresnel.shape
 1284share/dia/shapes/Lights/Moving_head.png
 1285share/dia/shapes/Lights/Moving_head.shape
 1286share/dia/shapes/Lights/PAR.png
 1287share/dia/shapes/Lights/PAR.shape
 1288share/dia/shapes/Lights/PAR_floor.png
 1289share/dia/shapes/Lights/PAR_floor.shape
 1290share/dia/shapes/Lights/PC.png
 1291share/dia/shapes/Lights/PC.shape
 1292share/dia/shapes/Lights/Scanner.png
 1293share/dia/shapes/Lights/Scanner.shape
 1294share/dia/shapes/Lights/Striplight.png
 1295share/dia/shapes/Lights/Striplight.shape
 1296share/dia/shapes/Lights/Stroboscope.png
 1297share/dia/shapes/Lights/Stroboscope.shape
 1298share/dia/shapes/Lights/Structure.png
 1299share/dia/shapes/Lights/Structure.shape
1271share/dia/shapes/Logic/and.png 1300share/dia/shapes/Logic/and.png
1272share/dia/shapes/Logic/and.shape 1301share/dia/shapes/Logic/and.shape
1273share/dia/shapes/Logic/buffer.png 1302share/dia/shapes/Logic/buffer.png
1274share/dia/shapes/Logic/buffer.shape 1303share/dia/shapes/Logic/buffer.shape
1275share/dia/shapes/Logic/connector.png 1304share/dia/shapes/Logic/connector.png
1276share/dia/shapes/Logic/connector.shape 1305share/dia/shapes/Logic/connector.shape
1277share/dia/shapes/Logic/inverter.png 1306share/dia/shapes/Logic/inverter.png
1278share/dia/shapes/Logic/inverter.shape 1307share/dia/shapes/Logic/inverter.shape
1279share/dia/shapes/Logic/nand.png 1308share/dia/shapes/Logic/nand.png
1280share/dia/shapes/Logic/nand.shape 1309share/dia/shapes/Logic/nand.shape
1281share/dia/shapes/Logic/nor.png 1310share/dia/shapes/Logic/nor.png
1282share/dia/shapes/Logic/nor.shape 1311share/dia/shapes/Logic/nor.shape
1283share/dia/shapes/Logic/not.png 1312share/dia/shapes/Logic/not.png
@@ -1338,26 +1367,30 @@ share/dia/shapes/Map/Isometric/Road1.png @@ -1338,26 +1367,30 @@ share/dia/shapes/Map/Isometric/Road1.png
1338share/dia/shapes/Map/Isometric/Road1.shape 1367share/dia/shapes/Map/Isometric/Road1.shape
1339share/dia/shapes/Map/Isometric/Roof1.png 1368share/dia/shapes/Map/Isometric/Roof1.png
1340share/dia/shapes/Map/Isometric/Roof1.shape 1369share/dia/shapes/Map/Isometric/Roof1.shape
1341share/dia/shapes/Map/Isometric/StraightRoad1.png 1370share/dia/shapes/Map/Isometric/StraightRoad1.png
1342share/dia/shapes/Map/Isometric/StraightRoad1.shape 1371share/dia/shapes/Map/Isometric/StraightRoad1.shape
1343share/dia/shapes/Map/Isometric/T-Junction.png 1372share/dia/shapes/Map/Isometric/T-Junction.png
1344share/dia/shapes/Map/Isometric/T-Junction.shape 1373share/dia/shapes/Map/Isometric/T-Junction.shape
1345share/dia/shapes/Map/Isometric/Train1.png 1374share/dia/shapes/Map/Isometric/Train1.png
1346share/dia/shapes/Map/Isometric/Train1.shape 1375share/dia/shapes/Map/Isometric/Train1.shape
1347share/dia/shapes/Map/Isometric/Train2.png 1376share/dia/shapes/Map/Isometric/Train2.png
1348share/dia/shapes/Map/Isometric/Train2.shape 1377share/dia/shapes/Map/Isometric/Train2.shape
1349share/dia/shapes/Map/Isometric/Tree1.png 1378share/dia/shapes/Map/Isometric/Tree1.png
1350share/dia/shapes/Map/Isometric/Tree1.shape 1379share/dia/shapes/Map/Isometric/Tree1.shape
 1380share/dia/shapes/Misc/expended-node.png
 1381share/dia/shapes/Misc/expended-node.shape
 1382share/dia/shapes/Misc/expensible-node.png
 1383share/dia/shapes/Misc/expensible-node.shape
1351share/dia/shapes/Misc/file.png 1384share/dia/shapes/Misc/file.png
1352share/dia/shapes/Misc/file.shape 1385share/dia/shapes/Misc/file.shape
1353share/dia/shapes/Misc/folder.png 1386share/dia/shapes/Misc/folder.png
1354share/dia/shapes/Misc/folder.shape 1387share/dia/shapes/Misc/folder.shape
1355share/dia/shapes/Network/antenna.png 1388share/dia/shapes/Network/antenna.png
1356share/dia/shapes/Network/antenna.shape 1389share/dia/shapes/Network/antenna.shape
1357share/dia/shapes/Network/computer.png 1390share/dia/shapes/Network/computer.png
1358share/dia/shapes/Network/computer.shape 1391share/dia/shapes/Network/computer.shape
1359share/dia/shapes/Network/dat_external.png 1392share/dia/shapes/Network/dat_external.png
1360share/dia/shapes/Network/dat_external.shape 1393share/dia/shapes/Network/dat_external.shape
1361share/dia/shapes/Network/digitizing_board.png 1394share/dia/shapes/Network/digitizing_board.png
1362share/dia/shapes/Network/digitizing_board.shape 1395share/dia/shapes/Network/digitizing_board.shape
1363share/dia/shapes/Network/disc.png 1396share/dia/shapes/Network/disc.png
@@ -1446,28 +1479,26 @@ share/dia/shapes/Pneumatic/dist52.png @@ -1446,28 +1479,26 @@ share/dia/shapes/Pneumatic/dist52.png
1446share/dia/shapes/Pneumatic/dist52.shape 1479share/dia/shapes/Pneumatic/dist52.shape
1447share/dia/shapes/Pneumatic/drain.png 1480share/dia/shapes/Pneumatic/drain.png
1448share/dia/shapes/Pneumatic/drain.shape 1481share/dia/shapes/Pneumatic/drain.shape
1449share/dia/shapes/Pneumatic/press.png 1482share/dia/shapes/Pneumatic/press.png
1450share/dia/shapes/Pneumatic/press.shape 1483share/dia/shapes/Pneumatic/press.shape
1451share/dia/shapes/Pneumatic/presshy.png 1484share/dia/shapes/Pneumatic/presshy.png
1452share/dia/shapes/Pneumatic/presshy.shape 1485share/dia/shapes/Pneumatic/presshy.shape
1453share/dia/shapes/Pneumatic/presspn.png 1486share/dia/shapes/Pneumatic/presspn.png
1454share/dia/shapes/Pneumatic/presspn.shape 1487share/dia/shapes/Pneumatic/presspn.shape
1455share/dia/shapes/Pneumatic/seijack.png 1488share/dia/shapes/Pneumatic/seijack.png
1456share/dia/shapes/Pneumatic/seijack.shape 1489share/dia/shapes/Pneumatic/seijack.shape
1457share/dia/shapes/Pneumatic/seojack.png 1490share/dia/shapes/Pneumatic/seojack.png
1458share/dia/shapes/Pneumatic/seojack.shape 1491share/dia/shapes/Pneumatic/seojack.shape
1459share/dia/shapes/RDP/arc.png 
1460share/dia/shapes/RDP/arc_inhibiteur.png 
1461share/dia/shapes/RDP/place.png 1492share/dia/shapes/RDP/place.png
1462share/dia/shapes/RDP/place.shape 1493share/dia/shapes/RDP/place.shape
1463share/dia/shapes/RDP/place_marquee.png 1494share/dia/shapes/RDP/place_marquee.png
1464share/dia/shapes/RDP/place_marquee.shape 1495share/dia/shapes/RDP/place_marquee.shape
1465share/dia/shapes/RDP/t_transition.png 1496share/dia/shapes/RDP/t_transition.png
1466share/dia/shapes/RDP/t_transition.shape 1497share/dia/shapes/RDP/t_transition.shape
1467share/dia/shapes/RDP/transition.png 1498share/dia/shapes/RDP/transition.png
1468share/dia/shapes/RDP/transition.shape 1499share/dia/shapes/RDP/transition.shape
1469share/dia/shapes/SDL/block.png 1500share/dia/shapes/SDL/block.png
1470share/dia/shapes/SDL/block.shape 1501share/dia/shapes/SDL/block.shape
1471share/dia/shapes/SDL/comment.png 1502share/dia/shapes/SDL/comment.png
1472share/dia/shapes/SDL/comment.shape 1503share/dia/shapes/SDL/comment.shape
1473share/dia/shapes/SDL/decision.png 1504share/dia/shapes/SDL/decision.png
@@ -1541,26 +1572,27 @@ share/dia/shapes/sybase/ltm.shape @@ -1541,26 +1572,27 @@ share/dia/shapes/sybase/ltm.shape
1541share/dia/shapes/sybase/repserver.png 1572share/dia/shapes/sybase/repserver.png
1542share/dia/shapes/sybase/repserver.shape 1573share/dia/shapes/sybase/repserver.shape
1543share/dia/shapes/sybase/rsm.png 1574share/dia/shapes/sybase/rsm.png
1544share/dia/shapes/sybase/rsm.shape 1575share/dia/shapes/sybase/rsm.shape
1545share/dia/shapes/sybase/stableq.png 1576share/dia/shapes/sybase/stableq.png
1546share/dia/shapes/sybase/stableq.shape 1577share/dia/shapes/sybase/stableq.shape
1547share/dia/sheets/AADL.sheet 1578share/dia/sheets/AADL.sheet
1548share/dia/sheets/Assorted.sheet 1579share/dia/sheets/Assorted.sheet
1549share/dia/sheets/BPMN.sheet 1580share/dia/sheets/BPMN.sheet
1550share/dia/sheets/ChemEng.sheet 1581share/dia/sheets/ChemEng.sheet
1551share/dia/sheets/Circuit.sheet 1582share/dia/sheets/Circuit.sheet
1552share/dia/sheets/Contact.sheet 1583share/dia/sheets/Contact.sheet
1553share/dia/sheets/Cybernetics.sheet 1584share/dia/sheets/Cybernetics.sheet
 1585share/dia/sheets/Database.sheet
1554share/dia/sheets/ER.sheet 1586share/dia/sheets/ER.sheet
1555share/dia/sheets/ER/weakentity.png 1587share/dia/sheets/ER/weakentity.png
1556share/dia/sheets/Electric.sheet 1588share/dia/sheets/Electric.sheet
1557share/dia/sheets/FS.sheet 1589share/dia/sheets/FS.sheet
1558share/dia/sheets/Flowchart.sheet 1590share/dia/sheets/Flowchart.sheet
1559share/dia/sheets/GRAFCET.sheet 1591share/dia/sheets/GRAFCET.sheet
1560share/dia/sheets/GRAFCET/etapei.png 1592share/dia/sheets/GRAFCET/etapei.png
1561share/dia/sheets/GRAFCET/etapemc.png 1593share/dia/sheets/GRAFCET/etapemc.png
1562share/dia/sheets/GRAFCET/etapeme.png 1594share/dia/sheets/GRAFCET/etapeme.png
1563share/dia/sheets/GRAFCET/etapems.png 1595share/dia/sheets/GRAFCET/etapems.png
1564share/dia/sheets/GRAFCET/etapesp.png 1596share/dia/sheets/GRAFCET/etapesp.png
1565share/dia/sheets/GRAFCET/vergent_and.png 1597share/dia/sheets/GRAFCET/vergent_and.png
1566share/dia/sheets/Gane_and_Sarson.sheet 1598share/dia/sheets/Gane_and_Sarson.sheet
@@ -1589,133 +1621,294 @@ share/dia/sheets/KAOS/conflicts.png @@ -1589,133 +1621,294 @@ share/dia/sheets/KAOS/conflicts.png
1589share/dia/sheets/KAOS/controls.png 1621share/dia/sheets/KAOS/controls.png
1590share/dia/sheets/KAOS/input.png 1622share/dia/sheets/KAOS/input.png
1591share/dia/sheets/KAOS/monitors.png 1623share/dia/sheets/KAOS/monitors.png
1592share/dia/sheets/KAOS/obstacle.png 1624share/dia/sheets/KAOS/obstacle.png
1593share/dia/sheets/KAOS/obstructs.png 1625share/dia/sheets/KAOS/obstructs.png
1594share/dia/sheets/KAOS/op-ref.png 1626share/dia/sheets/KAOS/op-ref.png
1595share/dia/sheets/KAOS/or-complete-ref.png 1627share/dia/sheets/KAOS/or-complete-ref.png
1596share/dia/sheets/KAOS/or-ref.png 1628share/dia/sheets/KAOS/or-ref.png
1597share/dia/sheets/KAOS/output.png 1629share/dia/sheets/KAOS/output.png
1598share/dia/sheets/KAOS/performs.png 1630share/dia/sheets/KAOS/performs.png
1599share/dia/sheets/KAOS/requirement.png 1631share/dia/sheets/KAOS/requirement.png
1600share/dia/sheets/KAOS/responsibility.png 1632share/dia/sheets/KAOS/responsibility.png
1601share/dia/sheets/KAOS/softgoal.png 1633share/dia/sheets/KAOS/softgoal.png
 1634share/dia/sheets/Lights.sheet
1602share/dia/sheets/Logic.sheet 1635share/dia/sheets/Logic.sheet
1603share/dia/sheets/MSE.sheet 1636share/dia/sheets/MSE.sheet
1604share/dia/sheets/Misc.sheet 1637share/dia/sheets/Misc.sheet
1605share/dia/sheets/Pneumatic.sheet 1638share/dia/sheets/Pneumatic.sheet
1606share/dia/sheets/SADT.sheet 1639share/dia/sheets/SADT.sheet
1607share/dia/sheets/SDL.sheet 1640share/dia/sheets/SDL.sheet
1608share/dia/sheets/UML.sheet 1641share/dia/sheets/UML.sheet
1609share/dia/sheets/UML/aggregation.png 1642share/dia/sheets/UML/aggregation.png
1610share/dia/sheets/UML/eventsink.png 1643share/dia/sheets/UML/eventsink.png
1611share/dia/sheets/UML/eventsource.png 1644share/dia/sheets/UML/eventsource.png
1612share/dia/sheets/UML/receptacle.png 1645share/dia/sheets/UML/receptacle.png
1613share/dia/sheets/UML/umlclass_template.png 1646share/dia/sheets/UML/umlclass_template.png
1614share/dia/sheets/chronogram.sheet 1647share/dia/sheets/chronogram.sheet
1615share/dia/sheets/ciscocomputer.sheet 1648share/dia/sheets/ciscocomputer.sheet
1616share/dia/sheets/ciscohub.sheet 1649share/dia/sheets/ciscohub.sheet
1617share/dia/sheets/ciscomisc.sheet 1650share/dia/sheets/ciscomisc.sheet
1618share/dia/sheets/cisconetwork.sheet 1651share/dia/sheets/cisconetwork.sheet
1619share/dia/sheets/ciscotelephony.sheet 1652share/dia/sheets/ciscotelephony.sheet
1620share/dia/sheets/civil.sheet 1653share/dia/sheets/civil.sheet
1621share/dia/sheets/jigsaw.sheet 1654share/dia/sheets/jigsaw.sheet
1622share/dia/sheets/network.sheet 1655share/dia/sheets/network.sheet
1623share/dia/sheets/sybase.sheet 1656share/dia/sheets/sybase.sheet
1624share/dia/ui/display-ui.xml 1657share/dia/ui/display-ui.xml
 1658share/dia/ui/integrated-ui.xml
1625share/dia/ui/popup-ui.xml 1659share/dia/ui/popup-ui.xml
 1660share/dia/ui/toolbar-ui.xml
1626share/dia/ui/toolbox-ui.xml 1661share/dia/ui/toolbox-ui.xml
1627share/dia/xslt/dia-uml.xsl 1662share/dia/xslt/dia-uml.xsl
1628share/dia/xslt/dia-uml2c++.xsl 1663share/dia/xslt/dia-uml2c++.xsl
1629share/dia/xslt/dia-uml2componentlist.xsl 1664share/dia/xslt/dia-uml2componentlist.xsl
1630share/dia/xslt/dia-uml2idl.xsl 1665share/dia/xslt/dia-uml2idl.xsl
1631share/dia/xslt/dia-uml2java.xsl 1666share/dia/xslt/dia-uml2java.xsl
1632share/dia/xslt/dia-uml2owl.xsl 1667share/dia/xslt/dia-uml2owl.xsl
1633share/dia/xslt/dia-uml2python.xsl 1668share/dia/xslt/dia-uml2python.xsl
1634share/dia/xslt/stylesheets.xml 1669share/dia/xslt/stylesheets.xml
 1670share/doc/dia/en/examples/diagram.dtd
 1671share/doc/dia/en/examples/shape.dtd
 1672share/doc/dia/en/examples/sheet.dtd
 1673share/doc/dia/eu/examples/diagram.dtd
 1674share/doc/dia/eu/examples/shape.dtd
 1675share/doc/dia/eu/examples/sheet.dtd
 1676share/doc/dia/fr/examples/diagram.dtd
 1677share/doc/dia/fr/examples/shape.dtd
 1678share/doc/dia/fr/examples/sheet.dtd
 1679share/doc/dia/pl/examples/diagram.dtd
 1680share/doc/dia/pl/examples/shape.dtd
 1681share/doc/dia/pl/examples/sheet.dtd
1635${DIA_HELPDIR}/C 1682${DIA_HELPDIR}/C
1636${DIA_HELPDIR}/en/authors.xml 1683${DIA_HELPDIR}/en/authors.xml
 1684${DIA_HELPDIR}/en/custom-shapes.xml
 1685${DIA_HELPDIR}/en/dia-1.xml
 1686${DIA_HELPDIR}/en/dia-cmdline.xml
1637${DIA_HELPDIR}/en/dia.xml 1687${DIA_HELPDIR}/en/dia.xml
1638${DIA_HELPDIR}/en/entities.xml 1688${DIA_HELPDIR}/en/entities.xml
 1689${DIA_HELPDIR}/en/graphics/adjacent.png
 1690${DIA_HELPDIR}/en/graphics/after-hor-spread.png
 1691${DIA_HELPDIR}/en/graphics/after-vert-spread.png
 1692${DIA_HELPDIR}/en/graphics/align-bottom.png
 1693${DIA_HELPDIR}/en/graphics/align-center.png
 1694${DIA_HELPDIR}/en/graphics/align-left.png
 1695${DIA_HELPDIR}/en/graphics/align-menu.png
 1696${DIA_HELPDIR}/en/graphics/align-middle.png
 1697${DIA_HELPDIR}/en/graphics/align-right.png
 1698${DIA_HELPDIR}/en/graphics/align-top.png
 1699${DIA_HELPDIR}/en/graphics/arrow-style.png
 1700${DIA_HELPDIR}/en/graphics/assorted-shapes.png
 1701${DIA_HELPDIR}/en/graphics/before-hor-spread.png
 1702${DIA_HELPDIR}/en/graphics/before-left.png
 1703${DIA_HELPDIR}/en/graphics/before-top.png
 1704${DIA_HELPDIR}/en/graphics/before-vert-spread.png
 1705${DIA_HELPDIR}/en/graphics/bezierline-rightclick.png
 1706${DIA_HELPDIR}/en/graphics/canvas-zoom.png
 1707${DIA_HELPDIR}/en/graphics/cisco-computer-shapes.png
 1708${DIA_HELPDIR}/en/graphics/cisco-misc-shapes.png
 1709${DIA_HELPDIR}/en/graphics/cisco-network-shapes.png
 1710${DIA_HELPDIR}/en/graphics/cisco-switch-shapes.png
 1711${DIA_HELPDIR}/en/graphics/cisco-telephony-shapes.png
 1712${DIA_HELPDIR}/en/graphics/color-dropdown.png
 1713${DIA_HELPDIR}/en/graphics/color-selector1.png
 1714${DIA_HELPDIR}/en/graphics/color_selector.png
 1715${DIA_HELPDIR}/en/graphics/connect-fixed.png
 1716${DIA_HELPDIR}/en/graphics/connect-middle.png
 1717${DIA_HELPDIR}/en/graphics/default-colors.png
 1718${DIA_HELPDIR}/en/graphics/defaults-box.png
 1719${DIA_HELPDIR}/en/graphics/defaults-text.png
 1720${DIA_HELPDIR}/en/graphics/delete-text.png
 1721${DIA_HELPDIR}/en/graphics/dia-startup.png
 1722${DIA_HELPDIR}/en/graphics/diagram-properties-grid.png
 1723${DIA_HELPDIR}/en/graphics/diagram-properties.png
 1724${DIA_HELPDIR}/en/graphics/diagram-tree-sort.png
 1725${DIA_HELPDIR}/en/graphics/diagram-tree.png
 1726${DIA_HELPDIR}/en/graphics/edit-text.png
 1727${DIA_HELPDIR}/en/graphics/file-preferences-diagram.png
 1728${DIA_HELPDIR}/en/graphics/file-preferences-favorites.png
 1729${DIA_HELPDIR}/en/graphics/file-preferences-tree.png
 1730${DIA_HELPDIR}/en/graphics/file-preferences-ui.png
 1731${DIA_HELPDIR}/en/graphics/file-preferences-view.png
 1732${DIA_HELPDIR}/en/graphics/flowchart-shapes.png
1639${DIA_HELPDIR}/en/graphics/greendots.png 1733${DIA_HELPDIR}/en/graphics/greendots.png
1640${DIA_HELPDIR}/en/graphics/home_network.png 1734${DIA_HELPDIR}/en/graphics/home_network.png
 1735${DIA_HELPDIR}/en/graphics/line-arrows.png
 1736${DIA_HELPDIR}/en/graphics/line-buttons.png
 1737${DIA_HELPDIR}/en/graphics/line-colors.png
 1738${DIA_HELPDIR}/en/graphics/line-connect.png
 1739${DIA_HELPDIR}/en/graphics/line-handles.png
 1740${DIA_HELPDIR}/en/graphics/line-styles.png
 1741${DIA_HELPDIR}/en/graphics/line-width.png
1641${DIA_HELPDIR}/en/graphics/line_icon.png 1742${DIA_HELPDIR}/en/graphics/line_icon.png
1642${DIA_HELPDIR}/en/graphics/line_props.png 1743${DIA_HELPDIR}/en/graphics/line_props.png
 1744${DIA_HELPDIR}/en/graphics/misc-shapes.png
 1745${DIA_HELPDIR}/en/graphics/network-shapes.png
 1746${DIA_HELPDIR}/en/graphics/object-group.png
 1747${DIA_HELPDIR}/en/graphics/polyline-rightclick.png
 1748${DIA_HELPDIR}/en/graphics/preferences-gridlines.png
 1749${DIA_HELPDIR}/en/graphics/preferences_fig.png
 1750${DIA_HELPDIR}/en/graphics/properties-uml-class1.png
 1751${DIA_HELPDIR}/en/graphics/reverse-colors.png
 1752${DIA_HELPDIR}/en/graphics/ruler-arrows.png
 1753${DIA_HELPDIR}/en/graphics/sample-flowchart.png
 1754${DIA_HELPDIR}/en/graphics/select-area.png
 1755${DIA_HELPDIR}/en/graphics/select-menu.png
 1756${DIA_HELPDIR}/en/graphics/selected-object.png
 1757${DIA_HELPDIR}/en/graphics/sheets-objects.png
 1758${DIA_HELPDIR}/en/graphics/snaptogrid-button.png
 1759${DIA_HELPDIR}/en/graphics/stacked.png
 1760${DIA_HELPDIR}/en/graphics/standard-line-properties.png
 1761${DIA_HELPDIR}/en/graphics/toolbox-basic.png
 1762${DIA_HELPDIR}/en/graphics/toolbox-image.png
 1763${DIA_HELPDIR}/en/graphics/toolbox-lower.png
 1764${DIA_HELPDIR}/en/graphics/toolbox-magnify.png
 1765${DIA_HELPDIR}/en/graphics/toolbox-modify.png
 1766${DIA_HELPDIR}/en/graphics/toolbox-scroll.png
 1767${DIA_HELPDIR}/en/graphics/toolbox-special.png
 1768${DIA_HELPDIR}/en/graphics/toolbox.png
 1769${DIA_HELPDIR}/en/graphics/uml-shapes.png
 1770${DIA_HELPDIR}/en/graphics/view-menu.png
 1771${DIA_HELPDIR}/en/graphics/view-zoom.png
 1772${DIA_HELPDIR}/en/graphics/zigzagline-rightclick.png
1643${DIA_HELPDIR}/en/intro.xml 1773${DIA_HELPDIR}/en/intro.xml
1644${DIA_HELPDIR}/en/license.xml 1774${DIA_HELPDIR}/en/license.xml
1645${DIA_HELPDIR}/en/usage-canvas.xml 1775${DIA_HELPDIR}/en/usage-canvas.xml
1646${DIA_HELPDIR}/en/usage-customization.xml 1776${DIA_HELPDIR}/en/usage-customization.xml
1647${DIA_HELPDIR}/en/usage-layers.xml 1777${DIA_HELPDIR}/en/usage-layers.xml
1648${DIA_HELPDIR}/en/usage-loadsave.xml 1778${DIA_HELPDIR}/en/usage-loadsave.xml
1649${DIA_HELPDIR}/en/usage-objects-basic.xml 1779${DIA_HELPDIR}/en/usage-objects-basic.xml
1650${DIA_HELPDIR}/en/usage-objects-selecting.xml 1780${DIA_HELPDIR}/en/usage-objects-selecting.xml
1651${DIA_HELPDIR}/en/usage-objects-special.xml 1781${DIA_HELPDIR}/en/usage-objects-special.xml
1652${DIA_HELPDIR}/en/usage-objects.xml 1782${DIA_HELPDIR}/en/usage-objects.xml
1653${DIA_HELPDIR}/en/usage-quickstart.xml 1783${DIA_HELPDIR}/en/usage-quickstart.xml
 1784${DIA_HELPDIR}/eu/authors.xml
1654${DIA_HELPDIR}/eu/dia.xml 1785${DIA_HELPDIR}/eu/dia.xml
 1786${DIA_HELPDIR}/eu/entities.xml
1655${DIA_HELPDIR}/eu/graphics/greendots.png 1787${DIA_HELPDIR}/eu/graphics/greendots.png
1656${DIA_HELPDIR}/eu/graphics/home_network.png 1788${DIA_HELPDIR}/eu/graphics/home_network.png
1657${DIA_HELPDIR}/eu/graphics/line_icon.png 1789${DIA_HELPDIR}/eu/graphics/line_icon.png
1658${DIA_HELPDIR}/eu/graphics/line_props.png 1790${DIA_HELPDIR}/eu/graphics/line_props.png
 1791${DIA_HELPDIR}/eu/intro.xml
 1792${DIA_HELPDIR}/eu/license.xml
 1793${DIA_HELPDIR}/eu/usage-canvas.xml
 1794${DIA_HELPDIR}/eu/usage-customization.xml
 1795${DIA_HELPDIR}/eu/usage-layers.xml
 1796${DIA_HELPDIR}/eu/usage-loadsave.xml
 1797${DIA_HELPDIR}/eu/usage-objects-basic.xml
 1798${DIA_HELPDIR}/eu/usage-objects-selecting.xml
 1799${DIA_HELPDIR}/eu/usage-objects-special.xml
 1800${DIA_HELPDIR}/eu/usage-objects.xml
 1801${DIA_HELPDIR}/eu/usage-quickstart.xml
 1802${DIA_HELPDIR}/fr/authors.xml
 1803${DIA_HELPDIR}/fr/custom-shapes.xml
 1804${DIA_HELPDIR}/fr/dia-1.xml
 1805${DIA_HELPDIR}/fr/dia-cmdline.xml
 1806${DIA_HELPDIR}/fr/dia.xml
 1807${DIA_HELPDIR}/fr/entities.xml
 1808${DIA_HELPDIR}/fr/graphics/color_selector.png
 1809${DIA_HELPDIR}/fr/graphics/greendots.png
 1810${DIA_HELPDIR}/fr/graphics/home_network.png
 1811${DIA_HELPDIR}/fr/graphics/line_icon.png
 1812${DIA_HELPDIR}/fr/graphics/line_props.png
 1813${DIA_HELPDIR}/fr/graphics/preferences_fig.png
 1814${DIA_HELPDIR}/fr/intro.xml
 1815${DIA_HELPDIR}/fr/license.xml
 1816${DIA_HELPDIR}/fr/usage-canvas.xml
 1817${DIA_HELPDIR}/fr/usage-customization.xml
 1818${DIA_HELPDIR}/fr/usage-layers.xml
 1819${DIA_HELPDIR}/fr/usage-loadsave.xml
 1820${DIA_HELPDIR}/fr/usage-objects-basic.xml
 1821${DIA_HELPDIR}/fr/usage-objects-selecting.xml
 1822${DIA_HELPDIR}/fr/usage-objects-special.xml
 1823${DIA_HELPDIR}/fr/usage-objects.xml
 1824${DIA_HELPDIR}/fr/usage-quickstart.xml
 1825${DIA_HELPDIR}/pl/authors.xml
1659${DIA_HELPDIR}/pl/dia.xml 1826${DIA_HELPDIR}/pl/dia.xml
1660${DIA_HELPDIR}/pl/graphics/greendots.png 1827${DIA_HELPDIR}/pl/graphics/greendots.png
1661${DIA_HELPDIR}/pl/graphics/home_network.png 1828${DIA_HELPDIR}/pl/graphics/home_network.png
1662${DIA_HELPDIR}/pl/graphics/line_props.png 1829${DIA_HELPDIR}/pl/graphics/line_props.png
 1830${DIA_HELPDIR}/pl/intro.xml
 1831${DIA_HELPDIR}/pl/license.xml
 1832${DIA_HELPDIR}/pl/usage-canvas.xml
 1833${DIA_HELPDIR}/pl/usage-customization.xml
 1834${DIA_HELPDIR}/pl/usage-layers.xml
 1835${DIA_HELPDIR}/pl/usage-loadsave.xml
 1836${DIA_HELPDIR}/pl/usage-objects-selecting.xml
 1837${DIA_HELPDIR}/pl/usage-objects-special.xml
 1838${DIA_HELPDIR}/pl/usage-objects.xml
 1839${DIA_HELPDIR}/pl/usage-quickstart.xml
 1840share/icons/hicolor/16x16/apps/dia.png
 1841share/icons/hicolor/22x22/apps/dia.png
 1842share/icons/hicolor/24x24/apps/dia.png
 1843share/icons/hicolor/32x32/apps/dia.png
 1844share/icons/hicolor/48x48/apps/dia.png
 1845share/icons/hicolor/scalable/apps/dia.svg
1663share/locale/am/LC_MESSAGES/dia.mo 1846share/locale/am/LC_MESSAGES/dia.mo
1664share/locale/ar/LC_MESSAGES/dia.mo 1847share/locale/ar/LC_MESSAGES/dia.mo
1665share/locale/az/LC_MESSAGES/dia.mo 1848share/locale/az/LC_MESSAGES/dia.mo
1666share/locale/be/LC_MESSAGES/dia.mo 1849share/locale/be/LC_MESSAGES/dia.mo
1667share/locale/bg/LC_MESSAGES/dia.mo 1850share/locale/bg/LC_MESSAGES/dia.mo
1668share/locale/bs/LC_MESSAGES/dia.mo 1851share/locale/bs/LC_MESSAGES/dia.mo
1669share/locale/ca/LC_MESSAGES/dia.mo 1852share/locale/ca/LC_MESSAGES/dia.mo
1670share/locale/cs/LC_MESSAGES/dia.mo 1853share/locale/cs/LC_MESSAGES/dia.mo
1671share/locale/da/LC_MESSAGES/dia.mo 1854share/locale/da/LC_MESSAGES/dia.mo
1672share/locale/de/LC_MESSAGES/dia.mo 1855share/locale/de/LC_MESSAGES/dia.mo
 1856share/locale/dz/LC_MESSAGES/dia.mo
1673share/locale/el/LC_MESSAGES/dia.mo 1857share/locale/el/LC_MESSAGES/dia.mo
1674share/locale/en_CA/LC_MESSAGES/dia.mo 1858share/locale/en_CA/LC_MESSAGES/dia.mo
1675share/locale/en_GB/LC_MESSAGES/dia.mo 1859share/locale/en_GB/LC_MESSAGES/dia.mo
1676share/locale/es/LC_MESSAGES/dia.mo 1860share/locale/es/LC_MESSAGES/dia.mo
1677share/locale/eu/LC_MESSAGES/dia.mo 1861share/locale/eu/LC_MESSAGES/dia.mo
1678share/locale/fi/LC_MESSAGES/dia.mo 1862share/locale/fi/LC_MESSAGES/dia.mo
1679share/locale/fr/LC_MESSAGES/dia.mo 1863share/locale/fr/LC_MESSAGES/dia.mo
1680share/locale/ga/LC_MESSAGES/dia.mo 1864share/locale/ga/LC_MESSAGES/dia.mo
1681share/locale/gl/LC_MESSAGES/dia.mo 1865share/locale/gl/LC_MESSAGES/dia.mo
1682share/locale/gu/LC_MESSAGES/dia.mo 1866share/locale/gu/LC_MESSAGES/dia.mo
1683share/locale/hr/LC_MESSAGES/dia.mo 1867share/locale/hr/LC_MESSAGES/dia.mo
1684share/locale/hu/LC_MESSAGES/dia.mo 1868share/locale/hu/LC_MESSAGES/dia.mo
1685share/locale/id/LC_MESSAGES/dia.mo 1869share/locale/id/LC_MESSAGES/dia.mo
1686share/locale/is/LC_MESSAGES/dia.mo 1870share/locale/is/LC_MESSAGES/dia.mo
1687share/locale/it/LC_MESSAGES/dia.mo 1871share/locale/it/LC_MESSAGES/dia.mo
1688share/locale/ja/LC_MESSAGES/dia.mo 1872share/locale/ja/LC_MESSAGES/dia.mo
 1873share/locale/kn/LC_MESSAGES/dia.mo
1689share/locale/ko/LC_MESSAGES/dia.mo 1874share/locale/ko/LC_MESSAGES/dia.mo
1690share/locale/lt/LC_MESSAGES/dia.mo 1875share/locale/lt/LC_MESSAGES/dia.mo
1691share/locale/lv/LC_MESSAGES/dia.mo 1876share/locale/lv/LC_MESSAGES/dia.mo
1692share/locale/mk/LC_MESSAGES/dia.mo 1877share/locale/mk/LC_MESSAGES/dia.mo
1693share/locale/ml/LC_MESSAGES/dia.mo 1878share/locale/ml/LC_MESSAGES/dia.mo
1694share/locale/mn/LC_MESSAGES/dia.mo 1879share/locale/mn/LC_MESSAGES/dia.mo
 1880share/locale/mr/LC_MESSAGES/dia.mo
1695share/locale/ms/LC_MESSAGES/dia.mo 1881share/locale/ms/LC_MESSAGES/dia.mo
1696share/locale/nb/LC_MESSAGES/dia.mo 1882share/locale/nb/LC_MESSAGES/dia.mo
1697share/locale/ne/LC_MESSAGES/dia.mo 1883share/locale/ne/LC_MESSAGES/dia.mo
1698share/locale/nl/LC_MESSAGES/dia.mo 1884share/locale/nl/LC_MESSAGES/dia.mo
1699share/locale/nn/LC_MESSAGES/dia.mo 1885share/locale/nn/LC_MESSAGES/dia.mo
 1886share/locale/oc/LC_MESSAGES/dia.mo
 1887share/locale/pa/LC_MESSAGES/dia.mo
1700share/locale/pl/LC_MESSAGES/dia.mo 1888share/locale/pl/LC_MESSAGES/dia.mo
1701share/locale/pt/LC_MESSAGES/dia.mo 1889share/locale/pt/LC_MESSAGES/dia.mo
1702share/locale/pt_BR/LC_MESSAGES/dia.mo 1890share/locale/pt_BR/LC_MESSAGES/dia.mo
1703share/locale/ro/LC_MESSAGES/dia.mo 1891share/locale/ro/LC_MESSAGES/dia.mo
1704share/locale/ru/LC_MESSAGES/dia.mo 1892share/locale/ru/LC_MESSAGES/dia.mo
1705share/locale/rw/LC_MESSAGES/dia.mo 1893share/locale/rw/LC_MESSAGES/dia.mo
1706share/locale/sk/LC_MESSAGES/dia.mo 1894share/locale/sk/LC_MESSAGES/dia.mo
1707share/locale/sl/LC_MESSAGES/dia.mo 1895share/locale/sl/LC_MESSAGES/dia.mo
1708share/locale/sq/LC_MESSAGES/dia.mo 1896share/locale/sq/LC_MESSAGES/dia.mo
1709share/locale/sr/LC_MESSAGES/dia.mo 1897share/locale/sr/LC_MESSAGES/dia.mo
1710share/locale/sr@Latn/LC_MESSAGES/dia.mo 1898share/locale/sr@Latn/LC_MESSAGES/dia.mo
1711share/locale/sv/LC_MESSAGES/dia.mo 1899share/locale/sv/LC_MESSAGES/dia.mo
1712share/locale/th/LC_MESSAGES/dia.mo 1900share/locale/th/LC_MESSAGES/dia.mo
1713share/locale/tr/LC_MESSAGES/dia.mo 1901share/locale/tr/LC_MESSAGES/dia.mo
1714share/locale/uk/LC_MESSAGES/dia.mo 1902share/locale/uk/LC_MESSAGES/dia.mo
1715share/locale/vi/LC_MESSAGES/dia.mo 1903share/locale/vi/LC_MESSAGES/dia.mo
1716share/locale/zh_CN/LC_MESSAGES/dia.mo 1904share/locale/zh_CN/LC_MESSAGES/dia.mo
 1905share/locale/zh_HK/LC_MESSAGES/dia.mo
1717share/locale/zh_TW/LC_MESSAGES/dia.mo 1906share/locale/zh_TW/LC_MESSAGES/dia.mo
1718share/mime-info/dia.keys 1907share/mime-info/dia.keys
1719share/mime-info/dia.mime 1908share/mime-info/dia.mime
1720share/pixmaps/dia-diagram.png 1909share/omf/dia/dia-C.omf
1721share/pixmaps/dia_gnome_icon.png 1910share/omf/dia/dia-eu.omf
 1911share/omf/dia/dia-fr.omf
 1912share/omf/dia/dia-pl.omf
 1913@pkgdir share/oaf
 1914@pkgdir share/dia/sheets/SISSI
cvs diff -r1.7 -r1.8 pkgsrc/graphics/dia/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/dia/options.mk 2009/07/22 09:01:31 1.7
+++ pkgsrc/graphics/dia/options.mk 2009/12/09 10:22:04 1.8
@@ -1,30 +1,28 @@ @@ -1,30 +1,28 @@
1# $NetBSD: options.mk,v 1.7 2009/07/22 09:01:31 wiz Exp $ 1# $NetBSD: options.mk,v 1.8 2009/12/09 10:22:04 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.dia 3PKG_OPTIONS_VAR= PKG_OPTIONS.dia
4#PKG_SUPPORTED_OPTIONS= gnome cairo 4PKG_SUPPORTED_OPTIONS= gnome cairo
5PKG_SUPPORTED_OPTIONS= gnome 5PKG_SUGGESTED_OPTIONS= gnome cairo
6PKG_SUGGESTED_OPTIONS= gnome 
7 6
8.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
9 8
10PLIST_VARS+= cairo gnome 9PLIST_VARS+= cairo gnome
11 10
12.if !empty(PKG_OPTIONS:Mgnome) 11.if !empty(PKG_OPTIONS:Mgnome)
13CONFIGURE_ARGS+= --enable-gnome 12CONFIGURE_ARGS+= --enable-gnome
14. include "../../devel/libgnome/buildlink3.mk" 13. include "../../devel/libgnome/buildlink3.mk"
15. include "../../devel/libgnomeui/buildlink3.mk" 14. include "../../devel/libgnomeui/buildlink3.mk"
16PLIST.gnome= yes 15PLIST.gnome= yes
17PLIST_SUBST+= DIA_HELPDIR=share/gnome/help/dia 16PLIST_SUBST+= DIA_HELPDIR=share/gnome/help/dia
18.else 17.else
19CONFIGURE_ARGS+= --disable-gnome 18CONFIGURE_ARGS+= --disable-gnome
20PLIST_SUBST+= DIA_HELPDIR=share/dia/help 19PLIST_SUBST+= DIA_HELPDIR=share/dia/help
21.endif 20.endif
22 21
23# Disabled, freedesktop is down. 
24.if !empty(PKG_OPTIONS:Mcairo) 22.if !empty(PKG_OPTIONS:Mcairo)
25CONFIGURE_ARGS+= --with-cairo 23CONFIGURE_ARGS+= --with-cairo
26. include "../../graphics/cairo/buildlink3.mk" 24. include "../../graphics/cairo/buildlink3.mk"
27PLIST.cairo= yes 25PLIST.cairo= yes
28.else 26.else
29CONFIGURE_ARGS+= --without-cairo 27CONFIGURE_ARGS+= --without-cairo
30.endif 28.endif
cvs diff -r1.5 -r1.6 pkgsrc/graphics/dia/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/dia/patches/patch-aa 2007/04/19 20:14:59 1.5
+++ pkgsrc/graphics/dia/patches/patch-aa 2009/12/09 10:22:04 1.6
@@ -1,50 +1,67 @@ @@ -1,50 +1,67 @@
1$NetBSD: patch-aa,v 1.5 2007/04/19 20:14:59 drochner Exp $ 1$NetBSD: patch-aa,v 1.6 2009/12/09 10:22:04 drochner Exp $
2 2
3--- configure.orig 2007-03-29 08:11:17.000000000 +0200 3--- configure.orig 2009-05-03 20:09:51.000000000 +0200
4+++ configure 4+++ configure
5@@ -20515,7 +20515,7 @@ if test "${with_freetype+set}" = set; th 5@@ -22005,7 +22005,7 @@ else
6 else 
7 with_freetype=yes 6 with_freetype=yes
8 fi; 7 fi
 8
9-if test "x$with_freetype" == "xyes"; then 9-if test "x$with_freetype" == "xyes"; then
10+if test "x$with_freetype" = "xyes"; then 10+if test "x$with_freetype" = "xyes"; then
11  11
12 pkg_failed=no 12 pkg_failed=no
13 echo "$as_me:$LINENO: checking for PANGOFT2" >&5 13 { $as_echo "$as_me:$LINENO: checking for PANGOFT2" >&5
14@@ -20989,7 +20989,8 @@ if test "${with_gnomeprint+set}" = set;  14@@ -22692,7 +22692,7 @@ else
15 else 15 $as_echo "yes" >&6; }
16 with_gnomeprint=no 16 pangocairo_ok=yes
17 fi; 17 fi
18-if test "x$with_gnomeprint" == "xyes"; then 18-if test "x$pangocairo_ok" == "xyes"; then
19+if  19+if test "x$pangocairo_ok" = "xyes"; then
20+test "x$with_gnomeprint" = "xyes"; then 
21  20
22 pkg_failed=no 21 cat >>confdefs.h <<\_ACEOF
23 echo "$as_me:$LINENO: checking for GNOMEPRINT" >&5 22 #define HAVE_PANGOCAIRO_H 1
24@@ -21927,7 +21928,7 @@ else 23@@ -23393,7 +23393,7 @@ $as_echo "no" >&6; }
25 echo "${ECHO_T}no" >&6 
26 fi 24 fi
27  25
 26
28-if test "$XGETTEXT" == none ; then 27-if test "$XGETTEXT" == none ; then
29+if test "$XGETTEXT" = none ; then 28+if test "$XGETTEXT" = none ; then
30 { { echo "$as_me:$LINENO: error: xgettext program not found: $XGETTEXT." >&5 29 { { $as_echo "$as_me:$LINENO: error: xgettext program not found: $XGETTEXT." >&5
31 echo "$as_me: error: xgettext program not found: $XGETTEXT." >&2;} 30 $as_echo "$as_me: error: xgettext program not found: $XGETTEXT." >&2;}
32 { (exit 1); exit 1; }; } 31 { (exit 1); exit 1; }; }
33@@ -25023,7 +25024,7 @@ echo $ECHO_N "checking for $am_display_P 32@@ -26631,7 +26631,7 @@ $as_echo_n "checking for $am_display_PYT
34 if test "${am_cv_python_pythondir+set}" = set; then 33 if test "${am_cv_python_pythondir+set}" = set; then
35 echo $ECHO_N "(cached) $ECHO_C" >&6 34 $as_echo_n "(cached) " >&6
36 else 35 else
37- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || 36- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
38+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null || 37+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null ||
39 echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` 38 echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
40 fi 39 fi
41 echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 40 { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
42@@ -25041,7 +25042,7 @@ echo $ECHO_N "checking for $am_display_P 41@@ -26649,7 +26649,7 @@ $as_echo_n "checking for $am_display_PYT
43 if test "${am_cv_python_pyexecdir+set}" = set; then 42 if test "${am_cv_python_pyexecdir+set}" = set; then
44 echo $ECHO_N "(cached) $ECHO_C" >&6 43 $as_echo_n "(cached) " >&6
45 else 44 else
46- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || 45- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
47+ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null || 46+ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null ||
48 echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` 47 echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
49 fi 48 fi
50 echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 49 { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
 50@@ -27022,7 +27022,7 @@ $as_echo "no" >&6; }
 51 fi
 52
 53
 54-if test "x$dblatex" == "xno"; then
 55+if test "x$dblatex" = "xno"; then
 56 if test "x$jw" != "xno"; then
 57 WITH_JW_TRUE=
 58 WITH_JW_FALSE='#'
 59@@ -27043,7 +27043,7 @@ fi
 60 fi
 61 hardbook_ok=no
 62 xsltproc_ok=no
 63-if test "x$with_hardbooks" == "xno"; then
 64+if test "x$with_hardbooks" = "xno"; then
 65 if test "xno" != "xno"; then
 66 WITH_JW_TRUE=
 67 WITH_JW_FALSE='#'
File Deleted: pkgsrc/graphics/dia/patches/Attic/patch-ab
cvs diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-ca (expand / switch to unified diff)

--- pkgsrc/graphics/dia/patches/patch-ca 2006/06/11 16:55:35 1.1
+++ pkgsrc/graphics/dia/patches/patch-ca 2009/12/09 10:22:04 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ca,v 1.1 2006/06/11 16:55:35 drochner Exp $ 1$NetBSD: patch-ca,v 1.2 2009/12/09 10:22:04 drochner Exp $
2 2
3--- doc/en/Makefile.in.orig 2006-06-11 17:34:55.000000000 +0200 3--- doc/en/Makefile.in.orig 2009-05-03 20:12:41.000000000 +0200
4+++ doc/en/Makefile.in 4+++ doc/en/Makefile.in
5@@ -326,7 +326,7 @@ docname = dia 5@@ -332,7 +332,7 @@ RESOLUTION = 600
6 lang = en 6 ENCODING = utf8
7 omffile =  7 UNICODE = 1
8 entities =  8 LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside'
9-@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang) 9-@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/$(docname)/help/$(lang)
10+@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang) 10+@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/dia/help/$(lang)
11  11
12 # ********** Begin of section some packagers may need to modify ********** 12 # ********** Begin of section some packagers may need to modify **********
13 # This variable (docdir) specifies where the documents should be installed. 13 # This variable (helpdocdir) specifies where the documents should be installed.
cvs diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-cb (expand / switch to unified diff)

--- pkgsrc/graphics/dia/patches/patch-cb 2006/06/11 16:55:35 1.1
+++ pkgsrc/graphics/dia/patches/patch-cb 2009/12/09 10:22:04 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-cb,v 1.1 2006/06/11 16:55:35 drochner Exp $ 1$NetBSD: patch-cb,v 1.2 2009/12/09 10:22:04 drochner Exp $
2 2
3--- doc/eu/Makefile.in.orig 2006-06-11 17:35:09.000000000 +0200 3--- doc/eu/Makefile.in.orig 2009-05-03 20:12:41.000000000 +0200
4+++ doc/eu/Makefile.in 4+++ doc/eu/Makefile.in
5@@ -326,7 +326,7 @@ docname = dia 5@@ -331,7 +331,7 @@ RESOLUTION = 600
6 lang = eu 6 ENCODING = utf8
7 omffile =  7 UNICODE = 1
8 entities =  8 LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside'
9-@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang) 9-@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/$(docname)/help/$(lang)
10+@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang) 10+@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/dia/help/$(lang)
11  11
12 # ********** Begin of section some packagers may need to modify ********** 12 # ********** Begin of section some packagers may need to modify **********
13 # This variable (docdir) specifies where the documents should be installed. 13 # This variable (helpdocdir) specifies where the documents should be installed.
cvs diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-cc (expand / switch to unified diff)

--- pkgsrc/graphics/dia/patches/patch-cc 2006/06/11 16:55:35 1.1
+++ pkgsrc/graphics/dia/patches/patch-cc 2009/12/09 10:22:04 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-cc,v 1.1 2006/06/11 16:55:35 drochner Exp $ 1$NetBSD: patch-cc,v 1.2 2009/12/09 10:22:04 drochner Exp $
2 2
3--- doc/pl/Makefile.in.orig 2006-06-11 17:35:25.000000000 +0200 3--- doc/pl/Makefile.in.orig 2009-05-03 20:12:41.000000000 +0200
4+++ doc/pl/Makefile.in 4+++ doc/pl/Makefile.in
5@@ -322,7 +322,7 @@ docname = dia 5@@ -326,7 +326,7 @@ DOCUMENT_ENCODING = ISO-8859-2
6 lang = pl 6 ENCODING = utf8
7 omffile =  7 UNICODE = 1
8 entities =  8 LATEX_CLASS_OPTIONS = -P 'latex.class.options=oneside' -P 'latex.babel.use=0'
9-@HAVE_GNOME_FALSE@docdir = $(datadir)/help/$(docname)/$(lang) 9-@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/$(docname)/help/$(lang)
10+@HAVE_GNOME_FALSE@docdir = $(datadir)/dia/help/$(lang) 10+@HAVE_GNOME_FALSE@helpdocdir = $(datadir)/dia/help/$(lang)
11  11
12 # ********** Begin of section some packagers may need to modify ********** 12 # ********** Begin of section some packagers may need to modify **********
13 # This variable (docdir) specifies where the documents should be installed. 13 # This variable (helpdocdir) specifies where the documents should be installed.
File Added: pkgsrc/graphics/dia/patches/patch-cd
$NetBSD: patch-cd,v 1.1 2009/12/09 10:22:04 drochner Exp $

--- doc/fr/Makefile.in.orig	2009-05-03 20:12:41.000000000 +0200
+++ doc/fr/Makefile.in
@@ -571,7 +571,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-man
+install-data-am: install-data-local
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
cvs diff -r1.2 -r1.3 pkgsrc/graphics/dia/patches/patch-da (expand / switch to unified diff)

--- pkgsrc/graphics/dia/patches/patch-da 2007/11/17 14:14:01 1.2
+++ pkgsrc/graphics/dia/patches/patch-da 2009/12/09 10:22:04 1.3
@@ -1,21 +1,19 @@ @@ -1,21 +1,19 @@
1$NetBSD: patch-da,v 1.2 2007/11/17 14:14:01 rillig Exp $ 1$NetBSD: patch-da,v 1.3 2009/12/09 10:22:04 drochner Exp $
2 2
3Some shells don't like syntactically empty "for" loops. 3--- omf.make.orig 2009-04-17 10:25:24.000000000 +0200
4 4+++ omf.make
5--- omf.make.orig 2007-01-06 23:39:36.000000000 +0100 
6+++ omf.make 2007-11-17 15:12:01.000000000 +0100 
7@@ -44,11 +44,10 @@ omf_timestamp: $(omffile) 5@@ -44,11 +44,10 @@ omf_timestamp: $(omffile)
8  6
9 install-data-hook-omf: 7 install-data-hook-omf:
10 $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) 8 $(mkinstalldirs) $(omf_dest_dir)
11- if test "$(omffile)"; then \ 9- -if test -n "$(omffile)"; then \
12- for file in $(omffile); do \ 10- for file in $(omffile); do \
13+ omffile="$(omffile)"; \ 11+ omffile="$(omffile)"; \
14+ for file in $$omffile; do \ 12+ for file in $$omffile; do \
15 $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ 13 $(INSTALL_DATA) $$file.out $(omf_dest_dir)/$$file; \
16- done; \ 14- done; \
17- fi 15- fi
18+ done 16+ done;
19 -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) 17 -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(omf_dest_dir)
20  18
21 uninstall-local-omf: 19 uninstall-local-omf: