summaryrefslogtreecommitdiff
path: root/graphics/dia
diff options
context:
space:
mode:
authormjl <mjl>2002-09-07 17:40:50 +0000
committermjl <mjl>2002-09-07 17:40:50 +0000
commit0e691781b6679230e094a78f57473e427881d5cf (patch)
treeb7b548d0fb830b2e91b67066f0cb810946cffb37 /graphics/dia
parent1105416102fec62397a7908b5977eb7bf9695eed (diff)
downloadpkgsrc-0e691781b6679230e094a78f57473e427881d5cf.tar.gz
Add patches from freebsd I forgot last time around
Diffstat (limited to 'graphics/dia')
-rw-r--r--graphics/dia/distinfo4
-rw-r--r--graphics/dia/patches/patch-ba14
-rw-r--r--graphics/dia/patches/patch-bb14
3 files changed, 31 insertions, 1 deletions
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index bf9d5c25685..cc7078fca43 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/09/01 00:38:08 mjl Exp $
+$NetBSD: distinfo,v 1.5 2002/09/07 17:40:50 mjl Exp $
SHA1 (dia-0.90.tar.gz) = 7e9705dbf3f3ce62a58169f531dbc635140a88d8
Size (dia-0.90.tar.gz) = 2888211 bytes
SHA1 (patch-aa) = ed5bb19334fcacc772aa1c504fc3c3e4dab933b4
SHA1 (patch-ab) = 9ec08acce0b9a2fe5f2e6b8b15cf294d961aabe1
+SHA1 (patch-ba) = 3a0c2cb558c10dd5c76e5c1ec9fa8571a7d9125f
+SHA1 (patch-bb) = 3838f817e02df719b121029e151d84cb307c7fd5
diff --git a/graphics/dia/patches/patch-ba b/graphics/dia/patches/patch-ba
new file mode 100644
index 00000000000..1733e12cb6b
--- /dev/null
+++ b/graphics/dia/patches/patch-ba
@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.1 2002/09/07 17:40:51 mjl Exp $
+
+--- lib/charconv.c.orig Fri May 17 01:06:50 2002
++++ lib/charconv.c Sun Sep 1 02:54:46 2002
+@@ -98,7 +98,8 @@
+
+ if ((*charset == NULL) ||
+ (0==strcmp(*charset,"US-ASCII")) ||
+- (0==strcmp(*charset,"ANSI_X3.4-1968"))) {
++ (0==strcmp(*charset,"ANSI_X3.4-1968")) ||
++ (**charset == '\0')) {
+ /* we got basic stupid ASCII here. We use its sane
+ superset instead. Especially since libxml2 doesn't like
+ the pedantic name of ASCII. */
diff --git a/graphics/dia/patches/patch-bb b/graphics/dia/patches/patch-bb
new file mode 100644
index 00000000000..00f1845db33
--- /dev/null
+++ b/graphics/dia/patches/patch-bb
@@ -0,0 +1,14 @@
+$NetBSD: patch-bb,v 1.1 2002/09/07 17:40:51 mjl Exp $
+
+--- lib/font.c.orig Sun Sep 1 02:46:29 2002
++++ lib/font.c Sun Sep 1 02:47:22 2002
+@@ -467,7 +467,8 @@
+
+ char *last_resort_fonts[] = {
+ "-adobe-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*",
+-#ifndef G_OS_WIN32
++ "-*-courier-medium-r-normal-*-%d-*-*-*-*-*-*-*",
++#ifdef G_OS_WIN32
+ "system" /* Must be last. This is guaranteed to exist on a MS-Windows
+ system. */
+ #else