Tue Jun 9 08:55:23 2015 UTC ()
Update dia to 0.97.3, provided by David H. Gutteridge in PR 49954.

dia-0.97.3: 2014-09-05

 * Fix double free with some SVG rendering (regression from Dia 0.97.2)
 * Fixes to cope better with updated versions of Dia's dependencies:
   - don't crash at start-up with ABI breaking GLib 2-36
   - don't assert in cairo 1.12 with invalid arc parameters
   - avoid kerning problems (character overlap) for all Pango versions
   - fix image files to be loadable by libpng16
 * Backport fixes for some seldom crashes and other annoyances, see:
   http://bugzilla.gnome.org/buglist.cgi?product=dia&target_milestone=0.97.3
 * Update translations for Brazilian Portuguese, German, Hungarian,
   Polish, Romanian, Serbian and Slovenian


(wiz)
diff -r1.90 -r1.91 pkgsrc/graphics/dia/Makefile
diff -r1.28 -r1.29 pkgsrc/graphics/dia/Makefile.common
diff -r1.20 -r1.21 pkgsrc/graphics/dia/PLIST
diff -r1.31 -r1.32 pkgsrc/graphics/dia/distinfo
diff -r1.43 -r1.44 pkgsrc/graphics/dia-python/Makefile
diff -r1.8 -r1.9 pkgsrc/graphics/dia/patches/patch-aa
diff -r0 -r1.1 pkgsrc/graphics/dia/patches/patch-app_load_save.c
diff -r1.1 -r0 pkgsrc/graphics/dia/patches/patch-app_render_gdk.c
diff -r1.1 -r0 pkgsrc/graphics/dia/patches/patch-objects_custom_shape__typeinfo_c
diff -r1.1 -r0 pkgsrc/graphics/dia/patches/patch-plug-ins_postscript_diapsft2renderer.c
diff -r1.1 -r0 pkgsrc/graphics/dia/patches/patch-tests_test-boundingbox_c
diff -r1.1 -r0 pkgsrc/graphics/dia/patches/patch-tests_test-objects_c
diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-be
diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-cd
cvs diff -r1.90 -r1.91 pkgsrc/graphics/dia/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/dia/Makefile 2015/04/25 14:23:08 1.90
+++ pkgsrc/graphics/dia/Makefile 2015/06/09 08:55:22 1.91
@@ -1,15 +1,12 @@ @@ -1,15 +1,12 @@
1# $NetBSD: Makefile,v 1.90 2015/04/25 14:23:08 tnn Exp $ 1# $NetBSD: Makefile,v 1.91 2015/06/09 08:55:22 wiz Exp $
2# 
3 2
4.include "Makefile.common" 3.include "Makefile.common"
5 4
6PKGREVISION= 23 
7 
8.include "options.mk" 5.include "options.mk"
9 6
10# just to convert the manpage 7# just to convert the manpage
11BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 8BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
12 9
13.include "../../sysutils/desktop-file-utils/desktopdb.mk" 10.include "../../sysutils/desktop-file-utils/desktopdb.mk"
14.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 11.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
15.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/graphics/dia/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/dia/Makefile.common 2012/12/04 12:37:15 1.28
+++ pkgsrc/graphics/dia/Makefile.common 2015/06/09 08:55:22 1.29
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile.common,v 1.28 2012/12/04 12:37:15 ryoon Exp $ 1# $NetBSD: Makefile.common,v 1.29 2015/06/09 08:55:22 wiz Exp $
2# 2#
3# used by graphics/dia-python/Makefile 3# used by graphics/dia-python/Makefile
4 4
5DISTNAME= dia-0.97.2 5DISTNAME= dia-0.97.3
6PKGNAME= ${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/} 6PKGNAME= ${DISTNAME:S/dia-/dia${DIA_SUBPKG}-/}
7CATEGORIES= graphics 7CATEGORIES= graphics
8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.97/} 8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/dia/0.97/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://live.gnome.org/Dia 12HOMEPAGE= https://live.gnome.org/Dia
13COMMENT= Program for creating diagrams of all kinds 13COMMENT= Program for creating diagrams of all kinds
 14LICENSE= gnu-gpl-v2
14 15
15DISTINFO_FILE= ${.CURDIR}/../../graphics/dia/distinfo 16DISTINFO_FILE= ${.CURDIR}/../../graphics/dia/distinfo
16PATCHDIR= ${.CURDIR}/../../graphics/dia/patches 17PATCHDIR= ${.CURDIR}/../../graphics/dia/patches
17 18
18GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
19USE_TOOLS+= gmake intltool pkg-config msgfmt 20USE_TOOLS+= gmake intltool pkg-config msgfmt
20USE_LIBTOOL= YES 21USE_LIBTOOL= YES
21USE_PKGLOCALEDIR= YES 22USE_PKGLOCALEDIR= YES
22USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
23 24
24CHECK_PORTABILITY_SKIP+= installer/macosx/dia 25CHECK_PORTABILITY_SKIP+= installer/macosx/dia
25 26
26CONFIGURE_ARGS+= --disable-emf 27CONFIGURE_ARGS+= --disable-emf
cvs diff -r1.20 -r1.21 pkgsrc/graphics/dia/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/dia/PLIST 2012/01/18 18:36:51 1.20
+++ pkgsrc/graphics/dia/PLIST 2015/06/09 08:55:22 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.20 2012/01/18 18:36:51 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.21 2015/06/09 08:55:22 wiz Exp $
2bin/dia 2bin/dia
3lib/dia/libaadl_objects.la 3lib/dia/libaadl_objects.la
4lib/dia/libart_filter.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_lines_objects.la
9lib/dia/libcustom_objects.la 9lib/dia/libcustom_objects.la
10lib/dia/libdb_objects.la 10lib/dia/libdb_objects.la
11lib/dia/libdia.la 11lib/dia/libdia.la
12lib/dia/libdxf_filter.la 12lib/dia/libdxf_filter.la
13lib/dia/liber_objects.la 13lib/dia/liber_objects.la
14lib/dia/libflowchart_objects.la 14lib/dia/libflowchart_objects.la
@@ -1890,26 +1890,27 @@ share/locale/oc/LC_MESSAGES/dia.mo @@ -1890,26 +1890,27 @@ share/locale/oc/LC_MESSAGES/dia.mo
1890share/locale/or/LC_MESSAGES/dia.mo 1890share/locale/or/LC_MESSAGES/dia.mo
1891share/locale/pa/LC_MESSAGES/dia.mo 1891share/locale/pa/LC_MESSAGES/dia.mo
1892share/locale/pl/LC_MESSAGES/dia.mo 1892share/locale/pl/LC_MESSAGES/dia.mo
1893share/locale/pt/LC_MESSAGES/dia.mo 1893share/locale/pt/LC_MESSAGES/dia.mo
1894share/locale/pt_BR/LC_MESSAGES/dia.mo 1894share/locale/pt_BR/LC_MESSAGES/dia.mo
1895share/locale/ro/LC_MESSAGES/dia.mo 1895share/locale/ro/LC_MESSAGES/dia.mo
1896share/locale/ru/LC_MESSAGES/dia.mo 1896share/locale/ru/LC_MESSAGES/dia.mo
1897share/locale/rw/LC_MESSAGES/dia.mo 1897share/locale/rw/LC_MESSAGES/dia.mo
1898share/locale/sk/LC_MESSAGES/dia.mo 1898share/locale/sk/LC_MESSAGES/dia.mo
1899share/locale/sl/LC_MESSAGES/dia.mo 1899share/locale/sl/LC_MESSAGES/dia.mo
1900share/locale/sq/LC_MESSAGES/dia.mo 1900share/locale/sq/LC_MESSAGES/dia.mo
1901share/locale/sr/LC_MESSAGES/dia.mo 1901share/locale/sr/LC_MESSAGES/dia.mo
1902share/locale/sr@Latn/LC_MESSAGES/dia.mo 1902share/locale/sr@Latn/LC_MESSAGES/dia.mo
 1903share/locale/sr@latin/LC_MESSAGES/dia.mo
1903share/locale/sv/LC_MESSAGES/dia.mo 1904share/locale/sv/LC_MESSAGES/dia.mo
1904share/locale/ta/LC_MESSAGES/dia.mo 1905share/locale/ta/LC_MESSAGES/dia.mo
1905share/locale/th/LC_MESSAGES/dia.mo 1906share/locale/th/LC_MESSAGES/dia.mo
1906share/locale/tr/LC_MESSAGES/dia.mo 1907share/locale/tr/LC_MESSAGES/dia.mo
1907share/locale/uk/LC_MESSAGES/dia.mo 1908share/locale/uk/LC_MESSAGES/dia.mo
1908share/locale/vi/LC_MESSAGES/dia.mo 1909share/locale/vi/LC_MESSAGES/dia.mo
1909share/locale/zh_CN/LC_MESSAGES/dia.mo 1910share/locale/zh_CN/LC_MESSAGES/dia.mo
1910share/locale/zh_HK/LC_MESSAGES/dia.mo 1911share/locale/zh_HK/LC_MESSAGES/dia.mo
1911share/locale/zh_TW/LC_MESSAGES/dia.mo 1912share/locale/zh_TW/LC_MESSAGES/dia.mo
1912share/mime-info/dia.keys 1913share/mime-info/dia.keys
1913share/mime-info/dia.mime 1914share/mime-info/dia.mime
1914${PLIST.gnome}share/omf/dia/dia-C.omf 1915${PLIST.gnome}share/omf/dia/dia-C.omf
1915${PLIST.gnome}share/omf/dia/dia-eu.omf 1916${PLIST.gnome}share/omf/dia/dia-eu.omf
cvs diff -r1.31 -r1.32 pkgsrc/graphics/dia/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/dia/distinfo 2014/04/15 20:34:36 1.31
+++ pkgsrc/graphics/dia/distinfo 2015/06/09 08:55:22 1.32
@@ -1,18 +1,14 @@ @@ -1,18 +1,14 @@
1$NetBSD: distinfo,v 1.31 2014/04/15 20:34:36 asau Exp $ 1$NetBSD: distinfo,v 1.32 2015/06/09 08:55:22 wiz Exp $
2 2
3SHA1 (dia-0.97.2.tar.xz) = dc7ed6f8cd83acc8f421d28f30e4042fe370e9ba 3SHA1 (dia-0.97.3.tar.xz) = 316393951daebd186ba387e1cd6e34160a458c39
4RMD160 (dia-0.97.2.tar.xz) = f9270f1f2cb6ad505219463827d02e3759693796 4RMD160 (dia-0.97.3.tar.xz) = a984efa1663cc154f4394060af37fab146f99175
5Size (dia-0.97.2.tar.xz) = 5507004 bytes 5Size (dia-0.97.3.tar.xz) = 5548500 bytes
6SHA1 (patch-aa) = ab5acd47ba4557aa8cc4a5abb3ce1f41ea5e2574 6SHA1 (patch-aa) = bad171ff4f379030f05c613b362e669a53d7f6da
7SHA1 (patch-app_render_gdk.c) = 2bff345b8168ef731eb977f1850fd6a725224c78 7SHA1 (patch-app_load_save.c) = ee6c58a9db031fc89c61939a6c3fce90dae75a8d
8SHA1 (patch-be) = dab7626daefcd702b31f54d198311d9be921e1ff 8SHA1 (patch-be) = 08db7c440eea343895cced29522dd487f11d4773
9SHA1 (patch-ca) = 8737f3ff19244e2f87ffb571da21159bc2248648 9SHA1 (patch-ca) = 8737f3ff19244e2f87ffb571da21159bc2248648
10SHA1 (patch-cb) = 02210139cbf38e91a61ad1e090f63f5635bb26ef 10SHA1 (patch-cb) = 02210139cbf38e91a61ad1e090f63f5635bb26ef
11SHA1 (patch-cc) = 2dd4c822d8771e48ff1ac67946d765e5d8b85d50 11SHA1 (patch-cc) = 2dd4c822d8771e48ff1ac67946d765e5d8b85d50
12SHA1 (patch-cd) = b7dd72a359fe6f36a56d2c16f94427c6977b0477 12SHA1 (patch-cd) = d5fdf63320e59278b5c99a07b450161ffbc1789b
13SHA1 (patch-da) = 4ed80c2a7eaa2dbbebd8265c8b74faac20c4f6c2 13SHA1 (patch-da) = 4ed80c2a7eaa2dbbebd8265c8b74faac20c4f6c2
14SHA1 (patch-objects_custom_shape__typeinfo_c) = 128477ab7cc363a490e042062379585800893626 
15SHA1 (patch-plug-ins_postscript_diapsft2renderer.c) = c4933ba0133aca4e6816e796499f9710158f333d 
16SHA1 (patch-plug-ins_postscript_paginate__psprint.c) = 59784ea73d32158f457e52132bc5c4cef375dcae 14SHA1 (patch-plug-ins_postscript_paginate__psprint.c) = 59784ea73d32158f457e52132bc5c4cef375dcae
17SHA1 (patch-tests_test-boundingbox_c) = f05fe01fd2d79bf5b519808aa491458040097fb7 
18SHA1 (patch-tests_test-objects_c) = 759b788aa55e3256758514906c1ce812fb3b6aba 
cvs diff -r1.43 -r1.44 pkgsrc/graphics/dia-python/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/dia-python/Makefile 2015/04/25 14:23:09 1.43
+++ pkgsrc/graphics/dia-python/Makefile 2015/06/09 08:55:23 1.44
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1# $NetBSD: Makefile,v 1.43 2015/04/25 14:23:09 tnn Exp $ 1# $NetBSD: Makefile,v 1.44 2015/06/09 08:55:23 wiz Exp $
2 2
3DIA_SUBPKG= -python 3DIA_SUBPKG= -python
4.include "../../graphics/dia/Makefile.common" 4.include "../../graphics/dia/Makefile.common"
5 5
6PKGREVISION= 17 
7 
8COMMENT+= (Python plugin) 6COMMENT+= (Python plugin)
9 7
10CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-python/--with-python/g} 8CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-python/--with-python/g}
11CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 9CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
12 10
13REPLACE_PYTHON= po-checktrans.py 11REPLACE_PYTHON= po-checktrans.py
14REPLACE_PYTHON+= plug-ins/python/gtkcons.py 12REPLACE_PYTHON+= plug-ins/python/gtkcons.py
15REPLACE_PYTHON+= sheets/checktrans.py 13REPLACE_PYTHON+= sheets/checktrans.py
16PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-gtk2 14PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-gtk2
17 15
18BUILD_DIRS+= plug-ins/python 16BUILD_DIRS+= plug-ins/python
19INSTALL_DIRS+= plug-ins/python 17INSTALL_DIRS+= plug-ins/python
20 18
cvs diff -r1.8 -r1.9 pkgsrc/graphics/dia/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/dia/patches/patch-aa 2012/01/18 18:36:51 1.8
+++ pkgsrc/graphics/dia/patches/patch-aa 2015/06/09 08:55:23 1.9
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-aa,v 1.8 2012/01/18 18:36:51 drochner Exp $ 1$NetBSD: patch-aa,v 1.9 2015/06/09 08:55:23 wiz Exp $
2 2
3--- configure.orig 2011-04-25 13:04:56.000000000 +0000 3--- configure.orig 2014-09-05 11:08:16.000000000 -0400
4+++ configure 4+++ configure
5@@ -18016,7 +18016,7 @@ $as_echo_n "checking for $am_display_PYT 5@@ -19308,7 +19308,7 @@
6 if test "${am_cv_python_pythondir+set}" = set; then : 6 if ${am_cv_python_pythondir+:} false; then :
7 $as_echo_n "(cached) " >&6 7 $as_echo_n "(cached) " >&6
8 else 8 else
9- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || 9- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
10+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null || 10+ am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0)" 2>/dev/null ||
11 echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"` 11 echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`
12 fi 12 fi
13 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 13 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
14@@ -18034,7 +18034,7 @@ $as_echo_n "checking for $am_display_PYT 14@@ -19326,7 +19326,7 @@
15 if test "${am_cv_python_pyexecdir+set}" = set; then : 15 if ${am_cv_python_pyexecdir+:} false; then :
16 $as_echo_n "(cached) " >&6 16 $as_echo_n "(cached) " >&6
17 else 17 else
18- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || 18- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
19+ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null || 19+ am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0)" 2>/dev/null ||
20 echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"` 20 echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`
21 fi 21 fi
22 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 22 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
23@@ -18121,18 +18121,18 @@ CPPFLAGS="$save_CPPFLAGS" 23@@ -19420,18 +19420,18 @@
24 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpython${PYTHON_VERSION}.a" >&5 24 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpython${PYTHON_VERSION}.a" >&5
25 $as_echo_n "checking for libpython${PYTHON_VERSION}.a... " >&6; } 25 $as_echo_n "checking for libpython${PYTHON_VERSION}.a... " >&6; }
26  26
27-py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config" 27- py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config"
28+py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config" 28+ py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
29  29
30 py_makefile="${py_config_dir}/Makefile" 30 py_makefile="${py_config_dir}/Makefile"
31 if test -f "$py_makefile"; then 31 if test -f "$py_makefile"; then
32 py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile` 32 py_basemodlibs=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $py_makefile`
33 py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile` 33 py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile`
34  34
35- if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then 35- if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then
36+ if test -e "$PYTHON_PREFIX/lib/libpython${PYTHON_VERSION}.so"; then 36+ if test -e "$PYTHON_PREFIX/lib/libpython${PYTHON_VERSION}.so"; then
37 PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs" 37 PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
38 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 38 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
39 $as_echo "found" >&6; } 39 $as_echo "found" >&6; }
40- elif test -e "${py_prefix}/${py_lib}/libpython${PYTHON_VERSION}.a"; then 40- elif test -e "${py_prefix}/${py_lib}/libpython${PYTHON_VERSION}.a"; then
41+ elif test -e "${py_prefix}/lib/libpython${PYTHON_VERSION}.a"; then 41+ elif test -e "${py_prefix}/lib/libpython${PYTHON_VERSION}.a"; then
42 PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs" 42 PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_basemodlibs $py_other_libs"
43 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 43 { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
44 $as_echo "found" >&6; } 44 $as_echo "found" >&6; }
File Added: pkgsrc/graphics/dia/patches/patch-app_load_save.c
$NetBSD: patch-app_load_save.c,v 1.1 2015/06/09 08:55:23 wiz Exp $

Allow NetBSD and OpenBSD to compile by exposing the fchmod() prototype.
This has been reported upstream as:
https://bugzilla.gnome.org/show_bug.cgi?id=750536

--- app/load_save.c.orig    2014-08-24 11:46:01.000000000 -0400
+++ app/load_save.c
@@ -19,7 +19,14 @@

 /* so we get fdopen declared even when compiling with -ansi */
 #define _POSIX_C_SOURCE 200809L
-#define _BSD_SOURCE 1 /* to get the prototype for fchmod() */
+/* to get the prototype for fchmod() */
+#if defined(__NetBSD__)
+#define _NETBSD_SOURCE 1
+#elif defined(__OpenBSD__)
+#define __BSD_VISIBLE 1
+#else
+#define _BSD_SOURCE 1
+#endif

 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
File Deleted: pkgsrc/graphics/dia/patches/Attic/patch-app_render_gdk.c
File Deleted: pkgsrc/graphics/dia/patches/Attic/patch-objects_custom_shape__typeinfo_c
File Deleted: pkgsrc/graphics/dia/patches/Attic/patch-plug-ins_postscript_diapsft2renderer.c
File Deleted: pkgsrc/graphics/dia/patches/Attic/patch-tests_test-boundingbox_c
File Deleted: pkgsrc/graphics/dia/patches/Attic/patch-tests_test-objects_c
cvs diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-be (expand / switch to unified diff)

--- pkgsrc/graphics/dia/patches/patch-be 2003/12/02 22:32:48 1.1
+++ pkgsrc/graphics/dia/patches/patch-be 2015/06/09 08:55:23 1.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: patch-be,v 1.1 2003/12/02 22:32:48 recht Exp $ 1$NetBSD: patch-be,v 1.2 2015/06/09 08:55:23 wiz Exp $
2 2
3--- lib/intl.c.orig 2002-09-23 21:27:44.000000000 +0200 3--- lib/intl.c.orig 2014-08-24 11:46:01.000000000 -0400
4+++ lib/intl.c 2003-11-10 22:54:10.000000000 +0100 4+++ lib/intl.c
5@@ -65,6 +65,8 @@ 5@@ -58,6 +58,9 @@
6 read_aliases ("/usr/share/locale/locale.alias"); 6 read_aliases ("/usr/share/locale/locale.alias");
7 read_aliases ("/usr/local/share/locale/locale.alias"); 7 read_aliases ("/usr/local/share/locale/locale.alias");
8 read_aliases ("/usr/lib/X11/locale/locale.alias"); 8 read_aliases ("/usr/lib/X11/locale/locale.alias");
9+ read_aliases ("/usr/X11R6/lib/X11/locale/locale.alias"); 9+ read_aliases ("/usr/X11R6/lib/X11/locale/locale.alias");
10+ read_aliases ("%%PREFIX%%/share/locale/locale.alias"); 10+ read_aliases ("/usr/X11R7/lib/X11/locale/locale.alias");
 11+ read_aliases ("/usr/pkg/share/locale/locale.alias");
11 read_aliases ("/usr/openwin/lib/locale/locale.alias"); 12 read_aliases ("/usr/openwin/lib/locale/locale.alias");
12 } 13 }
13 while((p=g_hash_table_lookup(alias_table,lang)) && strcmp(p, lang)) 14 while((p=g_hash_table_lookup(alias_table,lang)) && strcmp(p, lang))
cvs diff -r1.1 -r1.2 pkgsrc/graphics/dia/patches/patch-cd (expand / switch to unified diff)

--- pkgsrc/graphics/dia/patches/patch-cd 2009/12/09 10:22:04 1.1
+++ pkgsrc/graphics/dia/patches/patch-cd 2015/06/09 08:55:23 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-cd,v 1.1 2009/12/09 10:22:04 drochner Exp $ 1$NetBSD: patch-cd,v 1.2 2015/06/09 08:55:23 wiz Exp $
2 2
3--- doc/fr/Makefile.in.orig 2009-05-03 20:12:41.000000000 +0200 3--- doc/fr/Makefile.in.orig 2014-09-05 11:08:04.000000000 -0400
4+++ doc/fr/Makefile.in 4+++ doc/fr/Makefile.in
5@@ -571,7 +571,7 @@ info: info-am 5@@ -674,7 +674,7 @@
6  6
7 info-am: 7 info-am:
8  8
9-install-data-am: install-data-local install-man 9-install-data-am: install-data-local install-man
10+install-data-am: install-data-local 10+install-data-am: install-data-local
11 @$(NORMAL_INSTALL) 11 @$(NORMAL_INSTALL)
12 $(MAKE) $(AM_MAKEFLAGS) install-data-hook 12 $(MAKE) $(AM_MAKEFLAGS) install-data-hook
13  13 install-dvi: install-dvi-am