Changes 0.2.5:

        o All lists in preferencs panel and inspector panel are sorted
          in alphabetical order.
        o Added a russian (ru) translation.
        o Changed gettext DOMAIN from "FSViewer.app" to "FSViewer".
        o Removed dependency from "proplist-compat.h".
        o Comment out <sys/rlist.h> in FSUtils.c for FreeBSD 4.6.
        o Revised the german (de) translation (now more "NeXTish").
        o Changes in attribute inspector panel:
          - Link label now changes color (black/darkgrey)
          - File size is displayed in Bytes/KB/MB
        o A selection change in file viewer lists now updates the
          inspector panel.

11 files changed, 27 insertions, 246 deletions

diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index cbfb2abea4c..7fbd2298449 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,32 +1,23 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:18:14 tv Exp $
-#
+# $NetBSD: Makefile,v 1.15 2004/11/26 09:10:11 adam Exp $
 
-DISTNAME=	FSViewer.app-0.2.3
-PKGNAME=	FSViewer-0.2.3
-PKGREVISION=	4
+DISTNAME=	FSViewer.app-0.2.5
+PKGNAME=	FSViewer-0.2.5
 CATEGORIES=	sysutils x11 windowmaker
-MASTER_SITES=	http://www.csn.ul.ie/~clernong/download/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} icons.tar.gz
+MASTER_SITES=	http://www.bayernline.de/~gscholz/linux/fsviewer/
+
+PATCH_SITES=	http://www.bayernline.de/~gscholz/linux/fsviewer/
+PATCHFILES=	FSViewer.app-0.2.5-WM-0.81.0.patch.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	johnam@mail.kemper.org
-HOMEPAGE=	http://www.csn.ul.ie/~clernong/projects/fsviewer.html
+HOMEPAGE=	http://www.bayernline.de/~gscholz/linux/fsviewer/
 COMMENT=	NextStep-like Filemanager for WindowMaker
 
-DIST_SUBDIR=	fsviewer
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-# needed for the new location of WINGs include files -- can be removed
-# when the application gets updated for windowmaker>=0.64.0
-CFLAGS+=	-I${BUILDLINK_PREFIX.windowmaker}/include/WINGs
-
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
-GNU_CONFIGURE=		yes
+USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
-USE_BUILDLINK3=		yes
-
-post-install:
-	cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \
-		${PAX} -O -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif
+GNU_CONFIGURE=		yes
 
 .include "../../wm/windowmaker/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fsviewer/PLIST b/sysutils/fsviewer/PLIST
index e0eb98cc0a8..1d77f9ec69e 100644
--- a/sysutils/fsviewer/PLIST
+++ b/sysutils/fsviewer/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:09 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/26 09:10:11 adam Exp $
 GNUstep/Apps/FSViewer.app/FSViewer
 GNUstep/Apps/FSViewer.app/MagicFiles
 GNUstep/Apps/FSViewer.app/tiff/FSViewer.tif
 GNUstep/Apps/FSViewer.app/tiff/exec-link.tif
-GNUstep/Apps/FSViewer.app/tiff/file-core.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-a.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-aiff.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-au.tif
@@ -13,6 +12,7 @@ GNUstep/Apps/FSViewer.app/tiff/file-dot-c.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-cc.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-class.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-conf.tif
+GNUstep/Apps/FSViewer.app/tiff/file-dot-core.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-cpp.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-dat.tif
 GNUstep/Apps/FSViewer.app/tiff/file-dot-deb.tif
@@ -81,7 +81,6 @@ GNUstep/Apps/FSViewer.app/xpm/arrow.xpm
 GNUstep/Apps/FSViewer.app/xpm/clk.xpm
 GNUstep/Apps/FSViewer.app/xpm/date.xpm
 GNUstep/Apps/FSViewer.app/xpm/exec-link.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-core.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-a.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-aiff.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-au.xpm
@@ -91,6 +90,7 @@ GNUstep/Apps/FSViewer.app/xpm/file-dot-c.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-cc.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-class.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-conf.xpm
+GNUstep/Apps/FSViewer.app/xpm/file-dot-core.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-cpp.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-dat.xpm
 GNUstep/Apps/FSViewer.app/xpm/file-dot-deb.xpm
@@ -158,6 +158,8 @@ GNUstep/Apps/FSViewer.app/xpm/wmanalog.xpm
 GNUstep/Apps/FSViewer.app/xpm/wmdigital.xpm
 GNUstep/Apps/FSViewer.app/xpm/wmtime.xpm
 GNUstep/Apps/FSViewer.app/xpm/year.xpm
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/FSViewer.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/FSViewer.mo
 @dirrm GNUstep/Apps/FSViewer.app/xpm
 @dirrm GNUstep/Apps/FSViewer.app/tiff
 @dirrm GNUstep/Apps/FSViewer.app
diff --git a/sysutils/fsviewer/distinfo b/sysutils/fsviewer/distinfo
index 50872cd01a5..1205263a65f 100644
--- a/sysutils/fsviewer/distinfo
+++ b/sysutils/fsviewer/distinfo
@@ -1,15 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/10/05 14:16:04 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/11/26 09:10:11 adam Exp $
 
-SHA1 (fsviewer/FSViewer.app-0.2.3.tar.gz) = 2322d2443a7505748d5b452d366d6881c7a81110
-Size (fsviewer/FSViewer.app-0.2.3.tar.gz) = 203476 bytes
-SHA1 (fsviewer/icons.tar.gz) = 3553149133abebf526ba38795a07fa4d48fc6827
-Size (fsviewer/icons.tar.gz) = 475679 bytes
+SHA1 (FSViewer.app-0.2.5.tar.gz) = 0df2e5c6317f13b2c867c4d07c9840e455134f7d
+Size (FSViewer.app-0.2.5.tar.gz) = 858696 bytes
+SHA1 (FSViewer.app-0.2.5-WM-0.81.0.patch.gz) = 7a8c689a30292438c6bd2f282390c7b289efea63
+Size (FSViewer.app-0.2.5-WM-0.81.0.patch.gz) = 2674 bytes
 SHA1 (patch-aa) = 32f1bc29dc57922b716a360c208be22a4c7aba54
-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
+SHA1 (patch-ag) = 5496345589bdf7cbf8bd64449f93a7270ce046a0
diff --git a/sysutils/fsviewer/patches/patch-ab b/sysutils/fsviewer/patches/patch-ab
deleted file mode 100644
index 5fe0ad2fd42..00000000000
--- a/sysutils/fsviewer/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/07/22 17:42:08 wiz Exp $
-
---- src/FSFileView.c.orig	Sat Oct  9 20:45:21 1999
-+++ src/FSFileView.c
-@@ -397,10 +397,10 @@
-     if ((fView->primary))
-     {
- 	memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
--	attributes.window_style = (NSTitledWindowMask |
--				   NSMiniaturizableWindowMask | 
--				   NSResizableWindowMask);
--	attributes.window_level = NSNormalWindowLevel;
-+	attributes.window_style = (WMTitledWindowMask |
-+				   WMMiniaturizableWindowMask | 
-+				   WMResizableWindowMask);
-+	attributes.window_level = WMNormalWindowLevel;
- 	attributes.extra_flags = GSFullKeyboardEventsFlag;
- 	attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
- 			    GSExtraFlagsAttr);
-@@ -444,8 +444,8 @@
-                               WMViewSizeDidChangeNotification,
-                               WMWidgetView(fView->fileBrowserF));
- 
--    WMSetWindowMiniwindowImage(fView->fileView, 
--			       WMGetApplicationIconImage(fView->scr));
-+    WMSetWindowMiniwindowPixmap(fView->fileView, 
-+			       WMGetApplicationIconPixmap(fView->scr));
- 
-     array = WMGetUDObjectForKey(defaultsDB, "SHELF");
-     if(array && PLIsArray(array))
diff --git a/sysutils/fsviewer/patches/patch-ac b/sysutils/fsviewer/patches/patch-ac
deleted file mode 100644
index 4be9a76eb5a..00000000000
--- a/sysutils/fsviewer/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/07/22 17:42:09 wiz Exp $
-
---- src/FSFinder.c.orig	Sat Oct  9 20:45:24 1999
-+++ src/FSFinder.c
-@@ -138,11 +138,11 @@
-     }
-     
-     memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
--    attributes.window_style = (NSTitledWindowMask |
--			       NSMiniaturizableWindowMask | 
--			       NSClosableWindowMask |
--			       NSResizableWindowMask);
--    attributes.window_level = NSNormalWindowLevel;
-+    attributes.window_style = (WMTitledWindowMask |
-+			       WMMiniaturizableWindowMask | 
-+			       WMClosableWindowMask |
-+			       WMResizableWindowMask);
-+    attributes.window_level = WMNormalWindowLevel;
-     attributes.extra_flags = GSFullKeyboardEventsFlag;
-     attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
- 			GSExtraFlagsAttr);
-@@ -172,8 +172,8 @@
-                               WMTextDidEndEditingNotification, 
- 			      finder->searchField);
- 
--    WMSetWindowMiniwindowImage(finder->win, 
--			       WMGetApplicationIconImage(finder->scr));
-+    WMSetWindowMiniwindowPixmap(finder->win, 
-+			       WMGetApplicationIconPixmap(finder->scr));
- 
-     return finder;
- }
diff --git a/sysutils/fsviewer/patches/patch-ad b/sysutils/fsviewer/patches/patch-ad
deleted file mode 100644
index 1385a5de7f4..00000000000
--- a/sysutils/fsviewer/patches/patch-ad
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/07/22 17:42:09 wiz Exp $
-
---- src/FSViewer.c.orig	Sat Oct  9 20:45:22 1999
-+++ src/FSViewer.c
-@@ -127,8 +127,8 @@
-     }
- 
-     memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
--    attributes.window_style = (NSTitledWindowMask | NSClosableWindowMask);
--    attributes.window_level = NSFloatingWindowLevel;
-+    attributes.window_style = (WMTitledWindowMask | WMClosableWindowMask);
-+    attributes.window_level = WMFloatingWindowLevel;
-     attributes.extra_flags = GSFullKeyboardEventsFlag;
-     attributes.flags =
- 	(GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-@@ -153,10 +153,10 @@
-     }
- 
-     memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
--    attributes.window_style = (NSTitledWindowMask | 
--			       NSClosableWindowMask |
--			       NSMiniaturizableWindowMask);
--    attributes.window_level = NSNormalWindowLevel;
-+    attributes.window_style = (WMTitledWindowMask | 
-+			       WMClosableWindowMask |
-+			       WMMiniaturizableWindowMask);
-+    attributes.window_level = WMNormalWindowLevel;
-     attributes.extra_flags = GSFullKeyboardEventsFlag;
-     attributes.flags =
- 	(GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-@@ -182,8 +182,8 @@
-     // This is horrible: there must be a better way?
-     XStoreName(fsViewer->dpy, window, " ");
-     memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
--    attributes.window_style = (NSTitledWindowMask);
--    attributes.window_level = NSFloatingWindowLevel;
-+    attributes.window_style = (WMTitledWindowMask);
-+    attributes.window_level = WMFloatingWindowLevel;
-     attributes.extra_flags = GSFullKeyboardEventsFlag;
-     attributes.flags =
- 	(GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-@@ -417,7 +417,7 @@
-     if ((fsViewer->wmpixmap = WMCreatePixmapFromRImage(fsViewer->scr, 
- 						       fsViewer->image, 0)))
-     {
--        WMSetApplicationIconImage(fsViewer->scr, fsViewer->wmpixmap);
-+        WMSetApplicationIconPixmap(fsViewer->scr, fsViewer->wmpixmap);
-     }
- }
- 
diff --git a/sysutils/fsviewer/patches/patch-ae b/sysutils/fsviewer/patches/patch-ae
deleted file mode 100644
index 83b6b8e26b6..00000000000
--- a/sysutils/fsviewer/patches/patch-ae
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/07/22 17:42:09 wiz Exp $
-
---- src/FSPanel.c.orig	Sat Oct  9 20:45:22 1999
-+++ src/FSPanel.c
-@@ -103,7 +103,7 @@
-     WMSetWindowTitle(info->win, "Info");
-     WMSetWindowCloseAction(info->win, FSCloseInfoPanel, (void *) info);
-     
--    if ((appicon = WMGetApplicationIconImage(info->scr)))
-+    if ((appicon = WMGetApplicationIconPixmap(info->scr)))
-     {
- 	WMSize	appIconSize;
- 	
-@@ -624,13 +624,7 @@
-     FSSetFSViewerConfirmWindow(app, WMWidgetXID(confirm->win));
-     WMMapWidget(confirm->win);
-     
--    while (!(confirm->done))
--    {
--	XEvent event;
--	
--	WMNextEvent(dpy, &event);
--	WMHandleEvent(&event);
--    }
-+    WMRunModalLoop(scr, W_VIEW(confirm->win));
-     result = confirm->result;
-     
-     WMDestroyAlertPanel(confirm);
-@@ -1257,7 +1251,7 @@
- 
-     normalFont = WMSystemFontOfSize(alertPanel->scr, 10);
- 
--    appIcon = WMGetApplicationIconImage(alertPanel->scr);
-+    appIcon = WMGetApplicationIconPixmap(alertPanel->scr);
-     pixmapSize = WMGetPixmapSize(appIcon);
-     if (appIcon) 
-     {
diff --git a/sysutils/fsviewer/patches/patch-af b/sysutils/fsviewer/patches/patch-af
deleted file mode 100644
index afa3b0c0e24..00000000000
--- a/sysutils/fsviewer/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$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
index 6f24505a808..43f570d9317 100644
--- a/sysutils/fsviewer/patches/patch-ag
+++ b/sysutils/fsviewer/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2001/10/05 14:16:04 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2004/11/26 09:10:11 adam Exp $
 
---- src/timestampWidget.h.orig	Sat Oct  9 20:45:22 1999
+--- src/timestampWidget.h.orig	2002-01-05 16:20:27.000000000 +0000
 +++ src/timestampWidget.h
-@@ -43,6 +43,10 @@
+@@ -44,6 +44,10 @@ typedef struct W_TimeStamp TimeStamp;
  
  /* Function Prototypes - timestampWidget.c ***********************************/
  
@@ -12,4 +12,4 @@ $NetBSD: patch-ag,v 1.1 2001/10/05 14:16:04 wiz Exp $
 +
  extern  W_Class     InitTimeStamp(WMScreen*);
  extern  TimeStamp   *CreateTimeStamp(WMWidget*);
- extern  void        SetTimeStampBlank(TimeStamp*, BOOL);
+ extern  void        SetTimeStampBlank(TimeStamp*, Bool);
diff --git a/sysutils/fsviewer/patches/patch-ah b/sysutils/fsviewer/patches/patch-ah
deleted file mode 100644
index 98bc55e788f..00000000000
--- a/sysutils/fsviewer/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index e33b5bff07b..00000000000
--- a/sysutils/fsviewer/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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);