Fix build with WindowMaker 0.95.4.

8 files changed, 114 insertions, 16 deletions

diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 601dca9de15..2f699f90334 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2013/05/21 14:41:32 hans Exp $
+# $NetBSD: Makefile,v 1.64 2013/05/22 18:01:24 tron Exp $
 
 DISTNAME=	wmakerconf-2.11
 PKGREVISION=	28
@@ -8,6 +8,7 @@ MASTER_SITES=	http://starplot.org/wmakerconf/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://starplot.org/wmakerconf/
 COMMENT=	Gtk+ based configuration tool for Window Maker
+LICENSE=	gnu-gpl-v2
 
 USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
diff --git a/wm/wmakerconf/distinfo b/wm/wmakerconf/distinfo
index d6d5654e5f4..8f3d950313c 100644
--- a/wm/wmakerconf/distinfo
+++ b/wm/wmakerconf/distinfo
@@ -1,11 +1,15 @@
-$NetBSD: distinfo,v 1.8 2010/02/12 20:31:32 joerg Exp $
+$NetBSD: distinfo,v 1.9 2013/05/22 18:01:24 tron Exp $
 
 SHA1 (wmakerconf-2.11.tar.gz) = 2c2409aad8b0348c2801c4350047a5468a800e48
 RMD160 (wmakerconf-2.11.tar.gz) = 18d661836272ae21f9d79398359b37b97b0a396a
 Size (wmakerconf-2.11.tar.gz) = 791166 bytes
 SHA1 (patch-aa) = d26fdc359404796ea7bf6791014e3b8b3abc4cbc
 SHA1 (patch-ab) = 3e5f5f8cad200a6b09001572336920685d5e2a82
-SHA1 (patch-ac) = 89f7cba515367182c6ad257b43d76256ed7be609
 SHA1 (patch-ad) = ebcd4d319c9f0cd995f6b43b30bf4446daf24934
 SHA1 (patch-ae) = b656967929071c09bef3315588fede877e839ce6
 SHA1 (patch-af) = c6f05d30ee645d0e7ff1ed574208d5819beeceac
+SHA1 (patch-src_menu.c) = 9ae1df8b5b60881181f75ce409dc29593fe71210
+SHA1 (patch-src_rootmenu.c) = 2e327c2b1b3937e98a5e34f9de65c2d3c726403e
+SHA1 (patch-src_themebrowser.c) = 4b4620d322770aa2806a3c483e94bf4d27381501
+SHA1 (patch-src_window.c) = 4aa5f9f16276c0325b4d0a0b9d39289a89cec4c9
+SHA1 (patch-src_wmconfig.c) = 66d40308389977e9476593586ec8060acef41cae
diff --git a/wm/wmakerconf/patches/patch-ac b/wm/wmakerconf/patches/patch-ac
deleted file mode 100644
index b50f8989164..00000000000
--- a/wm/wmakerconf/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/05/25 09:57:14 adam Exp $
-
---- src/rootmenu.c.orig	2005-02-26 14:31:26.000000000 +0000
-+++ src/rootmenu.c
-@@ -477,7 +477,7 @@ real_rootmenu (GtkTooltips *tooltips, pr
- 
-       if (!file)
-       {
--	 file = fopen ("/etc/X11/WindowMaker/menu.hook", "r");
-+	 file = fopen (WMAKERDIR "/menu.hook", "r");
- 	 if (file)
- 	 {
- 	    debian_menu = YES;
diff --git a/wm/wmakerconf/patches/patch-src_menu.c b/wm/wmakerconf/patches/patch-src_menu.c
new file mode 100644
index 00000000000..3168c8f917b
--- /dev/null
+++ b/wm/wmakerconf/patches/patch-src_menu.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_menu.c,v 1.1 2013/05/22 18:01:25 tron Exp $
+
+Fix build with WindowMaker 0.95.4.
+
+--- src/menu.c.orig	2004-12-05 03:19:25.000000000 +0000
++++ src/menu.c	2013-05-22 18:38:39.000000000 +0100
+@@ -500,10 +500,10 @@
+  *  No return value.
+  */
+ {
+-   if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES))
++   if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname))
+       warning (_("Can't revert to backupfile of `WindowMaker'. "
+ 		 "Please manually revert from file WindowMaker.bak."));
+-   if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname, YES))
++   if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname))
+       warning (_("Can't revert to backupfile of `WMRootMenu'. "
+ 		 "Please manually revert from file WMRootMenu.bak."));
+    gtk_main_quit ();
diff --git a/wm/wmakerconf/patches/patch-src_rootmenu.c b/wm/wmakerconf/patches/patch-src_rootmenu.c
new file mode 100644
index 00000000000..6fbf92d774f
--- /dev/null
+++ b/wm/wmakerconf/patches/patch-src_rootmenu.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_rootmenu.c,v 1.1 2013/05/22 18:01:25 tron Exp $
+
+Fix build with WindowMaker 0.95.4 and change hard coded path name.
+
+--- src/rootmenu.c.orig	2005-02-26 14:31:26.000000000 +0000
++++ src/rootmenu.c	2013-05-22 18:39:04.000000000 +0100
+@@ -365,7 +365,7 @@
+ 		       node_freeitem, NULL);
+       g_node_destroy (node);
+ 
+-      if (WMWritePropListToFile (menu, filename, YES))
++      if (WMWritePropListToFile (menu, filename))
+       {
+ 	 menu_changed = NO;
+ 	 message (_("Window Maker root menu file '%s' saved."), filename);
+@@ -477,7 +477,7 @@
+ 
+       if (!file)
+       {
+-	 file = fopen ("/etc/X11/WindowMaker/menu.hook", "r");
++	 file = fopen (WMAKERDIR "/menu.hook", "r");
+ 	 if (file)
+ 	 {
+ 	    debian_menu = YES;
diff --git a/wm/wmakerconf/patches/patch-src_themebrowser.c b/wm/wmakerconf/patches/patch-src_themebrowser.c
new file mode 100644
index 00000000000..be6dd1f8a9e
--- /dev/null
+++ b/wm/wmakerconf/patches/patch-src_themebrowser.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_themebrowser.c,v 1.1 2013/05/22 18:01:25 tron Exp $
+
+Fix build with WindowMaker 0.95.4 and change hard coded path name.
+
+--- src/themebrowser.c.orig	2005-02-25 23:37:44.000000000 +0000
++++ src/themebrowser.c	2013-05-22 18:55:24.000000000 +0100
+@@ -2705,7 +2705,7 @@
+ 	 oldfiles = g_list_remove (oldfiles, tmp);
+ 	 Free (tmp);
+       }
+-      if (!WMWritePropListToFile (theme, stylename, YES))
++      if (!WMWritePropListToFile (theme, stylename))
+       {
+ 	 dialog_popup (DIALOG_ERROR, NULL, NULL,
+ 		       _("Can't save theme file\n`%s'\n"
diff --git a/wm/wmakerconf/patches/patch-src_window.c b/wm/wmakerconf/patches/patch-src_window.c
new file mode 100644
index 00000000000..94b626ae8fe
--- /dev/null
+++ b/wm/wmakerconf/patches/patch-src_window.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_window.c,v 1.1 2013/05/22 18:01:25 tron Exp $
+
+Fix build with WindowMaker 0.95.4.
+
+--- src/window.c.orig	2004-07-22 04:09:55.000000000 +0100
++++ src/window.c	2013-05-22 18:50:59.000000000 +0100
+@@ -1069,7 +1069,7 @@
+ 	 WMReleasePropList (all_keys);
+       }
+ 
+-      if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES))
++      if (WMWritePropListToFile (newwm, orig_wmaker_fname))
+       {
+ 	 changed = NO;
+ 	 message (_("Window Maker config file '%s' saved."),
diff --git a/wm/wmakerconf/patches/patch-src_wmconfig.c b/wm/wmakerconf/patches/patch-src_wmconfig.c
new file mode 100644
index 00000000000..97ec707f88f
--- /dev/null
+++ b/wm/wmakerconf/patches/patch-src_wmconfig.c
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_wmconfig.c,v 1.1 2013/05/22 18:01:25 tron Exp $
+
+Fix build with WindowMaker 0.95.4 and change hard coded path name.
+
+--- src/wmconfig.c.orig	2004-12-05 03:19:23.000000000 +0000
++++ src/wmconfig.c	2013-05-22 18:52:57.000000000 +0100
+@@ -216,7 +216,7 @@
+ 	 /*
+ 	  *  Generate backup file "'path'.bak"
+ 	  */
+-	 if (WMWritePropListToFile (orig_rootmenu, new, YES))
++	 if (WMWritePropListToFile (orig_rootmenu, new))
+ 	    message (_("Backupfile `%s' generated."), new);
+ 	 else
+ 	    error (_("Can't write backupfile `%s'."), new);
+@@ -280,7 +280,7 @@
+    if (!windowmaker)
+    {
+       windowmaker = global_windowmaker;
+-      if (WMWritePropListToFile (windowmaker, orig_wmaker_fname, YES))
++      if (WMWritePropListToFile (windowmaker, orig_wmaker_fname))
+ 	 warning (_("New WindowMaker configuration file `%s' created."),
+ 		  orig_wmaker_fname);
+       else
+@@ -294,7 +294,7 @@
+       /*
+        *  Generate backup file "'path'.bak"
+        */
+-      if (WMWritePropListToFile (windowmaker, new, YES))
++      if (WMWritePropListToFile (windowmaker, new))
+ 	 message (_("Backupfile `%s' generated."), new);
+       else
+ 	 error (_("Can't write backupfile `%s'."), new);