(x11/gnustep-gui) Updated 0.22 to 0.28

(pkgsrc)
  - githubify
  - DISTNAME changed  (gnustep-gui to libs-gui)
  - LICENSE changed   (gnu-gpl-v3  to gnu-lgpl-v2.1 OR gnu-gpl-v3),
    both COPYING and COPYING.LIB now included
  - some discussion either renaming to libs-gui or staying on gnustep-gui
    http://mail-index.netbsd.org/pkgsrc-users/2020/09/28/msg032335.html

(upstream)
1.1 Noteworthy changes in version '0.28.0'
==========================================

This version adds support for modern XIB files and many new classes.
Plus the usual bunch of bug fixes.

   * Support loading of document XIB files.
   * Improve Key Value Binding for NSArrayController and add more
     bindings.
   * Better support for multi monitor usage and other improvement in the
     backend integration.
   * Add classes NSFontCollection, NSColorSampler, NSSpeechRecognizer,
     NSAppearance, NSPDFInfo, NSPICTImageRep, NSCIImageRep,
     NSPDFImageRep, NSPDFPanel, NSDataAsset, NSDatePicker,
     NSDatePickerCell, NSPredicateEditor, NSPredicateEditorRowTemplate,
     NSRuleEditor, NSGestureRecognizer, NSButtonTouchBarItem,
     NSCandidateListTouchBarItem, NSClickGestureRecognizer,
     NSColorPickerTouchBarItem, NSCustomTouchBarItem,
     NSGroupTouchBarItem, NSMagnificationGestureRecognizer,
     NSPanGestureRecognizer, NSPickerTouchBarItem,
     NSPopoverTouchBarItem, NSPressGestureRecognizer,
     NSRotationGestureRecognizer, NSSharingServicePickerTouchBarItem,
     NSSliderTouchBarItem, NSStepperTouchBarItem, NSTouchBarItem,
     NSTouchBar, NSTouch, NSDockTile.
   * Implement NSEPSImageRep.
   * Better encoding handling in RTF files.
   * Theming and drawing improvements.
   * Increase small font size to 10.
   * New cursor and stepper images.
   * Move NSFileWrapper to Foundation.
   * Fixed build on Debian GNU/kFreeBSD.
   * With command line argument -autolaunch YES, do not activate the
     application when -activateIgnoringOtherApps: is invoked.
   * Improvements to WindowMaker compatibility (e.g.  WMFHideApplication
     support).
   * Lowered NSFloatingWindowLevel by one to distinguish floating panels
     from menus.

1.2 Noteworthy changes in version '0.27.0'
==========================================

This version includes numerous bugfixes, compatibility improvements and
other changes accumulated over the last year.  It also enables work to
be done on integrating NSViews with a Core Animation renderer.

   * Make targetForAction safer.
   * Speed up menu updates.
   * Clean up speech tool compilation and switch to newer interface.
   * Fix bug in CUPS subclassing introduced in last release.
   * Minor improvements to typesetting.
   * Add NSIsControllerMarker.
   * Fix tracking on segmented cell.
   * Bring slider cell closer to Cocoa implementation.
   * Add ivar for Core Animation in NSView.
   * Improve border calculation on printing.
   * Lazy load app icon.
   * Better detection of removable volumes.
   * Polish translations.
   * Japanese translations.
   * Lots of bug fixes.

1.3 Noteworthy changes in version '0.26.2'
==========================================

This version is a small, but important bugfix release.

   * printing: Fix allocation of the CUPS printing classes.
   * installation: Fix the configure script.

1.4 Noteworthy changes in version '0.26.1'
==========================================

This version is released to conincide with version 1.25.1 of
gnustep-base, which contains changes required for this version of
gnustep-gui and gnustep-back.

   It includes an important workaround for users of GNUstep Objective-C
Runtime (libobjc2) and non-fragile ABI to avoid a bug in interaction
between the clang compiler and the runtime when non-fragile ABI is in
use.  Specifically, Clang and the runtime may disagree on what is the
offset of an ivar in a class's RAM. This manifested in a crash at
application startup due to misalignment of _gcontext inside NSThread.
See the mailing list discussion
(http://lists.gnu.org/archive/html/discuss-gnustep/2017-12/msg00129.html)
for more information.

   It also contains the following changes:

   * tests: Cleanup of warnings.
   * tests: Fix text system deallocation test.
   * printing: Undefine __BLOCKS__ before including cups.h, as some
     versions of the header expect that libdispatch is present and used
     if __BLOCKS__ is defined.
   * graphics context: Workaround for Clang+libobjc2+nonfragile ABI
     issue.

1.5 Noteworthy changes in version '0.26.0'
==========================================

This version was bumped due to previous binary incompatibilities between
0.25.0 and 0.25.1.  This version also includes numerous compatibility
improvements from the Summer of Code project, and a wide variety of
other fixes.  Notably, it fixes the use of cupsGetPPD() in the printing
system.

   * printing: Add an include to get deprecated function cupsGetPPD() on
     newer CUPS systems.
   * chore: Bump required base version.
   * tiff: Support for writing resolution.
   * jpeg: Save resolution information if it is different from 72 dpi.
   * save panel: Fix return type of sorting function.
   * events: Add some newer Cocoa enums and one method with dummy
     implementation.
   * speech synthesis: NSSpeechSynthesizerDelegate is now a @protocol on
     runtimes that support it.
   * pasteboard: New type identifiers.
   * translations: Some work on Polish, Russian and German translations
   * cell: Improvements to mouse tracking logic on NSCell.
   * image: If an unknown named image is unarchived with a coder or
     keyed coder, keep the name.
   * screen: Add -backingScaleFactor and return 1.0.
   * window: Return 1.0 from -backingScaleFactor.

   * compatibility: Numerous stub implementations of constants, classes
     and methods to improve source-level compatibility.
   * other bugfixes

1.6 Noteworthy changes in version '0.25.1'
==========================================

   * JPEG (saving) alpha channel fixes and size with resolution != 72
   * JPEG resolution read support
   * TIFF saving fixes
   * Improved volumes mounting and support
   * Portability improvements in volume mounting and support
   * Corrected layout of empty strings
   * Only update visible menus

1.7 Noteworthy changes in version '0.25.0'
==========================================

   * Fixes for new GIF library versions
   * Theming of named images for specific applications by the use of the
     CFBundleIdentifier in the theme
   * New icons and corresponding constants for special folders, recycler
     and others
   * Improvements in NSWorkspace icon lookup
   * Improvements in removable media commands, imported and cleaned from
     GWorkspace
   * Numerous bug fixes and improvements in Cocoa compatibility
   * Numerous theme tweaks
   * Spanish locale

1.8 Noteworthy changes in version '0.24.1'
==========================================

From a look through ChangeLog, we can see a lot of bugfixes for this
release, with the main focus on avoiding display glitches and improving
OSX compatibility.

1.9 Noteworthy changes in version '0.24.0'
==========================================

New features include:
   * Require newer base release as we moved the
     -replaceObject:withObject: of NSKeyedUnarchiver there.
   * Support for newer releases of the gif library.
   * NSTabView is now flipped.
   * Theme improvements and changes to image mapping.

   Many bugfixes.

1.10 Noteworthy changes in version '0.23.1'
===========================================

This is a bugfix release, primarily to deal with coding/archiving
issues.

8 files changed, 170 insertions, 220 deletions

diff --git a/x11/gnustep-gui/DESCR b/x11/gnustep-gui/DESCR
index 65acd0bc658..2aa0faf8867 100644
--- a/x11/gnustep-gui/DESCR
+++ b/x11/gnustep-gui/DESCR
@@ -1 +1,7 @@
-  This package contains the GUI and AppKit classes for GNUstep.
+The GNUstep gui library is a library of graphical user interface classes
+written completely in the Objective-C language; the classes are based
+upon Apple's Cocoa framwork (which came from the OpenStep
+specification).  These classes include graphical objects such as
+buttons, text fields, popup lists, browser lists, and windows; there are
+also many associated classes for handling events, colors, fonts,
+pasteboards and images.
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index deb93c07fdb..a4e2b59c591 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,43 +1,29 @@
-# $NetBSD: Makefile,v 1.78 2020/09/21 03:43:22 mef Exp $
+# $NetBSD: Makefile,v 1.79 2020/10/02 23:47:28 mef Exp $
 
-DISTNAME=	gnustep-gui-0.22.0
-PKGREVISION=	23
-CATEGORIES=	x11 gnustep
-MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
+GITHUB_PROJECT=	libs-gui
+GITHUB_TAG=	gui-0_28_0
+DISTNAME=	gui-0_28_0
+PKGNAME=	gnustep-${DISTNAME:S/_/./g}
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_GITHUB:=gnustep/}
+DIST_SUBDIR=	gnustep-gui
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnustep.org/
+HOMEPAGE=	https://github.com/gnustep/libs-gui/
 COMMENT=	GNUstep AppKit Implementation
-LICENSE=	gnu-gpl-v3
+LICENSE=	gnu-lgpl-v2.1 OR gnu-gpl-v3
 
+WRKSRC=			${WRKDIR}/libs-gui-${DISTNAME}
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		objc
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
 MAKE_FILE=		GNUmakefile
 
-# problem:
-# | In file included from ../Headers/AppKit/AppKit.h:117:
-# | ../Headers/AppKit/NSWorkspace.h:169:14: error: redefinition of 'NSAppleEventDescriptor' as different kind of symbol
-# | typedef void NSAppleEventDescriptor;
-# |              ^
-# | /tmp/x11/gnustep-gui/work/.buildlink/include/Foundation/NSAppleEventDescriptor.h:36:12: note: previous definition is here
-# | @interface NSAppleEventDescriptor : NSObjec
-
-# hint: https://www.mail-archive.com/gnustep-cvs@gna.org/msg17908.html
-SUBST_CLASSES+=	gs
-SUBST_FILES.gs=	Source/NSAnimation.m
-SUBST_STAGE.gs=	pre-configure
-SUBST_SED.gs=	-e 's/GS_GC_UNHIDE//'
-SUBST_SED.gs+=	-e 's/GS_GC_HIDE//'
-
-INSTALLATION_DIRS+=	share/GNUstep/Applications
+PLIST_SUBST=	API_VERSION=${PKGVERSION:C/\.[0-9]$//}
 
 .include "../../devel/gnustep-base/buildlink3.mk"
-.include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnustep-gui/PLIST b/x11/gnustep-gui/PLIST
index 3b0c352ab3e..dcdf8ad7839 100644
--- a/x11/gnustep-gui/PLIST
+++ b/x11/gnustep-gui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2012/10/22 02:21:21 rh Exp $
+@comment $NetBSD: PLIST,v 1.24 2020/10/02 23:47:28 mef Exp $
 bin/gclose
 bin/gcloseall
 bin/gopen
@@ -20,6 +20,7 @@ include/AppKit/GSHbox.h
 include/AppKit/GSHelpAttachment.h
 include/AppKit/GSHelpManagerPanel.h
 include/AppKit/GSHorizontalTypesetter.h
+include/AppKit/GSImageMagickImageRep.h
 include/AppKit/GSInfoPanel.h
 include/AppKit/GSInstantiator.h
 include/AppKit/GSLayoutManager.h
@@ -46,14 +47,21 @@ include/AppKit/GSTypesetter.h
 include/AppKit/GSVbox.h
 include/AppKit/GSVersion.h
 include/AppKit/GSWindowDecorationView.h
+include/AppKit/GSXibElement.h
+include/AppKit/GSXibKeyedUnarchiver.h
 include/AppKit/GSXibLoading.h
+include/AppKit/GSXibObjectContainer.h
 include/AppKit/IMConnectors.h
 include/AppKit/IMCustomObject.h
 include/AppKit/IMLoading.h
+include/AppKit/NSAccessibility.h
+include/AppKit/NSAccessibilityConstants.h
 include/AppKit/NSActionCell.h
 include/AppKit/NSAffineTransform.h
 include/AppKit/NSAlert.h
 include/AppKit/NSAnimation.h
+include/AppKit/NSAnimationContext.h
+include/AppKit/NSAppearance.h
 include/AppKit/NSApplication.h
 include/AppKit/NSArrayController.h
 include/AppKit/NSAttributedString.h
@@ -64,14 +72,22 @@ include/AppKit/NSBrowser.h
 include/AppKit/NSBrowserCell.h
 include/AppKit/NSButton.h
 include/AppKit/NSButtonCell.h
+include/AppKit/NSButtonTouchBarItem.h
+include/AppKit/NSCIImageRep.h
 include/AppKit/NSCachedImageRep.h
+include/AppKit/NSCandidateListTouchBarItem.h
 include/AppKit/NSCell.h
+include/AppKit/NSClickGestureRecognizer.h
 include/AppKit/NSClipView.h
+include/AppKit/NSCollectionView.h
+include/AppKit/NSCollectionViewItem.h
 include/AppKit/NSColor.h
 include/AppKit/NSColorList.h
 include/AppKit/NSColorPanel.h
 include/AppKit/NSColorPicker.h
+include/AppKit/NSColorPickerTouchBarItem.h
 include/AppKit/NSColorPicking.h
+include/AppKit/NSColorSampler.h
 include/AppKit/NSColorSpace.h
 include/AppKit/NSColorWell.h
 include/AppKit/NSComboBox.h
@@ -80,26 +96,36 @@ include/AppKit/NSControl.h
 include/AppKit/NSController.h
 include/AppKit/NSCursor.h
 include/AppKit/NSCustomImageRep.h
+include/AppKit/NSCustomTouchBarItem.h
+include/AppKit/NSDataAsset.h
 include/AppKit/NSDataLink.h
 include/AppKit/NSDataLinkManager.h
 include/AppKit/NSDataLinkPanel.h
+include/AppKit/NSDatePicker.h
+include/AppKit/NSDatePickerCell.h
+include/AppKit/NSDockTile.h
 include/AppKit/NSDocument.h
 include/AppKit/NSDocumentController.h
 include/AppKit/NSDragging.h
 include/AppKit/NSDrawer.h
 include/AppKit/NSEPSImageRep.h
+include/AppKit/NSErrors.h
 include/AppKit/NSEvent.h
 include/AppKit/NSFileWrapper.h
+include/AppKit/NSFileWrapperExtensions.h
 include/AppKit/NSFont.h
+include/AppKit/NSFontCollection.h
 include/AppKit/NSFontDescriptor.h
 include/AppKit/NSFontManager.h
 include/AppKit/NSFontPanel.h
 include/AppKit/NSForm.h
 include/AppKit/NSFormCell.h
+include/AppKit/NSGestureRecognizer.h
 include/AppKit/NSGlyphGenerator.h
 include/AppKit/NSGradient.h
 include/AppKit/NSGraphics.h
 include/AppKit/NSGraphicsContext.h
+include/AppKit/NSGroupTouchBarItem.h
 include/AppKit/NSHelpManager.h
 include/AppKit/NSHelpPanel.h
 include/AppKit/NSImage.h
@@ -113,6 +139,7 @@ include/AppKit/NSKeyValueBinding.h
 include/AppKit/NSLayoutManager.h
 include/AppKit/NSLevelIndicator.h
 include/AppKit/NSLevelIndicatorCell.h
+include/AppKit/NSMagnificationGestureRecognizer.h
 include/AppKit/NSMatrix.h
 include/AppKit/NSMenu.h
 include/AppKit/NSMenuItem.h
@@ -122,27 +149,44 @@ include/AppKit/NSMovie.h
 include/AppKit/NSMovieView.h
 include/AppKit/NSNib.h
 include/AppKit/NSNibConnector.h
+include/AppKit/NSNibControlConnector.h
 include/AppKit/NSNibDeclarations.h
 include/AppKit/NSNibLoading.h
+include/AppKit/NSNibOutletConnector.h
 include/AppKit/NSObjectController.h
 include/AppKit/NSOpenGL.h
 include/AppKit/NSOpenGLView.h
 include/AppKit/NSOpenPanel.h
 include/AppKit/NSOutlineView.h
+include/AppKit/NSPDFImageRep.h
+include/AppKit/NSPDFInfo.h
+include/AppKit/NSPDFPanel.h
+include/AppKit/NSPICTImageRep.h
 include/AppKit/NSPageLayout.h
+include/AppKit/NSPanGestureRecognizer.h
 include/AppKit/NSPanel.h
 include/AppKit/NSParagraphStyle.h
 include/AppKit/NSPasteboard.h
+include/AppKit/NSPasteboardItem.h
+include/AppKit/NSPickerTouchBarItem.h
 include/AppKit/NSPopUpButton.h
 include/AppKit/NSPopUpButtonCell.h
+include/AppKit/NSPopover.h
+include/AppKit/NSPopoverTouchBarItem.h
+include/AppKit/NSPredicateEditor.h
+include/AppKit/NSPredicateEditorRowTemplate.h
+include/AppKit/NSPressGestureRecognizer.h
 include/AppKit/NSPrintInfo.h
 include/AppKit/NSPrintOperation.h
 include/AppKit/NSPrintPanel.h
 include/AppKit/NSPrinter.h
 include/AppKit/NSProgressIndicator.h
 include/AppKit/NSResponder.h
+include/AppKit/NSRotationGestureRecognizer.h
+include/AppKit/NSRuleEditor.h
 include/AppKit/NSRulerMarker.h
 include/AppKit/NSRulerView.h
+include/AppKit/NSRunningApplication.h
 include/AppKit/NSSavePanel.h
 include/AppKit/NSScreen.h
 include/AppKit/NSScrollView.h
@@ -154,16 +198,23 @@ include/AppKit/NSSegmentedCell.h
 include/AppKit/NSSegmentedControl.h
 include/AppKit/NSSelection.h
 include/AppKit/NSShadow.h
+include/AppKit/NSSharingService.h
+include/AppKit/NSSharingServicePickerTouchBarItem.h
 include/AppKit/NSSlider.h
 include/AppKit/NSSliderCell.h
+include/AppKit/NSSliderTouchBarItem.h
 include/AppKit/NSSound.h
+include/AppKit/NSSpeechRecognizer.h
 include/AppKit/NSSpeechSynthesizer.h
 include/AppKit/NSSpellChecker.h
 include/AppKit/NSSpellProtocol.h
 include/AppKit/NSSpellServer.h
 include/AppKit/NSSplitView.h
+include/AppKit/NSStatusBar.h
+include/AppKit/NSStatusItem.h
 include/AppKit/NSStepper.h
 include/AppKit/NSStepperCell.h
+include/AppKit/NSStepperTouchBarItem.h
 include/AppKit/NSStringDrawing.h
 include/AppKit/NSTabView.h
 include/AppKit/NSTabViewItem.h
@@ -172,6 +223,7 @@ include/AppKit/NSTableHeaderCell.h
 include/AppKit/NSTableHeaderView.h
 include/AppKit/NSTableView.h
 include/AppKit/NSText.h
+include/AppKit/NSTextAlternatives.h
 include/AppKit/NSTextAttachment.h
 include/AppKit/NSTextContainer.h
 include/AppKit/NSTextField.h
@@ -185,10 +237,19 @@ include/AppKit/NSTokenFieldCell.h
 include/AppKit/NSToolbar.h
 include/AppKit/NSToolbarItem.h
 include/AppKit/NSToolbarItemGroup.h
+include/AppKit/NSTouch.h
+include/AppKit/NSTouchBar.h
+include/AppKit/NSTouchBarItem.h
+include/AppKit/NSTrackingArea.h
+include/AppKit/NSTreeController.h
+include/AppKit/NSTreeNode.h
 include/AppKit/NSUserDefaultsController.h
+include/AppKit/NSUserInterfaceItemIdentification.h
+include/AppKit/NSUserInterfaceLayout.h
 include/AppKit/NSUserInterfaceValidation.h
 include/AppKit/NSView.h
 include/AppKit/NSViewController.h
+include/AppKit/NSVisualEffectView.h
 include/AppKit/NSWindow.h
 include/AppKit/NSWindowController.h
 include/AppKit/NSWorkspace.h
@@ -206,6 +267,7 @@ include/GNUstepGUI/GSHbox.h
 include/GNUstepGUI/GSHelpAttachment.h
 include/GNUstepGUI/GSHelpManagerPanel.h
 include/GNUstepGUI/GSHorizontalTypesetter.h
+include/GNUstepGUI/GSImageMagickImageRep.h
 include/GNUstepGUI/GSInfoPanel.h
 include/GNUstepGUI/GSInstantiator.h
 include/GNUstepGUI/GSLayoutManager.h
@@ -232,7 +294,10 @@ include/GNUstepGUI/GSTypesetter.h
 include/GNUstepGUI/GSVbox.h
 include/GNUstepGUI/GSVersion.h
 include/GNUstepGUI/GSWindowDecorationView.h
+include/GNUstepGUI/GSXibElement.h
+include/GNUstepGUI/GSXibKeyedUnarchiver.h
 include/GNUstepGUI/GSXibLoading.h
+include/GNUstepGUI/GSXibObjectContainer.h
 include/GNUstepGUI/IMConnectors.h
 include/GNUstepGUI/IMCustomObject.h
 include/GNUstepGUI/IMLoading.h
@@ -248,6 +313,7 @@ include/gnustep/gui/GSHbox.h
 include/gnustep/gui/GSHelpAttachment.h
 include/gnustep/gui/GSHelpManagerPanel.h
 include/gnustep/gui/GSHorizontalTypesetter.h
+include/gnustep/gui/GSImageMagickImageRep.h
 include/gnustep/gui/GSInfoPanel.h
 include/gnustep/gui/GSInstantiator.h
 include/gnustep/gui/GSLayoutManager.h
@@ -274,7 +340,10 @@ include/gnustep/gui/GSTypesetter.h
 include/gnustep/gui/GSVbox.h
 include/gnustep/gui/GSVersion.h
 include/gnustep/gui/GSWindowDecorationView.h
+include/gnustep/gui/GSXibElement.h
+include/gnustep/gui/GSXibKeyedUnarchiver.h
 include/gnustep/gui/GSXibLoading.h
+include/gnustep/gui/GSXibObjectContainer.h
 include/gnustep/gui/IMConnectors.h
 include/gnustep/gui/IMCustomObject.h
 include/gnustep/gui/IMLoading.h
@@ -308,12 +377,27 @@ lib/GNUstep/ColorPickers/WheelPicker.bundle/WheelPicker
 lib/GNUstep/ColorPickers/WheelPicker.bundle/stamp.make
 lib/GNUstep/Images/GNUstep.tiff
 lib/GNUstep/Images/GNUstepMenuImage.tiff
+lib/GNUstep/Images/GSContextualMenuCursor.tiff
+lib/GNUstep/Images/GSDisappearingItemCursor.tiff
+lib/GNUstep/Images/GSDragCopyCursor.tiff
+lib/GNUstep/Images/GSDragLinkCursor.tiff
+lib/GNUstep/Images/GSGreenArrowCursor.tiff
+lib/GNUstep/Images/GSOperationNotAllowedCursor.tiff
 lib/GNUstep/Images/GSSearch.tiff
 lib/GNUstep/Images/GSStop.tiff
 lib/GNUstep/Images/LogoGNUstep.tiff
 lib/GNUstep/Images/MagnifyGlass.tiff
+lib/GNUstep/Images/NSAddTemplate.tiff
+lib/GNUstep/Images/NSAdvanced.tiff
+lib/GNUstep/Images/NSCaution.tiff
+lib/GNUstep/Images/NSColorPanel.tiff
 lib/GNUstep/Images/NSComboArrow.tiff
+lib/GNUstep/Images/NSFontPanel.tiff
+lib/GNUstep/Images/NSInfo.tiff
+lib/GNUstep/Images/NSPreferencesGeneral.tiff
 lib/GNUstep/Images/NSRatingLevelIndicator.tiff
+lib/GNUstep/Images/NSRemoveTemplate.tiff
+lib/GNUstep/Images/NSUserAccounts.tiff
 lib/GNUstep/Images/common_2DCheckMark.tiff
 lib/GNUstep/Images/common_2DDash.tiff
 lib/GNUstep/Images/common_3DArrowDown.tiff
@@ -321,6 +405,7 @@ lib/GNUstep/Images/common_3DArrowLeft.tiff
 lib/GNUstep/Images/common_3DArrowRight.tiff
 lib/GNUstep/Images/common_3DArrowRightH.tiff
 lib/GNUstep/Images/common_3DArrowUp.tiff
+lib/GNUstep/Images/common_ApplicationFolder.tiff
 lib/GNUstep/Images/common_ArrowDown.tiff
 lib/GNUstep/Images/common_ArrowDownH.tiff
 lib/GNUstep/Images/common_ArrowLeft.tiff
@@ -352,12 +437,14 @@ lib/GNUstep/Images/common_HelpLink.tiff
 lib/GNUstep/Images/common_Home.tiff
 lib/GNUstep/Images/common_HomeDirectory.tiff
 lib/GNUstep/Images/common_ImageFolder.tiff
+lib/GNUstep/Images/common_Info.tiff
 lib/GNUstep/Images/common_LeftTabStop.tiff
 lib/GNUstep/Images/common_LibraryFolder.tiff
 lib/GNUstep/Images/common_MiniWindowTile.tiff
 lib/GNUstep/Images/common_Miniaturize.tiff
 lib/GNUstep/Images/common_MiniaturizeH.tiff
 lib/GNUstep/Images/common_Mount.tiff
+lib/GNUstep/Images/common_MultipleSelection.tiff
 lib/GNUstep/Images/common_MusicFolder.tiff
 lib/GNUstep/Images/common_Nibble.tiff
 lib/GNUstep/Images/common_OpenHandCursor.tiff
@@ -378,6 +465,8 @@ 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_RecyclerEmpty.tiff
+lib/GNUstep/Images/common_RecyclerFull.tiff
 lib/GNUstep/Images/common_Right.tiff
 lib/GNUstep/Images/common_RightH.tiff
 lib/GNUstep/Images/common_RightTabStop.tiff
@@ -388,6 +477,10 @@ lib/GNUstep/Images/common_Root_Sparc.tiff
 lib/GNUstep/Images/common_Root_Sparc2.tiff
 lib/GNUstep/Images/common_SliderHoriz.tiff
 lib/GNUstep/Images/common_SliderVert.tiff
+lib/GNUstep/Images/common_StepperDown.tiff
+lib/GNUstep/Images/common_StepperDownHighlighted.tiff
+lib/GNUstep/Images/common_StepperUp.tiff
+lib/GNUstep/Images/common_StepperUpHighlighted.tiff
 lib/GNUstep/Images/common_SwitchOff.tiff
 lib/GNUstep/Images/common_SwitchOn.tiff
 lib/GNUstep/Images/common_TabDownSelectedLeft.tiff
@@ -400,10 +493,10 @@ lib/GNUstep/Images/common_TabDownUnSelectedToSelectedJunction.tiff
 lib/GNUstep/Images/common_TabSelectedLeft.tiff
 lib/GNUstep/Images/common_TabSelectedRight.tiff
 lib/GNUstep/Images/common_TabSelectedToUnSelectedJunction.tiff
-lib/GNUstep/Images/common_TabUnSelectToSelectedJunction.tiff
 lib/GNUstep/Images/common_TabUnSelectedJunction.tiff
 lib/GNUstep/Images/common_TabUnSelectedLeft.tiff
 lib/GNUstep/Images/common_TabUnSelectedRight.tiff
+lib/GNUstep/Images/common_TabUnSelectedToSelectedJunction.tiff
 lib/GNUstep/Images/common_Tile.tiff
 lib/GNUstep/Images/common_ToolbarClippedItemsMark.tiff
 lib/GNUstep/Images/common_ToolbarCustomizeToolbarItem.tiff
@@ -416,6 +509,7 @@ lib/GNUstep/Images/common_UnknownApplication.tiff
 lib/GNUstep/Images/common_UnknownTool.tiff
 lib/GNUstep/Images/common_Unmount.tiff
 lib/GNUstep/Images/common_UpAndDownArrowSmall.tiff
+lib/GNUstep/Images/common_VideoFolder.tiff
 lib/GNUstep/Images/common_copyCursor.tiff
 lib/GNUstep/Images/common_linkCursor.tiff
 lib/GNUstep/Images/common_noCursor.tiff
@@ -428,49 +522,52 @@ 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.22/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSFindPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSFindPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSFindPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPageLayout.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPageLayout.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPrintPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPrintPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSPrintPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSSpellPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSSpellPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/English.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Esperanto.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/French.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/German.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Info-gnustep.plist
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Lojban.lproj/Localizable.strings
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSFindPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSFindPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSFindPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
-lib/GNUstep/Libraries/gnustep-gui/Versions/0.22/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSDataLinkPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSDataLinkPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSDataLinkPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSFindPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSFindPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSFindPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSPageLayout.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSPageLayout.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSPageLayout.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSPrintPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSPrintPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSPrintPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSSpellPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSSpellPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/English.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Esperanto.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/French.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/German.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Info-gnustep.plist
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Japanese.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Korean.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Lojban.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSDataLinkPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSFindPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSFindPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSFindPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSPageLayout.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSPageLayout.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSPageLayout.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSPrintPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSPrintPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSPrintPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSSpellPanel.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSSpellPanel.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSSpellPanel.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.classes
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/data.info
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/Resources/Spanish.lproj/GSToolbarCustomizationPalette.gorm/objects.gorm
+lib/GNUstep/Libraries/gnustep-gui/Versions/${API_VERSION}/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
@@ -489,5 +586,4 @@ lib/GNUstep/Sounds/Tink.wav
 lib/libgnustep-gui.so
 lib/libgnustep-gui.so.${PKGVERSION}
 share/GNUstep/Makefiles/Additional/gui.make
-@pkgdir share/GNUstep/Applications
 @pkgdir lib/GNUstep/Themes
diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk
index 313eb74abef..303e8f4d320 100644
--- a/x11/gnustep-gui/buildlink3.mk
+++ b/x11/gnustep-gui/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.34 2020/06/02 08:23:02 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2020/10/02 23:47:28 mef Exp $
 
 BUILDLINK_TREE+=	gnustep-gui
 
 .if !defined(GNUSTEP_GUI_BUILDLINK3_MK)
 GNUSTEP_GUI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnustep-gui+=	gnustep-gui>=0.16.0
-BUILDLINK_ABI_DEPENDS.gnustep-gui+=	gnustep-gui>=0.22.0nb22
+BUILDLINK_API_DEPENDS.gnustep-gui+=	gnustep-gui>=0.28
+BUILDLINK_ABI_DEPENDS.gnustep-gui+=	gnustep-gui>=0.28
 BUILDLINK_PKGSRCDIR.gnustep-gui?=	../../x11/gnustep-gui
 
 .include "../../devel/gnustep-base/buildlink3.mk"
diff --git a/x11/gnustep-gui/distinfo b/x11/gnustep-gui/distinfo
index 5c2f4d710a6..32476e89acb 100644
--- a/x11/gnustep-gui/distinfo
+++ b/x11/gnustep-gui/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.28 2015/11/04 03:28:31 agc Exp $
+$NetBSD: distinfo,v 1.29 2020/10/02 23:47:28 mef Exp $
 
-SHA1 (gnustep-gui-0.22.0.tar.gz) = dc9654ea3437810a9b4bfd3d2193a25628a88b41
-RMD160 (gnustep-gui-0.22.0.tar.gz) = 20153480d712a148e9e504f09273f70e1ba2f6d2
-SHA512 (gnustep-gui-0.22.0.tar.gz) = b9704ac2147f9154acf4077fa8fe691180966535789d2495409d8688738597af1e025eebb5397180a680d3aeb285233608de05b5ec89cb2f7ef2b152865a7afb
-Size (gnustep-gui-0.22.0.tar.gz) = 2734733 bytes
-SHA1 (patch-Headers_AppKit_NSNibDeclarations.h) = 6195f4771b515b20a7bdf998c2f2eec37b5fb856
-SHA1 (patch-Source_NSBitmapImageRep+GIF.m) = 6615553063802931102f160571ed13ffd5c86968
-SHA1 (patch-Source_NSBitmapImageRep+PNG.m) = 089f3bbb54f1fb3449cf34d69e09a82fb4dffc59
+SHA1 (gnustep-gui/gui-0_28_0.tar.gz) = 32496c4ebc5260358b65e3b02f422ad20b9915b3
+RMD160 (gnustep-gui/gui-0_28_0.tar.gz) = 53106237f12251b3f5d62c1acc503abb5c23ee75
+SHA512 (gnustep-gui/gui-0_28_0.tar.gz) = ccef19bbdf7bf51b992b941ed1bbd2e1aeabe83e2fd040a75b9fbfd77c90722f80de416e61ac37ee5d6eb5ced26efe0a1aeec49374db9c8c4237bc5b59182371
+Size (gnustep-gui/gui-0_28_0.tar.gz) = 2933423 bytes
diff --git a/x11/gnustep-gui/patches/patch-Headers_AppKit_NSNibDeclarations.h b/x11/gnustep-gui/patches/patch-Headers_AppKit_NSNibDeclarations.h
deleted file mode 100644
index e4c3f3a1508..00000000000
--- a/x11/gnustep-gui/patches/patch-Headers_AppKit_NSNibDeclarations.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Headers_AppKit_NSNibDeclarations.h,v 1.1 2013/03/23 12:20:43 joerg Exp $
-
---- Headers/AppKit/NSNibDeclarations.h.orig	2013-03-23 11:48:31.000000000 +0000
-+++ Headers/AppKit/NSNibDeclarations.h
-@@ -32,7 +32,7 @@
- #define _NSNibDeclarations_H_
- #import <GNUstepBase/GSVersionMacros.h>
- 
--#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
-+#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST) && !defined(__NetBSD__)
- #define IBOutlet
- #define IBAction void
- #endif
diff --git a/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+GIF.m b/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+GIF.m
deleted file mode 100644
index 5c45efd1022..00000000000
--- a/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+GIF.m
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD: patch-Source_NSBitmapImageRep+GIF.m,v 1.2 2014/05/25 07:18:44 obache Exp $
-
-* Fixes build with giflib>5
-
---- Source/NSBitmapImageRep+GIF.m.orig	2011-02-28 15:43:25.000000000 +0000
-+++ Source/NSBitmapImageRep+GIF.m
-@@ -140,7 +140,7 @@ static int gs_gif_output(GifFileType *fi
-     }
- 
-   gs_gif_init_input_source(&src, imageData);
--  file = DGifOpen(&src, gs_gif_input);
-+  file = DGifOpen(&src, gs_gif_input, NULL);
-   if (file == NULL)
-     {
-       /* we do not use giferror here because it doesn't
-@@ -149,7 +149,7 @@ static int gs_gif_output(GifFileType *fi
-       return NO;
-     }
- 
--  DGifCloseFile(file);
-+  DGifCloseFile(file, NULL);
-   return YES;
- }
- 
-@@ -168,7 +168,7 @@ static int gs_gif_output(GifFileType *fi
-    SET_ERROR_MSG(msg); \
-    if (file != NULL) \
-      {\
--       DGifCloseFile(file); \
-+       DGifCloseFile(file, NULL); \
-      }\
-    if (imgBuffer != NULL) \
-      {\
-@@ -214,7 +214,7 @@ static int gs_gif_output(GifFileType *fi
- 
-   /* open the image */
-   gs_gif_init_input_source(&src, imageData);
--  file = DGifOpen(&src, gs_gif_input);
-+  file = DGifOpen(&src, gs_gif_input, NULL);
-   if (file == NULL)
-     {
-       /* we do not use giferror here because it doesn't
-@@ -376,7 +376,7 @@ static int gs_gif_output(GifFileType *fi
-           withValue: [NSNumber numberWithInt: 0]];
- 
-   /* don't forget to close the gif */
--  DGifCloseFile(file);
-+  DGifCloseFile(file, NULL);
- 
-   return self;
- }
-@@ -457,10 +457,10 @@ static int gs_gif_output(GifFileType *fi
-   // If you have a color table, you must be certain that it is GIF format
-   colorTable = [self valueForProperty: NSImageRGBColorTable];	// nil is OK
-   colorMapSize = (colorTable)? [colorTable length]/sizeof(GifColorType) : 256;
--  GIFColorMap = MakeMapObject(colorMapSize, [colorTable bytes]);
-+  GIFColorMap = GifMakeMapObject(colorMapSize, [colorTable bytes]);
-   if (!GIFColorMap)
-     {
--      SET_ERROR_MSG(@"GIFRepresentation (giflib): MakeMapObject() failed.");
-+      SET_ERROR_MSG(@"GIFRepresentation (giflib): GifMakeMapObject() failed.");
-       free(rgbPlanes);
-       return nil;
-     }
-@@ -471,7 +471,7 @@ static int gs_gif_output(GifFileType *fi
-       SET_ERROR_MSG(@"GIFRepresentation: malloc out of memory.");
-       free(rgbPlanes);
-     }
--  status = QuantizeBuffer(width, height, &colorMapSize,
-+  status = GifQuantizeBuffer(width, height, &colorMapSize,
- 		       redPlane, greenPlane, bluePlane,
- 		       GIFImage, GIFColorMap->Colors);
-   if (status == GIF_ERROR)
-@@ -481,7 +481,7 @@ static int gs_gif_output(GifFileType *fi
-       return nil;
-     }
- 
--  // QuantizeBuffer returns an optimized colorMapSize,
-+  // GifQuantizeBuffer returns an optimized colorMapSize,
-   // but we must round up to nearest power of 2
-   // otherwise MakeColorMap() fails
-   for (h = 0; h < 8; h++)
-@@ -499,7 +499,7 @@ static int gs_gif_output(GifFileType *fi
-       free(GIFImage);
-       return nil;
-     }
--  GIFFile = EGifOpen(GIFRep, gs_gif_output);
-+  GIFFile = EGifOpen(GIFRep, gs_gif_output, NULL);
-   status = EGifPutScreenDesc(GIFFile, width, height, 8, 0, NULL);
-   if (status == GIF_ERROR)
-     {
-@@ -509,7 +509,7 @@ static int gs_gif_output(GifFileType *fi
-     }
- 
-   // note we are not supporting interlaced mode
--  status = EGifPutImageDesc(GIFFile, 0, 0, width, height, FALSE, GIFColorMap);
-+  status = EGifPutImageDesc(GIFFile, 0, 0, width, height, 0, GIFColorMap);
-   if (status == GIF_ERROR)
-     {
-       SET_ERROR_MSG(@"GIFRepresentation (giflib): EGifPutImageDesc() failed.");
-@@ -529,7 +529,7 @@ static int gs_gif_output(GifFileType *fi
- 	}
-       GIFImageP += width;
-     }
--  status = EGifCloseFile(GIFFile);
-+  status = EGifCloseFile(GIFFile, NULL);
- 
-   free(GIFImage);
- 
diff --git a/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+PNG.m b/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+PNG.m
deleted file mode 100644
index 83d851bbd6c..00000000000
--- a/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+PNG.m
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_NSBitmapImageRep+PNG.m,v 1.1 2013/02/26 23:35:25 joerg Exp $
-
---- Source/NSBitmapImageRep+PNG.m.orig	2013-02-26 13:18:16.000000000 +0000
-+++ Source/NSBitmapImageRep+PNG.m
-@@ -359,7 +359,7 @@ static void writer_func(png_structp png_
- 
-   // init structures
-   PNGRep = [NSMutableData dataWithLength: 0];
--  png_info_init_3(&png_info, png_sizeof(png_info));
-+  png_info_init_3(&png_info, sizeof(png_info));
-   png_set_write_fn(png_struct, PNGRep, writer_func, NULL);
-   png_set_IHDR(png_struct, png_info, width, height, depth,
-    type, interlace, PNG_COMPRESSION_TYPE_BASE,