summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--print/libgnomeprint/Makefile8
-rw-r--r--print/libgnomeprint/distinfo4
-rw-r--r--print/libgnomeprint/patches/patch-aa14
-rw-r--r--print/libgnomeprint/patches/patch-ab17
-rw-r--r--print/libgnomeprintui/distinfo3
-rw-r--r--print/libgnomeprintui/patches/patch-aa28
-rw-r--r--sysutils/gnome-vfs2/distinfo5
-rw-r--r--sysutils/gnome-vfs2/patches/patch-aa33
-rw-r--r--sysutils/gnome-vfs2/patches/patch-ai17
9 files changed, 120 insertions, 9 deletions
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 62e21f47b2f..070b9924e83 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 22:52:34 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/27 21:05:22 danw Exp $
#
DISTNAME= libgnomeprint-2.2.1.2
@@ -36,6 +36,12 @@ CONFIGURE_ARGS+= --with-cups
CONFIGURE_ARGS+= --without-cups
.endif
+.if ${OPSYS} == "Darwin"
+# AC_LTDL_SHLIBEXT doesn't work on Darwin (and would give the wrong
+# answer here even if it did).
+CONFIGURE_ENV+= libltdl_cv_shlibext=so
+.endif
+
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/libbonobo/buildlink2.mk"
.include "../../devel/pango/buildlink2.mk"
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 68e457a4f3f..f3e870ade2b 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.4 2003/03/12 13:03:30 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/09/27 21:05:22 danw Exp $
SHA1 (libgnomeprint-2.2.1.2.tar.bz2) = f70ccfa4d0dc009dbaba4aea8e16df3086da7c85
Size (libgnomeprint-2.2.1.2.tar.bz2) = 555140 bytes
+SHA1 (patch-aa) = 54cf15d9caa7834f06cae48a792fc4716bc8a3f9
+SHA1 (patch-ab) = f7ac5151f12e25fa0a4a616a32a5abac963d7a03
diff --git a/print/libgnomeprint/patches/patch-aa b/print/libgnomeprint/patches/patch-aa
new file mode 100644
index 00000000000..b37f131034e
--- /dev/null
+++ b/print/libgnomeprint/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.3 2003/09/27 21:05:22 danw Exp $
+
+--- libgnomeprint/gnome-print.c.orig Mon Sep 1 10:11:58 2003
++++ libgnomeprint/gnome-print.c Mon Sep 1 10:11:35 2003
+@@ -38,8 +38,8 @@
+ #include <libgnomeprint/gnome-print-frgba.h>
+
+ /* For the buffer stuff, remove when the buffer stuff is moved out here */
+-#include <sys/mman.h>
+ #include <sys/types.h>
++#include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
diff --git a/print/libgnomeprint/patches/patch-ab b/print/libgnomeprint/patches/patch-ab
new file mode 100644
index 00000000000..8bfde53b060
--- /dev/null
+++ b/print/libgnomeprint/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2003/09/27 21:05:22 danw Exp $
+
+--- libgnomeprint/transports/Makefile.in.orig Mon Sep 1 10:27:21 2003
++++ libgnomeprint/transports/Makefile.in Mon Sep 1 10:27:41 2003
+@@ -144,11 +144,8 @@
+ $(CUSTOM_LIB)
+
+
+-CPPFLAGS = \
+- -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
+-
+-
+ INCLUDES = \
++ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -I$(top_srcdir) \
+ $(LIBGNOMEPRINT_CFLAGS)
+
diff --git a/print/libgnomeprintui/distinfo b/print/libgnomeprintui/distinfo
index 8c872a5bcb0..5f7fd669586 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/03/12 13:03:31 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/09/27 21:07:03 danw Exp $
SHA1 (libgnomeprintui-2.2.1.2.tar.bz2) = bdeb1ff04790cf7c49c8fdca73f1a4bde2e2a6a5
Size (libgnomeprintui-2.2.1.2.tar.bz2) = 432121 bytes
+SHA1 (patch-aa) = 8b0389e536849d9ababbe58db9a369da77f1b301
diff --git a/print/libgnomeprintui/patches/patch-aa b/print/libgnomeprintui/patches/patch-aa
new file mode 100644
index 00000000000..fe330a346a6
--- /dev/null
+++ b/print/libgnomeprintui/patches/patch-aa
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.1 2003/09/27 21:07:03 danw Exp $
+
+--- libgnomeprintui/gpaui/Makefile.in.orig Mon Sep 1 10:41:51 2003
++++ libgnomeprintui/gpaui/Makefile.in Mon Sep 1 10:42:28 2003
+@@ -73,12 +73,6 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+-
+-CPPFLAGS = \
+- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+- -DBINDIR=\""$(bindir)"\" \
+- -DDATADIR=\""$(datadir)"\"
+-
+ CXX = @CXX@
+ DATADIRNAME = @DATADIRNAME@
+ DB2HTML = @DB2HTML@
+@@ -128,7 +122,9 @@
+ -I$(top_srcdir)/libgnomeprintui \
+ -DWE_ARE_LIBGNOMEPRINT_INTERNALS \
+ $(LIBGNOMEPRINTUI_CFLAGS) \
+- \
++ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
++ -DBINDIR=\""$(bindir)"\" \
++ -DDATADIR=\""$(datadir)"\" \
+ -DG_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
index c3d4896dfc2..a84a31ffe85 100644
--- a/sysutils/gnome-vfs2/distinfo
+++ b/sysutils/gnome-vfs2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2003/04/27 14:44:33 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2003/09/27 21:10:08 danw Exp $
SHA1 (gnome-vfs-2.2.4.tar.bz2) = 40518be379250cb8b6c611c2d585ea35403b3f53
Size (gnome-vfs-2.2.4.tar.bz2) = 999711 bytes
+SHA1 (patch-aa) = 33a61974bc6c5b8c933ccdfeffd30e17292064d2
SHA1 (patch-ae) = fbe0fa8e2def2fec2cc55317a35638d8314287d2
SHA1 (patch-ag) = 48a1a7e7b780bcf25f311abe0c48524c8fe9eaa4
-SHA1 (patch-ai) = 0cbdf095c4c55a770d13d443d904bb567fee3666
+SHA1 (patch-ai) = b1d2f5dd9c7b2e337b2f7e1608b521d695b71d72
SHA1 (patch-al) = f6e0f6b68e078e7a115871bb8cb4ea72bef7eab4
diff --git a/sysutils/gnome-vfs2/patches/patch-aa b/sysutils/gnome-vfs2/patches/patch-aa
new file mode 100644
index 00000000000..5460539aa03
--- /dev/null
+++ b/sysutils/gnome-vfs2/patches/patch-aa
@@ -0,0 +1,33 @@
+$NetBSD: patch-aa,v 1.4 2003/09/27 21:10:08 danw Exp $
+
+--- libgnomevfs/gnome-vfs-mime-magic.c.orig Wed Feb 19 04:31:23 2003
++++ libgnomevfs/gnome-vfs-mime-magic.c Sat Aug 30 23:14:05 2003
+@@ -29,8 +29,10 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdlib.h>
++#ifndef __APPLE__
+ #include <wctype.h>
+ #include <wchar.h>
++#endif
+
+ #include <glib/garray.h>
+ #include <glib/gmessages.h>
+@@ -759,6 +761,7 @@
+
+ if (g_utf8_get_char_validated(end, remaining_bytes) == -2)
+ return TRUE;
++#ifndef __APPLE__
+ else {
+ size_t wlen;
+ wchar_t wc;
+@@ -802,6 +805,9 @@
+ }
+ return TRUE;
+ }
++#else
++ return FALSE;
++#endif
+ }
+ }
+
diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai
index 41bed287703..0f8a5f4fb27 100644
--- a/sysutils/gnome-vfs2/patches/patch-ai
+++ b/sysutils/gnome-vfs2/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.3 2003/02/15 16:29:32 jmmv Exp $
+$NetBSD: patch-ai,v 1.4 2003/09/27 21:10:08 danw Exp $
---- modules/vfolder/Makefile.in.orig Mon Jan 20 20:46:19 2003
-+++ modules/vfolder/Makefile.in
-@@ -231,7 +231,7 @@ libvfolder_desktop_la_LIBADD = $(top_bui
+--- modules/vfolder/Makefile.in.orig Mon Mar 31 06:23:06 2003
++++ modules/vfolder/Makefile.in Sun Aug 31 11:35:23 2003
+@@ -210,7 +210,7 @@
+
+ ### Module setup
+
+-module_flags = -export_dynamic -avoid-version
++module_flags = -export_dynamic -avoid-version -module
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
+
+ modules_LTLIBRARIES = libvfolder-desktop.la
+@@ -230,7 +230,7 @@
### Default .vfolder-info files