gnome-libs should've stayed...sorry

spotted by steven@

x11/gnome/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2007/06/01 15:28:05 jasper Exp $
+# $OpenBSD: Makefile,v 1.34 2007/06/01 16:44:41 jasper Exp $
 
      SUBDIR += applets2
      SUBDIR += audio
@@ -29,6 +29,7 @@
      SUBDIR += libgnomeprintui
      SUBDIR += libgtkhtml
      SUBDIR += librsvg
+     SUBDIR += libs
      SUBDIR += libxklavier
      SUBDIR += menus
      SUBDIR += metacity

x11/gnome/libs/patches/patch-aclocal_m4

@@ -0,0 +1,92 @@
+$OpenBSD: patch-aclocal_m4,v 1.7 2007/06/01 16:44:41 jasper Exp $
+--- aclocal.m4.orig	Fri Aug 16 00:24:43 2002
++++ aclocal.m4	Tue Aug 24 01:02:03 2004
+@@ -1516,8 +1516,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+ 
+ if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ fi
+ 
+ # Allow CC to be a program name with arguments.
+@@ -1920,7 +1927,9 @@ cygwin* | mingw* | pw32* )
+     with_gnu_ld=no
+   fi
+   ;;
+-
++openbsd*)
++  with_gnu_ld=no
++  ;;
+ esac
+ 
+ ld_shlibs=yes
+@@ -2324,8 +2333,8 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++    hardcode_libdir_flag_spec='${wl}-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+     ;;
+@@ -2801,10 +2810,9 @@ newsos6)
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
+-  fi
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_overrides_runpath=yes
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -3936,6 +3944,16 @@ newos6*)
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
++openbsd*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++  else
++    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++  fi
++  ;;
++
+ osf3* | osf4* | osf5*)
+   # this will be overridden with pass_all, but let us keep it just in case
+   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+@@ -4704,6 +4722,7 @@ AC_DEFUN(AM_GNOME_WITH_NLS,
+ 	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
+ 
+ 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
++	     LIBS="-liconv $LIBS"
+ 	     AC_CHECK_LIB(intl, bindtextdomain,
+ 	       [AC_CACHE_CHECK([for gettext in libintl],
+ 		 gt_cv_func_gettext_libintl,
+@@ -4711,6 +4730,10 @@ AC_DEFUN(AM_GNOME_WITH_NLS,
+ 		  gt_cv_func_gettext_libintl=yes,
+ 		  gt_cv_func_gettext_libintl=no)],
+ 		 gt_cv_func_gettext_libintl=no)])
++	   fi
++
++	   if test "$gt_cv_func_gettext_libintl" = "yes"; then
++	     LIBS="$LIBS -lintl";
+ 	   fi
+ 
+ 	   if test "$gt_cv_func_gettext_libc" = "yes" \

x11/gnome/libs/patches/patch-configure_in

@@ -0,0 +1,23 @@
+$OpenBSD: patch-configure_in,v 1.6 2007/06/01 16:44:41 jasper Exp $
+--- configure.in.orig	Thu Aug 15 15:24:36 2002
++++ configure.in	Sat Nov 30 12:41:16 2002
+@@ -337,8 +337,8 @@ fi
+ 
+ dnl look for db headers
+ if test "$prefer_db1" = "yes"; then
+-	AC_CHECK_HEADERS(db_185.h db1/db.h)
+-	if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h" = nono; then
++	AC_CHECK_HEADERS(db.h db1/db.h)
++	if test "$ac_cv_header_db_h$ac_cv_header_db1_db_h" = nono; then
+ 	  AC_MSG_ERROR([Berkeley db library required for Gnome])
+ 	fi
+ 	AC_DEFINE(PREFER_DB1)
+@@ -436,7 +436,7 @@ else
+   kde_datadir=$with_kde_datadir
+ fi
+ 
+-AC_DEFINE_UNQUOTED(KDE_ICONDIR, "$kde_datadir/icons")
++AC_DEFINE_UNQUOTED(KDE_ICONDIR, "$kde_datadir/icons/hicolor/48x48/apps")
+ AC_DEFINE_UNQUOTED(KDE_MINI_ICONDIR, "$kde_datadir/icons/mini")
+ 
+ dnl

x11/gnome/libs/patches/patch-devel-docs_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-devel-docs_Makefile_in,v 1.1 2007/06/01 16:44:41 jasper Exp $
+--- devel-docs/Makefile.in.orig	Thu Aug 15 15:25:52 2002
++++ devel-docs/Makefile.in	Sat Nov 30 12:41:16 2002
+@@ -173,7 +173,7 @@ EXTRA_DIST = \
+ 	$(TEXT_FILES)
+ 
+ 
+-docdir = $(prefix)/doc
++docdir = $(prefix)/share/doc/gnome-libs
+ doc_DATA = $(TEXT_FILES)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h

x11/gnome/libs/patches/patch-devel-docs_gnome_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-devel-docs_gnome_Makefile_in,v 1.5 2007/06/01 16:44:41 jasper Exp $
+--- devel-docs/gnome/Makefile.in.orig	Thu Aug 15 15:25:53 2002
++++ devel-docs/gnome/Makefile.in	Sat Nov 30 12:41:16 2002
+@@ -366,7 +366,7 @@ install-data-local: 
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
++	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || true; \
+ 	  echo '-- Fixing Crossreferences' ; \
+ 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR) || true; \
+ 	fi)

x11/gnome/libs/patches/patch-devel-docs_gnomeui_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-devel-docs_gnomeui_Makefile_in,v 1.5 2007/06/01 16:44:41 jasper Exp $
+--- devel-docs/gnomeui/Makefile.in.orig	Thu Aug 15 15:25:57 2002
++++ devel-docs/gnomeui/Makefile.in	Sat Nov 30 12:41:16 2002
+@@ -427,7 +427,7 @@ install-data-local: 
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
++	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || true; \
+ 	  echo '-- Fixing Crossreferences' ; \
+ 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
+ 	fi)

x11/gnome/libs/patches/patch-devel-docs_gnorba_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-devel-docs_gnorba_Makefile_in,v 1.4 2007/06/01 16:44:41 jasper Exp $
+--- devel-docs/gnorba/Makefile.in.orig	Thu Aug 15 15:26:05 2002
++++ devel-docs/gnorba/Makefile.in	Sat Nov 30 12:41:16 2002
+@@ -344,7 +344,7 @@ install-data-local: 
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
++	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || true; \
+ 	  echo '-- Fixing Crossreferences' ; \
+ 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR) || true; \
+ 	fi)

x11/gnome/libs/patches/patch-libart_lgpl_doc_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-libart_lgpl_doc_Makefile_in,v 1.4 2007/06/01 16:44:41 jasper Exp $
+--- libart_lgpl/doc/Makefile.in.orig	Thu Aug 15 15:25:26 2002
++++ libart_lgpl/doc/Makefile.in	Sat Nov 30 12:41:16 2002
+@@ -260,7 +260,7 @@ install-am: all-am
+ install: install-am
+ uninstall-am:
+ uninstall: uninstall-am
+-all-am: Makefile all-local
++all-am: Makefile
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install

x11/gnome/libs/patches/patch-libgnome_gnome-dentry_c

@@ -0,0 +1,93 @@
+$OpenBSD: patch-libgnome_gnome-dentry_c,v 1.4 2007/06/01 16:44:41 jasper Exp $
+--- libgnome/gnome-dentry.c.orig	Wed Aug  7 00:57:14 2002
++++ libgnome/gnome-dentry.c	Fri Jun  1 18:38:20 2007
+@@ -88,7 +88,7 @@ add_comment_or_name(GList *list, char *lang, char *nam
+ 
+ /*read the names and comments from the desktop file*/
+ static GList *
+-read_names_and_comments(const char *file, int is_kde)
++read_names_and_comments(const char *file, int is_old_kde)
+ {
+ 	GList *i18n_list = NULL;
+ 	
+@@ -97,11 +97,11 @@ read_names_and_comments(const char *file, int is_kde)
+ 	char *prefix;
+ 	
+ 	gnome_config_push_prefix ("");
+-	if(!is_kde) {
+-		prefix = g_strconcat ("=", file, "=/Desktop Entry", NULL);
+-	} else {
+-		prefix = g_strconcat ("=", file, "=/KDE Desktop Entry", NULL);
+-	}
++        if(!is_old_kde) {
++                prefix = g_strconcat ("=", file, "=/Desktop Entry", NULL);
++        } else {
++                prefix = g_strconcat ("=", file, "=/KDE Desktop Entry", NULL);
++        }
+ 	iterator = gnome_config_init_iterator(prefix);
+ 	g_free(prefix);
+ 	gnome_config_pop_prefix ();
+@@ -155,7 +155,7 @@ gnome_desktop_entry_load_flags_conditional (const char
+ 	int exec_length;
+ 	char *icon_base;
+ 	char *p = NULL;
+-	gboolean is_kde = FALSE;
++	gboolean is_old_kde = FALSE;
+  	gboolean is_dot_directory = FALSE;
+ #ifdef __GLIBC__
+ 	gboolean is_utf8;
+@@ -178,8 +178,8 @@ gnome_desktop_entry_load_flags_conditional (const char
+ 		gnome_config_push_prefix (prefix);
+ 		g_free (prefix);
+ 
+-		is_kde = TRUE;
+-
++		is_old_kde = TRUE;
++		
+ 		name = gnome_config_get_translated_string ("Name");
+ 		if (!name) {
+ 			gnome_config_pop_prefix ();
+@@ -197,7 +197,8 @@ gnome_desktop_entry_load_flags_conditional (const char
+ 	    strcmp (file + strlen (file) - strlen (".directory"), ".directory") == 0)
+ 		is_dot_directory = TRUE;
+ 	
+-	type      = gnome_config_get_string (is_dot_directory ? "Type=Directory" : "Type");
++	if( !(type = gnome_config_get_string ("Type") ) )
++ 	    type = gnome_config_get_string ("Type=Directory");
+ 	gnome_config_get_vector ("Exec", &exec_length, &exec_vector);
+ 	try_file  = gnome_config_get_string ("TryExec");
+ 
+@@ -249,15 +250,21 @@ gnome_desktop_entry_load_flags_conditional (const char
+ 	newitem->geometry      = gnome_config_get_string ("Geometry");
+ 	newitem->multiple_args = gnome_config_get_bool   ("MultipleArgs=0");
+ 	newitem->location      = g_strdup (file);
+-	newitem->is_kde       =  is_kde;
+ 
+ 	icon_base              = gnome_config_get_string ("Icon");
+ 
+ 	if (icon_base && *icon_base) {
+ 		/* Sigh, now we need to make them local to the gnome install */
+ 		if (*icon_base != '/') {
+-			if (newitem->is_kde) {
+-				gchar *iconname = g_concat_dir_and_file (KDE_ICONDIR, icon_base);
++		        /*
++			   HACK: determine if file is an KDE desktop entry.
++			   KDE desktop files don't have the file-extension embedded in icon_base.
++			*/
++		        if( !strstr( icon_base, "." ) ) {
++			        gchar *icon_base_full = g_strconcat (icon_base, ".png", NULL);
++				gchar *iconname = g_concat_dir_and_file (KDE_ICONDIR, icon_base_full);
++			        newitem->is_kde = TRUE;
++				g_free (icon_base_full);
+ 				if (g_file_exists (iconname))
+ 					newitem->icon = iconname;
+ 				else {
+@@ -293,7 +300,7 @@ gnome_desktop_entry_load_flags_conditional (const char
+ 	gnome_config_pop_prefix ();
+ 
+ 	/*get us the Names and comments of different languages*/
+-	i18n_list = read_names_and_comments (file, is_kde);
++	i18n_list = read_names_and_comments (file, is_old_kde);
+ 	gnome_desktop_entry_set_i18n_list (newitem, i18n_list);
+ 	
+ 	if (clean_from_memory_after_load) {

x11/gnome/libs/patches/patch-libgnome_gnome-dump_c

@@ -0,0 +1,17 @@
+$OpenBSD: patch-libgnome_gnome-dump_c,v 1.4 2007/06/01 16:44:41 jasper Exp $
+--- libgnome/gnome-dump.c.orig	Fri Oct 26 20:01:24 2001
++++ libgnome/gnome-dump.c	Fri Oct 26 20:05:06 2001
+@@ -29,10 +29,10 @@
+ #ifdef HAVE_DB1_DB_H
+ # include <db1/db.h>
+ #else
+-# ifdef HAVE_DB_185_H
+-#  include <db_185.h>
+-# else
++# ifdef HAVE_DB_H
+ #  include <db.h>
++# else
++#  include <db_185.h>
+ # endif
+ #endif
+ 

x11/gnome/libs/patches/patch-libgnome_gnome-metadata_c

@@ -0,0 +1,17 @@
+$OpenBSD: patch-libgnome_gnome-metadata_c,v 1.4 2007/06/01 16:44:41 jasper Exp $
+--- libgnome/gnome-metadata.c.orig	Fri Oct 26 20:01:32 2001
++++ libgnome/gnome-metadata.c	Fri Oct 26 20:05:46 2001
+@@ -56,10 +56,10 @@ char *alloca ();
+ #ifdef HAVE_DB1_DB_H
+ # include <db1/db.h>
+ #else
+-# ifdef HAVE_DB_185_H
+-#  include <db_185.h>
+-# else
++# ifdef HAVE_DB_H
+ #  include <db.h>
++# else
++#  include <db_185.h>
+ # endif
+ #endif
+ #else

x11/gnome/libs/patches/patch-libgnomeui_gnome-dns_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-libgnomeui_gnome-dns_c,v 1.3 2007/06/01 16:44:42 jasper Exp $
+--- libgnomeui/gnome-dns.c.orig	Sun Sep 12 02:39:37 1999
++++ libgnomeui/gnome-dns.c	Fri Jun  1 18:38:20 2007
+@@ -402,7 +402,7 @@ static gint gnome_dns_create_server(void)
+ 	if (pid == 0) {
+ 	  dup2(pipefd0[0], 0);
+ 	  dup2(pipefd1[1], 1);
+-	  execlp("dns-helper", "dns-helper", NULL);
++	  execlp("dns-helper", "dns-helper", (void *)NULL);
+ 	  /* does not return */
+ 	}
+ 	/* else */

x11/gnome/libs/patches/patch-libgnomeui_gnome-init_c

@@ -0,0 +1,50 @@
+$OpenBSD: patch-libgnomeui_gnome-init_c,v 1.8 2007/06/01 16:44:42 jasper Exp $
+--- libgnomeui/gnome-init.c.orig	Sat Aug  3 15:23:52 2002
++++ libgnomeui/gnome-init.c	Fri Jun  1 18:38:20 2007
+@@ -205,32 +205,12 @@ gnome_init_cb(poptContext ctx, enum poptCallbackReason
+ 	switch(reason) {
+ 	case POPT_CALLBACK_REASON_PRE:
+                 {
+-                        char *ctype, *old_ctype = NULL;
+-                        gboolean ctype_set;
++			char old_ctype = NULL;
+ 
+                         gnome_segv_setup (FALSE);
+-                        ctype = setlocale (LC_CTYPE, NULL);
+-
+-                        if (ctype && !strcmp(ctype, "C")) {
+-                                old_ctype = g_strdup (getenv ("LC_CTYPE"));
+-                                putenv ("LC_CTYPE=en_US");
+-                                ctype_set = TRUE;
+-                        } else
+-                                ctype_set = FALSE;
+-
++                        
+                         gtk_set_locale ();
+ 
+-                        if (ctype_set) {
+-                                char *setme;
+-
+-                                if (old_ctype) {
+-                                        setme = g_strconcat ("LC_CTYPE=", old_ctype, NULL);
+-                                        g_free(old_ctype);
+-                                } else
+-                                        setme = "LC_CTYPE=";
+-
+-                                putenv (setme);
+-                        }
+                         client = gnome_master_client();
+                 }
+ 		break;
+@@ -673,9 +653,9 @@ static void gnome_segv_handle(int signum)
+ 
+ 		/* Child process */
+ 		execl(GNOMEBINDIR "/gnome_segv", GNOMEBINDIR "/gnome_segv",
+-		      program_invocation_name, buf, gnome_app_version, NULL);
++		      program_invocation_name, buf, gnome_app_version, (void *)NULL);
+ 
+-                execlp("gnome_segv", "gnome_segv", program_invocation_name, buf, gnome_app_version, NULL);
++                execlp("gnome_segv", "gnome_segv", program_invocation_name, buf, gnome_app_version, (void *)NULL);
+ 
+                 _exit(99);
+ 	}

x11/gnome/libs/patches/patch-libgnomeui_gnome-messagebox_c

@@ -0,0 +1,75 @@
+$OpenBSD: patch-libgnomeui_gnome-messagebox_c,v 1.3 2007/06/01 16:44:42 jasper Exp $
+--- libgnomeui/gnome-messagebox.c.orig	Thu Jun 29 03:40:25 2000
++++ libgnomeui/gnome-messagebox.c	Fri Jun  1 18:38:20 2007
+@@ -109,7 +109,7 @@ gnome_message_box_new (const gchar           *message,
+ 	if (strcmp(GNOME_MESSAGE_BOX_INFO, message_box_type) == 0)
+ 	{
+ 		gtk_window_set_title (GTK_WINDOW (message_box), _("Information"));
+-		s = gnome_unconditional_pixmap_file("gnome-info.png");
++		s = gnome_unconditional_pixmap_file("gnome-info1.png");
+ 		if (s) {
+                         pixmap = gnome_pixmap_new_from_file(s);
+                         g_free(s);
+@@ -118,7 +118,7 @@ gnome_message_box_new (const gchar           *message,
+ 	else if (strcmp(GNOME_MESSAGE_BOX_WARNING, message_box_type) == 0)
+ 	{
+ 		gtk_window_set_title (GTK_WINDOW (message_box), _("Warning"));
+-		s = gnome_unconditional_pixmap_file("gnome-warning.png");
++		s = gnome_unconditional_pixmap_file("gnome-warning1.png");
+ 		if (s) {
+                         pixmap = gnome_pixmap_new_from_file(s);
+                         g_free(s);
+@@ -127,7 +127,7 @@ gnome_message_box_new (const gchar           *message,
+ 	else if (strcmp(GNOME_MESSAGE_BOX_ERROR, message_box_type) == 0)
+ 	{
+ 		gtk_window_set_title (GTK_WINDOW (message_box), _("Error"));
+-		s = gnome_unconditional_pixmap_file("gnome-error.png");
++		s = gnome_unconditional_pixmap_file("gnome-error1.png");
+ 		if (s) {
+                         pixmap = gnome_pixmap_new_from_file(s);
+                         g_free(s);
+@@ -136,7 +136,7 @@ gnome_message_box_new (const gchar           *message,
+ 	else if (strcmp(GNOME_MESSAGE_BOX_QUESTION, message_box_type) == 0)
+ 	{
+ 		gtk_window_set_title (GTK_WINDOW (message_box), _("Question"));
+-		s = gnome_unconditional_pixmap_file("gnome-question.png");
++		s = gnome_unconditional_pixmap_file("gnome-question1.png");
+ 		if (s) {
+                         pixmap = gnome_pixmap_new_from_file(s);
+                         g_free(s);
+@@ -155,7 +155,7 @@ gnome_message_box_new (const gchar           *message,
+ 	if ( (pixmap == NULL) ||
+ 	     (GNOME_PIXMAP(pixmap)->pixmap == NULL) ) {
+         	if (pixmap) gtk_widget_destroy(pixmap);
+-		s = gnome_unconditional_pixmap_file ("gnome-default-dlg.png");
++		s = gnome_unconditional_pixmap_file ("gnome-default-dlg1.png");
+          	if (s) {
+ 			pixmap = gnome_pixmap_new_from_file(s);
+                         g_free(s);
+@@ -242,7 +242,7 @@ gnome_message_box_newv (const gchar           *message
+ 	if (strcmp(GNOME_MESSAGE_BOX_INFO, message_box_type) == 0)
+ 	{
+ 		gtk_window_set_title (GTK_WINDOW (message_box), _("Information"));
+-		s = gnome_pixmap_file("gnome-info.png");
++		s = gnome_pixmap_file("gnome-info1.png");
+ 		if (s) {
+                         pixmap = gnome_pixmap_new_from_file(s);
+                         g_free(s);
+@@ -251,7 +251,7 @@ gnome_message_box_newv (const gchar           *message
+ 	else if (strcmp(GNOME_MESSAGE_BOX_WARNING, message_box_type) == 0)
+ 	{
+ 		gtk_window_set_title (GTK_WINDOW (message_box), _("Warning"));
+-		s = gnome_pixmap_file("gnome-warning.png");
++		s = gnome_pixmap_file("gnome-warning1.png");
+ 		if (s) {
+                         pixmap = gnome_pixmap_new_from_file(s);
+                         g_free(s);
+@@ -269,7 +269,7 @@ gnome_message_box_newv (const gchar           *message
+ 	else if (strcmp(GNOME_MESSAGE_BOX_QUESTION, message_box_type) == 0)
+ 	{
+ 		gtk_window_set_title (GTK_WINDOW (message_box), _("Question"));
+-		s = gnome_pixmap_file("gnome-question.png");
++		s = gnome_pixmap_file("gnome-question1.png");
+ 		if (s) {
+                         pixmap = gnome_pixmap_new_from_file(s);
+                         g_free(s);

x11/gnome/libs/patches/patch-libgnorba_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-libgnorba_Makefile_in,v 1.5 2007/06/01 16:44:42 jasper Exp $
+--- libgnorba/Makefile.in.orig	Fri Aug 16 00:25:44 2002
++++ libgnorba/Makefile.in	Fri Jun  1 18:38:22 2007
+@@ -1185,7 +1185,7 @@ $(table_built): $(top_srcdir)/idl/Table.idl
+ 	$(ORBIT_IDL) $(IDL_FLAGS) $(top_srcdir)/idl/Table.idl
+ 
+ install-data-hook:
+-	$(RM) -f $(DESTDIR)$(bindir)/new-object
++	rm -f $(DESTDIR)$(bindir)/new-object
+ 	$(LN_S) goad-browser $(DESTDIR)$(bindir)/new-object
+ 
+ clean-local:

x11/gnome/libs/patches/patch-libgnorba_orbitns_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-libgnorba_orbitns_c,v 1.3 2007/06/01 16:44:42 jasper Exp $
+--- libgnorba/orbitns.c.orig	Thu Aug 19 18:10:18 1999
++++ libgnorba/orbitns.c	Fri Jun  1 18:38:20 2007
+@@ -225,7 +225,7 @@ name_server_by_forking (CORBA_Environment *ev)
+ 		
+ 		setsid();
+ 		
+-		execlp("gnome-name-service", "gnome-name-service", NULL);
++		execlp("gnome-name-service", "gnome-name-service", (void *)NULL);
+ 		_exit(1);
+ 	}
+ 

x11/gnome/libs/patches/patch-zvt_subshell_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-zvt_subshell_c,v 1.3 2007/06/01 16:44:42 jasper Exp $
+--- zvt/subshell.c.orig	Sat Aug  3 17:37:39 2002
++++ zvt/subshell.c	Fri Jun  1 18:38:20 2007
+@@ -242,7 +242,7 @@ get_ptys (int *master, int *slave, int update_wutmp)
+ 			close (helper_socket_fdpassing [0]);
+ 			close (helper_socket_fdpassing [1]);
+ 
+-			execl (GNOMESBINDIR "/gnome-pty-helper", "gnome-pty-helper", NULL);
++			execl (GNOMESBINDIR "/gnome-pty-helper", "gnome-pty-helper", (void *)NULL);
+ 			exit (1);
+ 		} else {
+ 			close (helper_socket_fdpassing [1]);

x11/gnome/libs/patches/patch-zvt_zterm_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-zvt_zterm_c,v 1.3 2007/06/01 16:44:42 jasper Exp $
+--- zvt/zterm.c.orig	Sat Jan 18 01:23:09 2003
++++ zvt/zterm.c	Sat Jan 18 01:23:39 2003
+@@ -304,7 +304,7 @@ main (gint argc, gchar *argv[])
+ 	}
+       }
+       
+-      execle (shell->str, name->str, NULL, env_copy);
++      execle (shell->str, name->str, (void *)NULL, env_copy);
+       perror ("Could not exec\n");
+       _exit (127);
+     }