Fix build with current windowmaker.

4 files changed, 49 insertions, 1 deletions

diff --git a/sysutils/fsviewer/distinfo b/sysutils/fsviewer/distinfo
index 842eefd7730..5e17f61eaa4 100644
--- a/sysutils/fsviewer/distinfo
+++ b/sysutils/fsviewer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/05/04 16:34:48 joerg Exp $
+$NetBSD: distinfo,v 1.9 2013/12/07 18:24:59 dholland Exp $
 
 SHA1 (FSViewer.app-0.2.5.tar.gz) = 0df2e5c6317f13b2c867c4d07c9840e455134f7d
 RMD160 (FSViewer.app-0.2.5.tar.gz) = 6e11d8c950c4c4b6020b2af33a32d31f7bca371d
@@ -6,9 +6,12 @@ Size (FSViewer.app-0.2.5.tar.gz) = 858696 bytes
 SHA1 (FSViewer.app-0.2.5-WM-0.81.0.patch.gz) = 7a8c689a30292438c6bd2f282390c7b289efea63
 RMD160 (FSViewer.app-0.2.5-WM-0.81.0.patch.gz) = 86817447aa7183670e4ea131bf67f8a80a48a5aa
 Size (FSViewer.app-0.2.5-WM-0.81.0.patch.gz) = 2674 bytes
+SHA1 (patch-Makefile.am) = ac63d77d4fb8533bb7bdaabd2b3da76759186f94
+SHA1 (patch-Makefile.in) = 7b707482d0ec2d29c0cba3dd8a7f964dd9b5eedd
 SHA1 (patch-aa) = 790b6a6810bf38ffebb0b00f68f29e5ebe01a83d
 SHA1 (patch-ab) = a0894d4fc9a1e925f1df331c26f23c915699a73f
 SHA1 (patch-ag) = 5496345589bdf7cbf8bd64449f93a7270ce046a0
 SHA1 (patch-src_FSFileButton.c) = 128ebcd74177133d87363cdafad8cf5aa1868d20
 SHA1 (patch-src_FSPanel.c) = 9c9315e50335086e4c0ba7166731dfdefc1967c3
+SHA1 (patch-src_extnInspector.c) = 280d65c66b081b313dc6ee0496cd0381ba2ea6f6
 SHA1 (patch-src_list.h) = eff2f1c3aff21bd02ad53eb54dcc08d33494fe5a
diff --git a/sysutils/fsviewer/patches/patch-Makefile.am b/sysutils/fsviewer/patches/patch-Makefile.am
new file mode 100644
index 00000000000..920367d8abb
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.am,v 1.1 2013/12/07 18:24:59 dholland Exp $
+
+Disable directory containing only a NOINST program, since it doesn't build.
+
+--- Makefile.am~	2002-12-15 17:03:45.000000000 +0000
++++ Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ##
+ 
+-SUBDIRS		= m4 src po defs tiff xpm
++SUBDIRS		= m4 src po tiff xpm
+ EXTRA_DIST	= config.rpath docs/* FSViewer.app-0.2.5.spec
+ 
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/sysutils/fsviewer/patches/patch-Makefile.in b/sysutils/fsviewer/patches/patch-Makefile.in
new file mode 100644
index 00000000000..e8cfab0fc93
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/12/07 18:24:59 dholland Exp $
+
+Disable directory containing only a NOINST program, since it doesn't build.
+
+--- Makefile.in~	2002-12-15 17:03:53.000000000 +0000
++++ Makefile.in
+@@ -96,7 +96,7 @@ am__quote = @am__quote@
+ fsviewerdir = @fsviewerdir@
+ install_sh = @install_sh@
+ 
+-SUBDIRS = m4 src po defs tiff xpm
++SUBDIRS = m4 src po tiff xpm
+ EXTRA_DIST = config.rpath docs/* FSViewer.app-0.2.5.spec
+ 
+ ACLOCAL_AMFLAGS = -I m4
diff --git a/sysutils/fsviewer/patches/patch-src_extnInspector.c b/sysutils/fsviewer/patches/patch-src_extnInspector.c
new file mode 100644
index 00000000000..c0ea125eba0
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-src_extnInspector.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_extnInspector.c,v 1.1 2013/12/07 18:24:59 dholland Exp $
+
+Fix build with current windowmaker.
+
+--- src/extnInspector.c~	2002-12-14 21:35:58.000000000 +0000
++++ src/extnInspector.c
+@@ -229,7 +229,7 @@ storeData(_Panel *panel)
+ 
+     if(numRows > 0)
+ 	WMWritePropListToFile(filesDB,
+-	  wdefaultspathfordomain("FSViewer"), True);
++	  wdefaultspathfordomain("FSViewer"));
+ 
+    if(extn)
+ 	free(extn);