11 files changed, 42 insertions, 50 deletions

diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index 56a4ee97a186..0be43860d804 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnustep-app
 PORTVERSION=	2.0.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11 gnustep
 
 MAINTAINER=	theraven@FreeBSD.org
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index 1220b381dd8c..bcb085029375 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gskrab
 PORTVERSION=	0.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	http://organact.mine.nu/~wolfgang/gskrab/
 DISTNAME=	GSKrab-${PORTVERSION}
diff --git a/x11/innerspace/Makefile b/x11/innerspace/Makefile
index 58af91fc1001..d16b346a6019 100644
--- a/x11/innerspace/Makefile
+++ b/x11/innerspace/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	innerspace
 PORTVERSION=	0.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	InnerSpace-${PORTVERSION}
diff --git a/x11/innerspace/files/patch-Black.bproj_GNUmakefile b/x11/innerspace/files/patch-Black.bproj_GNUmakefile
new file mode 100644
index 000000000000..e205ec7476f6
--- /dev/null
+++ b/x11/innerspace/files/patch-Black.bproj_GNUmakefile
@@ -0,0 +1,11 @@
+--- Black.bproj/GNUmakefile.orig	2017-08-13 17:29:20 UTC
++++ Black.bproj/GNUmakefile
+@@ -18,8 +18,6 @@
+ #  If not, write to the Free Software Foundation,
+ #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+ # Black_MAIN_MODEL_FILE = Black.gmodel
+ Black_PRINCIPAL_CLASS = BlackView
+ 
diff --git a/x11/innerspace/files/patch-Boxes.bproj_GNUmakefile b/x11/innerspace/files/patch-Boxes.bproj_GNUmakefile
new file mode 100644
index 000000000000..bb18e4c38cb6
--- /dev/null
+++ b/x11/innerspace/files/patch-Boxes.bproj_GNUmakefile
@@ -0,0 +1,11 @@
+--- Boxes.bproj/GNUmakefile.orig	2017-08-13 17:28:44 UTC
++++ Boxes.bproj/GNUmakefile
+@@ -26,8 +26,6 @@
+ #  If not, write to the Free Software Foundation,
+ #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+ 
+ # Boxes_MAIN_MODEL_FILE = Boxes.gorm
+ Boxes_PRINCIPAL_CLASS = BoxesView
diff --git a/x11/innerspace/files/patch-NickSpace.bproj_GNUmakefile b/x11/innerspace/files/patch-NickSpace.bproj_GNUmakefile
new file mode 100644
index 000000000000..56a087092dd3
--- /dev/null
+++ b/x11/innerspace/files/patch-NickSpace.bproj_GNUmakefile
@@ -0,0 +1,11 @@
+--- NickSpace.bproj/GNUmakefile.orig	2017-08-13 17:29:06 UTC
++++ NickSpace.bproj/GNUmakefile
+@@ -26,8 +26,6 @@
+ #  If not, write to the Free Software Foundation,
+ #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ 
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+ NickSpace_MAIN_MODEL_FILE = NickSpace.gorm
+ 
+ include $(GNUSTEP_MAKEFILES)/common.make
diff --git a/x11/innerspace/files/patch-NickSpaceView.m b/x11/innerspace/files/patch-NickSpace.bproj_NickSpaceView.m
index c4971adb5893..79b7da2400a3 100644
--- a/x11/innerspace/files/patch-NickSpaceView.m
+++ b/x11/innerspace/files/patch-NickSpace.bproj_NickSpaceView.m
@@ -1,4 +1,4 @@
---- NickSpace.bproj/NickSpaceView.m.orig	2005-06-27 18:53:04.000000000 -0500
+--- NickSpace.bproj/NickSpaceView.m.orig	2005-06-27 23:53:04 UTC
 +++ NickSpace.bproj/NickSpaceView.m
 @@ -1,6 +1,8 @@
  #import "NickSpaceView.h"
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index a65677aa8540..7070bc1561d1 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	terminal.app
-PORTVERSION=	0.9.8
-PORTREVISION=	3
+PORTVERSION=	0.9.9
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	SAVANNAH/gap
 DISTNAME=	Terminal-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	theraven@FreeBSD.org
 COMMENT=	Terminal Emulator for GNUstep
 
 LICENSE=	GPLv2 # only
diff --git a/x11/terminal.app/distinfo b/x11/terminal.app/distinfo
index e299e4af9e45..546819998c34 100644
--- a/x11/terminal.app/distinfo
+++ b/x11/terminal.app/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Terminal-0.9.8.tar.gz) = 488428fcc8c25eb3d0b29419f12f48d1dc893dbf89aa71a80743fba31e18eace
-SIZE (Terminal-0.9.8.tar.gz) = 110520
+TIMESTAMP = 1502622027
+SHA256 (Terminal-0.9.9.tar.gz) = 27f81bbecdbd10cde8c080012cde4973bec20e551c58c29f353733cf03c220e9
+SIZE (Terminal-0.9.9.tar.gz) = 88762
diff --git a/x11/terminal.app/files/patch-TerminalView.m b/x11/terminal.app/files/patch-TerminalView.m
deleted file mode 100644
index b22f3414cbe8..000000000000
--- a/x11/terminal.app/files/patch-TerminalView.m
+++ /dev/null
@@ -1,28 +0,0 @@
---- TerminalView.m.orig	2012-03-06 17:54:33.000000000 -0500
-+++ TerminalView.m
-@@ -33,7 +33,7 @@ activated */
- #  include <termios.h>
- #  include <pcap.h>
- #define TCSETS TIOCSETA
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #  include <sys/types.h>
- #  include <sys/ioctl.h>
- #  include <termios.h>
-@@ -52,7 +52,7 @@ activated */
- #include <sys/types.h>
- #include <unistd.h>
- #include <fcntl.h>
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__DragonFly__)
- #if !(defined (__NetBSD__)) && !(defined (__SOLARIS__)) && !(defined(__OpenBSD__))
- #  include <pty.h>
- #endif
-@@ -73,6 +73,7 @@ activated */
- #include <AppKit/NSGraphics.h>
- #include <AppKit/NSScroller.h>
- #include <AppKit/DPSOperators.h>
-+#include <AppKit/NSButtonCell.h>
- 
- #include "TerminalView.h"
- 
diff --git a/x11/terminal.app/files/patch-main.m b/x11/terminal.app/files/patch-main.m
deleted file mode 100644
index 7681b87186bd..000000000000
--- a/x11/terminal.app/files/patch-main.m
+++ /dev/null
@@ -1,13 +0,0 @@
---- main.m.orig	2009-11-20 21:06:38.000000000 +0100
-+++ main.m	2010-05-24 09:20:30.000000000 +0200
-@@ -186,8 +186,8 @@
- 	[m addItemWithTitle: _(@"Close")
- 		action: @selector(performClose:)
- 		keyEquivalent: @"w"];
--	[m addItemWithTitle: _(@"Miniaturize all")
--		action: @selector(miniaturizeAll:)
-+	[m addItemWithTitle: _(@"Miniaturize Window")
-+		action: @selector(miniaturize:)
- 		keyEquivalent: @"m"];
- 	[menu setSubmenu: m forItem: [menu addItemWithTitle: _(@"Windows")]];
- 	[NSApp setWindowsMenu: m];