Hi.
This diff updates dia to the latest available version.
Of course I do not intend to commit anything before a stable release is
out, which hopefully will be soon.
Meanwhile, some testings do not hurt.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/dia/Makefile,v
retrieving revision 1.57
diff -u -r1.57 Makefile
--- Makefile 11 Apr 2009 10:05:47 -0000 1.57
+++ Makefile 15 Apr 2009 18:09:34 -0000
@@ -2,85 +2,80 @@
COMMENT= technical diagrams drawing tool
-DISTNAME= dia-0.96.1
-PKGNAME= ${DISTNAME}p12
+GNOME_PROJECT= dia
+GNOME_VERSION= 0.97-pre3
+PKGNAME= ${GNOME_PROJECT}-${GNOME_VERSION:S/-//}
+
CATEGORIES= graphics
HOMEPAGE= http://live.gnome.org/Dia/
MAINTAINER= Antoine Jacoutot <[email protected]>
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.96/}
-
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
- Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
- fontconfig freetype glib-2.0 glitz gmodule-2.0 \
- gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pcre pixman-1 png pthread z gio-2.0
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pthread xml2 z
-BUILD_DEPENDS= ::textproc/xmlto \
- ::textproc/docbook
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
art_lgpl_2.>=5::graphics/libart \
- popt::devel/popt \
- xml2.>=10::textproc/libxml \
- xslt.>=1::textproc/libxslt
-RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
+ xslt.>=3::textproc/libxslt
MODULES= devel/gettext \
- textproc/intltool
+ x11/gnome \
+ lang/python
USE_X11= Yes
-USE_GMAKE= Yes
-USE_LIBTOOL= Yes
+DESKTOP_FILES= Yes
-# patch-doc_en_usage-layers_xml seen as binary file
+# patch-doc_en_usage-layers_xml is seen as binary file
DIFF_ARGS= -a
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng \
-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LOCALBASE=${LOCALBASE}
+ LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
- --without-cairo \
- --without-python
+ --with-cairo \
+ --enable-db2html=no \
+ --with-hardbooks=no
FLAVORS= gnome
FLAVOR?=
.if ${FLAVOR:L:Mgnome}
+CONFIGURE_ENV+= PYTHON="${MODPY_BIN}"
CONFIGURE_ARGS+=--enable-gnome \
- --with-gnomeprint
+ --with-python \
+ --with-swig
+BUILD_DEPENDS+= ::devel/swig \
+ ::textproc/docbook-xsl
LIB_DEPENDS+= gnomeui-2::x11/gnome/libgnomeui \
- gnomeprint-2-2::x11/gnome/libgnomeprint
-WANTLIB+= ICE ORBit-2 ORBitCosNaming-2 SM bonobo-2 \
- bonobo-activation bonoboui-2 crypto dbus-1 dbus-glib-1 \
- gailutil gconf-2 gnome-2 gnome-keyring \
- gnomecanvas-2 gnomevfs-2 ssl util
-RUN_DEPENDS+= :yelp-*:x11/gnome/yelp
+ ${MODPY_LIB_DEPENDS}
+WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM bonobo-2 bonobo-activation
+WANTLIB += bonoboui-2 crypto dbus-1 dbus-glib-1 gconf-2 gailutil
+WANTLIB += gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 popt ssl
+WANTLIB += util
+MODGNOME_HELP_FILES= Yes
.else
+# help is only installed and usable with yelp
+PATCH_LIST= patch-* no_gnome-patch-*
CONFIGURE_ARGS+=--disable-gnome \
- --without-gnomeprint
+ --without-python \
+ --without-swig
RUN_DEPENDS+= ::devel/xdg-utils
+MODPY_RUNDEP= No
.endif
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/app/commands.c
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dia/html/{en,pl}
- xmlto -o ${PREFIX}/share/doc/dia/html/en html ${WRKSRC}/doc/en/dia.xml
- xmlto -o ${PREFIX}/share/doc/dia/html/pl html ${WRKSRC}/doc/pl/dia.xml
- @cd ${PREFIX}/share/doc/dia/html && ln -s en C
-.if ${FLAVOR:L:Mgnome}
- @cd ${PREFIX}/share/gnome/help/dia && ln -s en C
-.endif
+ ${SUBST_CMD} ${WRKSRC}/app/commands.c \
+ ${WRKSRC}/po-checktrans.py
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/dia/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 6 Apr 2007 10:10:01 -0000 1.8
+++ distinfo 15 Apr 2009 18:09:34 -0000
@@ -1,5 +1,5 @@
-MD5 (dia-0.96.1.tar.gz) = ++T5E7zoiwXXMb5fcFEmpg==
-RMD160 (dia-0.96.1.tar.gz) = uHap43YL4XdLwOaas12afwKgOuA=
-SHA1 (dia-0.96.1.tar.gz) = Je/dtEz3jpRVXOMemzZkWpqnyLk=
-SHA256 (dia-0.96.1.tar.gz) = ce4yOPT8U+dD7Jogy1XErOwR54KtoT2p4SzGbCZ5q4Y=
-SIZE (dia-0.96.1.tar.gz) = 6463296
+MD5 (dia-0.97-pre3.tar.bz2) = JyO8z9yiwK+bhQdLEfEB4A==
+RMD160 (dia-0.97-pre3.tar.bz2) = tqGO44IdrvRgJecAuySCLFd052A=
+SHA1 (dia-0.97-pre3.tar.bz2) = CRMBvfQ6BRjKSSuMuUpoKaHxh2s=
+SHA256 (dia-0.97-pre3.tar.bz2) = iE9WppPmILvzqEBGOSp5s/GOVGefFGr52xNQd/afkUg=
+SIZE (dia-0.97-pre3.tar.bz2) = 6709948
Index: patches/no_gnome-patch-data_display-ui_xml
===================================================================
RCS file: patches/no_gnome-patch-data_display-ui_xml
diff -N patches/no_gnome-patch-data_display-ui_xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/no_gnome-patch-data_display-ui_xml 15 Apr 2009 18:09:34 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- data/display-ui.xml.orig Wed Apr 15 15:24:47 2009
++++ data/display-ui.xml Wed Apr 15 15:24:53 2009
+@@ -163,9 +163,6 @@
+ <separator name="DebugExtensionStart" />
+ </menu>
+ <menu name="Help" action="Help">
+- <menuitem name="HelpContents" action="HelpContents" />
+- <separator name="HelpExtensionStart" />
+- <separator name="HelpExtensionEnd" />
+ <menuitem name="HelpAbout" action="HelpAbout" />
+ </menu>
+ </menubar>
Index: patches/no_gnome-patch-data_integrated-ui_xml
===================================================================
RCS file: patches/no_gnome-patch-data_integrated-ui_xml
diff -N patches/no_gnome-patch-data_integrated-ui_xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/no_gnome-patch-data_integrated-ui_xml 15 Apr 2009 18:09:34
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- data/integrated-ui.xml.orig Wed Apr 15 15:24:59 2009
++++ data/integrated-ui.xml Wed Apr 15 15:25:08 2009
+@@ -172,9 +172,6 @@
+ </menu>
+
+ <menu name="Help" action="Help">
+- <menuitem name="HelpContents" action="HelpContents" />
+- <separator name="HelpExtensionStart" />
+- <separator name="HelpExtensionEnd" />
+ <menuitem name="HelpAbout" action="HelpAbout" />
+ </menu>
+ </menubar>
Index: patches/no_gnome-patch-data_popup-ui_xml
===================================================================
RCS file: patches/no_gnome-patch-data_popup-ui_xml
diff -N patches/no_gnome-patch-data_popup-ui_xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/no_gnome-patch-data_popup-ui_xml 15 Apr 2009 18:09:34 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- data/popup-ui.xml.orig Wed Apr 15 15:21:42 2009
++++ data/popup-ui.xml Wed Apr 15 15:24:41 2009
+@@ -160,9 +160,6 @@
+ <separator name="DebugExtensionStart" />
+ </menu>
+ <menu name="Help" action="Help">
+- <menuitem name="HelpContents" action="HelpContents" />
+- <separator name="HelpExtensionStart" />
+- <separator name="HelpExtensionEnd" />
+ <menuitem name="HelpAbout" action="HelpAbout" />
+ </menu>
+ </popup>
Index: patches/no_gnome-patch-data_toolbox-ui_xml
===================================================================
RCS file: patches/no_gnome-patch-data_toolbox-ui_xml
diff -N patches/no_gnome-patch-data_toolbox-ui_xml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/no_gnome-patch-data_toolbox-ui_xml 15 Apr 2009 18:09:34 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- data/toolbox-ui.xml.orig Wed Apr 15 15:25:16 2009
++++ data/toolbox-ui.xml Wed Apr 15 15:25:24 2009
+@@ -15,9 +15,6 @@
+ <menuitem name="FileQuit" action="FileQuit" />
+ </menu>
+ <menu name="Help" action="Help">
+- <menuitem name="HelpContents" action="HelpContents" />
+- <separator name="HelpExtensionStart" />
+- <separator name="HelpExtensionEnd" />
+ <menuitem name="HelpAbout" action="HelpAbout" />
+ </menu>
+ </menubar>
Index: patches/patch-app_commands_c
===================================================================
RCS file: /cvs/ports/graphics/dia/patches/patch-app_commands_c,v
retrieving revision 1.4
diff -u -r1.4 patch-app_commands_c
--- patches/patch-app_commands_c 11 Apr 2009 10:05:47 -0000 1.4
+++ patches/patch-app_commands_c 15 Apr 2009 18:09:34 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-app_commands_c,v 1.4 2009/04/11 10:05:47 ajacoutot Exp $
---- app/commands.c.orig Sun Mar 18 20:49:14 2007
-+++ app/commands.c Sat Apr 11 11:16:22 2009
-@@ -532,7 +532,7 @@ help_manual_callback (GtkAction *action)
+--- app/commands.c.orig Sun Mar 8 13:38:35 2009
++++ app/commands.c Tue Apr 14 22:57:59 2009
+@@ -641,7 +641,7 @@ help_manual_callback (GtkAction *action)
const char *dentry;
GError *error = NULL;
@@ -10,7 +10,7 @@
if (!helpdir) {
message_warning(_("Could not find help directory"));
return;
-@@ -581,7 +581,7 @@ help_manual_callback (GtkAction *action)
+@@ -690,7 +690,7 @@ help_manual_callback (GtkAction *action)
ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL);
#else
command = getenv("BROWSER");
@@ -19,7 +19,7 @@
system(command);
g_free(command);
#endif
-@@ -599,7 +599,7 @@ activate_url (GtkAboutDialog *about,
+@@ -708,7 +708,7 @@ activate_url (GtkAboutDialog *about,
ShellExecuteA (0, "open", link, NULL, NULL, SW_SHOWNORMAL);
#else
gchar *command = getenv("BROWSER");
Index: patches/patch-app_main_c
===================================================================
RCS file: /cvs/ports/graphics/dia/patches/patch-app_main_c,v
retrieving revision 1.1
diff -u -r1.1 patch-app_main_c
--- patches/patch-app_main_c 3 Oct 2008 11:39:01 -0000 1.1
+++ patches/patch-app_main_c 15 Apr 2009 18:09:34 -0000
@@ -1,16 +1,15 @@
$OpenBSD: patch-app_main_c,v 1.1 2008/10/03 11:39:01 ajacoutot Exp $
---- app/main.c.orig Sun Jan 21 09:18:08 2007
-+++ app/main.c Fri Oct 3 12:39:09 2008
-@@ -17,6 +17,8 @@
+--- app/main.c.orig Tue Apr 14 22:57:03 2009
++++ app/main.c Tue Apr 14 22:57:33 2009
+@@ -16,6 +16,7 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <config.h>
-
+#include <ieeefp.h>
-+
- #include "geometry.h"
- #include "diagram.h"
- #include "display.h"
-@@ -28,6 +30,8 @@
+
+ #include "app_procs.h"
+
+@@ -23,6 +24,8 @@
int main(int argc, char *argv[])
{
Index: patches/patch-doc_Makefile_in
===================================================================
RCS file: patches/patch-doc_Makefile_in
diff -N patches/patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in 18 Oct 2007 14:18:40 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.2 2007/10/18 14:18:40 ajacoutot Exp $
---- doc/Makefile.in.orig Thu Mar 29 11:15:09 2007
-+++ doc/Makefile.in Thu Oct 18 11:27:51 2007
-@@ -276,7 +276,7 @@ EXTRA_DIST = \
- shape.dtd \
- sheet.dtd
-
-...@have_gnome_false@helpdir = $(pkgdatadir)/help
-...@have_gnome_false@helpdir = $(datadir)/gnome/help/dia
- @have_gnome_t...@helpdir = $(datadir)/gnome/help/dia
- all: all-recursive
-
-@@ -590,7 +590,7 @@ uninstall-info: uninstall-info-recursive
-
- # a simple rule to symlink en to C
- install-data-local:
-- -(cd $(DESTDIR)$(helpdir) && rm -f C && ln -s en C)
-+# -(cd $(DESTDIR)$(helpdir) && rm -f C && ln -s en C)
- uninstall-local:
- rm -f $(DESTDIR)$(helpdir)/C
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: patches/patch-doc_en_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/dia/patches/patch-doc_en_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-doc_en_Makefile_in
--- patches/patch-doc_en_Makefile_in 18 Oct 2007 14:18:40 -0000 1.4
+++ patches/patch-doc_en_Makefile_in 15 Apr 2009 18:09:34 -0000
@@ -1,39 +1,20 @@
-$OpenBSD: patch-doc_en_Makefile_in,v 1.4 2007/10/18 14:18:40 ajacoutot Exp $
---- doc/en/Makefile.in.orig Thu Mar 29 11:15:09 2007
-+++ doc/en/Makefile.in Tue Oct 16 13:47:14 2007
-@@ -332,7 +332,7 @@ docname = dia
- lang = en
- omffile =
- entities =
-...@have_gnome_false@docdir = $(datadir)/help/$(docname)/$(lang)
-...@have_gnome_false@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
- # ********** Begin of section some packagers may need to modify **********
- # This variable (docdir) specifies where the documents should be installed.
-@@ -600,7 +600,7 @@ install-data-hook-omf:
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+$OpenBSD$
+--- doc/en/Makefile.in.orig Mon Apr 13 19:43:46 2009
++++ doc/en/Makefile.in Wed Apr 15 19:22:52 2009
+@@ -724,7 +724,6 @@ install-data-hook-omf:
+ $(INSTALL_DATA) $$file.out $(omf_dest_dir)/$$file; \
done; \
fi
-- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
-+ # -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
+- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(omf_dest_dir)
uninstall-local-omf:
-for file in $(srcdir)/*.omf; do \
-@@ -617,7 +617,7 @@ clean-local-omf:
- done; \
- fi
-
--all: omf
-+all:
-
- $(docname).xml: $(entities)
- -ourdir=`pwd`; \
-@@ -633,7 +633,7 @@ app-dist-hook:
- done \
- fi
+@@ -956,7 +955,7 @@ clean-local-xml: clean-local-omf
--install-data-local: omf
-+install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- for file in $(xml_files); do \
- cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
+ dist-hook: app-dist-hook
+ @[email protected]: dia.dbk
+...@have_db2man_true@ xsltproc --novalid $(DB2MAN) $< >dia.1
+...@have_db2man_true@ xsltproc --novalid --nonet $(DB2MAN) $< >dia.1
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: patches/patch-doc_en_Makefile_in.orig
===================================================================
RCS file: patches/patch-doc_en_Makefile_in.orig
diff -N patches/patch-doc_en_Makefile_in.orig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_en_Makefile_in.orig 15 Apr 2009 18:09:34 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- doc/en/Makefile.in.orig Tue Apr 14 22:55:33 2009
++++ doc/en/Makefile.in Tue Apr 14 22:56:04 2009
+@@ -724,7 +724,6 @@ install-data-hook-omf:
+ $(INSTALL_DATA) $$file.out $(omf_dest_dir)/$$file; \
+ done; \
+ fi
+- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(omf_dest_dir)
+
+ uninstall-local-omf:
+ -for file in $(srcdir)/*.omf; do \
Index: patches/patch-doc_en_usage-layers_xml
===================================================================
RCS file: /cvs/ports/graphics/dia/patches/patch-doc_en_usage-layers_xml,v
retrieving revision 1.1
diff -u -r1.1 patch-doc_en_usage-layers_xml
--- patches/patch-doc_en_usage-layers_xml 18 Oct 2007 14:18:40 -0000
1.1
+++ patches/patch-doc_en_usage-layers_xml 15 Apr 2009 18:09:34 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-doc_en_usage-layers_xml,v 1.1 2007/10/18 14:18:40 ajacoutot
Exp $
---- doc/en/usage-layers.xml.orig Sun Jan 21 17:12:45 2007
-+++ doc/en/usage-layers.xml Thu Oct 18 13:58:36 2007
+--- doc/en/usage-layers.xml.orig Tue Apr 14 22:54:36 2009
++++ doc/en/usage-layers.xml Tue Apr 14 22:55:25 2009
@@ -26,7 +26,7 @@
</para>
</tip>
<para>
-- Each new diagram comes with the default layer labelled ?Background?. Of
course you can change its name and settings to customize it to your needs as
you can do with any other layer.
+- Each new diagram comes with the default layer labeled "Background". Of
course you can change its name and settings to customize it to your needs as
you can do with any other layer.
+ Each new diagram comes with the default layer labelled Background. Of
course you can change its name and settings to customize it to your needs as
you can do with any other layer.
</para>
<para>
Index: patches/patch-doc_eu_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/dia/patches/patch-doc_eu_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-doc_eu_Makefile_in
--- patches/patch-doc_eu_Makefile_in 18 Oct 2007 14:18:40 -0000 1.3
+++ patches/patch-doc_eu_Makefile_in 15 Apr 2009 18:09:34 -0000
@@ -1,30 +1,20 @@
$OpenBSD: patch-doc_eu_Makefile_in,v 1.3 2007/10/18 14:18:40 ajacoutot Exp $
---- doc/eu/Makefile.in.orig Thu Mar 29 11:15:09 2007
-+++ doc/eu/Makefile.in Tue Oct 16 13:47:26 2007
-@@ -332,7 +332,7 @@ docname = dia
- lang = eu
- omffile =
- entities =
-...@have_gnome_false@docdir = $(datadir)/help/$(docname)/$(lang)
-...@have_gnome_false@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
- # ********** Begin of section some packagers may need to modify **********
- # This variable (docdir) specifies where the documents should be installed.
-@@ -593,7 +593,7 @@ install-data-hook-omf:
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+--- doc/eu/Makefile.in.orig Mon Apr 13 19:43:46 2009
++++ doc/eu/Makefile.in Wed Apr 15 19:23:41 2009
+@@ -639,7 +639,6 @@ install-data-hook-omf:
+ $(INSTALL_DATA) $$file.out $(omf_dest_dir)/$$file; \
done; \
fi
-- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
-+ # -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
+- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(omf_dest_dir)
uninstall-local-omf:
-for file in $(srcdir)/*.omf; do \
-@@ -610,7 +610,7 @@ clean-local-omf:
- done; \
- fi
-
--all: omf
-+all:
+@@ -871,7 +870,7 @@ clean-local-xml: clean-local-omf
- $(docname).xml: $(entities)
- -ourdir=`pwd`; \
+ dist-hook: app-dist-hook
+ @[email protected]: dia.dbk
+...@have_db2man_true@ xsltproc --novalid $(DB2MAN) $< >dia.1
+...@have_db2man_true@ xsltproc --novalid --nonet $(DB2MAN) $< >dia.1
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: patches/patch-doc_eu_Makefile_in.orig
===================================================================
RCS file: patches/patch-doc_eu_Makefile_in.orig
diff -N patches/patch-doc_eu_Makefile_in.orig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-doc_eu_Makefile_in.orig 15 Apr 2009 18:09:34 -0000
@@ -0,0 +1,11 @@
+$OpenBSD: patch-doc_eu_Makefile_in,v 1.3 2007/10/18 14:18:40 ajacoutot Exp $
+--- doc/eu/Makefile.in.orig Mon Apr 13 19:43:46 2009
++++ doc/eu/Makefile.in Tue Apr 14 22:58:57 2009
+@@ -639,7 +639,6 @@ install-data-hook-omf:
+ $(INSTALL_DATA) $$file.out $(omf_dest_dir)/$$file; \
+ done; \
+ fi
+- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(omf_dest_dir)
+
+ uninstall-local-omf:
+ -for file in $(srcdir)/*.omf; do \
Index: patches/patch-doc_pl_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/dia/patches/patch-doc_pl_Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-doc_pl_Makefile_in
--- patches/patch-doc_pl_Makefile_in 18 Oct 2007 14:18:40 -0000 1.4
+++ patches/patch-doc_pl_Makefile_in 15 Apr 2009 18:09:34 -0000
@@ -1,39 +1,11 @@
$OpenBSD: patch-doc_pl_Makefile_in,v 1.4 2007/10/18 14:18:40 ajacoutot Exp $
---- doc/pl/Makefile.in.orig Thu Mar 29 11:15:10 2007
-+++ doc/pl/Makefile.in Tue Oct 16 13:46:56 2007
-@@ -328,7 +328,7 @@ docname = dia
- lang = pl
- omffile =
- entities =
-...@have_gnome_false@docdir = $(datadir)/help/$(docname)/$(lang)
-...@have_gnome_false@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
- # ********** Begin of section some packagers may need to modify **********
- # This variable (docdir) specifies where the documents should be installed.
-@@ -535,7 +535,7 @@ install-data-hook-omf:
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
+--- doc/pl/Makefile.in.orig Tue Apr 14 22:48:29 2009
++++ doc/pl/Makefile.in Tue Apr 14 22:54:22 2009
+@@ -580,7 +580,6 @@ install-data-hook-omf:
+ $(INSTALL_DATA) $$file.out $(omf_dest_dir)/$$file; \
done; \
fi
-- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
-+ # -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
+- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o
$(omf_dest_dir)
uninstall-local-omf:
-for file in $(srcdir)/*.omf; do \
-@@ -552,7 +552,7 @@ clean-local-omf:
- done; \
- fi
-
--all: omf
-+all:
-
- $(docname).xml: $(entities)
- -ourdir=`pwd`; \
-@@ -568,7 +568,7 @@ app-dist-hook:
- done \
- fi
-
--install-data-local: omf
-+install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- for file in $(xml_files); do \
- cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
Index: patches/patch-plug-ins_pixbuf_pixbuf_c
===================================================================
RCS file: patches/patch-plug-ins_pixbuf_pixbuf_c
diff -N patches/patch-plug-ins_pixbuf_pixbuf_c
--- patches/patch-plug-ins_pixbuf_pixbuf_c 16 May 2008 11:55:29 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-plug-ins_pixbuf_pixbuf_c,v 1.1 2008/05/16 11:55:29 ajacoutot
Exp $
---- plug-ins/pixbuf/pixbuf.c.orig Fri May 16 13:43:44 2008
-+++ plug-ins/pixbuf/pixbuf.c Fri May 16 13:44:35 2008
-@@ -233,7 +233,7 @@ dia_plugin_init(PluginInfo *info)
- }
- /* there is no write only filter */
- {
-- DiaImportFilter* ifilter = g_new0 (DiaImportFilter, 1);
-+ DiaImportFilter* ifilter;
- gchar* name;
-
- name = gdk_pixbuf_format_get_name (format);
-@@ -252,6 +252,7 @@ dia_plugin_init(PluginInfo *info)
- g_free (name);
- continue;
- }
-+ ifilter = g_new0 (DiaImportFilter, 1);
- /* the pixbuf desriptions are too generic for Dia's usage, make our
own */
- ifilter->description = g_strdup_printf ("Pixbuf[%s]", name);
- ifilter->extensions = (const
gchar**)gdk_pixbuf_format_get_extensions (format);
Index: patches/patch-po-checktrans_py
===================================================================
RCS file: patches/patch-po-checktrans_py
diff -N patches/patch-po-checktrans_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-po-checktrans_py 15 Apr 2009 18:09:34 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- po-checktrans.py.orig Wed Apr 15 00:12:43 2009
++++ po-checktrans.py Wed Apr 15 00:13:01 2009
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!${MODPY_BIN}
+ #
+ # This quick hack gives translation statistics (from the core translation
+ # files).
Index: patches/patch-xmldocs_make
===================================================================
RCS file: patches/patch-xmldocs_make
diff -N patches/patch-xmldocs_make
--- patches/patch-xmldocs_make 13 Jun 2006 19:27:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-xmldocs_make,v 1.1 2006/06/13 19:27:54 steven Exp $
---- xmldocs.make.orig Thu Jun 8 12:36:49 2006
-+++ xmldocs.make Thu Jun 8 12:37:02 2006
-@@ -36,11 +36,11 @@
- # ********** Begin of section some packagers may need to modify **********
- # This variable (docdir) specifies where the documents should be installed.
- # This default value should work for most packages.
--if HAVE_GNOME
-+#if HAVE_GNOME
- docdir = $(datadir)/gnome/help/$(docname)/$(lang)
--else
--docdir = $(datadir)/help/$(docname)/$(lang)
--endif
-+#else
-+#docdir = $(datadir)/help/$(docname)/$(lang)
-+#endif
-
- # ********** You should not have to edit below this line **********
- xml_files = $(entities) $(docname).xml
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/graphics/dia/pkg/DESCR,v
retrieving revision 1.4
diff -u -r1.4 DESCR
--- pkg/DESCR 16 May 2008 11:55:29 -0000 1.4
+++ pkg/DESCR 15 Apr 2009 18:09:34 -0000
@@ -10,4 +10,4 @@
that span multiple pages).
Available flavor:
- gnome - build support for GNOME and the gnomeprint plug-in
+ gnome - build support for GNOME and python plug-in and bindings
Index: pkg/PFRAG.gnome
===================================================================
RCS file: /cvs/ports/graphics/dia/pkg/PFRAG.gnome,v
retrieving revision 1.4
diff -u -r1.4 PFRAG.gnome
--- pkg/PFRAG.gnome 11 Apr 2009 10:05:47 -0000 1.4
+++ pkg/PFRAG.gnome 15 Apr 2009 18:09:34 -0000
@@ -1,18 +1,117 @@
@comment $OpenBSD: PFRAG.gnome,v 1.4 2009/04/11 10:05:47 ajacoutot Exp $
%%SHARED%%
-lib/dia/libgprint_filter.a
-lib/dia/libgprint_filter.la
+lib/dia/libpython_plugin.a
+lib/dia/libpython_plugin.la
+share/dia/python/
+share/dia/python-startup.py
+share/dia/python/allprops.py
+share/dia/python/aobjects.py
+share/dia/python/codegen.py
+share/dia/python/diasvg.py
+share/dia/python/diasvg_import.py
+share/dia/python/dot.py
+share/dia/python/doxrev.py
+share/dia/python/gtkcons.py
+share/dia/python/imgmap.py
+share/dia/python/otypes.py
+share/dia/python/pydiadoc.py
+share/dia/python/scascale.py
+share/dia/python/select_by.py
+share/dia/python/select_empty.py
share/gnome/help/dia/
share/gnome/help/dia/C
share/gnome/help/dia/en/
share/gnome/help/dia/en/authors.xml
+share/gnome/help/dia/en/custom-shapes.xml
+share/gnome/help/dia/en/dia-1.xml
+share/gnome/help/dia/en/dia-cmdline.xml
share/gnome/help/dia/en/dia.xml
share/gnome/help/dia/en/entities.xml
share/gnome/help/dia/en/graphics/
+share/gnome/help/dia/en/graphics/adjacent.png
+share/gnome/help/dia/en/graphics/after-hor-spread.png
+share/gnome/help/dia/en/graphics/after-vert-spread.png
+share/gnome/help/dia/en/graphics/align-bottom.png
+share/gnome/help/dia/en/graphics/align-center.png
+share/gnome/help/dia/en/graphics/align-left.png
+share/gnome/help/dia/en/graphics/align-menu.png
+share/gnome/help/dia/en/graphics/align-middle.png
+share/gnome/help/dia/en/graphics/align-right.png
+share/gnome/help/dia/en/graphics/align-top.png
+share/gnome/help/dia/en/graphics/arrow-style.png
+share/gnome/help/dia/en/graphics/assorted-shapes.png
+share/gnome/help/dia/en/graphics/before-hor-spread.png
+share/gnome/help/dia/en/graphics/before-left.png
+share/gnome/help/dia/en/graphics/before-top.png
+share/gnome/help/dia/en/graphics/before-vert-spread.png
+share/gnome/help/dia/en/graphics/bezierline-rightclick.png
+share/gnome/help/dia/en/graphics/canvas-zoom.png
+share/gnome/help/dia/en/graphics/cisco-computer-shapes.png
+share/gnome/help/dia/en/graphics/cisco-misc-shapes.png
+share/gnome/help/dia/en/graphics/cisco-network-shapes.png
+share/gnome/help/dia/en/graphics/cisco-switch-shapes.png
+share/gnome/help/dia/en/graphics/cisco-telephony-shapes.png
+share/gnome/help/dia/en/graphics/color-dropdown.png
+share/gnome/help/dia/en/graphics/color-selector1.png
+share/gnome/help/dia/en/graphics/color_selector.png
+share/gnome/help/dia/en/graphics/connect-fixed.png
+share/gnome/help/dia/en/graphics/connect-middle.png
+share/gnome/help/dia/en/graphics/default-colors.png
+share/gnome/help/dia/en/graphics/defaults-box.png
+share/gnome/help/dia/en/graphics/defaults-text.png
+share/gnome/help/dia/en/graphics/delete-text.png
+share/gnome/help/dia/en/graphics/dia-startup.png
+share/gnome/help/dia/en/graphics/diagram-properties-grid.png
+share/gnome/help/dia/en/graphics/diagram-properties.png
+share/gnome/help/dia/en/graphics/diagram-tree-sort.png
+share/gnome/help/dia/en/graphics/diagram-tree.png
+share/gnome/help/dia/en/graphics/edit-text.png
+share/gnome/help/dia/en/graphics/file-preferences-diagram.png
+share/gnome/help/dia/en/graphics/file-preferences-favorites.png
+share/gnome/help/dia/en/graphics/file-preferences-tree.png
+share/gnome/help/dia/en/graphics/file-preferences-ui.png
+share/gnome/help/dia/en/graphics/file-preferences-view.png
+share/gnome/help/dia/en/graphics/flowchart-shapes.png
share/gnome/help/dia/en/graphics/greendots.png
share/gnome/help/dia/en/graphics/home_network.png
+share/gnome/help/dia/en/graphics/line-arrows.png
+share/gnome/help/dia/en/graphics/line-buttons.png
+share/gnome/help/dia/en/graphics/line-colors.png
+share/gnome/help/dia/en/graphics/line-connect.png
+share/gnome/help/dia/en/graphics/line-handles.png
+share/gnome/help/dia/en/graphics/line-styles.png
+share/gnome/help/dia/en/graphics/line-width.png
share/gnome/help/dia/en/graphics/line_icon.png
share/gnome/help/dia/en/graphics/line_props.png
+share/gnome/help/dia/en/graphics/misc-shapes.png
+share/gnome/help/dia/en/graphics/network-shapes.png
+share/gnome/help/dia/en/graphics/object-group.png
+share/gnome/help/dia/en/graphics/polyline-rightclick.png
+share/gnome/help/dia/en/graphics/preferences-gridlines.png
+share/gnome/help/dia/en/graphics/preferences_fig.png
+share/gnome/help/dia/en/graphics/properties-uml-class1.png
+share/gnome/help/dia/en/graphics/reverse-colors.png
+share/gnome/help/dia/en/graphics/ruler-arrows.png
+share/gnome/help/dia/en/graphics/sample-flowchart.png
+share/gnome/help/dia/en/graphics/select-area.png
+share/gnome/help/dia/en/graphics/select-menu.png
+share/gnome/help/dia/en/graphics/selected-object.png
+share/gnome/help/dia/en/graphics/sheets-objects.png
+share/gnome/help/dia/en/graphics/snaptogrid-button.png
+share/gnome/help/dia/en/graphics/stacked.png
+share/gnome/help/dia/en/graphics/standard-line-properties.png
+share/gnome/help/dia/en/graphics/toolbox-basic.png
+share/gnome/help/dia/en/graphics/toolbox-image.png
+share/gnome/help/dia/en/graphics/toolbox-lower.png
+share/gnome/help/dia/en/graphics/toolbox-magnify.png
+share/gnome/help/dia/en/graphics/toolbox-modify.png
+share/gnome/help/dia/en/graphics/toolbox-scroll.png
+share/gnome/help/dia/en/graphics/toolbox-special.png
+share/gnome/help/dia/en/graphics/toolbox.png
+share/gnome/help/dia/en/graphics/uml-shapes.png
+share/gnome/help/dia/en/graphics/view-menu.png
+share/gnome/help/dia/en/graphics/view-zoom.png
+share/gnome/help/dia/en/graphics/zigzagline-rightclick.png
share/gnome/help/dia/en/intro.xml
share/gnome/help/dia/en/license.xml
share/gnome/help/dia/en/usage-canvas.xml
@@ -25,15 +124,71 @@
share/gnome/help/dia/en/usage-objects.xml
share/gnome/help/dia/en/usage-quickstart.xml
share/gnome/help/dia/eu/
+share/gnome/help/dia/eu/authors.xml
share/gnome/help/dia/eu/dia.xml
+share/gnome/help/dia/eu/entities.xml
share/gnome/help/dia/eu/graphics/
share/gnome/help/dia/eu/graphics/greendots.png
share/gnome/help/dia/eu/graphics/home_network.png
share/gnome/help/dia/eu/graphics/line_icon.png
share/gnome/help/dia/eu/graphics/line_props.png
+share/gnome/help/dia/eu/intro.xml
+share/gnome/help/dia/eu/license.xml
+share/gnome/help/dia/eu/usage-canvas.xml
+share/gnome/help/dia/eu/usage-customization.xml
+share/gnome/help/dia/eu/usage-layers.xml
+share/gnome/help/dia/eu/usage-loadsave.xml
+share/gnome/help/dia/eu/usage-objects-basic.xml
+share/gnome/help/dia/eu/usage-objects-selecting.xml
+share/gnome/help/dia/eu/usage-objects-special.xml
+share/gnome/help/dia/eu/usage-objects.xml
+share/gnome/help/dia/eu/usage-quickstart.xml
+share/gnome/help/dia/fr/
+share/gnome/help/dia/fr/authors.xml
+share/gnome/help/dia/fr/custom-shapes.xml
+share/gnome/help/dia/fr/dia-1.xml
+share/gnome/help/dia/fr/dia-cmdline.xml
+share/gnome/help/dia/fr/dia.xml
+share/gnome/help/dia/fr/entities.xml
+share/gnome/help/dia/fr/graphics/
+share/gnome/help/dia/fr/graphics/color_selector.png
+share/gnome/help/dia/fr/graphics/greendots.png
+share/gnome/help/dia/fr/graphics/home_network.png
+share/gnome/help/dia/fr/graphics/line_icon.png
+share/gnome/help/dia/fr/graphics/line_props.png
+share/gnome/help/dia/fr/graphics/preferences_fig.png
+share/gnome/help/dia/fr/intro.xml
+share/gnome/help/dia/fr/license.xml
+share/gnome/help/dia/fr/usage-canvas.xml
+share/gnome/help/dia/fr/usage-customization.xml
+share/gnome/help/dia/fr/usage-layers.xml
+share/gnome/help/dia/fr/usage-loadsave.xml
+share/gnome/help/dia/fr/usage-objects-basic.xml
+share/gnome/help/dia/fr/usage-objects-selecting.xml
+share/gnome/help/dia/fr/usage-objects-special.xml
+share/gnome/help/dia/fr/usage-objects.xml
+share/gnome/help/dia/fr/usage-quickstart.xml
share/gnome/help/dia/pl/
+share/gnome/help/dia/pl/authors.xml
share/gnome/help/dia/pl/dia.xml
share/gnome/help/dia/pl/graphics/
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
+share/gnome/help/dia/pl/intro.xml
+share/gnome/help/dia/pl/license.xml
+share/gnome/help/dia/pl/usage-canvas.xml
+share/gnome/help/dia/pl/usage-customization.xml
+share/gnome/help/dia/pl/usage-layers.xml
+share/gnome/help/dia/pl/usage-loadsave.xml
+share/gnome/help/dia/pl/usage-objects-selecting.xml
+share/gnome/help/dia/pl/usage-objects-special.xml
+share/gnome/help/dia/pl/usage-objects.xml
+share/gnome/help/dia/pl/usage-quickstart.xml
+...@comment share/oaf/
+share/omf/
+share/omf/dia/
+share/omf/dia/dia-C.omf
+share/omf/dia/dia-eu.omf
+share/omf/dia/dia-fr.omf
+share/omf/dia/dia-pl.omf
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/graphics/dia/pkg/PFRAG.shared,v
retrieving revision 1.7
diff -u -r1.7 PFRAG.shared
--- pkg/PFRAG.shared 6 Apr 2007 10:10:01 -0000 1.7
+++ pkg/PFRAG.shared 15 Apr 2009 18:09:34 -0000
@@ -1,10 +1,12 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2007/04/06 10:10:01 ajacoutot Exp $
lib/dia/libaadl_objects.so
-lib/dia/libbondgraph_objects.so
+lib/dia/libart_filter.so
lib/dia/libcairo_filter.so
lib/dia/libcgm_filter.so
lib/dia/libchronogram_objects.so
+lib/dia/libcustom_lines_objects.so
lib/dia/libcustom_objects.so
+lib/dia/libdb_objects.so
lib/dia/libdia.so
lib/dia/libdxf_filter.so
lib/dia/liber_objects.so
@@ -20,9 +22,11 @@
lib/dia/libnetwork_objects.so
lib/dia/libpgf_filter.so
lib/dia/libpixbuf_filter.so
+lib/dia/libpostscript_filter.so
lib/dia/libpstricks_filter.so
lib/dia/libsadt_objects.so
lib/dia/libshape_filter.so
+lib/dia/libsissi_objects.so
lib/dia/libstandard_objects.so
lib/dia/libsvg_filter.so
lib/dia/libuml_objects.so
Index: pkg/PFRAG.shared-gnome
===================================================================
RCS file: /cvs/ports/graphics/dia/pkg/PFRAG.shared-gnome,v
retrieving revision 1.1
diff -u -r1.1 PFRAG.shared-gnome
--- pkg/PFRAG.shared-gnome 16 May 2008 11:55:29 -0000 1.1
+++ pkg/PFRAG.shared-gnome 15 Apr 2009 18:09:34 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-gnome,v 1.1 2008/05/16 11:55:29 ajacoutot Exp $
-lib/dia/libgprint_filter.so
+lib/dia/libpython_plugin.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/dia/pkg/PLIST,v
retrieving revision 1.19
diff -u -r1.19 PLIST
--- pkg/PLIST 11 Apr 2009 10:05:47 -0000 1.19
+++ pkg/PLIST 15 Apr 2009 18:09:35 -0000
@@ -4,16 +4,20 @@
lib/dia/
lib/dia/libaadl_objects.a
lib/dia/libaadl_objects.la
-lib/dia/libbondgraph_objects.a
-lib/dia/libbondgraph_objects.la
+lib/dia/libart_filter.a
+lib/dia/libart_filter.la
lib/dia/libcairo_filter.a
lib/dia/libcairo_filter.la
lib/dia/libcgm_filter.a
lib/dia/libcgm_filter.la
lib/dia/libchronogram_objects.a
lib/dia/libchronogram_objects.la
+lib/dia/libcustom_lines_objects.a
+lib/dia/libcustom_lines_objects.la
lib/dia/libcustom_objects.a
lib/dia/libcustom_objects.la
+lib/dia/libdb_objects.a
+lib/dia/libdb_objects.la
lib/dia/libdia.a
lib/dia/libdia.la
lib/dia/libdxf_filter.a
@@ -44,12 +48,16 @@
lib/dia/libpgf_filter.la
lib/dia/libpixbuf_filter.a
lib/dia/libpixbuf_filter.la
+lib/dia/libpostscript_filter.a
+lib/dia/libpostscript_filter.la
lib/dia/libpstricks_filter.a
lib/dia/libpstricks_filter.la
lib/dia/libsadt_objects.a
lib/dia/libsadt_objects.la
lib/dia/libshape_filter.a
lib/dia/libshape_filter.la
+lib/dia/libsissi_objects.a
+lib/dia/libsissi_objects.la
lib/dia/libstandard_objects.a
lib/dia/libstandard_objects.la
lib/dia/libsvg_filter.a
@@ -67,7 +75,7 @@
@man man/man1/dia.1
share/applications/dia.desktop
share/dia/
-share/dia/dia_logo.png
+share/dia/dia-splash.png
share/dia/shapes/
share/dia/shapes/Assorted/
share/dia/shapes/Assorted/arrow-chevron.png
@@ -1314,6 +1322,33 @@
share/dia/shapes/Gane_and_Sarson/entity.shape
share/dia/shapes/Gane_and_Sarson/process.png
share/dia/shapes/Gane_and_Sarson/process.shape
+share/dia/shapes/Lights/
+share/dia/shapes/Lights/ACL.png
+share/dia/shapes/Lights/ACL.shape
+share/dia/shapes/Lights/Blacklight.png
+share/dia/shapes/Lights/Blacklight.shape
+share/dia/shapes/Lights/Blinders.png
+share/dia/shapes/Lights/Blinders.shape
+share/dia/shapes/Lights/ERS.png
+share/dia/shapes/Lights/ERS.shape
+share/dia/shapes/Lights/Fresnel.png
+share/dia/shapes/Lights/Fresnel.shape
+share/dia/shapes/Lights/Moving_head.png
+share/dia/shapes/Lights/Moving_head.shape
+share/dia/shapes/Lights/PAR.png
+share/dia/shapes/Lights/PAR.shape
+share/dia/shapes/Lights/PAR_floor.png
+share/dia/shapes/Lights/PAR_floor.shape
+share/dia/shapes/Lights/PC.png
+share/dia/shapes/Lights/PC.shape
+share/dia/shapes/Lights/Scanner.png
+share/dia/shapes/Lights/Scanner.shape
+share/dia/shapes/Lights/Striplight.png
+share/dia/shapes/Lights/Striplight.shape
+share/dia/shapes/Lights/Stroboscope.png
+share/dia/shapes/Lights/Stroboscope.shape
+share/dia/shapes/Lights/Structure.png
+share/dia/shapes/Lights/Structure.shape
share/dia/shapes/Logic/
share/dia/shapes/Logic/and.png
share/dia/shapes/Logic/and.shape
@@ -1399,6 +1434,10 @@
share/dia/shapes/Map/Isometric/Tree1.png
share/dia/shapes/Map/Isometric/Tree1.shape
share/dia/shapes/Misc/
+share/dia/shapes/Misc/expended-node.png
+share/dia/shapes/Misc/expended-node.shape
+share/dia/shapes/Misc/expensible-node.png
+share/dia/shapes/Misc/expensible-node.shape
share/dia/shapes/Misc/file.png
share/dia/shapes/Misc/file.shape
share/dia/shapes/Misc/folder.png
@@ -1510,8 +1549,6 @@
share/dia/shapes/Pneumatic/seojack.png
share/dia/shapes/Pneumatic/seojack.shape
share/dia/shapes/RDP/
-share/dia/shapes/RDP/arc.png
-share/dia/shapes/RDP/arc_inhibiteur.png
share/dia/shapes/RDP/place.png
share/dia/shapes/RDP/place.shape
share/dia/shapes/RDP/place_marquee.png
@@ -1609,6 +1646,7 @@
share/dia/sheets/Circuit.sheet
share/dia/sheets/Contact.sheet
share/dia/sheets/Cybernetics.sheet
+share/dia/sheets/Database.sheet
share/dia/sheets/ER/
share/dia/sheets/ER.sheet
share/dia/sheets/ER/weakentity.png
@@ -1662,12 +1700,140 @@
share/dia/sheets/KAOS/requirement.png
share/dia/sheets/KAOS/responsibility.png
share/dia/sheets/KAOS/softgoal.png
+share/dia/sheets/Lights.sheet
share/dia/sheets/Logic.sheet
share/dia/sheets/MSE.sheet
share/dia/sheets/Misc.sheet
share/dia/sheets/Pneumatic.sheet
share/dia/sheets/SADT.sheet
share/dia/sheets/SDL.sheet
+share/dia/sheets/SISSI/
+share/dia/sheets/SISSI.sheet
+share/dia/sheets/SISSI/1.xml
+share/dia/sheets/SISSI/10.xml
+share/dia/sheets/SISSI/11.xml
+share/dia/sheets/SISSI/12.xml
+share/dia/sheets/SISSI/13.xml
+share/dia/sheets/SISSI/14.xml
+share/dia/sheets/SISSI/15.xml
+share/dia/sheets/SISSI/16.xml
+share/dia/sheets/SISSI/17.xml
+share/dia/sheets/SISSI/18.xml
+share/dia/sheets/SISSI/19.xml
+share/dia/sheets/SISSI/2.xml
+share/dia/sheets/SISSI/20.xml
+share/dia/sheets/SISSI/21.xml
+share/dia/sheets/SISSI/22.xml
+share/dia/sheets/SISSI/23.xml
+share/dia/sheets/SISSI/28.xml
+share/dia/sheets/SISSI/29.xml
+share/dia/sheets/SISSI/3.xml
+share/dia/sheets/SISSI/30.xml
+share/dia/sheets/SISSI/31.xml
+share/dia/sheets/SISSI/32.xml
+share/dia/sheets/SISSI/33.xml
+share/dia/sheets/SISSI/34.xml
+share/dia/sheets/SISSI/35.xml
+share/dia/sheets/SISSI/36.xml
+share/dia/sheets/SISSI/37.xml
+share/dia/sheets/SISSI/38.xml
+share/dia/sheets/SISSI/39.xml
+share/dia/sheets/SISSI/4.xml
+share/dia/sheets/SISSI/40.xml
+share/dia/sheets/SISSI/41.xml
+share/dia/sheets/SISSI/42.xml
+share/dia/sheets/SISSI/43.xml
+share/dia/sheets/SISSI/44.xml
+share/dia/sheets/SISSI/45.xml
+share/dia/sheets/SISSI/46.xml
+share/dia/sheets/SISSI/47.xml
+share/dia/sheets/SISSI/48.xml
+share/dia/sheets/SISSI/5.xml
+share/dia/sheets/SISSI/50.xml
+share/dia/sheets/SISSI/51.xml
+share/dia/sheets/SISSI/52.xml
+share/dia/sheets/SISSI/53.xml
+share/dia/sheets/SISSI/54.xml
+share/dia/sheets/SISSI/55.xml
+share/dia/sheets/SISSI/56.xml
+share/dia/sheets/SISSI/57.xml
+share/dia/sheets/SISSI/58.xml
+share/dia/sheets/SISSI/59.xml
+share/dia/sheets/SISSI/6.xml
+share/dia/sheets/SISSI/60.xml
+share/dia/sheets/SISSI/61.xml
+share/dia/sheets/SISSI/62.xml
+share/dia/sheets/SISSI/63.xml
+share/dia/sheets/SISSI/7.xml
+share/dia/sheets/SISSI/70.xml
+share/dia/sheets/SISSI/71.xml
+share/dia/sheets/SISSI/75.xml
+share/dia/sheets/SISSI/76.xml
+share/dia/sheets/SISSI/8.xml
+share/dia/sheets/SISSI/9.xml
+share/dia/sheets/SISSI/aircooler.png
+share/dia/sheets/SISSI/alarm_center.png
+share/dia/sheets/SISSI/analyse.xpm
+share/dia/sheets/SISSI/barriere.png
+share/dia/sheets/SISSI/camera_interphone.png
+share/dia/sheets/SISSI/capteur_brise_glace.png
+share/dia/sheets/SISSI/capteur_faisceau.png
+share/dia/sheets/SISSI/cellular_phone.png
+share/dia/sheets/SISSI/cloud.png
+share/dia/sheets/SISSI/condensateur.png
+share/dia/sheets/SISSI/detecteur_alimentation.png
+share/dia/sheets/SISSI/detecteur_courant.png
+share/dia/sheets/SISSI/detecteur_enthalpie.png
+share/dia/sheets/SISSI/detecteur_fumee.png
+share/dia/sheets/SISSI/detecteur_humidite.png
+share/dia/sheets/SISSI/detecteur_lumiere.png
+share/dia/sheets/SISSI/detecteur_mouvement.png
+share/dia/sheets/SISSI/detecteur_mouvement_video.png
+share/dia/sheets/SISSI/detecteur_niveau.png
+share/dia/sheets/SISSI/detecteur_pression.png
+share/dia/sheets/SISSI/detecteur_qualite_air.png
+share/dia/sheets/SISSI/detecteur_tension.png
+share/dia/sheets/SISSI/detecteur_vehicule.png
+share/dia/sheets/SISSI/detecteur_vibration.png
+share/dia/sheets/SISSI/digi_code.png
+share/dia/sheets/SISSI/diskette.png
+share/dia/sheets/SISSI/extincteur.png
+share/dia/sheets/SISSI/extracteur_humidite.png
+share/dia/sheets/SISSI/faraday.png
+share/dia/sheets/SISSI/file.png
+share/dia/sheets/SISSI/filtre_air.png
+share/dia/sheets/SISSI/hub.png
+share/dia/sheets/SISSI/ibm_mini.png
+share/dia/sheets/SISSI/info.xpm
+share/dia/sheets/SISSI/key.png
+share/dia/sheets/SISSI/laptop.png
+share/dia/sheets/SISSI/lecteur_badge.png
+share/dia/sheets/SISSI/lecteur_badge_clavier.png
+share/dia/sheets/SISSI/lecteur_biometrique.png
+share/dia/sheets/SISSI/logiciel.xpm
+share/dia/sheets/SISSI/menace.xpm
+share/dia/sheets/SISSI/meuble.xpm
+share/dia/sheets/SISSI/modem.png
+share/dia/sheets/SISSI/onduleur.png
+share/dia/sheets/SISSI/pc.png
+share/dia/sheets/SISSI/pda.png
+share/dia/sheets/SISSI/personne.xpm
+share/dia/sheets/SISSI/phone.png
+share/dia/sheets/SISSI/pompe.png
+share/dia/sheets/SISSI/pompe_rotative.png
+share/dia/sheets/SISSI/porte_tambour.png
+share/dia/sheets/SISSI/relational_database.png
+share/dia/sheets/SISSI/router.png
+share/dia/sheets/SISSI/safe.png
+share/dia/sheets/SISSI/sauvegarde.xpm
+share/dia/sheets/SISSI/si.xpm
+share/dia/sheets/SISSI/sissi_object.xpm
+share/dia/sheets/SISSI/storage_array.png
+share/dia/sheets/SISSI/support.xpm
+share/dia/sheets/SISSI/tourniquet.png
+share/dia/sheets/SISSI/ventilateur.png
+share/dia/sheets/SISSI/ventilateur_axial.png
+share/dia/sheets/SISSI/ventilateur_centrifuge.png
share/dia/sheets/UML/
share/dia/sheets/UML.sheet
share/dia/sheets/UML/aggregation.png
@@ -1687,7 +1853,9 @@
share/dia/sheets/sybase.sheet
share/dia/ui/
share/dia/ui/display-ui.xml
+share/dia/ui/integrated-ui.xml
share/dia/ui/popup-ui.xml
+share/dia/ui/toolbar-ui.xml
share/dia/ui/toolbox-ui.xml
share/dia/xslt/
share/dia/xslt/dia-uml.xsl
@@ -1699,70 +1867,32 @@
share/dia/xslt/dia-uml2python.xsl
share/dia/xslt/stylesheets.xml
share/doc/dia/
-share/doc/dia/html/
-share/doc/dia/html/C
-share/doc/dia/html/en/
-share/doc/dia/html/en/ch01.html
-share/doc/dia/html/en/ch02.html
-share/doc/dia/html/en/ch02s02.html
-share/doc/dia/html/en/ch02s03.html
-share/doc/dia/html/en/ch02s04.html
-share/doc/dia/html/en/ch02s05.html
-share/doc/dia/html/en/ch02s06.html
-share/doc/dia/html/en/ch02s07.html
-share/doc/dia/html/en/ch03.html
-share/doc/dia/html/en/ch03s02.html
-share/doc/dia/html/en/ch03s03.html
-share/doc/dia/html/en/ch03s04.html
-share/doc/dia/html/en/ch03s05.html
-share/doc/dia/html/en/ch04.html
-share/doc/dia/html/en/ch04s02.html
-share/doc/dia/html/en/ch04s03.html
-share/doc/dia/html/en/ch04s04.html
-share/doc/dia/html/en/ch05.html
-share/doc/dia/html/en/ch06.html
-share/doc/dia/html/en/ch06s02.html
-share/doc/dia/html/en/ch07.html
-share/doc/dia/html/en/ch07s02.html
-share/doc/dia/html/en/ch08.html
-share/doc/dia/html/en/ch08s02.html
-share/doc/dia/html/en/ch09.html
-share/doc/dia/html/en/ch10.html
-share/doc/dia/html/en/ch10s02.html
-share/doc/dia/html/en/ch10s03.html
-share/doc/dia/html/en/ch11.html
-share/doc/dia/html/en/ch12.html
-share/doc/dia/html/en/index.html
-share/doc/dia/html/pl/
-share/doc/dia/html/pl/ch01.html
-share/doc/dia/html/pl/ch01s02.html
-share/doc/dia/html/pl/ch01s03.html
-share/doc/dia/html/pl/ch01s04.html
-share/doc/dia/html/pl/ch01s05.html
-share/doc/dia/html/pl/ch01s06.html
-share/doc/dia/html/pl/ch01s07.html
-share/doc/dia/html/pl/ch02.html
-share/doc/dia/html/pl/ch02s02.html
-share/doc/dia/html/pl/ch02s03.html
-share/doc/dia/html/pl/ch02s04.html
-share/doc/dia/html/pl/ch02s05.html
-share/doc/dia/html/pl/ch03.html
-share/doc/dia/html/pl/ch03s02.html
-share/doc/dia/html/pl/ch03s03.html
-share/doc/dia/html/pl/ch03s04.html
-share/doc/dia/html/pl/ch04.html
-share/doc/dia/html/pl/ch04s02.html
-share/doc/dia/html/pl/ch05.html
-share/doc/dia/html/pl/ch05s02.html
-share/doc/dia/html/pl/ch06.html
-share/doc/dia/html/pl/ch06s02.html
-share/doc/dia/html/pl/ch07.html
-share/doc/dia/html/pl/ch08.html
-share/doc/dia/html/pl/ch08s02.html
-share/doc/dia/html/pl/ch08s03.html
-share/doc/dia/html/pl/ch09.html
-share/doc/dia/html/pl/ch10.html
-share/doc/dia/html/pl/index.html
+share/doc/dia/en/
+share/doc/dia/en/examples/
+share/doc/dia/en/examples/diagram.dtd
+share/doc/dia/en/examples/shape.dtd
+share/doc/dia/en/examples/sheet.dtd
+share/doc/dia/eu/
+share/doc/dia/eu/examples/
+share/doc/dia/eu/examples/diagram.dtd
+share/doc/dia/eu/examples/shape.dtd
+share/doc/dia/eu/examples/sheet.dtd
+share/doc/dia/fr/
+share/doc/dia/fr/examples/
+share/doc/dia/fr/examples/diagram.dtd
+share/doc/dia/fr/examples/shape.dtd
+share/doc/dia/fr/examples/sheet.dtd
+share/doc/dia/pl/
+share/doc/dia/pl/examples/
+share/doc/dia/pl/examples/diagram.dtd
+share/doc/dia/pl/examples/shape.dtd
+share/doc/dia/pl/examples/sheet.dtd
+share/icons/hicolor/16x16/apps/dia.png
+share/icons/hicolor/22x22/apps/dia.png
+share/icons/hicolor/24x24/apps/dia.png
+share/icons/hicolor/32x32/apps/dia.png
+share/icons/hicolor/48x48/apps/dia.png
+share/icons/hicolor/scalable/apps/dia.svg
share/locale/am/LC_MESSAGES/dia.mo
share/locale/ar/LC_MESSAGES/dia.mo
share/locale/az/LC_MESSAGES/dia.mo
@@ -1773,6 +1903,7 @@
share/locale/cs/LC_MESSAGES/dia.mo
share/locale/da/LC_MESSAGES/dia.mo
share/locale/de/LC_MESSAGES/dia.mo
+share/locale/dz/LC_MESSAGES/dia.mo
share/locale/el/LC_MESSAGES/dia.mo
share/locale/en_CA/LC_MESSAGES/dia.mo
share/locale/en_GB/LC_MESSAGES/dia.mo
@@ -1795,11 +1926,14 @@
share/locale/mk/LC_MESSAGES/dia.mo
share/locale/ml/LC_MESSAGES/dia.mo
share/locale/mn/LC_MESSAGES/dia.mo
+share/locale/mr/LC_MESSAGES/dia.mo
share/locale/ms/LC_MESSAGES/dia.mo
share/locale/nb/LC_MESSAGES/dia.mo
share/locale/ne/LC_MESSAGES/dia.mo
share/locale/nl/LC_MESSAGES/dia.mo
share/locale/nn/LC_MESSAGES/dia.mo
+share/locale/oc/LC_MESSAGES/dia.mo
+share/locale/pa/LC_MESSAGES/dia.mo
share/locale/pl/LC_MESSAGES/dia.mo
share/locale/pt/LC_MESSAGES/dia.mo
share/locale/pt_BR/LC_MESSAGES/dia.mo
@@ -1810,6 +1944,8 @@
share/locale/sl/LC_MESSAGES/dia.mo
share/locale/sq/LC_MESSAGES/dia.mo
share/locale/sr/LC_MESSAGES/dia.mo
+share/locale/s...@latn/
+share/locale/s...@latn/LC_MESSAGES/
share/locale/s...@latn/LC_MESSAGES/dia.mo
share/locale/sv/LC_MESSAGES/dia.mo
share/locale/th/LC_MESSAGES/dia.mo
@@ -1817,16 +1953,17 @@
share/locale/uk/LC_MESSAGES/dia.mo
share/locale/vi/LC_MESSAGES/dia.mo
share/locale/zh_CN/LC_MESSAGES/dia.mo
+share/locale/zh_HK/LC_MESSAGES/dia.mo
share/locale/zh_TW/LC_MESSAGES/dia.mo
+...@comment share/man/
+...@comment share/man/fr/
+...@comment share/man/fr/man1/
+...@comment @man share/man/fr/man1/dia.1
share/mime-info/
share/mime-info/dia.keys
share/mime-info/dia.mime
-...@comment share/oaf/
-...@comment share/omf/
-...@comment share/omf/dia/
-share/pixmaps/
-share/pixmaps/dia-diagram.png
-share/pixmaps/dia_gnome_icon.png
@exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database
+...@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
+...@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
%%gnome%%
--
Antoine
