Make it work with windowmaker libproplist compatibility stubs instead

of libproplist.

6 files changed, 79 insertions, 3 deletions

diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index c9c00edcdba..14eabbb47f0 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/07/22 17:42:08 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/05 14:16:04 wiz Exp $
 #
 
 DISTNAME=	FSViewer.app-0.2.3
@@ -18,13 +18,14 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 # when the application gets updated for windowmaker>=0.64.0
 CFLAGS+=	-I${BUILDLINK_DIR}/include/WINGs
 
-USE_X11BASE=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
+USE_BUILDLINK_ONLY=	yes
 
 post-install:
 	cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \
 		${PAX} -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif
 
 .include "../../wm/windowmaker/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fsviewer/distinfo b/sysutils/fsviewer/distinfo
index ff96f96f650..50872cd01a5 100644
--- a/sysutils/fsviewer/distinfo
+++ b/sysutils/fsviewer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/07/22 17:42:08 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/10/05 14:16:04 wiz Exp $
 
 SHA1 (fsviewer/FSViewer.app-0.2.3.tar.gz) = 2322d2443a7505748d5b452d366d6881c7a81110
 Size (fsviewer/FSViewer.app-0.2.3.tar.gz) = 203476 bytes
@@ -9,3 +9,7 @@ SHA1 (patch-ab) = 766277775f2b7301b27fafc7259b35a30e3de4cf
 SHA1 (patch-ac) = 7ac9166c7dad050ef7f9aeb9ca54154a4f034aaf
 SHA1 (patch-ad) = d81cc263f985db77e4fcae5d55cfa5bb2eedc4d5
 SHA1 (patch-ae) = 7e35dd9a28622634770785d4fbfe766644c290d0
+SHA1 (patch-af) = 4a6f12abe840ac04927d3e22f1523cd2dff2ac0d
+SHA1 (patch-ag) = 3123af4181b684b553e490b66e981247dbb5c3b5
+SHA1 (patch-ah) = 9a84bd4f64a938126cbc5f250ef75885f68b56dc
+SHA1 (patch-ai) = 6696208d293f86d71a2b4fd6f0af642e13be3250
diff --git a/sysutils/fsviewer/patches/patch-af b/sysutils/fsviewer/patches/patch-af
new file mode 100644
index 00000000000..afa3b0c0e24
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-af
@@ -0,0 +1,30 @@
+$NetBSD: patch-af,v 1.1 2001/10/05 14:16:04 wiz Exp $
+
+--- defs/chdef.c.orig	Sat Oct  9 20:45:21 1999
++++ defs/chdef.c
+@@ -13,6 +13,8 @@
+ #include <WINGs.h>
+ #include <WUtil.h>
+ 
++#include <WINGs/proplist-compat.h>
++
+ #include "../src/config.h"
+ 
+ static proplist_t FSGetDBObjectForKey(proplist_t dict, char *key);
+@@ -371,8 +373,14 @@
+ 	}
+ 
+ 	SetIntegerForKey(0, "DisplayMCListPixmap");
+-	
+-	PLSave(filesDB, YES);
++
++	{
++	char *home         = NULL;
++	home = wdefaultspathfordomain("FSViewer"); 
++	PLSave(filesDB, home, YES);
++	if (home)
++	    free(home);
++	}
+ 	result = 0;
+     }	    
+     else
diff --git a/sysutils/fsviewer/patches/patch-ag b/sysutils/fsviewer/patches/patch-ag
new file mode 100644
index 00000000000..6f24505a808
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2001/10/05 14:16:04 wiz Exp $
+
+--- src/timestampWidget.h.orig	Sat Oct  9 20:45:22 1999
++++ src/timestampWidget.h
+@@ -43,6 +43,10 @@
+ 
+ /* Function Prototypes - timestampWidget.c ***********************************/
+ 
++#ifndef BOOL
++#define BOOL int
++#endif
++
+ extern  W_Class     InitTimeStamp(WMScreen*);
+ extern  TimeStamp   *CreateTimeStamp(WMWidget*);
+ extern  void        SetTimeStampBlank(TimeStamp*, BOOL);
diff --git a/sysutils/fsviewer/patches/patch-ah b/sysutils/fsviewer/patches/patch-ah
new file mode 100644
index 00000000000..98bc55e788f
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2001/10/05 14:16:04 wiz Exp $
+
+--- src/FSViewer.h.orig	Sat Oct  9 20:59:19 1999
++++ src/FSViewer.h
+@@ -9,7 +9,7 @@
+ #include <X11/Xlib.h>
+ #include <WMaker.h>
+ 
+-#include <proplist.h>
++#include <WINGs/proplist-compat.h>
+ #include <wraster.h>
+ 
+ #include <WINGs.h>
diff --git a/sysutils/fsviewer/patches/patch-ai b/sysutils/fsviewer/patches/patch-ai
new file mode 100644
index 00000000000..e33b5bff07b
--- /dev/null
+++ b/sysutils/fsviewer/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2001/10/05 14:16:04 wiz Exp $
+
+--- src/extnInspector.c.orig	Sat Oct  9 20:45:22 1999
++++ src/extnInspector.c
+@@ -226,7 +226,7 @@
+     }
+ 
+     if(numRows > 0)
+-	PLSave(filesDB, YES);
++	PLSave(filesDB, extn, YES);
+ 
+    if(extn)
+ 	free(extn);