- update to 0.22

4 files changed, 112 insertions, 159 deletions

diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 02992a49828b..883b41f29c59 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -6,12 +6,7 @@
 #
 
 PORTNAME=	gnustep-gui
-.if defined(WITH_GNUSTEP_DEVEL)
-PORTVERSION=	0.20.0
-.else
-PORTVERSION=	0.17.1
-PORTREVISION=	3
-.endif
+PORTVERSION=	0.22.0
 CATEGORIES=	x11-toolkits gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -26,13 +21,9 @@ LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
-.if defined(WITH_GNUSTEP_DEVEL)
 LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
 LIB_DEPENDS+=	ao.4:${PORTSDIR}/audio/libao
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libflite.a:${PORTSDIR}/audio/flite
-.else
-LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile
-.endif
 
 LICENSE_COMB=	multi
 LICENSE=	GPLv3 LGPL3
@@ -53,7 +44,8 @@ USE_GNUSTEP_BASE=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 USE_XORG=	x11 xt
 
-EXTRA_PATCHES+=		${FILESDIR}/GNUmakefile.patch
+EXTRA_PATCHES+=	${FILESDIR}/GNUmakefile.patch
+EXTRA_PATCHES+=	${FILESDIR}/AudioOutputSink.m.patch
 MAKE_FLAGS+=	OPTFLAG="${CFLAGS}"
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 BREAKS_IF_PEDANTIC=	yes
@@ -61,28 +53,12 @@ PLIST_SUB+=	BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1}
 
 ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/libpng15
 
-.if defined(WITH_GNUSTEP_DEVEL)
-EXTRA_PATCHES+=	${FILESDIR}/AudioOutputSink.m.patch
-.endif
-
 .if defined(WITHOUT_GNUSTEP_FAKEMAIN)
 .if !exists(/proc/curproc)
 IGNORE=		requires procfs mounted to build or run, for details see procfs(5)
 .endif
 .endif
 
-.if !defined(WITHOUT_PORTAUDIO2) && !defined(WITHOUT_PORTAUDIO) && !defined(WITH_GNUSTEP_DEVEL)
-LIB_DEPENDS+=	portaudio:${PORTSDIR}/audio/portaudio2
-CPPFLAGS+=	-I${LOCALBASE}/include/portaudio2 ${PTHREAD_CFLAGS}
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2 ${PTHREAD_LIBS}
-ADDITIONAL_INCLUDE_DIRS+=	-I${LOCALBASE}/include/portaudio2
-ADDITIONAL_LDFLAGS+=	-L${LOCALBASE}/lib/portaudio2
-PLIST_SUB+=	WITH_PORTAUDIO=""
-.else
-PLIST_SUB+=	WITH_PORTAUDIO="@comment "
-.endif
-
 .if !defined(WITHOUT_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	WITH_CUPS=""
diff --git a/x11-toolkits/gnustep-gui/distinfo b/x11-toolkits/gnustep-gui/distinfo
index 79da63f40764..3490b9b81aad 100644
--- a/x11-toolkits/gnustep-gui/distinfo
+++ b/x11-toolkits/gnustep-gui/distinfo
@@ -1,4 +1,2 @@
-SHA256 (gnustep-gui-0.17.1.tar.gz) = b4dd99a84c833e135a7975be84927abb840c30dc3daba10714f6ac5a48930ac9
-SIZE (gnustep-gui-0.17.1.tar.gz) = 1917258
-SHA256 (gnustep-gui-0.20.0.tar.gz) = 26f28951f07c0abb5439f468b60a6726168c510ae3579cd075e6a9c5bab73f5a
-SIZE (gnustep-gui-0.20.0.tar.gz) = 2648224
+SHA256 (gnustep-gui-0.22.0.tar.gz) = 201a02da45a3ad2285fee6a6fcc7c8a463632e27d3175d7293e2290e573fca5d
+SIZE (gnustep-gui-0.22.0.tar.gz) = 2734733
diff --git a/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m b/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m
deleted file mode 100644
index 8432441cfac2..000000000000
--- a/x11-toolkits/gnustep-gui/files/patch-NSBitmapImageRep+PNG.m
+++ /dev/null
@@ -1,15 +0,0 @@
---- Source/NSBitmapImageRep+PNG.m.orig	2009-02-17 00:23:41.000000000 +0100
-+++ Source/NSBitmapImageRep+PNG.m	2012-04-27 18:54:35.000000000 +0200
-@@ -33,9 +33,11 @@
- #if HAVE_LIBPNG
- 
- #ifdef HAVE_LIBPNG_PNG_H
--#include <libpng/png.h>
-+#include <png.h>
-+#include <pngpriv.h>
- #else
- #include <png.h>
-+#include <pngpriv.h>
- #endif
- 
- #include <Foundation/NSData.h>
diff --git a/x11-toolkits/gnustep-gui/pkg-plist b/x11-toolkits/gnustep-gui/pkg-plist
index 92ce7676baa8..d5e2f577a876 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -1,19 +1,19 @@
-%%GNUSTEP_DEVEL%%GNUstep/System/Applications/GSSpeechServer.app/GSSpeechServer
-%%GNUSTEP_DEVEL%%GNUstep/System/Applications/GSSpeechServer.app/Resources/GSSpeechServer.desktop
-%%GNUSTEP_DEVEL%%GNUstep/System/Applications/GSSpeechServer.app/Resources/Info-gnustep.plist
-%%GNUSTEP_DEVEL%%GNUstep/System/Applications/GSSpeechServer.app/stamp.make
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Bundles/AudioOutput.nssound/AudioOutput
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources/Info-gnustep.plist
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Bundles/AudioOutput.nssound/stamp.make
+GNUstep/System/Applications/GSSpeechServer.app/GSSpeechServer
+GNUstep/System/Applications/GSSpeechServer.app/Resources/GSSpeechServer.desktop
+GNUstep/System/Applications/GSSpeechServer.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/GSSpeechServer.app/stamp.make
+GNUstep/System/Library/Bundles/AudioOutput.nssound/AudioOutput
+GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/AudioOutput.nssound/stamp.make
 %%WITH_CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/GSCUPS
 %%WITH_CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources/Info-gnustep.plist
 %%WITH_CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/stamp.make
 GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR
 GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources/Info-gnustep.plist
 GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/stamp.make
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Bundles/Sndfile.nssound/Resources/Info-gnustep.plist
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Bundles/Sndfile.nssound/Sndfile
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Bundles/Sndfile.nssound/stamp.make
+GNUstep/System/Library/Bundles/Sndfile.nssound/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/Sndfile.nssound/Sndfile
+GNUstep/System/Library/Bundles/Sndfile.nssound/stamp.make
 GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/RTFConverter
 GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/Resources/Info-gnustep.plist
 GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/stamp.make
@@ -31,7 +31,7 @@ GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSGrayColorP
 GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSHSBColorPicker.tiff
 GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSRGBColorPicker.tiff
 GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Info-gnustep.plist
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj/StandardPicker.strings
 GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj/StandardPicker.strings
 GNUstep/System/Library/ColorPickers/StandardPicker.bundle/StandardPicker
 GNUstep/System/Library/ColorPickers/StandardPicker.bundle/stamp.make
@@ -41,8 +41,6 @@ GNUstep/System/Library/ColorPickers/WheelPicker.bundle/WheelPicker
 GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ClassesTOC.gsdoc
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ClassesTOC.html
-%%GNUSTEP_STABLE%%%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ConstantsTOC.gsdoc
-%%GNUSTEP_STABLE%%%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ConstantsTOC.html
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/Functions.gsdoc
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/Functions.html
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/FunctionsTOC.gsdoc
@@ -60,7 +58,7 @@ GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/GuiAdditions.html
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/GuiAdditions.igsdoc
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/MainIndex.html
-%%GNUSTEP_DEVEL%%%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/OrderedSymbolDeclarations.plist
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/OrderedSymbolDeclarations.plist
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/TypesAndConstants.gsdoc
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/TypesAndConstants.html
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/TypesTOC.gsdoc
@@ -311,7 +309,7 @@ GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/NSWindowController.html
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/NSWorkspace.gsdoc
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/NSWorkspace.html
-%%GNUSTEP_DEVEL%%%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/OrderedSymbolDeclarations.plist
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/OrderedSymbolDeclarations.plist
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ProtocolsTOC.gsdoc
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ProtocolsTOC.html
 %%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/TypesAndConstants.gsdoc
@@ -351,10 +349,9 @@ GNUstep/System/Library/Headers/AppKit/GSDisplayServer.h
 GNUstep/System/Library/Headers/AppKit/GSDragView.h
 GNUstep/System/Library/Headers/AppKit/GSEPSPrintOperation.h
 GNUstep/System/Library/Headers/AppKit/GSFontInfo.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/AppKit/GSFusedSilica.h
 GNUstep/System/Library/Headers/AppKit/GSGormLoading.h
 GNUstep/System/Library/Headers/AppKit/GSHbox.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/GSHelpAttachment.h
+GNUstep/System/Library/Headers/AppKit/GSHelpAttachment.h
 GNUstep/System/Library/Headers/AppKit/GSHelpManagerPanel.h
 GNUstep/System/Library/Headers/AppKit/GSHorizontalTypesetter.h
 GNUstep/System/Library/Headers/AppKit/GSInfoPanel.h
@@ -370,8 +367,8 @@ GNUstep/System/Library/Headers/AppKit/GSPDFPrintOperation.h
 GNUstep/System/Library/Headers/AppKit/GSPasteboardServer.h
 GNUstep/System/Library/Headers/AppKit/GSPrintOperation.h
 GNUstep/System/Library/Headers/AppKit/GSPrinting.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/GSSoundSink.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/GSSoundSource.h
+GNUstep/System/Library/Headers/AppKit/GSSoundSink.h
+GNUstep/System/Library/Headers/AppKit/GSSoundSource.h
 GNUstep/System/Library/Headers/AppKit/GSServicesManager.h
 GNUstep/System/Library/Headers/AppKit/GSTable.h
 GNUstep/System/Library/Headers/AppKit/GSTextConverter.h
@@ -382,8 +379,8 @@ GNUstep/System/Library/Headers/AppKit/GSTrackingRect.h
 GNUstep/System/Library/Headers/AppKit/GSTypesetter.h
 GNUstep/System/Library/Headers/AppKit/GSVbox.h
 GNUstep/System/Library/Headers/AppKit/GSVersion.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/GSWindowDecorationView.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/GSXibLoading.h
+GNUstep/System/Library/Headers/AppKit/GSWindowDecorationView.h
+GNUstep/System/Library/Headers/AppKit/GSXibLoading.h
 GNUstep/System/Library/Headers/AppKit/IMConnectors.h
 GNUstep/System/Library/Headers/AppKit/IMCustomObject.h
 GNUstep/System/Library/Headers/AppKit/IMLoading.h
@@ -434,7 +431,7 @@ GNUstep/System/Library/Headers/AppKit/NSFontPanel.h
 GNUstep/System/Library/Headers/AppKit/NSForm.h
 GNUstep/System/Library/Headers/AppKit/NSFormCell.h
 GNUstep/System/Library/Headers/AppKit/NSGlyphGenerator.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/NSGradient.h
+GNUstep/System/Library/Headers/AppKit/NSGradient.h
 GNUstep/System/Library/Headers/AppKit/NSGraphics.h
 GNUstep/System/Library/Headers/AppKit/NSGraphicsContext.h
 GNUstep/System/Library/Headers/AppKit/NSHelpManager.h
@@ -490,7 +487,7 @@ GNUstep/System/Library/Headers/AppKit/NSSecureTextField.h
 GNUstep/System/Library/Headers/AppKit/NSSegmentedCell.h
 GNUstep/System/Library/Headers/AppKit/NSSegmentedControl.h
 GNUstep/System/Library/Headers/AppKit/NSSelection.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/NSShadow.h
+GNUstep/System/Library/Headers/AppKit/NSShadow.h
 GNUstep/System/Library/Headers/AppKit/NSSlider.h
 GNUstep/System/Library/Headers/AppKit/NSSliderCell.h
 GNUstep/System/Library/Headers/AppKit/NSSound.h
@@ -525,7 +522,7 @@ GNUstep/System/Library/Headers/AppKit/NSToolbarItemGroup.h
 GNUstep/System/Library/Headers/AppKit/NSUserDefaultsController.h
 GNUstep/System/Library/Headers/AppKit/NSUserInterfaceValidation.h
 GNUstep/System/Library/Headers/AppKit/NSView.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/AppKit/NSViewController.h
+GNUstep/System/Library/Headers/AppKit/NSViewController.h
 GNUstep/System/Library/Headers/AppKit/NSWindow.h
 GNUstep/System/Library/Headers/AppKit/NSWindowController.h
 GNUstep/System/Library/Headers/AppKit/NSWorkspace.h
@@ -538,10 +535,9 @@ GNUstep/System/Library/Headers/GNUstepGUI/GSDisplayServer.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSDragView.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSEPSPrintOperation.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSFontInfo.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/GNUstepGUI/GSFusedSilica.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSGormLoading.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSHbox.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepGUI/GSHelpAttachment.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSHelpAttachment.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSHelpManagerPanel.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSHorizontalTypesetter.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSInfoPanel.h
@@ -557,8 +553,8 @@ GNUstep/System/Library/Headers/GNUstepGUI/GSPDFPrintOperation.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSPasteboardServer.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSPrintOperation.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSPrinting.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepGUI/GSSoundSink.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepGUI/GSSoundSource.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSSoundSink.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSSoundSource.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSServicesManager.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSTable.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSTextConverter.h
@@ -569,8 +565,8 @@ GNUstep/System/Library/Headers/GNUstepGUI/GSTrackingRect.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSTypesetter.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSVbox.h
 GNUstep/System/Library/Headers/GNUstepGUI/GSVersion.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepGUI/GSWindowDecorationView.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/GNUstepGUI/GSXibLoading.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSWindowDecorationView.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSXibLoading.h
 GNUstep/System/Library/Headers/GNUstepGUI/IMConnectors.h
 GNUstep/System/Library/Headers/GNUstepGUI/IMCustomObject.h
 GNUstep/System/Library/Headers/GNUstepGUI/IMLoading.h
@@ -581,10 +577,9 @@ GNUstep/System/Library/Headers/gnustep/gui/GSDisplayServer.h
 GNUstep/System/Library/Headers/gnustep/gui/GSDragView.h
 GNUstep/System/Library/Headers/gnustep/gui/GSEPSPrintOperation.h
 GNUstep/System/Library/Headers/gnustep/gui/GSFontInfo.h
-%%GNUSTEP_STABLE%%GNUstep/System/Library/Headers/gnustep/gui/GSFusedSilica.h
 GNUstep/System/Library/Headers/gnustep/gui/GSGormLoading.h
 GNUstep/System/Library/Headers/gnustep/gui/GSHbox.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/gui/GSHelpAttachment.h
+GNUstep/System/Library/Headers/gnustep/gui/GSHelpAttachment.h
 GNUstep/System/Library/Headers/gnustep/gui/GSHelpManagerPanel.h
 GNUstep/System/Library/Headers/gnustep/gui/GSHorizontalTypesetter.h
 GNUstep/System/Library/Headers/gnustep/gui/GSInfoPanel.h
@@ -600,8 +595,8 @@ GNUstep/System/Library/Headers/gnustep/gui/GSPDFPrintOperation.h
 GNUstep/System/Library/Headers/gnustep/gui/GSPasteboardServer.h
 GNUstep/System/Library/Headers/gnustep/gui/GSPrintOperation.h
 GNUstep/System/Library/Headers/gnustep/gui/GSPrinting.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/gui/GSSoundSink.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/gui/GSSoundSource.h
+GNUstep/System/Library/Headers/gnustep/gui/GSSoundSink.h
+GNUstep/System/Library/Headers/gnustep/gui/GSSoundSource.h
 GNUstep/System/Library/Headers/gnustep/gui/GSServicesManager.h
 GNUstep/System/Library/Headers/gnustep/gui/GSTable.h
 GNUstep/System/Library/Headers/gnustep/gui/GSTextConverter.h
@@ -612,8 +607,8 @@ GNUstep/System/Library/Headers/gnustep/gui/GSTrackingRect.h
 GNUstep/System/Library/Headers/gnustep/gui/GSTypesetter.h
 GNUstep/System/Library/Headers/gnustep/gui/GSVbox.h
 GNUstep/System/Library/Headers/gnustep/gui/GSVersion.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/gui/GSWindowDecorationView.h
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Headers/gnustep/gui/GSXibLoading.h
+GNUstep/System/Library/Headers/gnustep/gui/GSWindowDecorationView.h
+GNUstep/System/Library/Headers/gnustep/gui/GSXibLoading.h
 GNUstep/System/Library/Headers/gnustep/gui/IMConnectors.h
 GNUstep/System/Library/Headers/gnustep/gui/IMCustomObject.h
 GNUstep/System/Library/Headers/gnustep/gui/IMLoading.h
@@ -649,44 +644,44 @@ GNUstep/System/Library/Images/common_ClosedHandCursor.tiff
 GNUstep/System/Library/Images/common_ColorSwatch.tiff
 GNUstep/System/Library/Images/common_ComboBoxEllipsis.tiff
 GNUstep/System/Library/Images/common_DecimalTabStop.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_Desktop.tiff
+GNUstep/System/Library/Images/common_Desktop.tiff
 GNUstep/System/Library/Images/common_Diamond.tiff
 GNUstep/System/Library/Images/common_Dimple.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_DimpleHoriz.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_DocsFolder.tiff
+GNUstep/System/Library/Images/common_DimpleHoriz.tiff
+GNUstep/System/Library/Images/common_DocsFolder.tiff
 GNUstep/System/Library/Images/common_DownArrowSmall.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_DownloadFolder.tiff
+GNUstep/System/Library/Images/common_DownloadFolder.tiff
 GNUstep/System/Library/Images/common_Folder.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_GSFolder.tiff
+GNUstep/System/Library/Images/common_GSFolder.tiff
 GNUstep/System/Library/Images/common_HelpCursor.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_HelpLink.tiff
+GNUstep/System/Library/Images/common_HelpLink.tiff
 GNUstep/System/Library/Images/common_Home.tiff
 GNUstep/System/Library/Images/common_HomeDirectory.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ImageFolder.tiff
+GNUstep/System/Library/Images/common_ImageFolder.tiff
 GNUstep/System/Library/Images/common_LeftTabStop.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_LibraryFolder.tiff
+GNUstep/System/Library/Images/common_LibraryFolder.tiff
 GNUstep/System/Library/Images/common_MiniWindowTile.tiff
 GNUstep/System/Library/Images/common_Miniaturize.tiff
 GNUstep/System/Library/Images/common_MiniaturizeH.tiff
 GNUstep/System/Library/Images/common_Mount.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_MusicFolder.tiff
+GNUstep/System/Library/Images/common_MusicFolder.tiff
 GNUstep/System/Library/Images/common_Nibble.tiff
 GNUstep/System/Library/Images/common_OpenHandCursor.tiff
 GNUstep/System/Library/Images/common_Printer.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressIndeterminate_1.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressIndeterminate_2.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressIndeterminate_3.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressIndeterminate_4.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressIndeterminate_5.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressIndeterminate_6.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressSpinning_1.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressSpinning_2.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressSpinning_3.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressSpinning_4.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressSpinning_5.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressSpinning_6.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressSpinning_7.tiff
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Images/common_ProgressSpinning_8.tiff
+GNUstep/System/Library/Images/common_ProgressIndeterminate_1.tiff
+GNUstep/System/Library/Images/common_ProgressIndeterminate_2.tiff
+GNUstep/System/Library/Images/common_ProgressIndeterminate_3.tiff
+GNUstep/System/Library/Images/common_ProgressIndeterminate_4.tiff
+GNUstep/System/Library/Images/common_ProgressIndeterminate_5.tiff
+GNUstep/System/Library/Images/common_ProgressIndeterminate_6.tiff
+GNUstep/System/Library/Images/common_ProgressSpinning_1.tiff
+GNUstep/System/Library/Images/common_ProgressSpinning_2.tiff
+GNUstep/System/Library/Images/common_ProgressSpinning_3.tiff
+GNUstep/System/Library/Images/common_ProgressSpinning_4.tiff
+GNUstep/System/Library/Images/common_ProgressSpinning_5.tiff
+GNUstep/System/Library/Images/common_ProgressSpinning_6.tiff
+GNUstep/System/Library/Images/common_ProgressSpinning_7.tiff
+GNUstep/System/Library/Images/common_ProgressSpinning_8.tiff
 GNUstep/System/Library/Images/common_RadioOff.tiff
 GNUstep/System/Library/Images/common_RadioOn.tiff
 GNUstep/System/Library/Images/common_Right.tiff
@@ -742,9 +737,9 @@ GNUstep/System/Library/KeyBindings/DefaultKeyBindings.dict
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/data.info
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/objects.gorm
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/data.classes
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/data.info
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm/objects.gorm
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPageLayout.gorm/data.classes
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPageLayout.gorm/data.info
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
@@ -763,25 +758,25 @@ GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Info-gnustep.plist
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Italian.lproj/Localizable.strings
 GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Lojban.lproj/Localizable.strings
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/data.info
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/objects.gorm
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/Localizable.strings
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/data.classes
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/data.info
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm/objects.gorm
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/Localizable.strings
 GNUstep/System/Library/Libraries/libgnustep-gui.so
 GNUstep/System/Library/Libraries/libgnustep-gui.so.%%BASEVERSION%%
 GNUstep/System/Library/Libraries/libgnustep-gui.so.%%VERSION%%
@@ -790,39 +785,38 @@ GNUstep/System/Library/PostScript/GSProlog.ps
 GNUstep/System/Library/PostScript/PPD/English.lproj/Generic-PostScript_Printer-Postscript.ppd
 GNUstep/System/Library/Services/GSspell.service/GSspell
 GNUstep/System/Library/Services/GSspell.service/Resources/Info-gnustep.plist
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Basso.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Blow.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Bottle.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Frog.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Glass.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Hero.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Ping.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Pop.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Sosumi.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Submarine.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Library/Sounds/Tink.wav
-%%GNUSTEP_DEVEL%%GNUstep/System/Tools/GSSpeechServer
+GNUstep/System/Library/Sounds/Basso.wav
+GNUstep/System/Library/Sounds/Blow.wav
+GNUstep/System/Library/Sounds/Bottle.wav
+GNUstep/System/Library/Sounds/Frog.wav
+GNUstep/System/Library/Sounds/Glass.wav
+GNUstep/System/Library/Sounds/Hero.wav
+GNUstep/System/Library/Sounds/Ping.wav
+GNUstep/System/Library/Sounds/Pop.wav
+GNUstep/System/Library/Sounds/Sosumi.wav
+GNUstep/System/Library/Sounds/Submarine.wav
+GNUstep/System/Library/Sounds/Tink.wav
+GNUstep/System/Tools/GSSpeechServer
 GNUstep/System/Tools/gclose
 GNUstep/System/Tools/gcloseall
-%%WITH_PORTAUDIO%%GNUstep/System/Tools/gnustep_sndd
 GNUstep/System/Tools/gopen
 GNUstep/System/Tools/make_services
-%%GNUSTEP_DEVEL%%GNUstep/System/Tools/say
+GNUstep/System/Tools/say
 GNUstep/System/Tools/set_show_service
-%%GNUSTEP_DEVEL%%@exec mkdir -p %D/GNUstep/System/Library/Themes
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Themes
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Sounds
+@exec mkdir -p %D/GNUstep/System/Library/Themes
+@dirrm GNUstep/System/Library/Themes
+@dirrm GNUstep/System/Library/Sounds
 @dirrm GNUstep/System/Library/Services/GSspell.service/Resources
 @dirrm GNUstep/System/Library/Services/GSspell.service
 @dirrm GNUstep/System/Library/PostScript/PPD/English.lproj
 @dirrm GNUstep/System/Library/PostScript/PPD
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSSpellPanel.gorm
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPrintPanel.gorm
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSPageLayout.gorm
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSFindPanel.gorm
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Lojban.lproj
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Italian.lproj
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/German.lproj
@@ -832,7 +826,7 @@ GNUstep/System/Tools/set_show_service
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSSpellPanel.gorm
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPrintPanel.gorm
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSPageLayout.gorm
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm
+@dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSFindPanel.gorm
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj/GSDataLinkPanel.gorm
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/English.lproj
 @dirrm GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources
@@ -855,7 +849,7 @@ GNUstep/System/Tools/set_show_service
 @dirrm GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources
 @dirrm GNUstep/System/Library/ColorPickers/WheelPicker.bundle
 @dirrm GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj
+@dirrm GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj
 @dirrm GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj
 @dirrm GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj
 @dirrm GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources
@@ -867,14 +861,14 @@ GNUstep/System/Tools/set_show_service
 @dirrm GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/Resources
 @dirrm GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle
 @dirrm GNUstep/System/Library/Bundles/TextConverters
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Bundles/Sndfile.nssound/Resources
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Bundles/Sndfile.nssound
+@dirrm GNUstep/System/Library/Bundles/Sndfile.nssound/Resources
+@dirrm GNUstep/System/Library/Bundles/Sndfile.nssound
 @dirrm GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources
 @dirrm GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle
 %%WITH_CUPS%%@dirrm GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources
 %%WITH_CUPS%%@dirrm GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle
 @dirrm GNUstep/System/Library/Bundles/GSPrinting
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Library/Bundles/AudioOutput.nssound
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Applications/GSSpeechServer.app/Resources
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/System/Applications/GSSpeechServer.app
+@dirrm GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources
+@dirrm GNUstep/System/Library/Bundles/AudioOutput.nssound
+@dirrm GNUstep/System/Applications/GSSpeechServer.app/Resources
+@dirrm GNUstep/System/Applications/GSSpeechServer.app