diff --git a/x11/gnustep/gui/Makefile b/x11/gnustep/gui/Makefile
index df4ba6fbccf..7eb6d597765 100644
--- a/x11/gnustep/gui/Makefile
+++ b/x11/gnustep/gui/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.44 2016/06/03 11:45:43 sebastia Exp $
+# $OpenBSD: Makefile,v 1.45 2016/06/23 20:56:23 sebastia Exp $
 
 COMMENT=	GNUstep gui library
 
-REVISION =	2
-DISTNAME =	gnustep-gui-0.24.1
+DISTNAME =	gnustep-gui-0.25.0
 
 CATEGORIES=	devel
 
 # needs to follow gnustep-back backend versioning
 # cf. gnustep_backend_bundle() in ${WRKSRC}/Source/NSApplication.m
-SHARED_LIBS =	gnustep-gui 0.25	# .0.23.1
+SHARED_LIBS =	gnustep-gui 0.26
 
 HOMEPAGE=	http://www.gnustep.org/
 
diff --git a/x11/gnustep/gui/distinfo b/x11/gnustep/gui/distinfo
index a823279a20c..801aed696c6 100644
--- a/x11/gnustep/gui/distinfo
+++ b/x11/gnustep/gui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnustep/gnustep-gui-0.24.1.tar.gz) = p0lXPJnWaLgyMMxAuLIVsT1i55VhV5moc5gUBs8rtyg=
-SIZE (gnustep/gnustep-gui-0.24.1.tar.gz) = 2837611
+SHA256 (gnustep/gnustep-gui-0.25.0.tar.gz) = xXVgJrM5qDjbVGW3avau2gHCG096L0AhXB+nkmMfToI=
+SIZE (gnustep/gnustep-gui-0.25.0.tar.gz) = 2882556
diff --git a/x11/gnustep/gui/patches/patch-Headers_AppKit_NSMenu_h b/x11/gnustep/gui/patches/patch-Headers_AppKit_NSMenu_h
index ef13fcbd78e..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Headers_AppKit_NSMenu_h
+++ b/x11/gnustep/gui/patches/patch-Headers_AppKit_NSMenu_h
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Headers_AppKit_NSMenu_h,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38568
-
---- Headers/AppKit/NSMenu.h.orig	Fri May 22 08:47:10 2015
-+++ Headers/AppKit/NSMenu.h	Fri May 22 08:47:35 2015
-@@ -558,7 +558,7 @@
- 
- /** Returns an item located at index.
-  */
--- (id <NSMenuItem>) itemAtIndex: (NSInteger)index;
-+- (NSMenuItem *) itemAtIndex: (NSInteger)index;
- 
- /** Informs the menu that the specified item has changed.
-  */
diff --git a/x11/gnustep/gui/patches/patch-Model_GMArchiver_m b/x11/gnustep/gui/patches/patch-Model_GMArchiver_m
index 8add053e04e..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Model_GMArchiver_m
+++ b/x11/gnustep/gui/patches/patch-Model_GMArchiver_m
@@ -1,24 +0,0 @@
-$OpenBSD: patch-Model_GMArchiver_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Model/GMArchiver.m.orig	Fri May 22 09:35:12 2015
-+++ Model/GMArchiver.m	Fri May 22 09:37:04 2015
-@@ -475,7 +475,7 @@
- - (void) encodeShort: (short)value withName: (NSString*)name
- {
-   if (!findingConditionals && name) {
--    id valueString = [NSString stringWithFormat: @"%s", value];
-+    id valueString = [NSString stringWithFormat: @"%hd", value];
- 
-     [lastObjectRepresentation setObject: valueString forKey: name];
-   }
-@@ -511,7 +511,7 @@
- - (void) encodeLong: (long)value withName: (NSString*)name
- {
-   if (!findingConditionals && name) {
--    id valueString = [NSString stringWithFormat: @"%l", value];
-+    id valueString = [NSString stringWithFormat: @"%ld", value];
- 
-     [lastObjectRepresentation setObject: valueString forKey: name];
-   }
diff --git a/x11/gnustep/gui/patches/patch-Source_GSDisplayServer_m b/x11/gnustep/gui/patches/patch-Source_GSDisplayServer_m
index d5ff09fc66c..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_GSDisplayServer_m
+++ b/x11/gnustep/gui/patches/patch-Source_GSDisplayServer_m
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Source_GSDisplayServer_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/GSDisplayServer.m.orig	Fri May 22 09:31:36 2015
-+++ Source/GSDisplayServer.m	Fri May 22 09:32:18 2015
-@@ -1112,7 +1112,7 @@ GSCurrentServer(void)
- 	{
- 	  NSEvent *event = events[i];
- 
--          NSLog(@"index %d %@", i, event);
-+          NSLog(@"index %lu %@", (unsigned long) i, event);
-         }
-     }
-   else
diff --git a/x11/gnustep/gui/patches/patch-Source_GSXibLoader_m b/x11/gnustep/gui/patches/patch-Source_GSXibLoader_m
index a31c9913006..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_GSXibLoader_m
+++ b/x11/gnustep/gui/patches/patch-Source_GSXibLoader_m
@@ -1,51 +0,0 @@
-$OpenBSD: patch-Source_GSXibLoader_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/GSXibLoader.m.orig	Fri May 22 09:32:45 2015
-+++ Source/GSXibLoader.m	Fri May 22 09:34:57 2015
-@@ -410,7 +410,7 @@
-                               __PRETTY_FUNCTION__,
-                               NSStringFromClass([self class])];
-           [NSException raise: NSInvalidArgumentException
--                      format: format];
-+                      format: @"%@", format];
-         }
-       
-       // Load the connection ID....
-@@ -433,7 +433,7 @@
-               NSString *format = [NSString stringWithFormat:@"%s:class: %@ - connection ID is missing or zero!",
-                                   __PRETTY_FUNCTION__, NSStringFromClass([self class])];
-               [NSException raise: NSInvalidArgumentException
--                          format: format];
-+                          format: @"%@", format];
-             }
-         }
-       else
-@@ -442,7 +442,7 @@
-                               __PRETTY_FUNCTION__,
-                               NSStringFromClass([self class])];
-           [NSException raise: NSInvalidArgumentException
--                      format: format];
-+                      format: @"%@", format];
-         }
-     }
-   else
-@@ -582,7 +582,7 @@
-                               __PRETTY_FUNCTION__,
-                               NSStringFromClass([self class])];
-           [NSException raise: NSInvalidArgumentException
--                      format: format];
-+                      format: @"%@", format];
-         }
-       
-       if ([coder containsValueForKey: @"object"])
-@@ -632,7 +632,7 @@
- 
- - (NSString *) description
- {
--  return [NSString stringWithFormat: @"<%@, %@, %@, %d>",
-+  return [NSString stringWithFormat: @"<%@, %@, %@, %p>",
- 		   [self className],
- 		   object,
- 		   parent,
diff --git a/x11/gnustep/gui/patches/patch-Source_NSAnimation_m b/x11/gnustep/gui/patches/patch-Source_NSAnimation_m
index 563af9bbc81..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSAnimation_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSAnimation_m
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Source_NSAnimation_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/NSAnimation.m.orig	Fri May 22 08:43:30 2015
-+++ Source/NSAnimation.m	Fri May 22 08:44:25 2015
-@@ -797,7 +797,7 @@ nsanimation_progressMarkSorter(NSAnimationProgress fir
-         [delegate methodForSelector: @selector (animationShouldStart:)]
-         : NULL;
-       NSDebugMLLog(@"NSAnimationDelegate",
--                   @"Delegation methods : %x %x %x %x %x",
-+                   @"Delegation methods : %p %p %p %p %p",
-                    _delegate_animationDidReachProgressMark,
-                    _delegate_animationValueForProgress,
-                    _delegate_animationDidEnd,
diff --git a/x11/gnustep/gui/patches/patch-Source_NSBitmapImageRep+GIF_m b/x11/gnustep/gui/patches/patch-Source_NSBitmapImageRep+GIF_m
index 22815980dde..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSBitmapImageRep+GIF_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSBitmapImageRep+GIF_m
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Source_NSBitmapImageRep+GIF_m,v 1.4 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38544
-
---- Source/NSBitmapImageRep+GIF.m.orig	Mon May 25 19:30:24 2015
-+++ Source/NSBitmapImageRep+GIF.m	Mon May 25 19:30:40 2015
-@@ -64,6 +64,7 @@ objective-c headers.
- // GIF> 5.1
- #if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
-   #define DGifCloseFile(f) DGifCloseFile(f, NULL)
-+  #define EGifCloseFile(f) EGifCloseFile(f, NULL)
- #endif
- 
- /* -----------------------------------------------------------
diff --git a/x11/gnustep/gui/patches/patch-Source_NSCachedImageRep_m b/x11/gnustep/gui/patches/patch-Source_NSCachedImageRep_m
index c59c66cff96..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSCachedImageRep_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSCachedImageRep_m
@@ -1,17 +0,0 @@
-$OpenBSD: patch-Source_NSCachedImageRep_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/NSCachedImageRep.m.orig	Fri May 22 08:49:07 2015
-+++ Source/NSCachedImageRep.m	Fri May 22 08:54:48 2015
-@@ -93,8 +93,8 @@
-       pixelsWide <= 0 || pixelsHigh <= 0)
-     {
-       [NSException raise: NSInvalidArgumentException
--		  format: @"NSCachedImageRep created with size %@ pixelsWide %d pixelsHigh %d",
--		   NSStringFromSize(aSize), pixelsWide, pixelsHigh];
-+		  format: @"NSCachedImageRep created with size %@ pixelsWide %li pixelsHigh %li",
-+		   NSStringFromSize(aSize), (long int) pixelsWide, (long int) pixelsHigh];
-     }
- 
-   // FIXME: Only create new window when separate is YES
diff --git a/x11/gnustep/gui/patches/patch-Source_NSEvent_m b/x11/gnustep/gui/patches/patch-Source_NSEvent_m
index e7c3954be18..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSEvent_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSEvent_m
@@ -1,124 +0,0 @@
-$OpenBSD: patch-Source_NSEvent_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/NSEvent.m.orig	Fri May 22 08:55:02 2015
-+++ Source/NSEvent.m	Fri May 22 09:06:56 2015
-@@ -289,7 +289,7 @@ static Class eventClass;
-   if ([dict objectForKey: timerKey])
-     [NSException raise: NSInternalInconsistencyException
-                 format: @"Periodic events are already being generated for "
--                        @"this thread %x", GSCurrentThread()];
-+                        @"this thread %p", GSCurrentThread()];
- 
-   /*
-    *  Register a timer that will fire in delaySeconds.
-@@ -609,25 +609,26 @@ static const char *eventTypes[] = {
-       case NSRightMouseDown:
-       case NSRightMouseUp:
-         return [NSString stringWithFormat:
--          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
--          @" time = %f, window = %d, dpsContext = %p,"
--          @" event number = %d, click = %d, pressure = %f",
-+          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
-+          @" time = %f, window = %ld, dpsContext = %p,"
-+          @" event number = %ld, click = %ld, pressure = %f",
-           eventTypes[event_type], location_point.x, location_point.y,
--          modifier_flags, event_time, window_num, event_context,
--          event_data.mouse.event_num, event_data.mouse.click,
-+          (unsigned long) modifier_flags, event_time, (long) window_num,
-+	  event_context, (long int) event_data.mouse.event_num,
-+	  (long int) event_data.mouse.click,
-           event_data.mouse.pressure];
-         break;
- 
-       case NSMouseEntered:
-       case NSMouseExited:
-         return [NSString stringWithFormat:
--          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
--          @" time = %f, window = %d, dpsContext = %p, "
--          @" event number = %d, tracking number = %d, user data = %p",
-+          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
-+          @" time = %f, window = %ld, dpsContext = %p, "
-+          @" event number = %ld, tracking number = %ld, user data = %p",
-           eventTypes[event_type], location_point.x, location_point.y,
--          modifier_flags, event_time, window_num, event_context,
--          event_data.tracking.event_num,
--          event_data.tracking.tracking_num,
-+          (unsigned long) modifier_flags, event_time, (long) window_num, event_context,
-+          (long) event_data.tracking.event_num,
-+          (long) event_data.tracking.tracking_num,
-           event_data.tracking.user_data];
-         break;
- 
-@@ -635,11 +636,11 @@ static const char *eventTypes[] = {
-       case NSKeyUp:
-       case NSFlagsChanged:
-         return [NSString stringWithFormat:
--          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
--          @" time = %f, window = %d, dpsContext = %p, "
-+          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
-+          @" time = %f, window = %ld, dpsContext = %p, "
-           @" repeat = %s, keys = %@, ukeys = %@, keyCode = 0x%x",
-           eventTypes[event_type], location_point.x, location_point.y,
--          modifier_flags, event_time, window_num, event_context,
-+          (unsigned long) modifier_flags, event_time, (long) window_num, event_context,
-           (event_data.key.repeat ? "YES" : "NO"),
-           event_data.key.char_keys, event_data.key.unmodified_keys,
-           event_data.key.key_code];
-@@ -651,13 +652,13 @@ static const char *eventTypes[] = {
-       case NSSystemDefined:
-       case NSApplicationDefined:
-         return [NSString stringWithFormat:
--          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
--          @" time = %f, window = %d, dpsContext = %p, "
--          @" subtype = %d, data1 = %p, data2 = %p",
-+          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
-+          @" time = %f, window = %ld, dpsContext = %p, "
-+          @" subtype = %d, data1 = %lx, data2 = %lx",
-           eventTypes[event_type], location_point.x, location_point.y,
--          modifier_flags, event_time, window_num, event_context,
--          event_data.misc.sub_type, event_data.misc.data1,
--          event_data.misc.data2];
-+          (unsigned long) modifier_flags, event_time, (long) window_num, event_context,
-+          event_data.misc.sub_type, (long) event_data.misc.data1,
-+          (long) event_data.misc.data2];
-         break;
- 
-       case NSScrollWheel:
-@@ -666,14 +667,14 @@ static const char *eventTypes[] = {
-       case NSOtherMouseDragged:
-       case NSRightMouseDragged:
-         return [NSString stringWithFormat:
--          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"
--          @" time = %f, window = %d, dpsContext = %p,"
--          @" event number = %d, click = %d, pressure = %f"
--          @" button = %d, deltaX = %f, deltaY = %f, deltaZ = %f",
-+          @"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %lu,"
-+          @" time = %f, window = %ld, dpsContext = %p,"
-+          @" event number = %ld, click = %ld, pressure = %f"
-+          @" button = %ld, deltaX = %f, deltaY = %f, deltaZ = %f",
-           eventTypes[event_type], location_point.x, location_point.y,
--          modifier_flags, event_time, window_num, event_context,
--          event_data.mouse.event_num, event_data.mouse.click,
--          event_data.mouse.pressure, event_data.mouse.button,
-+          (unsigned long) modifier_flags, event_time, (long) window_num, event_context,
-+          (long ) event_data.mouse.event_num, (long) event_data.mouse.click,
-+          event_data.mouse.pressure, (long) event_data.mouse.button,
-           event_data.mouse.deltaX,
-           event_data.mouse.deltaY,
-           event_data.mouse.deltaZ];
-@@ -686,10 +687,10 @@ static const char *eventTypes[] = {
- 
-       default:
-         return [NSString stringWithFormat:
--          @"NSEvent: eventType = UNKNOWN!, point = { %f, %f }, modifiers = %u,"
--          @" time = %f, window = %d",
-+          @"NSEvent: eventType = UNKNOWN!, point = { %f, %f }, modifiers = %lu,"
-+          @" time = %f, window = %ld",
-           location_point.x, location_point.y,
--          modifier_flags, event_time, window_num];
-+          (unsigned long) modifier_flags, event_time, (long) window_num];
-         break;
-     }
- 
diff --git a/x11/gnustep/gui/patches/patch-Source_NSGradient_m b/x11/gnustep/gui/patches/patch-Source_NSGradient_m
index 41e860d428c..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSGradient_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSGradient_m
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Source_NSGradient_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38572
-
---- Source/NSGradient.m.orig	Fri May 22 09:07:07 2015
-+++ Source/NSGradient.m	Fri May 22 09:09:51 2015
-@@ -334,7 +334,7 @@ relativeCenterPosition: (NSPoint)relativeCenterPoint
-       startPoint = NSMakePoint(NSMinX(rect), NSMaxY(rect));
-     }
-   rad = PI * angle / 180;
--  length = abs(NSWidth(rect) * cos(rad) + NSHeight(rect) * sin(rad));
-+  length = fabs(NSWidth(rect) * cos(rad) + NSHeight(rect) * sin(rad));
-   endPoint = NSMakePoint(startPoint.x + length * cos(rad), 
-                          startPoint.y + length * sin(rad));
- 
diff --git a/x11/gnustep/gui/patches/patch-Source_NSMenu_m b/x11/gnustep/gui/patches/patch-Source_NSMenu_m
index 3e14f32371e..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSMenu_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSMenu_m
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Source_NSMenu_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38568
-
---- Source/NSMenu.m.orig	Fri May 22 08:47:47 2015
-+++ Source/NSMenu.m	Fri May 22 08:48:21 2015
-@@ -894,7 +894,7 @@ static BOOL menuBarVisible = YES;
-   return nil;
- }
- 
--- (id <NSMenuItem>) itemAtIndex: (NSInteger)index
-+- (NSMenuItem *) itemAtIndex: (NSInteger)index
- {
-   if (index >= [_items count] || index < 0)
-     [NSException  raise: NSRangeException
diff --git a/x11/gnustep/gui/patches/patch-Source_NSPrintPanel_m b/x11/gnustep/gui/patches/patch-Source_NSPrintPanel_m
index 3045562c9d4..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSPrintPanel_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSPrintPanel_m
@@ -1,18 +0,0 @@
-$OpenBSD: patch-Source_NSPrintPanel_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/NSPrintPanel.m.orig	Fri May 22 09:14:22 2015
-+++ Source/NSPrintPanel.m	Fri May 22 09:16:28 2015
-@@ -462,9 +462,9 @@ static NSPrintPanel *shared_instance = nil;
-   else
-     {
-       NSString *str;
--      str = [NSString stringWithFormat: @"%d", _pages.location];
-+      str = [NSString stringWithFormat: @"%lu", (unsigned long) _pages.location];
-       [[fromRangeForm cellAtIndex: 0] setStringValue: str];
--      str = [NSString stringWithFormat: @"%d", NSMaxRange(_pages)-1];
-+      str = [NSString stringWithFormat: @"%lu", (unsigned long) NSMaxRange(_pages)-1];
-       [[toRangeForm cellAtIndex: 0] setStringValue: str];
-     }
- }
diff --git a/x11/gnustep/gui/patches/patch-Source_NSSplitView_m b/x11/gnustep/gui/patches/patch-Source_NSSplitView_m
index 4389795d1ec..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSSplitView_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSSplitView_m
@@ -1,24 +0,0 @@
-$OpenBSD: patch-Source_NSSplitView_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/NSSplitView.m.orig	Wed Sep 18 01:19:12 2013
-+++ Source/NSSplitView.m	Sun May 24 19:03:32 2015
-@@ -150,7 +150,7 @@ static NSNotificationCenter *nc = nil;
-                 {
-                   proportion = (NSWidth(frames[i]))/oldTotal;              
-                 }
--              key = [NSString stringWithFormat: @"%u", i];
-+              key = [NSString stringWithFormat: @"%lu", (unsigned long) i];
-               [config setObject: [NSNumber numberWithDouble: proportion]
-                          forKey: key];
-             }
-@@ -829,7 +829,7 @@ static NSNotificationCenter *nc = nil;
-               NSNumber	*proportion;
- 	      NSString	*key;
- 
--	      key = [NSString stringWithFormat: @"%u", i];
-+	      key = [NSString stringWithFormat: @"%lu", (unsigned long) i];
-               proportion = [config objectForKey: key];
-               if (proportion == nil)
-                 {
diff --git a/x11/gnustep/gui/patches/patch-Source_NSTextBlock_m b/x11/gnustep/gui/patches/patch-Source_NSTextBlock_m
index f9f4e299be0..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSTextBlock_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSTextBlock_m
@@ -1,42 +0,0 @@
-$OpenBSD: patch-Source_NSTextBlock_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/NSTextBlock.m.orig	Fri May 22 09:17:53 2015
-+++ Source/NSTextBlock.m	Fri May 22 09:19:54 2015
-@@ -72,7 +72,7 @@
- {
-   if (edge >= sizeof(_borderColorForEdge) / sizeof(_borderColorForEdge[0]))
-     [NSException raise: NSInvalidArgumentException
--                 format: @"invalid edge %d", edge];
-+                 format: @"invalid edge %lu", (unsigned long) edge];
-   ASSIGN(_borderColorForEdge[edge], color);
- }
- 
-@@ -167,7 +167,7 @@
- 		 format: @"invalid layer %d", layer];
-   if (edge >= sizeof(_width[0]) / sizeof(_width[0][0]))
-     [NSException raise: NSInvalidArgumentException
--		 format: @"invalid edge %d", edge];
-+		 format: @"invalid edge %lu", (unsigned long) edge];
-   return _width[layer][edge];
- }
- 
-@@ -179,7 +179,7 @@
- 		 format: @"invalid layer %d", layer];
-   if (edge >= sizeof(_width[0]) / sizeof(_width[0][0]))
-     [NSException raise: NSInvalidArgumentException
--		 format: @"invalid edge %d", edge];
-+		 format: @"invalid edge %lu", (unsigned long) edge];
-   return _widthType[layer][edge];
- }
- 
-@@ -193,7 +193,7 @@
- 		 format: @"invalid layer %d", layer];
-   if (edge >= sizeof(_width[0]) / sizeof(_width[0][0]))
-     [NSException raise: NSInvalidArgumentException
--		 format: @"invalid edge %d", edge];
-+		 format: @"invalid edge %lu", (unsigned long) edge];
-   _width[layer][edge] = val;
-   _widthType[layer][edge] = type;
- }
diff --git a/x11/gnustep/gui/patches/patch-Source_NSTextContainer_m b/x11/gnustep/gui/patches/patch-Source_NSTextContainer_m
index 2ec37289cdd..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSTextContainer_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSTextContainer_m
@@ -1,36 +0,0 @@
-$OpenBSD: patch-Source_NSTextContainer_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38567
-
---- Source/NSTextContainer.m.orig	Fri May 22 09:20:04 2015
-+++ Source/NSTextContainer.m	Fri May 22 09:23:44 2015
-@@ -96,12 +96,12 @@ use bounds rectangle instead of frame? */
-   NSDebugLLog(@"NSText", @"NSTextContainer initWithContainerSize");
-   if (aSize.width < 0)
-     {
--      NSWarnMLog(@"given negative width", 0);
-+      NSWarnMLog(@"given negative width");
-       aSize.width = 0;
-     }
-   if (aSize.height < 0)
-     {
--      NSWarnMLog(@"given negative height", 0);
-+      NSWarnMLog(@"given negative height");
-       aSize.height = 0;
-     }
-   _layoutManager = nil;
-@@ -246,12 +246,12 @@ framework intact.
- 
-   if (aSize.width < 0)
-     {
--      NSWarnMLog(@"given negative width", 0);
-+      NSWarnMLog(@"given negative width");
-       aSize.width = 0;
-     }
-   if (aSize.height < 0)
-     {
--      NSWarnMLog(@"given negative height", 0);
-+      NSWarnMLog(@"given negative height");
-       aSize.height = 0;
-     }
- 
diff --git a/x11/gnustep/gui/patches/patch-Source_NSToolbarItem_m b/x11/gnustep/gui/patches/patch-Source_NSToolbarItem_m
index 7739c75e041..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSToolbarItem_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSToolbarItem_m
@@ -1,24 +0,0 @@
-$OpenBSD: patch-Source_NSToolbarItem_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38569
-
---- Source/NSToolbarItem.m.orig	Fri May 22 09:23:58 2015
-+++ Source/NSToolbarItem.m	Fri May 22 09:25:09 2015
-@@ -287,7 +287,7 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovable
-           index = [toolbar _indexOfItem: _toolbarItem];
-         }
- 	  [GSToolbarView setDraggedItemIndex:index];
--      [pboard setString: [NSString stringWithFormat:@"%d", index] 
-+      [pboard setString: [NSString stringWithFormat:@"%ld", (long) index] 
-               forType: GSMovableToolbarItemPboardType];
-           
-       [self dragImage: image 
-@@ -777,7 +777,7 @@ NSString *GSMovableToolbarItemPboardType = @"GSMovable
-           index = [toolbar _indexOfItem: _toolbarItem];
-         }
- 	  [GSToolbarView setDraggedItemIndex:index];
--      [pboard setString: [NSString stringWithFormat:@"%d", index] 
-+      [pboard setString: [NSString stringWithFormat:@"%ld", (long) index] 
-               forType: GSMovableToolbarItemPboardType];
-       
-       [self dragImage: image 
diff --git a/x11/gnustep/gui/patches/patch-Source_NSView_m b/x11/gnustep/gui/patches/patch-Source_NSView_m
index 26c4ffcaf7a..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSView_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSView_m
@@ -1,96 +0,0 @@
-$OpenBSD: patch-Source_NSView_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38567
-
---- Source/NSView.m.orig	Fri May 22 09:25:21 2015
-+++ Source/NSView.m	Fri May 22 09:27:21 2015
-@@ -595,12 +595,12 @@ GSSetDragTypes(NSView* obj, NSArray *types)
- 
-   if (frameRect.size.width < 0)
-     {
--      NSWarnMLog(@"given negative width", 0);
-+      NSWarnMLog(@"given negative width");
-       frameRect.size.width = 0;
-     }
-   if (frameRect.size.height < 0)
-     {
--      NSWarnMLog(@"given negative height", 0);
-+      NSWarnMLog(@"given negative height");
-       frameRect.size.height = 0;
-     }
-   _frame = frameRect;			// Set frame rectangle
-@@ -1178,12 +1178,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
- 
-   if (frameRect.size.width < 0)
-     {
--      NSWarnMLog(@"given negative width", 0);
-+      NSWarnMLog(@"given negative width");
-       frameRect.size.width = 0;
-     }
-   if (frameRect.size.height < 0)
-     {
--      NSWarnMLog(@"given negative height", 0);
-+      NSWarnMLog(@"given negative height");
-       frameRect.size.height = 0;
-     }
- 
-@@ -1259,12 +1259,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
-   NSRect newFrame = _frame;
-   if (newSize.width < 0)
-     {
--      NSWarnMLog(@"given negative width", 0);
-+      NSWarnMLog(@"given negative width");
-       newSize.width = 0;
-     }
-   if (newSize.height < 0)
-     {
--      NSWarnMLog(@"given negative height", 0);
-+      NSWarnMLog(@"given negative height");
-       newSize.height = 0;
-     }
-   if (NSEqualSizes(_frame.size, newSize) == NO)
-@@ -1385,12 +1385,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
-   NSDebugLLog(@"NSView", @"setBounds %@", NSStringFromRect(aRect));
-   if (aRect.size.width < 0)
-     {
--      NSWarnMLog(@"given negative width", 0);
-+      NSWarnMLog(@"given negative width");
-       aRect.size.width = 0;
-     }
-   if (aRect.size.height < 0)
-     {
--      NSWarnMLog(@"given negative height", 0);
-+      NSWarnMLog(@"given negative height");
-       aRect.size.height = 0;
-     }
- 
-@@ -1479,12 +1479,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
- 
-   if (newSize.width < 0)
-     {
--      NSWarnMLog(@"given negative width", 0);
-+      NSWarnMLog(@"given negative width");
-       newSize.width = 0;
-     }
-   if (newSize.height < 0)
-     {
--      NSWarnMLog(@"given negative height", 0);
-+      NSWarnMLog(@"given negative height");
-       newSize.height = 0;
-     }
- 
-@@ -1570,12 +1570,12 @@ static NSSize _computeScale(NSSize fs, NSSize bs)
-     {
-       if (newSize.width < 0)
-         {
--          NSWarnMLog(@"given negative width", 0);
-+          NSWarnMLog(@"given negative width");
-           newSize.width = 0;
-         }
-       if (newSize.height < 0)
-         {
--          NSWarnMLog(@"given negative height", 0);
-+          NSWarnMLog(@"given negative height");
-           newSize.height = 0;
-         }
- 
diff --git a/x11/gnustep/gui/patches/patch-Source_NSWindow_m b/x11/gnustep/gui/patches/patch-Source_NSWindow_m
index 998814a00d5..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-Source_NSWindow_m
+++ b/x11/gnustep/gui/patches/patch-Source_NSWindow_m
@@ -1,47 +0,0 @@
-$OpenBSD: patch-Source_NSWindow_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38572
-
---- Source/NSWindow.m.orig	Fri Dec 26 08:59:29 2014
-+++ Source/NSWindow.m	Sun May 24 19:06:15 2015
-@@ -889,8 +889,8 @@ many times.
- 
- - (NSString*) description
- {
--  return [[super description] stringByAppendingFormat: @"Number: %d Title: %@",
--    [self windowNumber], [self title]];
-+  return [[super description] stringByAppendingFormat: @"Number: %ld Title: %@",
-+    (long) [self windowNumber], [self title]];
- }
- 
- - (void) _startBackendWindow
-@@ -2066,10 +2066,10 @@ titleWithRepresentedFilename(NSString *representedFile
-     }
- 
-   // Find the biggest difference
--  maxDiff = abs(newFrame.origin.x - _frame.origin.x);
--  maxDiff = MAX(maxDiff, abs(newFrame.origin.y - _frame.origin.y));
--  maxDiff = MAX(maxDiff, abs(newFrame.size.width - _frame.size.width));
--  maxDiff = MAX(maxDiff, abs(newFrame.size.height - _frame.size.height));
-+  maxDiff = fabs(newFrame.origin.x - _frame.origin.x);
-+  maxDiff = MAX(maxDiff, fabs(newFrame.origin.y - _frame.origin.y));
-+  maxDiff = MAX(maxDiff, fabs(newFrame.size.width - _frame.size.width));
-+  maxDiff = MAX(maxDiff, fabs(newFrame.size.height - _frame.size.height));
- 
-   return (maxDiff * resizeTime) / 150;
- }
-@@ -5115,10 +5115,10 @@ current key view.<br />
-   maxRect = [self constrainFrameRect: maxRect toScreen: [self screen]];
- 
-   // Compare the new frame with the current one
--  if ((abs(NSMaxX(maxRect) - NSMaxX(_frame)) < DIST)
--    && (abs(NSMaxY(maxRect) - NSMaxY(_frame)) < DIST)
--    && (abs(NSMinX(maxRect) - NSMinX(_frame)) < DIST)
--    && (abs(NSMinY(maxRect) - NSMinY(_frame)) < DIST))
-+  if ((fabs(NSMaxX(maxRect) - NSMaxX(_frame)) < DIST)
-+    && (fabs(NSMaxY(maxRect) - NSMaxY(_frame)) < DIST)
-+    && (fabs(NSMinX(maxRect) - NSMinX(_frame)) < DIST)
-+    && (fabs(NSMinY(maxRect) - NSMinY(_frame)) < DIST))
-     {
-       // Already in zoomed mode, reset user frame, if stored
-       if (_autosaveName != nil)
diff --git a/x11/gnustep/gui/patches/patch-TextConverters_RTF_RTFConsumer_m b/x11/gnustep/gui/patches/patch-TextConverters_RTF_RTFConsumer_m
index 874e2078fd2..e69de29bb2d 100644
--- a/x11/gnustep/gui/patches/patch-TextConverters_RTF_RTFConsumer_m
+++ b/x11/gnustep/gui/patches/patch-TextConverters_RTF_RTFConsumer_m
@@ -1,29 +0,0 @@
-$OpenBSD: patch-TextConverters_RTF_RTFConsumer_m,v 1.1 2015/05/28 18:38:16 sebastia Exp $
-
-upstream svn #38570
-
---- TextConverters/RTF/RTFConsumer.m.orig	Fri May 22 09:37:14 2015
-+++ TextConverters/RTF/RTFConsumer.m	Fri May 22 09:38:13 2015
-@@ -941,8 +941,8 @@ void GSRTFregisterFont (void *ctxt, const char *fontNa
-   if (!fontName || !*fontName)
-     {	
-       [NSException raise: NSInvalidArgumentException 
--		   format: @"Error in RTF (font omitted?), position:%d",
--		   TEXTPOSITION];
-+		   format: @"Error in RTF (font omitted?), position:%lu",
-+		   (unsigned long) TEXTPOSITION];
-     }
-   // exclude trailing ';' from fontName
-   if (';' == fontName[strlen(fontName)-1])
-@@ -967,9 +967,9 @@ void GSRTFfontNumber (void *ctxt, int fontNumber)
-     {
-       /* we're about to set an unknown font */
-       [NSException raise: NSInvalidArgumentException 
--		   format: @"Error in RTF (referring to undefined font \\f%d), position:%d",
-+		   format: @"Error in RTF (referring to undefined font \\f%d), position:%lu",
- 		   fontNumber,
--		   TEXTPOSITION];
-+		   (unsigned long) TEXTPOSITION];
-     } 
-   else 
-     {
diff --git a/x11/gnustep/gui/patches/patch-configure_ac b/x11/gnustep/gui/patches/patch-configure_ac
index 8dc200f0fbc..c829c7d8f46 100644
--- a/x11/gnustep/gui/patches/patch-configure_ac
+++ b/x11/gnustep/gui/patches/patch-configure_ac
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure_ac,v 1.2 2016/06/03 11:45:43 sebastia Exp $
---- configure.ac.orig	Wed May 13 23:04:45 2015
-+++ configure.ac	Wed May 18 22:18:21 2016
-@@ -502,12 +502,17 @@ AC_ARG_ENABLE(speech, 
+$OpenBSD: patch-configure_ac,v 1.3 2016/06/23 20:56:23 sebastia Exp $
+--- configure.ac.orig	Fri Feb 12 01:56:56 2016
++++ configure.ac	Mon Jun 20 22:05:56 2016
+@@ -504,12 +504,17 @@ AC_ARG_ENABLE(speech, 
  BUILD_SPEECH=
  
  # has flite, for speech synthesis.
diff --git a/x11/gnustep/gui/pkg/PLIST b/x11/gnustep/gui/pkg/PLIST
index 3dce70b28d9..3875d4808ca 100644
--- a/x11/gnustep/gui/pkg/PLIST
+++ b/x11/gnustep/gui/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2015/05/28 18:38:16 sebastia Exp $
+@comment $OpenBSD: PLIST,v 1.13 2016/06/23 20:56:23 sebastia Exp $
 bin/GSSpeechServer
 @bin bin/gclose
 @bin bin/gcloseall
@@ -60,6 +60,7 @@ include/AppKit/NSActionCell.h
 include/AppKit/NSAffineTransform.h
 include/AppKit/NSAlert.h
 include/AppKit/NSAnimation.h
+include/AppKit/NSAnimationContext.h
 include/AppKit/NSApplication.h
 include/AppKit/NSArrayController.h
 include/AppKit/NSAttributedString.h
@@ -372,9 +373,16 @@ 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
@@ -382,6 +390,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
@@ -420,6 +429,7 @@ 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
@@ -440,6 +450,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
@@ -482,6 +494,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
@@ -533,6 +546,8 @@ ${LIBDIR}/Resources/German.lproj/Localizable.strings
 ${LIBDIR}/Resources/Info-gnustep.plist
 ${LIBDIR}/Resources/Italian.lproj/
 ${LIBDIR}/Resources/Italian.lproj/Localizable.strings
+${LIBDIR}/Resources/Korean.lproj/
+${LIBDIR}/Resources/Korean.lproj/Localizable.strings
 ${LIBDIR}/Resources/Lojban.lproj/
 ${LIBDIR}/Resources/Lojban.lproj/Localizable.strings
 ${LIBDIR}/Resources/Spanish.lproj/