- Update to use gnustep-back instead of gnustep-xgps

- Sweep devel slave ports
- retire x11-toolkits/gnustep-xgps

3 files changed, 40 insertions, 63 deletions

diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 8ab4ecb136e9..8088faf15ebb 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -6,21 +6,11 @@
 #
 
 PORTNAME=	gnustep-gui
-.if defined(GNUSTEP_GUI_DEVEL)
 PORTVERSION=	0.8.3
-.else
-PORTVERSION=	0.7.6
-.endif
 CATEGORIES=	x11-toolkits
-.if defined(GNUSTEP_GUI_DEVEL)
 MASTER_SITES=	${MASTER_SITE_GNUSTEP} \
 		ftp://ftp.gnustep.org/pub/gnustep/%SUBDIR%/
 MASTER_SITE_SUBDIR=	core
-PKGNAMESUFFIX?=	-devel
-.else
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dinoex
-.endif
 
 MAINTAINER=	dinoex@FreeBSD.org
 
@@ -28,19 +18,9 @@ BUILD_DEPENDS=	${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall
 RUN_DEPENDS=	${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
-.if defined(GNUSTEP_GUI_DEVEL)
 LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
-.endif
 
 BREAKS_IF_PEDANTIC=	yes
-.if defined(GNUSTEP_GUI_DEVEL)
-EXTRA_PATCHES=	${FILESDIR}/extra-pa_unix_oss.c
-PLIST_SUB+=	DEVEL=""
-PLIST_SUB+=	NODEVEL="@comment "
-.else
-PLIST_SUB+=	DEVEL="@comment "
-PLIST_SUB+=	NODEVEL=""
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -76,13 +56,11 @@ post-extract:
 	@${CP} ${PREFIX}/System/Makefiles/${file} ${WRKSRC}
 .endfor
 
-.if defined(GNUSTEP_GUI_DEVEL)
 pre-configure:
 	@ ${MV} ${EXTRA_FIX} ${EXTRA_FIX}.sed
 	${SED} -e "s=-lphread=${PTHREAD_LIBS}=" -e "s;CFLAGS =;CFLAGS+=;" \
 		-e "s;-Wall;-Wall ${PTHREAD_CFLAGS:S=""==};" \
 		${EXTRA_FIX}.sed > ${EXTRA_FIX}
-.endif
 
 do-configure:
 	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
diff --git a/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c b/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c
index 526a5e27eac6..526a5e27eac6 100644
--- a/x11-toolkits/gnustep-gui/files/extra-pa_unix_oss.c
+++ b/x11-toolkits/gnustep-gui/files/patch-pa_unix_oss.c
diff --git a/x11-toolkits/gnustep-gui/pkg-plist b/x11-toolkits/gnustep-gui/pkg-plist
index 99683e7b7e0c..7f9393a085cb 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -4,15 +4,15 @@ System/Headers/AppKit/AppKitExceptions.h
 System/Headers/AppKit/DPSOperators.h
 System/Headers/AppKit/GMAppKit.h
 System/Headers/AppKit/GMArchiver.h
-%%DEVEL%%System/Headers/AppKit/GSDisplayServer.h
+System/Headers/AppKit/GSDisplayServer.h
 System/Headers/AppKit/GSFontInfo.h
-%%DEVEL%%System/Headers/AppKit/GSFusedSilica.h
+System/Headers/AppKit/GSFusedSilica.h
 System/Headers/AppKit/GSHbox.h
 System/Headers/AppKit/GSHelpManagerPanel.h
 System/Headers/AppKit/GSInfoPanel.h
 System/Headers/AppKit/GSMemoryPanel.h
 System/Headers/AppKit/GSMethodTable.h
-%%DEVEL%%System/Headers/AppKit/GSNibTemplates.h
+System/Headers/AppKit/GSNibTemplates.h
 System/Headers/AppKit/GSPasteboardServer.h
 System/Headers/AppKit/GSServicesManager.h
 System/Headers/AppKit/GSTable.h
@@ -84,8 +84,8 @@ System/Headers/AppKit/NSMenuView.h
 System/Headers/AppKit/NSNibConnector.h
 System/Headers/AppKit/NSNibDeclarations.h
 System/Headers/AppKit/NSNibLoading.h
-%%DEVEL%%System/Headers/AppKit/NSOpenGL.h
-%%DEVEL%%System/Headers/AppKit/NSOpenGLView.h
+System/Headers/AppKit/NSOpenGL.h
+System/Headers/AppKit/NSOpenGLView.h
 System/Headers/AppKit/NSOpenPanel.h
 System/Headers/AppKit/NSOutlineView.h
 System/Headers/AppKit/NSPageLayout.h
@@ -110,7 +110,7 @@ System/Headers/AppKit/NSSecureTextField.h
 System/Headers/AppKit/NSSelection.h
 System/Headers/AppKit/NSSlider.h
 System/Headers/AppKit/NSSliderCell.h
-%%DEVEL%%System/Headers/AppKit/NSSound.h
+System/Headers/AppKit/NSSound.h
 System/Headers/AppKit/NSSpellChecker.h
 System/Headers/AppKit/NSSpellProtocol.h
 System/Headers/AppKit/NSSpellServer.h
@@ -131,15 +131,14 @@ System/Headers/AppKit/NSTextField.h
 System/Headers/AppKit/NSTextFieldCell.h
 System/Headers/AppKit/NSTextStorage.h
 System/Headers/AppKit/NSTextView.h
-%%DEVEL%%System/Headers/AppKit/NSToolbar.h
-%%DEVEL%%System/Headers/AppKit/NSToolbarItem.h
+System/Headers/AppKit/NSToolbar.h
+System/Headers/AppKit/NSToolbarItem.h
 System/Headers/AppKit/NSUserInterfaceValidation.h
 System/Headers/AppKit/NSView.h
 System/Headers/AppKit/NSWindow.h
 System/Headers/AppKit/NSWindowController.h
 System/Headers/AppKit/NSWorkspace.h
 System/Headers/AppKit/PSOperators.h
-%%NODEVEL%%System/Headers/AppKit/nsimage-tiff.h
 System/Headers/gnustep/AppKit/GMAppKit.h
 System/Headers/gnustep/AppKit/GMArchiver.h
 System/Headers/gnustep/AppKit/IMConnectors.h
@@ -164,26 +163,26 @@ System/Libraries/Resources/Images/common_ArrowRight.tiff
 System/Libraries/Resources/Images/common_ArrowRightH.tiff
 System/Libraries/Resources/Images/common_ArrowUp.tiff
 System/Libraries/Resources/Images/common_ArrowUpH.tiff
-%%DEVEL%%System/Libraries/Resources/Images/common_CenterTabStop.tiff
+System/Libraries/Resources/Images/common_CenterTabStop.tiff
 System/Libraries/Resources/Images/common_Close.tiff
 System/Libraries/Resources/Images/common_CloseBroken.tiff
 System/Libraries/Resources/Images/common_CloseH.tiff
 System/Libraries/Resources/Images/common_ColorSwatch.tiff
-%%DEVEL%%System/Libraries/Resources/Images/common_DecimalTabStop.tiff
+System/Libraries/Resources/Images/common_DecimalTabStop.tiff
 System/Libraries/Resources/Images/common_Diamond.tiff
 System/Libraries/Resources/Images/common_Dimple.tiff
 System/Libraries/Resources/Images/common_DownArrowSmall.tiff
 System/Libraries/Resources/Images/common_Folder.tiff
 System/Libraries/Resources/Images/common_Home.tiff
-%%DEVEL%%System/Libraries/Resources/Images/common_HomeDirectory.tiff
-%%DEVEL%%System/Libraries/Resources/Images/common_LeftTabStop.tiff
+System/Libraries/Resources/Images/common_HomeDirectory.tiff
+System/Libraries/Resources/Images/common_LeftTabStop.tiff
 System/Libraries/Resources/Images/common_Mount.tiff
 System/Libraries/Resources/Images/common_Nibble.tiff
 System/Libraries/Resources/Images/common_RadioOff.tiff
 System/Libraries/Resources/Images/common_RadioOn.tiff
 System/Libraries/Resources/Images/common_Right.tiff
 System/Libraries/Resources/Images/common_RightH.tiff
-%%DEVEL%%System/Libraries/Resources/Images/common_RightTabStop.tiff
+System/Libraries/Resources/Images/common_RightTabStop.tiff
 System/Libraries/Resources/Images/common_Root_Apple.tiff
 System/Libraries/Resources/Images/common_Root_PC.tiff
 System/Libraries/Resources/Images/common_Root_SGI.tiff
@@ -534,7 +533,7 @@ System/Libraries/Resources/PrinterTypes/English.lproj/Xerox_DocuTech_90.ppd
 System/Libraries/Resources/PrinterTypes/English.lproj/Xerox_MajestiK_5765.ppd
 System/Libraries/Resources/PrinterTypes/French.lproj/Linotronic_300.ppd
 System/Libraries/Resources/PrinterTypes/German.lproj/Linotronic_300.ppd
-%%DEVEL%%System/Libraries/Resources/PrinterTypes/GSProlog.ps
+System/Libraries/Resources/PrinterTypes/GSProlog.ps
 System/Libraries/Resources/PrinterTypes/Italian.lproj/Linotronic_300.ppd
 System/Libraries/Resources/PrinterTypes/Printers
 System/Libraries/Resources/PrinterTypes/Spanish.lproj/Linotronic_300.ppd
@@ -548,18 +547,18 @@ System/Library/Bundles/TextConverters/RTFConverter.bundle/Resources/Info-gnustep
 System/Library/Bundles/TextConverters/RTFConverter.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/RTFConverter
 System/Library/Bundles/libgmodel.bundle/Resources/Info-gnustep.plist
 System/Library/Bundles/libgmodel.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libgmodel
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/Resources/GSCMYKColorPicker.tiff
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/Resources/GSGrayColorPicker.tiff
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/Resources/GSHSBColorPicker.tiff
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/Resources/GSRGBColorPicker.tiff
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/Resources/Info-gnustep.plist
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj/StandardPicker.strings
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj/StandardPicker.strings
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj/StandardPicker.strings
-%%DEVEL%%System/Library/ColorPickers/StandardPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/StandardPicker
-%%DEVEL%%System/Library/ColorPickers/WheelPicker.bundle/Resources/GSWheelColorPicker.tiff
-%%DEVEL%%System/Library/ColorPickers/WheelPicker.bundle/Resources/Info-gnustep.plist
-%%DEVEL%%System/Library/ColorPickers/WheelPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/WheelPicker
+System/Library/ColorPickers/StandardPicker.bundle/Resources/GSCMYKColorPicker.tiff
+System/Library/ColorPickers/StandardPicker.bundle/Resources/GSGrayColorPicker.tiff
+System/Library/ColorPickers/StandardPicker.bundle/Resources/GSHSBColorPicker.tiff
+System/Library/ColorPickers/StandardPicker.bundle/Resources/GSRGBColorPicker.tiff
+System/Library/ColorPickers/StandardPicker.bundle/Resources/Info-gnustep.plist
+System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj/StandardPicker.strings
+System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj/StandardPicker.strings
+System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj/StandardPicker.strings
+System/Library/ColorPickers/StandardPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/StandardPicker
+System/Library/ColorPickers/WheelPicker.bundle/Resources/GSWheelColorPicker.tiff
+System/Library/ColorPickers/WheelPicker.bundle/Resources/Info-gnustep.plist
+System/Library/ColorPickers/WheelPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/WheelPicker
 System/Library/Model/ColorPanel.gmodel
 System/Library/Model/SavePanel.gmodel
 System/Library/Model/SpellPanel.gmodel
@@ -583,20 +582,20 @@ System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/set_show_service
 @dirrm System/Library/Services/GSspell.service
 @dirrm System/Library/Services
 @dirrm System/Library/Model
-%%DEVEL%%@dirrm System/Library/ColorPickers/StandardPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%DEVEL%%@dirrm System/Library/ColorPickers/StandardPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%DEVEL%%@dirrm System/Library/ColorPickers/StandardPicker.bundle/%%GNU_ARCH%%
-%%DEVEL%%@dirrm System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj
-%%DEVEL%%@dirrm System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj
-%%DEVEL%%@dirrm System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj
-%%DEVEL%%@dirrm System/Library/ColorPickers/StandardPicker.bundle/Resources
-%%DEVEL%%@dirrm System/Library/ColorPickers/StandardPicker.bundle
-%%DEVEL%%@dirrm System/Library/ColorPickers/WheelPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%DEVEL%%@dirrm System/Library/ColorPickers/WheelPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%DEVEL%%@dirrm System/Library/ColorPickers/WheelPicker.bundle/%%GNU_ARCH%%
-%%DEVEL%%@dirrm System/Library/ColorPickers/WheelPicker.bundle/Resources
-%%DEVEL%%@dirrm System/Library/ColorPickers/WheelPicker.bundle
-%%DEVEL%%@dirrm System/Library/ColorPickers
+@dirrm System/Library/ColorPickers/StandardPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm System/Library/ColorPickers/StandardPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm System/Library/ColorPickers/StandardPicker.bundle/%%GNU_ARCH%%
+@dirrm System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj
+@dirrm System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj
+@dirrm System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj
+@dirrm System/Library/ColorPickers/StandardPicker.bundle/Resources
+@dirrm System/Library/ColorPickers/StandardPicker.bundle
+@dirrm System/Library/ColorPickers/WheelPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
+@dirrm System/Library/ColorPickers/WheelPicker.bundle/%%GNU_ARCH%%/%%OPSYS%%
+@dirrm System/Library/ColorPickers/WheelPicker.bundle/%%GNU_ARCH%%
+@dirrm System/Library/ColorPickers/WheelPicker.bundle/Resources
+@dirrm System/Library/ColorPickers/WheelPicker.bundle
+@dirrm System/Library/ColorPickers
 @dirrm System/Library/Bundles/libgmodel.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
 @dirrm System/Library/Bundles/libgmodel.bundle/%%GNU_ARCH%%/%%OPSYS%%
 @dirrm System/Library/Bundles/libgmodel.bundle/%%GNU_ARCH%%