diff options
-rw-r--r-- | graphics/dia/Makefile | 8 | ||||
-rw-r--r-- | graphics/dia/PLIST | 161 | ||||
-rw-r--r-- | graphics/dia/distinfo | 7 | ||||
-rw-r--r-- | graphics/dia/patches/patch-aa | 22 |
4 files changed, 185 insertions, 13 deletions
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 94cdd0dc460..a24fea7ffe9 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2004/04/14 16:15:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.32 2004/05/06 10:21:47 drochner Exp $ -DISTNAME= dia-0.92.2 -PKGREVISION= 7 +DISTNAME= dia-0.93 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.92/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.93/} MAINTAINER= jmcneill@invisible.yi.org HOMEPAGE= http://www.lysator.liu.se/~alla/dia/ @@ -43,6 +42,7 @@ post-patch: .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/py-gtk2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST index 6f651b2ccb4..29c4cfc983f 100644 --- a/graphics/dia/PLIST +++ b/graphics/dia/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/12/02 22:32:48 recht Exp $ +@comment $NetBSD: PLIST,v 1.6 2004/05/06 10:21:47 drochner Exp $ bin/dia lib/dia/libbondgraph_objects.a lib/dia/libbondgraph_objects.la @@ -78,6 +78,8 @@ lib/dia/libxslt_filter.so man/man1/dia.1 share/applications/dia.desktop share/dia/dia_logo.png +share/dia/images/broken-chain.xpm +share/dia/images/unbroken-chain.xpm share/dia/python-startup.py share/dia/python/diasvg.py share/dia/python/group_props.py @@ -106,6 +108,8 @@ share/dia/shapes/Assorted/arrow-right-notched.png share/dia/shapes/Assorted/arrow-right-notched.shape share/dia/shapes/Assorted/arrow-right.png share/dia/shapes/Assorted/arrow-right.shape +share/dia/shapes/Assorted/arrow-turn-up.png +share/dia/shapes/Assorted/arrow-turn-up.shape share/dia/shapes/Assorted/arrow-up-down-left.png share/dia/shapes/Assorted/arrow-up-down-left.shape share/dia/shapes/Assorted/arrow-up-down.png @@ -750,6 +754,66 @@ share/dia/shapes/Contact/l_soutr.shape share/dia/shapes/Contact/l_soutr.xpm share/dia/shapes/Contact/l_souts.shape share/dia/shapes/Contact/l_souts.xpm +share/dia/shapes/Cybernetics/b-integrator.png +share/dia/shapes/Cybernetics/b-integrator.shape +share/dia/shapes/Cybernetics/b-minus.png +share/dia/shapes/Cybernetics/b-minus.shape +share/dia/shapes/Cybernetics/b-sens.png +share/dia/shapes/Cybernetics/b-sens.shape +share/dia/shapes/Cybernetics/delta-t.png +share/dia/shapes/Cybernetics/delta-t.shape +share/dia/shapes/Cybernetics/empty-func.png +share/dia/shapes/Cybernetics/empty-func.shape +share/dia/shapes/Cybernetics/factor-0to-1.png +share/dia/shapes/Cybernetics/factor-0to-1.shape +share/dia/shapes/Cybernetics/factor-0to1.png +share/dia/shapes/Cybernetics/factor-0to1.shape +share/dia/shapes/Cybernetics/factor-greater1.png +share/dia/shapes/Cybernetics/factor-greater1.shape +share/dia/shapes/Cybernetics/factor-smaller-1.png +share/dia/shapes/Cybernetics/factor-smaller-1.shape +share/dia/shapes/Cybernetics/full-wave-rectifier.png +share/dia/shapes/Cybernetics/full-wave-rectifier.shape +share/dia/shapes/Cybernetics/half-wave-rectifier.png +share/dia/shapes/Cybernetics/half-wave-rectifier.shape +share/dia/shapes/Cybernetics/hpf.png +share/dia/shapes/Cybernetics/hpf.shape +share/dia/shapes/Cybernetics/l-integrator.png +share/dia/shapes/Cybernetics/l-integrator.shape +share/dia/shapes/Cybernetics/l-minus.png +share/dia/shapes/Cybernetics/l-minus.shape +share/dia/shapes/Cybernetics/l-sens.png +share/dia/shapes/Cybernetics/l-sens.shape +share/dia/shapes/Cybernetics/lpf.png +share/dia/shapes/Cybernetics/lpf.shape +share/dia/shapes/Cybernetics/negative-shift.png +share/dia/shapes/Cybernetics/negative-shift.shape +share/dia/shapes/Cybernetics/positive-shift.png +share/dia/shapes/Cybernetics/positive-shift.shape +share/dia/shapes/Cybernetics/product.png +share/dia/shapes/Cybernetics/product.shape +share/dia/shapes/Cybernetics/r-integrator.png +share/dia/shapes/Cybernetics/r-integrator.shape +share/dia/shapes/Cybernetics/r-minus.png +share/dia/shapes/Cybernetics/r-minus.shape +share/dia/shapes/Cybernetics/r-sens.png +share/dia/shapes/Cybernetics/r-sens.shape +share/dia/shapes/Cybernetics/relay.png +share/dia/shapes/Cybernetics/relay.shape +share/dia/shapes/Cybernetics/saturation.png +share/dia/shapes/Cybernetics/saturation.shape +share/dia/shapes/Cybernetics/sigmoid.png +share/dia/shapes/Cybernetics/sigmoid.shape +share/dia/shapes/Cybernetics/sine.png +share/dia/shapes/Cybernetics/sine.shape +share/dia/shapes/Cybernetics/sum.png +share/dia/shapes/Cybernetics/sum.shape +share/dia/shapes/Cybernetics/t-integrator.png +share/dia/shapes/Cybernetics/t-integrator.shape +share/dia/shapes/Cybernetics/t-minus.png +share/dia/shapes/Cybernetics/t-minus.shape +share/dia/shapes/Cybernetics/t-sens.png +share/dia/shapes/Cybernetics/t-sens.shape share/dia/shapes/Electric/cnx.shape share/dia/shapes/Electric/cnx.xpm share/dia/shapes/Electric/command.shape @@ -766,6 +830,20 @@ share/dia/shapes/Electric/lamp.shape share/dia/shapes/Electric/lamp.xpm share/dia/shapes/Electric/relay.shape share/dia/shapes/Electric/relay.xpm +share/dia/shapes/Electric/vcommand.shape +share/dia/shapes/Electric/vcommand.xpm +share/dia/shapes/Electric/vcontact_f.shape +share/dia/shapes/Electric/vcontact_f.xpm +share/dia/shapes/Electric/vcontact_o.shape +share/dia/shapes/Electric/vcontact_o.xpm +share/dia/shapes/Electric/vintpos_f.shape +share/dia/shapes/Electric/vintpos_f.xpm +share/dia/shapes/Electric/vintpos_o.shape +share/dia/shapes/Electric/vintpos_o.xpm +share/dia/shapes/Electric/vlamp.shape +share/dia/shapes/Electric/vlamp.xpm +share/dia/shapes/Electric/vrelay.shape +share/dia/shapes/Electric/vrelay.xpm share/dia/shapes/Flowchart/collate.shape share/dia/shapes/Flowchart/collate.xpm share/dia/shapes/Flowchart/delay.shape @@ -844,6 +922,56 @@ share/dia/shapes/MSE/small_extension_node.shape share/dia/shapes/MSE/small_extension_node.xpm share/dia/shapes/MSE/tacsat.shape share/dia/shapes/MSE/tacsat.xpm +share/dia/shapes/Map/Isometric/Block1.png +share/dia/shapes/Map/Isometric/Block1.shape +share/dia/shapes/Map/Isometric/Block2.png +share/dia/shapes/Map/Isometric/Block2.shape +share/dia/shapes/Map/Isometric/Block3.png +share/dia/shapes/Map/Isometric/Block3.shape +share/dia/shapes/Map/Isometric/Block4.png +share/dia/shapes/Map/Isometric/Block4.shape +share/dia/shapes/Map/Isometric/Block5.png +share/dia/shapes/Map/Isometric/Block5.shape +share/dia/shapes/Map/Isometric/Block6.png +share/dia/shapes/Map/Isometric/Block6.shape +share/dia/shapes/Map/Isometric/Block7.png +share/dia/shapes/Map/Isometric/Block7.shape +share/dia/shapes/Map/Isometric/Car1.png +share/dia/shapes/Map/Isometric/Car1.shape +share/dia/shapes/Map/Isometric/Car2.png +share/dia/shapes/Map/Isometric/Car2.shape +share/dia/shapes/Map/Isometric/Corner1.png +share/dia/shapes/Map/Isometric/Corner1.shape +share/dia/shapes/Map/Isometric/Corner2.png +share/dia/shapes/Map/Isometric/Corner2.shape +share/dia/shapes/Map/Isometric/Crossroads.png +share/dia/shapes/Map/Isometric/Crossroads.shape +share/dia/shapes/Map/Isometric/Elevated.png +share/dia/shapes/Map/Isometric/Elevated.shape +share/dia/shapes/Map/Isometric/Factory.png +share/dia/shapes/Map/Isometric/Factory.shape +share/dia/shapes/Map/Isometric/FootBridge.png +share/dia/shapes/Map/Isometric/FootBridge.shape +share/dia/shapes/Map/Isometric/OneWay.png +share/dia/shapes/Map/Isometric/OneWay.shape +share/dia/shapes/Map/Isometric/RedCar.png +share/dia/shapes/Map/Isometric/RedCar.shape +share/dia/shapes/Map/Isometric/River.png +share/dia/shapes/Map/Isometric/River.shape +share/dia/shapes/Map/Isometric/Road1.png +share/dia/shapes/Map/Isometric/Road1.shape +share/dia/shapes/Map/Isometric/Roof1.png +share/dia/shapes/Map/Isometric/Roof1.shape +share/dia/shapes/Map/Isometric/StraightRoad1.png +share/dia/shapes/Map/Isometric/StraightRoad1.shape +share/dia/shapes/Map/Isometric/T-Junction.png +share/dia/shapes/Map/Isometric/T-Junction.shape +share/dia/shapes/Map/Isometric/Train1.png +share/dia/shapes/Map/Isometric/Train1.shape +share/dia/shapes/Map/Isometric/Train2.png +share/dia/shapes/Map/Isometric/Train2.shape +share/dia/shapes/Map/Isometric/Tree1.png +share/dia/shapes/Map/Isometric/Tree1.shape share/dia/shapes/Misc/file.png share/dia/shapes/Misc/file.shape share/dia/shapes/Misc/folder.png @@ -1031,6 +1159,7 @@ share/dia/shapes/sybase/stableq.xpm share/dia/sheets/Assorted.sheet share/dia/sheets/Circuit.sheet share/dia/sheets/Contact.sheet +share/dia/sheets/Cybernetics.sheet share/dia/sheets/EML.sheet share/dia/sheets/ER.sheet share/dia/sheets/ER/weakentity.xpm @@ -1044,6 +1173,7 @@ share/dia/sheets/GRAFCET/etapeme.xpm share/dia/sheets/GRAFCET/etapems.xpm share/dia/sheets/GRAFCET/etapesp.xpm share/dia/sheets/GRAFCET/vergent_and.xpm +share/dia/sheets/IsometricMap.sheet share/dia/sheets/Logic.sheet share/dia/sheets/MSE.sheet share/dia/sheets/Misc.sheet @@ -1071,10 +1201,19 @@ share/dia/xslt/dia-uml2c++.xsl share/dia/xslt/dia-uml2componentlist.xsl share/dia/xslt/dia-uml2idl.xsl share/dia/xslt/dia-uml2java.xsl +share/dia/xslt/dia-uml2owl.xsl +share/dia/xslt/dia-uml2python.xsl share/dia/xslt/stylesheets.xml share/gnome/help/dia/C -share/gnome/help/dia/en/topic.dat -share/gnome/help/dia/pl/topic.dat +share/gnome/help/dia/en/dia.xml +share/gnome/help/dia/en/graphics/greendots.png +share/gnome/help/dia/en/graphics/home_network.png +share/gnome/help/dia/en/graphics/line_icon.png +share/gnome/help/dia/en/graphics/line_props.png +share/gnome/help/dia/pl/dia.xml +share/gnome/help/dia/pl/graphics/greendots.png +share/gnome/help/dia/pl/graphics/home_network.png +share/gnome/help/dia/pl/graphics/line_props.png ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/dia.mo @@ -1083,17 +1222,21 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/dia.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/dia.mo +${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/dia.mo +${PKGLOCALEDIR}/locale/is/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/dia.mo +${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/dia.mo @@ -1105,6 +1248,7 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/dia.mo +${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/dia.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/dia.mo @@ -1117,11 +1261,13 @@ share/mime-info/dia.keys share/mime-info/dia.mime share/pixmaps/dia-diagram.png share/pixmaps/dia_gnome_icon.png -@comment in gnome-dirs: @dirrm share/mime-info +@exec ${MKDIR} %D/share/omf/dia +@dirrm share/omf/dia +@dirrm share/gnome/help/dia/pl/graphics @dirrm share/gnome/help/dia/pl +@dirrm share/gnome/help/dia/en/graphics @dirrm share/gnome/help/dia/en @dirrm share/gnome/help/dia -@comment in gnome-dirs: @dirrm share/gnome/help @dirrm share/dia/xslt @dirrm share/dia/sheets/UML @dirrm share/dia/sheets/GRAFCET @@ -1133,10 +1279,13 @@ share/pixmaps/dia_gnome_icon.png @dirrm share/dia/shapes/Pneumatic @dirrm share/dia/shapes/Network @dirrm share/dia/shapes/Misc +@dirrm share/dia/shapes/Map/Isometric +@dirrm share/dia/shapes/Map @dirrm share/dia/shapes/MSE @dirrm share/dia/shapes/Logic @dirrm share/dia/shapes/Flowchart @dirrm share/dia/shapes/Electric +@dirrm share/dia/shapes/Cybernetics @dirrm share/dia/shapes/Contact @dirrm share/dia/shapes/Civil @dirrm share/dia/shapes/Cisco @@ -1144,6 +1293,6 @@ share/pixmaps/dia_gnome_icon.png @dirrm share/dia/shapes/Assorted @dirrm share/dia/shapes @dirrm share/dia/python +@dirrm share/dia/images @dirrm share/dia -@comment in gnome2-dirs: @dirrm share/applications @dirrm lib/dia diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo index 76bb76a151c..ea40fe831cb 100644 --- a/graphics/dia/distinfo +++ b/graphics/dia/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.10 2003/12/02 22:32:48 recht Exp $ +$NetBSD: distinfo,v 1.11 2004/05/06 10:21:47 drochner Exp $ -SHA1 (dia-0.92.2.tar.gz) = cba2fc2f81be55c903b7404617d1619c6a99b9d9 -Size (dia-0.92.2.tar.gz) = 4227714 bytes +SHA1 (dia-0.93.tar.gz) = c5687ee8e9d971f6101c5e8fb352656f009eda9b +Size (dia-0.93.tar.gz) = 4734801 bytes +SHA1 (patch-aa) = f556878638291a696894181c5a6907e688589530 SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff diff --git a/graphics/dia/patches/patch-aa b/graphics/dia/patches/patch-aa new file mode 100644 index 00000000000..6e9c0be11f0 --- /dev/null +++ b/graphics/dia/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.3 2004/05/06 10:21:47 drochner Exp $ + +--- configure.orig 2004-05-05 19:41:43.000000000 +0200 ++++ configure 2004-05-05 19:42:18.000000000 +0200 +@@ -23732,7 +23732,7 @@ + if test "${am_cv_python_pythondir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || ++ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + fi + echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +@@ -23750,7 +23750,7 @@ + if test "${am_cv_python_pyexecdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || ++ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null || + echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` + fi + echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 |