Index: Mk/Uses/gnustep.mk
===================================================================
--- Mk/Uses/gnustep.mk	(revision 441211)
+++ Mk/Uses/gnustep.mk	(working copy)
@@ -63,12 +63,12 @@
 
 .  if ${USE_GNUSTEP:Mbuild}
 PATH:=	${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS}:${PATH}
-MAKE_ENV+=	PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
+MAKE_ENV+=	PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
 # All GNUstep things installed from ports should be in the System domain.
 # Things installed from source can then freely live in the Local domain without
 # conflicts.
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-CONFIGURE_ENV+=	PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
+CONFIGURE_ENV+=	PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
 BUILD_DEPENDS+=	gnustep-make>0:devel/gnustep-make
 .include "${USESDIR}/objc.mk"
 .  endif
Index: Mk/Uses/objc.mk
===================================================================
--- Mk/Uses/objc.mk	(revision 441211)
+++ Mk/Uses/objc.mk	(working copy)
@@ -10,6 +10,8 @@
 .if !defined(_INCLUDE_USES_OBJC_MK)
 _INCLUDE_USES_OBJC_MK=	yes
 
+OBJC_CLANG_VERSION=40
+
 objc_ARGS?=
 .if !empty(objc_ARGS) && ! ${objc_ARGS:Mcompiler}
 IGNORE=	USES=objc only accepts no arguments or 'compiler'
@@ -39,17 +41,17 @@
 ALT_COMPILER_TYPE=	gcc
 .endif
 
-# We do always need clang
-.if ${COMPILER_TYPE} != clang
-.if ${ALT_COMPILER_TYPE} == clang
+# We do always need clang and prefer a recent version
+.if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < ${OBJC_CLANG_VERSION}) || ${COMPILER_TYPE} != clang
+.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= ${OJBC_CLANG_VERSION}
 CC=	/usr/bin/clang
 CPP=	/usr/bin/clang-cpp
 CXX=	/usr/bin/clang++
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang34:lang/clang34
-CPP=	${LOCALBASE}/bin/clang-cpp34
-CC=	${LOCALBASE}/bin/clang34
-CXX=	${LOCALBASE}/bin/clang++34
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${OBJC_CLANG_VERSION}:devel/llvm${OBJC_CLANG_VERSION}
+CPP=	${LOCALBASE}/bin/clang-cpp${OBJC_CLANG_VERSION}
+CC=	${LOCALBASE}/bin/clang${OBJC_CLANG_VERSION}
+CXX=	${LOCALBASE}/bin/clang++${OBJC_CLANG_VERSION}
 .endif
 .endif
 
Index: deskutils/gworkspace/Makefile
===================================================================
--- deskutils/gworkspace/Makefile	(revision 441211)
+++ deskutils/gworkspace/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gworkspace
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	deskutils gnustep
 #MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
 MASTER_SITES=	GNUSTEP/usr-apps
Index: deskutils/gworkspace/distinfo
===================================================================
--- deskutils/gworkspace/distinfo	(revision 441211)
+++ deskutils/gworkspace/distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (gworkspace-0.9.3.tar.gz) = 238343a8c4e447debec75ff49f4657f74a4256a49862899214a2c80616c79049
-SIZE (gworkspace-0.9.3.tar.gz) = 3833838
+TIMESTAMP = 1495374913
+SHA256 (gworkspace-0.9.4.tar.gz) = f3c18371c10d8ca02954017ce5c78d8f6b6ed3101a7adae86d7c557cea405632
+SIZE (gworkspace-0.9.4.tar.gz) = 3855909
Index: deskutils/gworkspace/pkg-plist
===================================================================
--- deskutils/gworkspace/pkg-plist	(revision 441211)
+++ deskutils/gworkspace/pkg-plist	(working copy)
@@ -108,13 +108,6 @@
 GNUstep/System/Applications/GWorkspace.app/Resources/Esperanto.lproj/Localizable.strings
 GNUstep/System/Applications/GWorkspace.app/Resources/FFArrow.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/FFArrow_disabled.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small_alt.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small_osx.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_alt.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_osx.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_WebLink.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/FileManager.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Localizable.strings
@@ -161,14 +154,11 @@
 GNUstep/System/Applications/GWorkspace.app/Resources/Month-8.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/Month-9.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/Month.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/MultipleSelection.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/Norvegian.lproj/Localizable.strings
 GNUstep/System/Applications/GWorkspace.app/Resources/Pboard.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Localizable.strings
 GNUstep/System/Applications/GWorkspace.app/Resources/REWArrow.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/REWArrow_disabled.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/Recycler.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/RecyclerFull.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/RightArr.tiff
 GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Localizable.strings
 GNUstep/System/Applications/GWorkspace.app/Resources/SlideMask.tiff
@@ -373,16 +363,11 @@
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Headers/FSNTextCell.h
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Headers/FSNode.h
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Headers/FSNodeRep.h
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/ArrowRight.tiff
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/English.lproj/Localizable.strings
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/FolderOpen.tiff
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/HardDisk.tiff
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/HardDiskOpen.tiff
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Info-gnustep.plist
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/MultipleSelection.tiff
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Recycler.tiff
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/RecyclerFull.tiff
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Workspace.tiff
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/libFSNode.so
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/libFSNode.so.0
 GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/libFSNode.so.0.1.0
@@ -418,7 +403,6 @@
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/InspectorWin.gorm/data.classes
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/InspectorWin.gorm/data.info
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/InspectorWin.gorm/objects.gorm
-GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/Localizable.strings
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/Tools.gorm/data.classes
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/Tools.gorm/data.info
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/Tools.gorm/objects.gorm
@@ -453,7 +437,6 @@
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Month-8.tiff
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Month-9.tiff
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Month.tiff
-GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/MultipleSelection.tiff
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Pboard.tiff
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Weekday-0.tiff
 GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Weekday-1.tiff
@@ -524,13 +507,19 @@
 GNUstep/System/Library/Libraries/libOperation.so
 GNUstep/System/Library/Libraries/libOperation.so.1
 GNUstep/System/Library/Libraries/libOperation.so.1.0.0
-GNUstep/System/Library/Services/thumbnailer.service/Resources/Info-gnustep.plist
-GNUstep/System/Library/Services/thumbnailer.service/thumbnailer
 GNUstep/System/Tools/GWorkspace
 GNUstep/System/Tools/Recycler
 GNUstep/System/Tools/ddbd
 GNUstep/System/Tools/fswatcher
 GNUstep/System/Tools/lsfupdater
-GNUstep/System/Tools/resizer
 GNUstep/System/Tools/searchtool
 GNUstep/System/Tools/wopen
+GNUstep/System/Library/Bundles/Role.extinfo/Resources/English.lproj/Localizable.strings
+GNUstep/System/Library/Bundles/Role.extinfo/Resources/French.lproj/Localizable.strings
+GNUstep/System/Library/Bundles/Role.extinfo/Resources/German.lproj/Localizable.strings
+GNUstep/System/Library/Bundles/Role.extinfo/Resources/Italian.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/French.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/German.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Italian.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Spanish.lproj/Localizable.strings
+
Index: deskutils/gworkspace-gwmetadata/Makefile
===================================================================
--- deskutils/gworkspace-gwmetadata/Makefile	(revision 441211)
+++ deskutils/gworkspace-gwmetadata/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gworkspace
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.4
 CATEGORIES=	deskutils gnustep
 #MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/
 MASTER_SITES=	GNUSTEP/usr-apps
Index: deskutils/gworkspace-gwmetadata/distinfo
===================================================================
--- deskutils/gworkspace-gwmetadata/distinfo	(revision 441211)
+++ deskutils/gworkspace-gwmetadata/distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (gworkspace-0.9.3.tar.gz) = 238343a8c4e447debec75ff49f4657f74a4256a49862899214a2c80616c79049
-SIZE (gworkspace-0.9.3.tar.gz) = 3833838
+TIMESTAMP = 1495374909
+SHA256 (gworkspace-0.9.4.tar.gz) = f3c18371c10d8ca02954017ce5c78d8f6b6ed3101a7adae86d7c557cea405632
+SIZE (gworkspace-0.9.4.tar.gz) = 3855909