From 70c2e3aa21bc2e9b9cd0af69f6c02a096fb2698d Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Thu, 7 Apr 2011 02:07:19 +0000
Subject: Update gnustep-gui to 0.18.0.  Notable changes include:    * Add live
 resize in NSSplitView    * Toolbars have been completely rewritten and
 improved    * New Mac OS X 10.5 methods in NSFont    * Bug fixes and
 stability improvements

---
 x11/gnustep-gui/Makefile         |   8 ++-
 x11/gnustep-gui/PLIST            | 105 ++++++++++++++++++++++++++++++---------
 x11/gnustep-gui/distinfo         |  10 ++--
 x11/gnustep-gui/patches/patch-ab |  15 ------
 x11/gnustep-gui/patches/patch-ac |  13 -----
 5 files changed, 88 insertions(+), 63 deletions(-)
 delete mode 100644 x11/gnustep-gui/patches/patch-ab
 delete mode 100644 x11/gnustep-gui/patches/patch-ac

(limited to 'x11')

diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 6de0a230d34..f63dae83e5d 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2011/03/09 16:30:44 drochner Exp $
+# $NetBSD: Makefile,v 1.49 2011/04/07 02:07:19 rh Exp $
 
-DISTNAME=	gnustep-gui-0.16.0
-PKGREVISION=	5
+DISTNAME=	gnustep-gui-0.18.0
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
-MAINTAINER=	rh@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	GNUstep AppKit Implementation
 LICENSE=	gnu-gpl-v3
@@ -16,7 +15,6 @@ USE_LANGUAGES=		objc
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
 MAKE_FILE=		GNUmakefile
-MAKE_JOBS_SAFE=		no
 
 INSTALLATION_DIRS+=	share/GNUstep/Applications
 
diff --git a/x11/gnustep-gui/PLIST b/x11/gnustep-gui/PLIST
index 04089441756..8822e280f25 100644
--- a/x11/gnustep-gui/PLIST
+++ b/x11/gnustep-gui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2009/06/14 22:06:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.22 2011/04/07 02:07:19 rh Exp $
 bin/gclose
 bin/gcloseall
 bin/gopen
@@ -34,16 +34,18 @@ include/AppKit/GSPasteboardServer.h
 include/AppKit/GSPrintOperation.h
 include/AppKit/GSPrinting.h
 include/AppKit/GSServicesManager.h
+include/AppKit/GSSoundSink.h
+include/AppKit/GSSoundSource.h
 include/AppKit/GSTable.h
 include/AppKit/GSTextConverter.h
 include/AppKit/GSTheme.h
 include/AppKit/GSTitleView.h
-include/AppKit/GSToolbar.h
 include/AppKit/GSToolbarView.h
 include/AppKit/GSTrackingRect.h
 include/AppKit/GSTypesetter.h
 include/AppKit/GSVbox.h
 include/AppKit/GSVersion.h
+include/AppKit/GSWindowDecorationView.h
 include/AppKit/IMConnectors.h
 include/AppKit/IMCustomObject.h
 include/AppKit/IMLoading.h
@@ -94,6 +96,7 @@ include/AppKit/NSFontPanel.h
 include/AppKit/NSForm.h
 include/AppKit/NSFormCell.h
 include/AppKit/NSGlyphGenerator.h
+include/AppKit/NSGradient.h
 include/AppKit/NSGraphics.h
 include/AppKit/NSGraphicsContext.h
 include/AppKit/NSHelpManager.h
@@ -149,9 +152,11 @@ include/AppKit/NSSecureTextField.h
 include/AppKit/NSSegmentedCell.h
 include/AppKit/NSSegmentedControl.h
 include/AppKit/NSSelection.h
+include/AppKit/NSShadow.h
 include/AppKit/NSSlider.h
 include/AppKit/NSSliderCell.h
 include/AppKit/NSSound.h
+include/AppKit/NSSpeechSynthesizer.h
 include/AppKit/NSSpellChecker.h
 include/AppKit/NSSpellProtocol.h
 include/AppKit/NSSpellServer.h
@@ -178,10 +183,10 @@ include/AppKit/NSTokenField.h
 include/AppKit/NSTokenFieldCell.h
 include/AppKit/NSToolbar.h
 include/AppKit/NSToolbarItem.h
+include/AppKit/NSToolbarItemGroup.h
 include/AppKit/NSUserDefaultsController.h
 include/AppKit/NSUserInterfaceValidation.h
 include/AppKit/NSView.h
-include/AppKit/NSWindow+Toolbar.h
 include/AppKit/NSWindow.h
 include/AppKit/NSWindowController.h
 include/AppKit/NSWorkspace.h
@@ -213,16 +218,18 @@ include/GNUstepGUI/GSPasteboardServer.h
 include/GNUstepGUI/GSPrintOperation.h
 include/GNUstepGUI/GSPrinting.h
 include/GNUstepGUI/GSServicesManager.h
+include/GNUstepGUI/GSSoundSink.h
+include/GNUstepGUI/GSSoundSource.h
 include/GNUstepGUI/GSTable.h
 include/GNUstepGUI/GSTextConverter.h
 include/GNUstepGUI/GSTheme.h
 include/GNUstepGUI/GSTitleView.h
-include/GNUstepGUI/GSToolbar.h
 include/GNUstepGUI/GSToolbarView.h
 include/GNUstepGUI/GSTrackingRect.h
 include/GNUstepGUI/GSTypesetter.h
 include/GNUstepGUI/GSVbox.h
 include/GNUstepGUI/GSVersion.h
+include/GNUstepGUI/GSWindowDecorationView.h
 include/GNUstepGUI/IMConnectors.h
 include/GNUstepGUI/IMCustomObject.h
 include/GNUstepGUI/IMLoading.h
@@ -252,16 +259,18 @@ include/gnustep/gui/GSPasteboardServer.h
 include/gnustep/gui/GSPrintOperation.h
 include/gnustep/gui/GSPrinting.h
 include/gnustep/gui/GSServicesManager.h
+include/gnustep/gui/GSSoundSink.h
+include/gnustep/gui/GSSoundSource.h
 include/gnustep/gui/GSTable.h
 include/gnustep/gui/GSTextConverter.h
 include/gnustep/gui/GSTheme.h
 include/gnustep/gui/GSTitleView.h
-include/gnustep/gui/GSToolbar.h
 include/gnustep/gui/GSToolbarView.h
 include/gnustep/gui/GSTrackingRect.h
 include/gnustep/gui/GSTypesetter.h
 include/gnustep/gui/GSVbox.h
 include/gnustep/gui/GSVersion.h
+include/gnustep/gui/GSWindowDecorationView.h
 include/gnustep/gui/IMConnectors.h
 include/gnustep/gui/IMCustomObject.h
 include/gnustep/gui/IMLoading.h
@@ -285,6 +294,7 @@ lib/GNUstep/ColorPickers/StandardPicker.bundle/Resources/GSGrayColorPicker.tiff
 lib/GNUstep/ColorPickers/StandardPicker.bundle/Resources/GSHSBColorPicker.tiff
 lib/GNUstep/ColorPickers/StandardPicker.bundle/Resources/GSRGBColorPicker.tiff
 lib/GNUstep/ColorPickers/StandardPicker.bundle/Resources/Info-gnustep.plist
+lib/GNUstep/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj/StandardPicker.strings
 lib/GNUstep/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj/StandardPicker.strings
 lib/GNUstep/ColorPickers/StandardPicker.bundle/StandardPicker
 lib/GNUstep/ColorPickers/StandardPicker.bundle/stamp.make
@@ -326,6 +336,7 @@ lib/GNUstep/Images/common_ComboBoxEllipsis.tiff
 lib/GNUstep/Images/common_DecimalTabStop.tiff
 lib/GNUstep/Images/common_Diamond.tiff
 lib/GNUstep/Images/common_Dimple.tiff
+lib/GNUstep/Images/common_DimpleHoriz.tiff
 lib/GNUstep/Images/common_DownArrowSmall.tiff
 lib/GNUstep/Images/common_Folder.tiff
 lib/GNUstep/Images/common_HelpCursor.tiff
@@ -339,6 +350,20 @@ lib/GNUstep/Images/common_Mount.tiff
 lib/GNUstep/Images/common_Nibble.tiff
 lib/GNUstep/Images/common_OpenHandCursor.tiff
 lib/GNUstep/Images/common_Printer.tiff
+lib/GNUstep/Images/common_ProgressIndeterminate_1.tiff
+lib/GNUstep/Images/common_ProgressIndeterminate_2.tiff
+lib/GNUstep/Images/common_ProgressIndeterminate_3.tiff
+lib/GNUstep/Images/common_ProgressIndeterminate_4.tiff
+lib/GNUstep/Images/common_ProgressIndeterminate_5.tiff
+lib/GNUstep/Images/common_ProgressIndeterminate_6.tiff
+lib/GNUstep/Images/common_ProgressSpinning_1.tiff
+lib/GNUstep/Images/common_ProgressSpinning_2.tiff
+lib/GNUstep/Images/common_ProgressSpinning_3.tiff
+lib/GNUstep/Images/common_ProgressSpinning_4.tiff
+lib/GNUstep/Images/common_ProgressSpinning_5.tiff
+lib/GNUstep/Images/common_ProgressSpinning_6.tiff
+lib/GNUstep/Images/common_ProgressSpinning_7.tiff
+lib/GNUstep/Images/common_ProgressSpinning_8.tiff
 lib/GNUstep/Images/common_RadioOff.tiff
 lib/GNUstep/Images/common_RadioOn.tiff
 lib/GNUstep/Images/common_Right.tiff
@@ -391,28 +416,60 @@ lib/GNUstep/Images/nsmapping.strings
 lib/GNUstep/Images/page_landscape.tiff
 lib/GNUstep/Images/page_portrait.tiff
 lib/GNUstep/KeyBindings/DefaultKeyBindings.dict
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSPageLayout.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSPageLayout.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSPrintPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSPrintPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSPrintPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSSpellPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/GSSpellPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/English.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/Esperanto.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/German.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/Info-gnustep.plist
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.16/Resources/Lojban.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPageLayout.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPageLayout.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPrintPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPrintPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSPrintPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSSpellPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSSpellPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/English.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Esperanto.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/French.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/German.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Info-gnustep.plist
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Lojban.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/0.18/Resources/Spanish.lproj/Localizable.strings
 lib/GNUstep/PostScript/GSProlog.ps
 lib/GNUstep/PostScript/PPD/English.lproj/Generic-PostScript_Printer-Postscript.ppd
 lib/GNUstep/Services/GSspell.service/GSspell
 lib/GNUstep/Services/GSspell.service/Resources/Info-gnustep.plist
-lib/libgnustep-gui.so.${PKGVERSION}
+lib/GNUstep/Sounds/Basso.wav
+lib/GNUstep/Sounds/Blow.wav
+lib/GNUstep/Sounds/Bottle.wav
+lib/GNUstep/Sounds/Frog.wav
+lib/GNUstep/Sounds/Glass.wav
+lib/GNUstep/Sounds/Hero.wav
+lib/GNUstep/Sounds/Ping.wav
+lib/GNUstep/Sounds/Pop.wav
+lib/GNUstep/Sounds/Sosumi.wav
+lib/GNUstep/Sounds/Submarine.wav
+lib/GNUstep/Sounds/Tink.wav
 lib/libgnustep-gui.so
+lib/libgnustep-gui.so.${PKGVERSION}
 share/GNUstep/Makefiles/Additional/gui.make
-@pkgdir lib/GNUstep/Applications
+@pkgdir share/GNUstep/Applications
+@pkgdir lib/GNUstep/Themes
diff --git a/x11/gnustep-gui/distinfo b/x11/gnustep-gui/distinfo
index 777de22e23c..51ab0098d6c 100644
--- a/x11/gnustep-gui/distinfo
+++ b/x11/gnustep-gui/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.21 2011/01/29 12:40:14 wiz Exp $
+$NetBSD: distinfo,v 1.22 2011/04/07 02:07:19 rh Exp $
 
-SHA1 (gnustep-gui-0.16.0.tar.gz) = cc0a14f700a3736b8e4113d3ad80ed6f979d60be
-RMD160 (gnustep-gui-0.16.0.tar.gz) = 3083746b7bba1652d7522d5eb7e7a430b309a6f2
-Size (gnustep-gui-0.16.0.tar.gz) = 1867264 bytes
+SHA1 (gnustep-gui-0.18.0.tar.gz) = f78e2b03c05bb6b5f40d6b1ec129835f758f1947
+RMD160 (gnustep-gui-0.18.0.tar.gz) = 38f938d1ed2d98e351eb5c6d325bd4782ef2c3fb
+Size (gnustep-gui-0.18.0.tar.gz) = 2520596 bytes
 SHA1 (patch-aa) = 6882f212b477971283b70464cc7f52502aad8d83
-SHA1 (patch-ab) = 731885b48f571237414072a72a9fcc878340cf9a
-SHA1 (patch-ac) = ad486b1e2a751475c2f8bb118f8452c38273053a
diff --git a/x11/gnustep-gui/patches/patch-ab b/x11/gnustep-gui/patches/patch-ab
deleted file mode 100644
index 74b194798f6..00000000000
--- a/x11/gnustep-gui/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/11/25 12:52:14 adam Exp $
-
---- Tools/gsnd/gsnd.m.orig	2007-10-29 22:16:17.000000000 +0100
-+++ Tools/gsnd/gsnd.m
-@@ -40,6 +40,10 @@
- #include <syslog.h>
- #endif
- 
-+#ifdef _X
-+#undef _X
-+#endif
-+
- #define	GSNDNAME @"GNUstepGSSoundServer"
- #define FRAME_SIZE 4
- #define BUFFER_SIZE_IN_FRAMES (1024 * FRAME_SIZE)  
diff --git a/x11/gnustep-gui/patches/patch-ac b/x11/gnustep-gui/patches/patch-ac
deleted file mode 100644
index 510e12fe796..00000000000
--- a/x11/gnustep-gui/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/07/29 12:59:25 adam Exp $
-
---- Tools/gsnd/GNUmakefile.preamble.orig	2005-07-01 20:54:03.000000000 +0000
-+++ Tools/gsnd/GNUmakefile.preamble
-@@ -26,7 +26,7 @@
- #ADDITIONAL_INCLUDE_DIRS +=
- 
- # Additional LDFLAGS to pass to the linker
--#ADDITIONAL_LDFLAGS += 
-+ADDITIONAL_LDFLAGS += -lossaudio
- 
- # Additional library directories the linker should search
- # ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR)
-- 
cgit v1.2.3