Update gworkspace to 0.9.1. Changes are mostly bugfixes including the

ability to compile with clang and the modern Objective-C runtime.

4 files changed, 21 insertions, 24 deletions

diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile
index 59368f1788d..07a4255f21c 100644
--- a/sysutils/gworkspace/Makefile
+++ b/sysutils/gworkspace/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2010/11/28 07:42:19 dholland Exp $
+# $NetBSD: Makefile,v 1.34 2012/10/22 03:08:29 rh Exp $
 #
 
-DISTNAME=	gworkspace-0.8.6
-PKGREVISION=	1
+DISTNAME=	gworkspace-0.9.1
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
 
@@ -15,13 +14,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=	GWLib-[0-9]*
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/gw/GW/}
 USE_TOOLS+=	gs:run file:run sh:run
 USE_LANGUAGES=	objc
 CONFIGURE_ARGS+=	--with-sh=${TOOLS_PATH.sh:Q}
 CONFIGURE_ARGS+=	--with-file=${TOOLS_PATH.file:Q}
 MAKE_FILE=	GNUmakefile
-MAKE_JOBS_SAFE=	no
 
 .include "../../x11/gnustep-back/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/sysutils/gworkspace/PLIST b/sysutils/gworkspace/PLIST
index 631f535e214..2c5da0b5858 100644
--- a/sysutils/gworkspace/PLIST
+++ b/sysutils/gworkspace/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:16:07 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/10/22 03:08:29 rh Exp $
 bin/GWorkspace
 bin/Recycler
 bin/ddbd
@@ -43,7 +43,6 @@ lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.go
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/data.info
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/objects.gorm
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/data.classes
-lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/data.info
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/objects.gorm
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/DesktopPref.gorm/data.classes
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/DesktopPref.gorm/data.info
@@ -91,7 +90,6 @@ lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf.rtfd/TabbedShelf-develop.tiff
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf.rtfd/dummy.tiff
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/data.classes
-lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/data.info
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/objects.gorm
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/HistoryPref.gorm/data.classes
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/HistoryPref.gorm/data.info
@@ -110,7 +108,6 @@ lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/da
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/data.info
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/objects.gorm
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/OperationPrefs.gorm/data.classes
-lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/OperationPrefs.gorm/data.info
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/OperationPrefs.gorm/objects.gorm
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/data.classes
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/data.info
@@ -122,10 +119,8 @@ lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/SearchResults.go
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/SearchResults.gorm/data.info
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/SearchResults.gorm/objects.gorm
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/data.classes
-lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/data.info
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/objects.gorm
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/StartAppWin.gorm/data.classes
-lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/StartAppWin.gorm/data.info
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/StartAppWin.gorm/objects.gorm
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/data.classes
 lib/GNUstep/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/data.info
@@ -140,9 +135,11 @@ lib/GNUstep/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small_
 lib/GNUstep/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small_osx.tiff
 lib/GNUstep/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_alt.tiff
 lib/GNUstep/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_osx.tiff
+lib/GNUstep/Applications/GWorkspace.app/Resources/FileIcon_WebLink.tiff
 lib/GNUstep/Applications/GWorkspace.app/Resources/FileManager.tiff
 lib/GNUstep/Applications/GWorkspace.app/Resources/French.lproj/Localizable.strings
 lib/GNUstep/Applications/GWorkspace.app/Resources/GWorkspace.desktop
+lib/GNUstep/Applications/GWorkspace.app/Resources/GWorkspaceInfo.plist
 lib/GNUstep/Applications/GWorkspace.app/Resources/German.lproj/Localizable.strings
 lib/GNUstep/Applications/GWorkspace.app/Resources/Hungarian.lproj/Localizable.strings
 lib/GNUstep/Applications/GWorkspace.app/Resources/Info-gnustep.plist
@@ -253,10 +250,8 @@ lib/GNUstep/Applications/GWorkspace.app/stamp.make
 lib/GNUstep/Applications/Recycler.app/Recycler
 lib/GNUstep/Applications/Recycler.app/Resources/English.lproj/Localizable.strings
 lib/GNUstep/Applications/Recycler.app/Resources/English.lproj/PreferencesWin.gorm/data.classes
-lib/GNUstep/Applications/Recycler.app/Resources/English.lproj/PreferencesWin.gorm/data.info
 lib/GNUstep/Applications/Recycler.app/Resources/English.lproj/PreferencesWin.gorm/objects.gorm
 lib/GNUstep/Applications/Recycler.app/Resources/English.lproj/StartAppWin.gorm/data.classes
-lib/GNUstep/Applications/Recycler.app/Resources/English.lproj/StartAppWin.gorm/data.info
 lib/GNUstep/Applications/Recycler.app/Resources/English.lproj/StartAppWin.gorm/objects.gorm
 lib/GNUstep/Applications/Recycler.app/Resources/Info-gnustep.plist
 lib/GNUstep/Applications/Recycler.app/Resources/Recycler.desktop
@@ -323,6 +318,7 @@ lib/GNUstep/Bundles/FolderViewer.inspector/Resources/Info-gnustep.plist
 lib/GNUstep/Bundles/FolderViewer.inspector/Resources/InspectorInfo.plist
 lib/GNUstep/Bundles/FolderViewer.inspector/stamp.make
 lib/GNUstep/Bundles/IBViewViewer.inspector/IBViewViewer
+lib/GNUstep/Bundles/IBViewViewer.inspector/Resources/English.lproj/Help.rtfd/.gwdir
 lib/GNUstep/Bundles/IBViewViewer.inspector/Resources/English.lproj/Help.rtfd/TXT.rtf
 lib/GNUstep/Bundles/IBViewViewer.inspector/Resources/English.lproj/Help.rtfd/dummy.tiff
 lib/GNUstep/Bundles/IBViewViewer.inspector/Resources/Info-gnustep.plist
@@ -332,6 +328,7 @@ lib/GNUstep/Bundles/ImageThumbnailer.thumb/ImageThumbnailer
 lib/GNUstep/Bundles/ImageThumbnailer.thumb/Resources/Info-gnustep.plist
 lib/GNUstep/Bundles/ImageThumbnailer.thumb/stamp.make
 lib/GNUstep/Bundles/ImageViewer.inspector/ImageViewer
+lib/GNUstep/Bundles/ImageViewer.inspector/Resources/English.lproj/Help.rtfd/.gwdir
 lib/GNUstep/Bundles/ImageViewer.inspector/Resources/English.lproj/Help.rtfd/TXT.rtf
 lib/GNUstep/Bundles/ImageViewer.inspector/Resources/English.lproj/Help.rtfd/dummy.tiff
 lib/GNUstep/Bundles/ImageViewer.inspector/Resources/Info-gnustep.plist
@@ -341,6 +338,7 @@ lib/GNUstep/Bundles/MDModuleAnnotations.mdm/MDModuleAnnotations
 lib/GNUstep/Bundles/MDModuleAnnotations.mdm/Resources/Info-gnustep.plist
 lib/GNUstep/Bundles/MDModuleAnnotations.mdm/stamp.make
 lib/GNUstep/Bundles/NSColorViewer.inspector/NSColorViewer
+lib/GNUstep/Bundles/NSColorViewer.inspector/Resources/English.lproj/Help.rtfd/.gwdir
 lib/GNUstep/Bundles/NSColorViewer.inspector/Resources/English.lproj/Help.rtfd/TXT.rtf
 lib/GNUstep/Bundles/NSColorViewer.inspector/Resources/English.lproj/Help.rtfd/dummy.tiff
 lib/GNUstep/Bundles/NSColorViewer.inspector/Resources/Info-gnustep.plist
@@ -412,6 +410,7 @@ lib/GNUstep/Frameworks/FSNode.framework/libFSNode.so
 lib/GNUstep/Frameworks/Inspector.framework/Headers
 lib/GNUstep/Frameworks/Inspector.framework/Inspector
 lib/GNUstep/Frameworks/Inspector.framework/Resources
+lib/GNUstep/Frameworks/Inspector.framework/Versions/0/Headers/ContentViewersProtocol.h
 lib/GNUstep/Frameworks/Inspector.framework/Versions/0/Headers/Inspector.h
 lib/GNUstep/Frameworks/Inspector.framework/Versions/0/Inspector
 lib/GNUstep/Frameworks/Inspector.framework/Versions/0/Resources/Date-0.tiff
@@ -518,7 +517,6 @@ lib/GNUstep/Frameworks/Operation.framework/Versions/1/Resources/English.lproj/Fi
 lib/GNUstep/Frameworks/Operation.framework/Versions/1/Resources/English.lproj/Localizable.strings
 lib/GNUstep/Frameworks/Operation.framework/Versions/1/Resources/Info-gnustep.plist
 lib/GNUstep/Frameworks/Operation.framework/Versions/1/Resources/Operation.tiff
-lib/GNUstep/Frameworks/Operation.framework/Versions/1/Resources/progind.tiff
 lib/GNUstep/Frameworks/Operation.framework/Versions/1/libOperation.so
 lib/GNUstep/Frameworks/Operation.framework/Versions/1/libOperation.so.1.0.0
 lib/GNUstep/Frameworks/Operation.framework/Versions/Current
diff --git a/sysutils/gworkspace/distinfo b/sysutils/gworkspace/distinfo
index 44f977ba3ab..45bc7b01316 100644
--- a/sysutils/gworkspace/distinfo
+++ b/sysutils/gworkspace/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/04/13 12:45:04 rh Exp $
+$NetBSD: distinfo,v 1.9 2012/10/22 03:08:29 rh Exp $
 
-SHA1 (gworkspace-0.8.6.tar.gz) = 19cf899f8c85585926c9449520e6f770710d7787
-RMD160 (gworkspace-0.8.6.tar.gz) = 72fc3a2f4bc5db616509ec6c30bc135aca2a8900
-Size (gworkspace-0.8.6.tar.gz) = 2394844 bytes
-SHA1 (patch-aa) = 4a9220c316ed36a060c42b0cc3c53f52316f5b00
+SHA1 (gworkspace-0.9.1.tar.gz) = 6303c45f5a0e7d6a68b0ce93e38456da1a000b4d
+RMD160 (gworkspace-0.9.1.tar.gz) = 17f0cec32965faf6a4f77b29ce3483aac1829a6e
+Size (gworkspace-0.9.1.tar.gz) = 3791146 bytes
+SHA1 (patch-aa) = a6f36e54a42cfa59baa10ea9366fc82aa60b4af4
diff --git a/sysutils/gworkspace/patches/patch-aa b/sysutils/gworkspace/patches/patch-aa
index 0ac9f67a1c9..5f6871b197b 100644
--- a/sysutils/gworkspace/patches/patch-aa
+++ b/sysutils/gworkspace/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2009/04/13 12:45:04 rh Exp $
+$NetBSD: patch-aa,v 1.7 2012/10/22 03:08:29 rh Exp $
 
---- GWorkspace/Desktop/GWDesktopManager.m.orig	2007-02-23 01:30:56.000000000 +1000
+Add missing includes.
+
+--- GWorkspace/Desktop/GWDesktopManager.m.orig	2012-03-28 18:45:01.000000000 +0000
 +++ GWorkspace/Desktop/GWDesktopManager.m
 @@ -31,6 +31,14 @@
- #include "GWorkspace.h"
- #include "GWViewersManager.h"
- #include "TShelf/TShelfWin.h"
+ #import "GWorkspace.h"
+ #import "GWViewersManager.h"
+ #import "TShelf/TShelfWin.h"
 +#include <sys/types.h>
 +#include <sys/param.h>
 +