aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2017-08-21 21:26:28 +0800
committertheraven <theraven@FreeBSD.org>2017-08-21 21:26:28 +0800
commitb979cb2ebddb0a2733e9a38fb66d4229500c7113 (patch)
tree1818a753b93ff1ef78365147f674b9e83bcf0048
parent0f34c5b91d625d06b13a8b457ca91d2a821387a4 (diff)
downloadfreebsd-ports-gnome-b979cb2ebddb0a2733e9a38fb66d4229500c7113.tar.gz
freebsd-ports-gnome-b979cb2ebddb0a2733e9a38fb66d4229500c7113.tar.zst
freebsd-ports-gnome-b979cb2ebddb0a2733e9a38fb66d4229500c7113.zip
Update GNUstep core libraries.
Update the default Objective-C compiler. Fix various build failures in GNUstep ports from newer versions of the GNUstep core libraries and from changes to GNUstep Make. Update various ports that use GNUstep and bump the portrevision of the ones that haven't had a new release.
-rw-r--r--Mk/Uses/gnustep.mk4
-rw-r--r--Mk/Uses/objc.mk16
-rw-r--r--archivers/freetar/Makefile2
-rw-r--r--archivers/unarchiver/Makefile2
-rw-r--r--archivers/zipper/Makefile2
-rw-r--r--audio/cddb-bundle/Makefile2
-rw-r--r--audio/gnustep-cdplayer/Makefile2
-rw-r--r--audio/mpdcon/Makefile2
-rw-r--r--biology/biococoa/Makefile2
-rw-r--r--databases/fortytwo-bdb/Makefile2
-rw-r--r--databases/sqlclient/Makefile2
-rw-r--r--deskutils/affiche/Makefile2
-rw-r--r--deskutils/appwrapper/Makefile2
-rw-r--r--deskutils/cartotheque/Makefile2
-rw-r--r--deskutils/charmap/Makefile2
-rw-r--r--deskutils/gnustep-wrapper/Makefile2
-rw-r--r--deskutils/gnustep-wrapper/files/patch-Directories.make11
-rw-r--r--deskutils/gworkspace-gwmetadata/Makefile2
-rw-r--r--deskutils/gworkspace-gwmetadata/distinfo5
-rw-r--r--deskutils/gworkspace/Makefile3
-rw-r--r--deskutils/gworkspace/distinfo5
-rw-r--r--deskutils/gworkspace/pkg-plist29
-rw-r--r--deskutils/helpviewer/Makefile2
-rw-r--r--deskutils/plopfolio/Makefile2
-rw-r--r--deskutils/preferences/Makefile2
-rw-r--r--deskutils/preferences/files/patch-GNUmakefile.preamble31
-rw-r--r--deskutils/preferences/files/patch-Keyboard.m10
-rw-r--r--deskutils/preferences/files/patch-Modules_Keyboard_GNUmakefile (renamed from deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile)6
-rw-r--r--deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m13
-rw-r--r--deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble21
-rw-r--r--deskutils/simpleagenda/Makefile2
-rw-r--r--deskutils/systempreferences/Makefile2
-rw-r--r--deskutils/toolboxkit/Makefile2
-rw-r--r--devel/cherivis-devel/Makefile1
-rw-r--r--devel/fortytwo-encore/Makefile2
-rw-r--r--devel/gnustep-make/Makefile3
-rw-r--r--devel/gnustep-make/distinfo5
-rw-r--r--devel/gnustep-make/files/patch-Instance_framework.make11
-rw-r--r--devel/gnustep-make/pkg-plist2
-rw-r--r--devel/gnustep/Makefile2
-rw-r--r--devel/gorm/Makefile2
-rw-r--r--devel/gorm/distinfo5
-rw-r--r--devel/highlighterkit/Makefile2
-rw-r--r--devel/performance/Makefile2
-rw-r--r--devel/projectcenter/Makefile1
-rw-r--r--devel/sope2/Makefile1
-rw-r--r--devel/sope3/Makefile1
-rw-r--r--devel/wizardkit/Makefile2
-rw-r--r--finance/expense/Makefile2
-rw-r--r--ftp/gnustep-ftp/Makefile2
-rw-r--r--ftp/waiho/Makefile2
-rw-r--r--games/fortunate/Makefile2
-rw-r--r--games/gmastermind/Makefile2
-rw-r--r--games/gmines/Makefile2
-rw-r--r--games/gnustep-ladder/Makefile2
-rw-r--r--games/gnustep-sudoku/Makefile2
-rw-r--r--games/gomoku/Makefile2
-rw-r--r--games/grubik/Makefile4
-rw-r--r--games/grubik/files/patch-GNUmakefile21
-rw-r--r--games/gshisen/Makefile2
-rw-r--r--games/jigsaw/Makefile2
-rw-r--r--games/lapispuzzle/Makefile2
-rw-r--r--games/nextgo/Makefile2
-rw-r--r--games/nextgo/files/patch-GNUmakefile11
-rw-r--r--games/nextgo/files/patch-smartgo.h8
-rw-r--r--games/oolite/Makefile2
-rw-r--r--graphics/cenon/Makefile15
-rw-r--r--graphics/cenon/distinfo5
-rw-r--r--graphics/cenon/files/patch-DocView.m13
-rw-r--r--graphics/cenon/pkg-plist10
-rw-r--r--graphics/fortytwo/Makefile2
-rw-r--r--graphics/gnustep-slideshow/Makefile2
-rw-r--r--graphics/gnustep-slideshowkit/Makefile4
-rw-r--r--graphics/graphos/Makefile5
-rw-r--r--graphics/graphos/distinfo5
-rw-r--r--graphics/graphos/pkg-plist1
-rw-r--r--graphics/imageviewer/Makefile2
-rw-r--r--graphics/laternamagica/Makefile2
-rw-r--r--graphics/pikopixel/Makefile6
-rw-r--r--graphics/pikopixel/distinfo5
-rw-r--r--graphics/pikopixel/pkg-plist121
-rw-r--r--graphics/pixen/Makefile2
-rw-r--r--graphics/preview/Makefile2
-rw-r--r--graphics/price/Makefile2
-rw-r--r--japanese/jishyo/Makefile2
-rw-r--r--lang/gnustep-base/Makefile7
-rw-r--r--lang/gnustep-base/distinfo5
-rw-r--r--lang/gnustep-base/pkg-plist20
-rw-r--r--lang/gscheme/Makefile2
-rw-r--r--mail/addresses-goodies/Makefile2
-rw-r--r--mail/addresses/Makefile2
-rw-r--r--mail/gnumail/Makefile2
-rw-r--r--mail/pantomime/Makefile1
-rw-r--r--math/edenmath/Makefile2
-rw-r--r--misc/gnustep-examples/Makefile2
-rw-r--r--multimedia/poe/Makefile2
-rw-r--r--net/remotedesk/Makefile2
-rw-r--r--net/zillion/Makefile2
-rw-r--r--news/lusernet/Makefile2
-rw-r--r--print/gspdf/Makefile2
-rw-r--r--science/fisicalab/Makefile2
-rw-r--r--science/gtamsanalyzer/Makefile2
-rw-r--r--science/paje/Makefile5
-rw-r--r--science/paje/files/patch-AggregatingFilter_GNUmakefile18
-rw-r--r--science/paje/files/patch-ContainerFilter_GNUmakefile8
-rw-r--r--science/paje/files/patch-EntityTypeFilter_GNUmakefile8
-rw-r--r--science/paje/files/patch-FieldFilter_GNUmakefile8
-rw-r--r--science/paje/files/patch-FileReader_GNUmakefile11
-rw-r--r--science/paje/files/patch-General_GNUmakefile8
-rw-r--r--science/paje/files/patch-General_NSArray+Additions.m (renamed from science/paje/files/patch-NSArray+Additions.m)4
-rw-r--r--science/paje/files/patch-ImbricationFilter_GNUmakefile8
-rw-r--r--science/paje/files/patch-OrderFilter_GNUmakefile8
-rw-r--r--science/paje/files/patch-PajeEventDecoder_GNUmakefile11
-rw-r--r--science/paje/files/patch-PajeSimulator_GNUmakefile11
-rw-r--r--science/paje/files/patch-ReductionFilter_GNUmakefile8
-rw-r--r--science/paje/files/patch-SpaceTimeViewer_DrawView+Drawing.m (renamed from science/paje/files/patch-DrawView+Drawing.m)4
-rw-r--r--science/paje/files/patch-SpaceTimeViewer_DrawView+Finding.m (renamed from science/paje/files/patch-DrawView+Finding.m)2
-rw-r--r--science/paje/files/patch-SpaceTimeViewer_GNUmakefile8
-rw-r--r--science/paje/files/patch-StatViewer_GNUmakefile8
-rw-r--r--science/paje/files/patch-StorageController_GNUmakefile17
-rw-r--r--sysutils/batmon/Makefile1
-rw-r--r--sysutils/timemon/Makefile1
-rw-r--r--textproc/duncan/Makefile1
-rw-r--r--textproc/easydiff/Makefile2
-rw-r--r--textproc/latex-service/Makefile2
-rw-r--r--textproc/localize/Makefile2
-rw-r--r--textproc/popup/Makefile2
-rw-r--r--www/grr/Makefile2
-rw-r--r--www/rsskit/Makefile2
-rw-r--r--www/sogo2/Makefile1
-rw-r--r--www/sogo3/Makefile1
-rw-r--r--x11-clocks/aclock/Makefile2
-rw-r--r--x11-toolkits/gnustep-back/Makefile3
-rw-r--r--x11-toolkits/gnustep-back/distinfo5
-rw-r--r--x11-toolkits/gnustep-gui/Makefile5
-rw-r--r--x11-toolkits/gnustep-gui/distinfo5
-rw-r--r--x11-toolkits/gnustep-gui/files/patch-Headers__AppKit__NSTableView.h11
-rw-r--r--x11-toolkits/gnustep-gui/pkg-plist46
-rw-r--r--x11/gnustep-app/Makefile2
-rw-r--r--x11/gskrab/Makefile2
-rw-r--r--x11/innerspace/Makefile2
-rw-r--r--x11/innerspace/files/patch-Black.bproj_GNUmakefile11
-rw-r--r--x11/innerspace/files/patch-Boxes.bproj_GNUmakefile11
-rw-r--r--x11/innerspace/files/patch-NickSpace.bproj_GNUmakefile11
-rw-r--r--x11/innerspace/files/patch-NickSpace.bproj_NickSpaceView.m (renamed from x11/innerspace/files/patch-NickSpaceView.m)2
-rw-r--r--x11/terminal.app/Makefile5
-rw-r--r--x11/terminal.app/distinfo5
-rw-r--r--x11/terminal.app/files/patch-TerminalView.m28
-rw-r--r--x11/terminal.app/files/patch-main.m13
149 files changed, 601 insertions, 315 deletions
diff --git a/Mk/Uses/gnustep.mk b/Mk/Uses/gnustep.mk
index 9749ac5cadcf..225bf46b13be 100644
--- a/Mk/Uses/gnustep.mk
+++ b/Mk/Uses/gnustep.mk
@@ -63,12 +63,12 @@ LIB_DEPENDS+= libgnustep-base.so:lang/gnustep-base
. if ${USE_GNUSTEP:Mbuild}
PATH:= ${GNUSTEP_SYSTEM_TOOLS}:${GNUSTEP_LOCAL_TOOLS}:${PATH}
-MAKE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
+MAKE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
# All GNUstep things installed from ports should be in the System domain.
# Things installed from source can then freely live in the Local domain without
# conflicts.
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-CONFIGURE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
+CONFIGURE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}"
BUILD_DEPENDS+= gnustep-make>0:devel/gnustep-make
.include "${USESDIR}/objc.mk"
. endif
diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk
index c055378a63bb..490e302a9e96 100644
--- a/Mk/Uses/objc.mk
+++ b/Mk/Uses/objc.mk
@@ -10,6 +10,8 @@
.if !defined(_INCLUDE_USES_OBJC_MK)
_INCLUDE_USES_OBJC_MK= yes
+OBJC_CLANG_VERSION=40
+
objc_ARGS?=
.if !empty(objc_ARGS) && ! ${objc_ARGS:Mcompiler}
IGNORE= USES=objc only accepts no arguments or 'compiler'
@@ -39,17 +41,17 @@ ALT_COMPILER_TYPE= clang
ALT_COMPILER_TYPE= gcc
.endif
-# We do always need clang
-.if ${COMPILER_TYPE} != clang
-.if ${ALT_COMPILER_TYPE} == clang
+# We do always need clang and prefer a recent version
+.if (${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < ${OBJC_CLANG_VERSION}) || ${COMPILER_TYPE} != clang
+.if ${ALT_COMPILER_TYPE} == clang && ${ALT_COMPILER_VERSION} >= ${OJBC_CLANG_VERSION}
CC= /usr/bin/clang
CPP= /usr/bin/clang-cpp
CXX= /usr/bin/clang++
.else
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34
-CPP= ${LOCALBASE}/bin/clang-cpp34
-CC= ${LOCALBASE}/bin/clang34
-CXX= ${LOCALBASE}/bin/clang++34
+BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${OBJC_CLANG_VERSION}:devel/llvm${OBJC_CLANG_VERSION}
+CPP= ${LOCALBASE}/bin/clang-cpp${OBJC_CLANG_VERSION}
+CC= ${LOCALBASE}/bin/clang${OBJC_CLANG_VERSION}
+CXX= ${LOCALBASE}/bin/clang++${OBJC_CLANG_VERSION}
.endif
.endif
diff --git a/archivers/freetar/Makefile b/archivers/freetar/Makefile
index 3329170914b9..68fd0bdab9eb 100644
--- a/archivers/freetar/Makefile
+++ b/archivers/freetar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= freetar
PORTVERSION= 0.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= archivers gnustep
MASTER_SITES= http://download.gna.org/freetar/
DISTNAME= FreeTar-${PORTVERSION}
diff --git a/archivers/unarchiver/Makefile b/archivers/unarchiver/Makefile
index 57f77dcae871..00a20c9e1a39 100644
--- a/archivers/unarchiver/Makefile
+++ b/archivers/unarchiver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unar
PORTVERSION= 1.10.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= archivers gnustep
MASTER_SITES= http://wakaba.c3.cx/releases/TheUnarchiver/
DISTNAME= ${PORTNAME}${PORTVERSION}_src
diff --git a/archivers/zipper/Makefile b/archivers/zipper/Makefile
index a24c800e8e65..0356a32f2b2c 100644
--- a/archivers/zipper/Makefile
+++ b/archivers/zipper/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zipper
PORTVERSION= 1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= archivers gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= Zipper-${PORTVERSION}
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 7886b1f758a4..5da0e7a99521 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cddb
PORTVERSION= 0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio gnustep
MASTER_SITES= SF/gsburn/cdplayer/${DISTNAME}
PKGNAMESUFFIX= -bundle${PKGNAMESUFFIX2}
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index ac9434fa2aa5..fd93238e1358 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cdplayer
PORTVERSION= 0.5.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio gnustep
MASTER_SITES= SF/gsburn/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= gnustep-
diff --git a/audio/mpdcon/Makefile b/audio/mpdcon/Makefile
index 0976ff376eb1..b9c4bc672500 100644
--- a/audio/mpdcon/Makefile
+++ b/audio/mpdcon/Makefile
@@ -2,7 +2,7 @@
PORTNAME= mpdcon
PORTVERSION= 1.5.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= MPDCon-${PORTVERSION}
diff --git a/biology/biococoa/Makefile b/biology/biococoa/Makefile
index 337da4d87d25..2554053dbcc8 100644
--- a/biology/biococoa/Makefile
+++ b/biology/biococoa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= biococoa
PORTVERSION= 2.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= biology gnustep
MASTER_SITES= http://bioinformatics.org/biococoa/downloads/ DEBIAN/pool/main/b/biococoa.app
DISTNAME= biococoa-${PORTVERSION}-src
diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile
index 494ed999d7f1..922e8cc54610 100644
--- a/databases/fortytwo-bdb/Makefile
+++ b/databases/fortytwo-bdb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bdb
PORTVERSION= 0.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= databases gnustep
MASTER_SITES= SF/fortytwo/Berkeley%20DB%20Wrapper%20%28BDB%29/${PORTVERSION}
PKGNAMEPREFIX= fortytwo-
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index f347a17fabe0..e1427fa8100f 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sqlclient
PORTVERSION= 1.8.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases gnustep
MASTER_SITES= GNUSTEP/libs
DISTNAME= SQLClient-${PORTVERSION}
diff --git a/deskutils/affiche/Makefile b/deskutils/affiche/Makefile
index 1c7c12325866..08c7b02cd61e 100644
--- a/deskutils/affiche/Makefile
+++ b/deskutils/affiche/Makefile
@@ -2,7 +2,7 @@
PORTNAME= affiche
PORTVERSION= 0.6.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnustep
MASTER_SITES= http://www.collaboration-world.com/affiche.data/releases/Stable/
DISTNAME= Affiche-${PORTVERSION}
diff --git a/deskutils/appwrapper/Makefile b/deskutils/appwrapper/Makefile
index 66d8326fc1a8..ea0b04e4d7f0 100644
--- a/deskutils/appwrapper/Makefile
+++ b/deskutils/appwrapper/Makefile
@@ -2,7 +2,7 @@
PORTNAME= appwrapper
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnustep
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AppWrapper%20${PORTVERSION}
DISTNAME= AppWrapper.${PORTVERSION}
diff --git a/deskutils/cartotheque/Makefile b/deskutils/cartotheque/Makefile
index 1ea58fb474de..dc041dbf627c 100644
--- a/deskutils/cartotheque/Makefile
+++ b/deskutils/cartotheque/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cartotheque
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnustep
MASTER_SITES= LOCAL/dinoex
DISTNAME= Cartotheque-${PORTVERSION}
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index a63ea3def78b..b67dd0837cfb 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= charmap
PORTVERSION= 0.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnustep
MASTER_SITES= http://www.sourcefiles.org/Utilities/GUI/
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 7144dd067088..a3964c14e60a 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wrapper
PORTVERSION= 0.1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnustep
#MASTER_SITES= ftp://ftp.raffael.ch/software/GNUstepWrapper/
MASTER_SITES= LOCAL/dinoex
diff --git a/deskutils/gnustep-wrapper/files/patch-Directories.make b/deskutils/gnustep-wrapper/files/patch-Directories.make
new file mode 100644
index 000000000000..3d4fa2ba91ac
--- /dev/null
+++ b/deskutils/gnustep-wrapper/files/patch-Directories.make
@@ -0,0 +1,11 @@
+--- Directories.make.orig 2017-08-13 17:48:46 UTC
++++ Directories.make
+@@ -28,8 +28,4 @@ OBJ_BASE_DIR=shared_obj
+ endif
+
+ ARCH_DIR=$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
+-ifneq ($(GNUSTEP_FLATTENED),yes)
+-OBJ_DIR=$(OBJ_BASE_DIR)/$(ARCH_DIR)
+-else
+ OBJ_DIR=$(OBJ_BASE_DIR)
+-endif
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index 627d965e1c96..7e0649e16396 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gworkspace
-PORTVERSION= 0.9.3
+PORTVERSION= 0.9.4
CATEGORIES= deskutils gnustep
#MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/
MASTER_SITES= GNUSTEP/usr-apps
diff --git a/deskutils/gworkspace-gwmetadata/distinfo b/deskutils/gworkspace-gwmetadata/distinfo
index 139637a1e2a3..b0d024921e9a 100644
--- a/deskutils/gworkspace-gwmetadata/distinfo
+++ b/deskutils/gworkspace-gwmetadata/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gworkspace-0.9.3.tar.gz) = 238343a8c4e447debec75ff49f4657f74a4256a49862899214a2c80616c79049
-SIZE (gworkspace-0.9.3.tar.gz) = 3833838
+TIMESTAMP = 1495374909
+SHA256 (gworkspace-0.9.4.tar.gz) = f3c18371c10d8ca02954017ce5c78d8f6b6ed3101a7adae86d7c557cea405632
+SIZE (gworkspace-0.9.4.tar.gz) = 3855909
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index 912708e26f5e..f0d8346ec921 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gworkspace
-PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTVERSION= 0.9.4
CATEGORIES= deskutils gnustep
#MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/
MASTER_SITES= GNUSTEP/usr-apps
diff --git a/deskutils/gworkspace/distinfo b/deskutils/gworkspace/distinfo
index 139637a1e2a3..ebad9d218dc3 100644
--- a/deskutils/gworkspace/distinfo
+++ b/deskutils/gworkspace/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gworkspace-0.9.3.tar.gz) = 238343a8c4e447debec75ff49f4657f74a4256a49862899214a2c80616c79049
-SIZE (gworkspace-0.9.3.tar.gz) = 3833838
+TIMESTAMP = 1495374913
+SHA256 (gworkspace-0.9.4.tar.gz) = f3c18371c10d8ca02954017ce5c78d8f6b6ed3101a7adae86d7c557cea405632
+SIZE (gworkspace-0.9.4.tar.gz) = 3855909
diff --git a/deskutils/gworkspace/pkg-plist b/deskutils/gworkspace/pkg-plist
index 35298548abce..35b017553ce8 100644
--- a/deskutils/gworkspace/pkg-plist
+++ b/deskutils/gworkspace/pkg-plist
@@ -108,13 +108,6 @@ GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gor
GNUstep/System/Applications/GWorkspace.app/Resources/Esperanto.lproj/Localizable.strings
GNUstep/System/Applications/GWorkspace.app/Resources/FFArrow.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/FFArrow_disabled.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small_alt.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small_osx.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_alt.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_osx.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_WebLink.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/FileManager.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Localizable.strings
@@ -161,14 +154,11 @@ GNUstep/System/Applications/GWorkspace.app/Resources/Month-7.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Month-8.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Month-9.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Month.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/MultipleSelection.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Norvegian.lproj/Localizable.strings
GNUstep/System/Applications/GWorkspace.app/Resources/Pboard.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Localizable.strings
GNUstep/System/Applications/GWorkspace.app/Resources/REWArrow.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/REWArrow_disabled.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/Recycler.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/RecyclerFull.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/RightArr.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Localizable.strings
GNUstep/System/Applications/GWorkspace.app/Resources/SlideMask.tiff
@@ -373,16 +363,11 @@ GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Headers/FSNPathCom
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Headers/FSNTextCell.h
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Headers/FSNode.h
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Headers/FSNodeRep.h
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/ArrowRight.tiff
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/English.lproj/Localizable.strings
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/FolderOpen.tiff
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/HardDisk.tiff
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/HardDiskOpen.tiff
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Info-gnustep.plist
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/MultipleSelection.tiff
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Recycler.tiff
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/RecyclerFull.tiff
-GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Workspace.tiff
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/libFSNode.so
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/libFSNode.so.0
GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/libFSNode.so.0.1.0
@@ -418,7 +403,6 @@ GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Engli
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/InspectorWin.gorm/data.classes
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/InspectorWin.gorm/data.info
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/InspectorWin.gorm/objects.gorm
-GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/Localizable.strings
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/Tools.gorm/data.classes
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/Tools.gorm/data.info
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/English.lproj/Tools.gorm/objects.gorm
@@ -453,7 +437,6 @@ GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Month
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Month-8.tiff
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Month-9.tiff
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Month.tiff
-GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/MultipleSelection.tiff
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Pboard.tiff
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Weekday-0.tiff
GNUstep/System/Library/Frameworks/Inspector.framework/Versions/0/Resources/Weekday-1.tiff
@@ -524,13 +507,19 @@ GNUstep/System/Library/Libraries/libInspector.so.0.1.0
GNUstep/System/Library/Libraries/libOperation.so
GNUstep/System/Library/Libraries/libOperation.so.1
GNUstep/System/Library/Libraries/libOperation.so.1.0.0
-GNUstep/System/Library/Services/thumbnailer.service/Resources/Info-gnustep.plist
-GNUstep/System/Library/Services/thumbnailer.service/thumbnailer
GNUstep/System/Tools/GWorkspace
GNUstep/System/Tools/Recycler
GNUstep/System/Tools/ddbd
GNUstep/System/Tools/fswatcher
GNUstep/System/Tools/lsfupdater
-GNUstep/System/Tools/resizer
GNUstep/System/Tools/searchtool
GNUstep/System/Tools/wopen
+GNUstep/System/Library/Bundles/Role.extinfo/Resources/English.lproj/Localizable.strings
+GNUstep/System/Library/Bundles/Role.extinfo/Resources/French.lproj/Localizable.strings
+GNUstep/System/Library/Bundles/Role.extinfo/Resources/German.lproj/Localizable.strings
+GNUstep/System/Library/Bundles/Role.extinfo/Resources/Italian.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/French.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/German.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Italian.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/FSNode.framework/Versions/0/Resources/Spanish.lproj/Localizable.strings
+
diff --git a/deskutils/helpviewer/Makefile b/deskutils/helpviewer/Makefile
index 37c679dc40ff..85c27d756bb9 100644
--- a/deskutils/helpviewer/Makefile
+++ b/deskutils/helpviewer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= helpviewer
PORTVERSION= 0.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnustep
MASTER_SITES= http://www.roard.com/helpviewer/download/
DISTNAME= HelpViewer-${PORTVERSION}
diff --git a/deskutils/plopfolio/Makefile b/deskutils/plopfolio/Makefile
index 52512c1c22d5..d971eb5c55c4 100644
--- a/deskutils/plopfolio/Makefile
+++ b/deskutils/plopfolio/Makefile
@@ -2,7 +2,7 @@
PORTNAME= plopfolio
PORTVERSION= 0.1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= deskutils gnustep
MASTER_SITES= GNUSTEP/usr-apps
diff --git a/deskutils/preferences/Makefile b/deskutils/preferences/Makefile
index 9f90bbef26f7..e4df930a5f82 100644
--- a/deskutils/preferences/Makefile
+++ b/deskutils/preferences/Makefile
@@ -2,7 +2,7 @@
PORTNAME= preferences
PORTVERSION= 1.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= deskutils gnustep
MASTER_SITES= SF/prefsapp/prefsapp/${PORTVERSION}
DISTNAME= Preferences-${PORTVERSION}
diff --git a/deskutils/preferences/files/patch-GNUmakefile.preamble b/deskutils/preferences/files/patch-GNUmakefile.preamble
new file mode 100644
index 000000000000..14914b05ebcb
--- /dev/null
+++ b/deskutils/preferences/files/patch-GNUmakefile.preamble
@@ -0,0 +1,31 @@
+--- GNUmakefile.preamble.orig 2002-02-12 04:35:17 UTC
++++ GNUmakefile.preamble
+@@ -2,10 +2,10 @@
+ ADDITIONAL_CPPFLAGS +=
+
+ # Additional flags to pass to the Objective-C compiler
+-ADDITIONAL_OBJCFLAGS += -Wall -Werror
++ADDITIONAL_OBJCFLAGS += -Wall
+
+ # Additional flags to pass to the C compiler
+-ADDITIONAL_CFLAGS += -Wall -Werror
++ADDITIONAL_CFLAGS += -Wall
+
+ # Additional include directories the compiler should search
+ ADDITIONAL_INCLUDE_DIRS +=
+@@ -30,15 +30,3 @@ ADDITIONAL_OBJC_LIBS +=
+ ADDITIONAL_TOOL_LIBS +=
+ # WebObjects
+ ADDITIONAL_WO_LIBS +=
+-
+-#
+-# Flags dealing with installing and uninstalling
+-#
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
+-
+-# Additional directories to be created during installation
+-ADDITIONAL_INSTALL_DIRS += \
+- $(GNUSTEP_USER_ROOT)/Library/Preferences \
+- $(GNUSTEP_LOCAL_ROOT)/Library/Preferences \
+- $(GNUSTEP_NETWORK_ROOT)/Library/Preferences \
+- $(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
diff --git a/deskutils/preferences/files/patch-Keyboard.m b/deskutils/preferences/files/patch-Keyboard.m
deleted file mode 100644
index bdf962baf8c3..000000000000
--- a/deskutils/preferences/files/patch-Keyboard.m
+++ /dev/null
@@ -1,10 +0,0 @@
---- Modules/Keyboard/Keyboard.m.orig 2002-06-08 10:29:36.000000000 +0200
-+++ Modules/Keyboard/Keyboard.m 2010-05-22 11:24:43.000000000 +0200
-@@ -37,6 +37,7 @@
- #import <AppKit/NSButton.h>
- #import <AppKit/NSNibLoading.h>
- #import <AppKit/NSOpenPanel.h>
-+#import <Foundation/NSUserDefaults.h>
-
- #import "Keyboard.h"
- #import "KeyboardView.h"
diff --git a/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile b/deskutils/preferences/files/patch-Modules_Keyboard_GNUmakefile
index 603e28217bbe..02a1348e3eb4 100644
--- a/deskutils/preferences/files/patch-Modules-Keyboard-GNUmakefile
+++ b/deskutils/preferences/files/patch-Modules_Keyboard_GNUmakefile
@@ -1,11 +1,11 @@
---- Modules/Keyboard/GNUmakefile.orig 2014-07-30 00:10:57.436168949 +0800
-+++ Modules/Keyboard/GNUmakefile 2014-07-30 00:11:06.363171068 +0800
+--- Modules/Keyboard/GNUmakefile.orig 2002-02-12 04:49:55 UTC
++++ Modules/Keyboard/GNUmakefile
@@ -3,7 +3,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
BUNDLE_NAME= Keyboard
BUNDLE_EXTENSION= .prefs
-BUNDLE_INSTALL_DIR= $(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
-+BUNDLE_INSTALL_DIR= $(DESTDIR)$(GNUSTEP_SYSTEM_ROOT)/Library/Preferences
++BUNDLE_INSTALL_DIR= $(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Preferences
Keyboard_RESOURCE_FILES= \
Keyboard.gorm
diff --git a/deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m b/deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m
new file mode 100644
index 000000000000..3dbd87aaaa21
--- /dev/null
+++ b/deskutils/preferences/files/patch-Modules_Keyboard_Keyboard.m
@@ -0,0 +1,13 @@
+--- Modules/Keyboard/Keyboard.m.orig 2017-08-13 12:40:14 UTC
++++ Modules/Keyboard/Keyboard.m
+@@ -34,9 +34,7 @@ static const char rcsid[] =
+ # include "Config.h"
+ #endif
+
+-#import <AppKit/NSButton.h>
+-#import <AppKit/NSNibLoading.h>
+-#import <AppKit/NSOpenPanel.h>
++#import <Cocoa/Cocoa.h>
+
+ #import "Keyboard.h"
+ #import "KeyboardView.h"
diff --git a/deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble b/deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble
new file mode 100644
index 000000000000..5b75f7af9ff0
--- /dev/null
+++ b/deskutils/preferences/files/patch-PrefsModule_GNUmakefile.preamble
@@ -0,0 +1,21 @@
+--- PrefsModule/GNUmakefile.preamble.orig 2002-02-12 05:02:11 UTC
++++ PrefsModule/GNUmakefile.preamble
+@@ -2,10 +2,10 @@
+ ADDITIONAL_CPPFLAGS +=
+
+ # Additional flags to pass to the Objective-C compiler
+-ADDITIONAL_OBJCFLAGS += -Wall -Werror
++ADDITIONAL_OBJCFLAGS += -Wall
+
+ # Additional flags to pass to the C compiler
+-ADDITIONAL_CFLAGS += -Wall -Werror
++ADDITIONAL_CFLAGS += -Wall
+
+ # Additional include directories the compiler should search
+ ADDITIONAL_INCLUDE_DIRS +=
+@@ -34,5 +34,4 @@ ADDITIONAL_WO_LIBS +=
+ #
+ # Flags dealing with installing and uninstalling
+ #
+-GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_SYSTEM_ROOT)
+ # Additional directories to be created during installation
diff --git a/deskutils/simpleagenda/Makefile b/deskutils/simpleagenda/Makefile
index c70e211d0d6c..05973d7bfe99 100644
--- a/deskutils/simpleagenda/Makefile
+++ b/deskutils/simpleagenda/Makefile
@@ -2,7 +2,7 @@
PORTNAME= simpleagenda
PORTVERSION= 0.43
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnustep
MASTER_SITES= http://coyote.octets.fr/pub/gnustep/
DISTNAME= SimpleAgenda-${PORTVERSION}
diff --git a/deskutils/systempreferences/Makefile b/deskutils/systempreferences/Makefile
index 194f46184316..32383059abe0 100644
--- a/deskutils/systempreferences/Makefile
+++ b/deskutils/systempreferences/Makefile
@@ -2,7 +2,7 @@
PORTNAME= systempreferences
PORTVERSION= 1.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils gnustep
MASTER_SITES= GNUSTEP/usr-apps
DISTNAME= SystemPreferences-${PORTVERSION}
diff --git a/deskutils/toolboxkit/Makefile b/deskutils/toolboxkit/Makefile
index 5cca5a4c3c8c..5abaaf8a982f 100644
--- a/deskutils/toolboxkit/Makefile
+++ b/deskutils/toolboxkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= toolbox
PORTVERSION= 0.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnustep
MASTER_SITES= http://ftp.azc.uam.mx/mirrors/gnu/savannah/files/toolbox/Release.pkg/0.8/ \
LOCAL/dinoex
diff --git a/devel/cherivis-devel/Makefile b/devel/cherivis-devel/Makefile
index e4e146e1a032..c384df4a6796 100644
--- a/devel/cherivis-devel/Makefile
+++ b/devel/cherivis-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= cherivis-devel
PORTVERSION= 0.4
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= devel gnustep
MAINTAINER= theraven@FreeBSD.org
diff --git a/devel/fortytwo-encore/Makefile b/devel/fortytwo-encore/Makefile
index 0d7b45e0c409..6eccf9be829d 100644
--- a/devel/fortytwo-encore/Makefile
+++ b/devel/fortytwo-encore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= encore
PORTVERSION= 0.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel gnustep
MASTER_SITES= SF/fortytwo/Encore/${PORTVERSION}
PKGNAMEPREFIX= fortytwo-
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 1ffedbba48c8..a3c2acab539b 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnustep-make
-PORTVERSION= 2.6.7
-PORTREVISION= 2
+PORTVERSION= 2.7.0
CATEGORIES= devel gnustep
MASTER_SITES= GNUSTEP/core
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 58a5fd441cc1..16253d6ceafb 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnustep-make-2.6.7.tar.gz) = 112b57737c3dcc66c78a5c88925ae1d672673d256d9935598e98bcd687d051e4
-SIZE (gnustep-make-2.6.7.tar.gz) = 583730
+TIMESTAMP = 1495188955
+SHA256 (gnustep-make-2.7.0.tar.gz) = 90a01cbfb68aafe01c4cc4123121ebd2da0e1e2076795b5682f0833fddf311ce
+SIZE (gnustep-make-2.7.0.tar.gz) = 596399
diff --git a/devel/gnustep-make/files/patch-Instance_framework.make b/devel/gnustep-make/files/patch-Instance_framework.make
deleted file mode 100644
index bd4f7cf5bd19..000000000000
--- a/devel/gnustep-make/files/patch-Instance_framework.make
+++ /dev/null
@@ -1,11 +0,0 @@
---- Instance/framework.make 2016-03-18 10:56:04.192482000 -0500
-+++ Instance/framework.make 2016-03-18 10:56:59.215696000 -0500
-@@ -493,7 +493,7 @@
- echo "@end" >> $@; \
- echo "@implementation $(DUMMY_FRAMEWORK)" >> $@; \
- echo "+ (NSString *)frameworkEnv { return nil; }" >> $@; \
-- echo "+ (NSString *)frameworkPath { return @\"$(FRAMEWORK_INSTALL_DIR)\"; }" >> $@; \
-+ echo "+ (NSString *)frameworkPath { return @\"$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)\"; }" >> $@; \
- echo "+ (NSString *)frameworkVersion { return @\"$(CURRENT_VERSION_NAME)\"; }" >> $@; \
- echo "static NSString *allClasses[] = {$$classlist};" >> $@; \
- echo "+ (NSString *const*)frameworkClasses { return allClasses; }" >> $@;\
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index 74b014073ca5..6d62f535c587 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -18,6 +18,7 @@ GNUstep/System/Library/Makefiles/Instance/Documentation/texi.make
GNUstep/System/Library/Makefiles/Instance/Shared/bundle.make
GNUstep/System/Library/Makefiles/Instance/Shared/headers.make
GNUstep/System/Library/Makefiles/Instance/Shared/java.make
+GNUstep/System/Library/Makefiles/Instance/Shared/pkgconfig.make
GNUstep/System/Library/Makefiles/Instance/Shared/stamp-string.make
GNUstep/System/Library/Makefiles/Instance/Shared/strings.make
GNUstep/System/Library/Makefiles/Instance/application.make
@@ -176,7 +177,6 @@ GNUstep/System/Makefiles
@dir GNUstep/System/Library/Libraries/Resources
@dir GNUstep/System/Library/Makefiles/Additional
@dir GNUstep/System/Library/Makefiles/Auxiliary
-@dir GNUstep/System/Library/Makefiles/%%GNU_ARCH%%
@dir GNUstep/System/Library/PostScript
@dir GNUstep/System/Library/Sounds
@dir GNUstep/System/Library/Services
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index ebd1ddd3c1c5..c19f91443bed 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnustep
PORTVERSION= 1.28.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel lang gnustep
MAINTAINER= theraven@FreeBSD.org
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index 575b00b18a59..1fcc623ab6c2 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gorm
-PORTVERSION= 1.2.22
+PORTVERSION= 1.2.23
CATEGORIES= devel gnustep
MASTER_SITES= GNUSTEP/dev-apps
diff --git a/devel/gorm/distinfo b/devel/gorm/distinfo
index d62f850c7835..3db26d41a562 100644
--- a/devel/gorm/distinfo
+++ b/devel/gorm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gorm-1.2.22.tar.gz) = b15aca762a41a233535cdcadf3e0ce8cfcfbb48c31857eef246ca5d68bb105d7
-SIZE (gorm-1.2.22.tar.gz) = 695453
+TIMESTAMP = 1495374876
+SHA256 (gorm-1.2.23.tar.gz) = cbd25abbbc85d81d50111be75da14aabce368337694948c95b68b6fdf74eeea2
+SIZE (gorm-1.2.23.tar.gz) = 695799
diff --git a/devel/highlighterkit/Makefile b/devel/highlighterkit/Makefile
index ce9872941eab..da21562500f6 100644
--- a/devel/highlighterkit/Makefile
+++ b/devel/highlighterkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= highlighterkit
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnustep
MASTER_SITES= http://download.gna.org/pmanager/0.2/
DISTNAME= HighlighterKit-${PORTVERSION}
diff --git a/devel/performance/Makefile b/devel/performance/Makefile
index 3fa0c40d8fcf..8b6be48c1251 100644
--- a/devel/performance/Makefile
+++ b/devel/performance/Makefile
@@ -2,7 +2,7 @@
PORTNAME= performance
PORTVERSION= 0.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnustep
MASTER_SITES= GNUSTEP/libs
DISTNAME= Performance-${PORTVERSION}
diff --git a/devel/projectcenter/Makefile b/devel/projectcenter/Makefile
index 20c66da6b6b7..befa3bd36385 100644
--- a/devel/projectcenter/Makefile
+++ b/devel/projectcenter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= projectcenter
PORTVERSION= 0.6.2
+PORTREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= GNUSTEP/dev-apps
DISTNAME= ProjectCenter-${PORTVERSION}
diff --git a/devel/sope2/Makefile b/devel/sope2/Makefile
index a253406b244a..ebf1fed80f1b 100644
--- a/devel/sope2/Makefile
+++ b/devel/sope2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sope2
PORTVERSION= 2.3.22
+PORTREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
DISTNAME= SOPE-${PORTVERSION}
diff --git a/devel/sope3/Makefile b/devel/sope3/Makefile
index 5af56cd6d267..1f2b9eca9897 100644
--- a/devel/sope3/Makefile
+++ b/devel/sope3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sope3
PORTVERSION= 3.2.10
+PORTREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
DISTNAME= SOPE-${PORTVERSION}
diff --git a/devel/wizardkit/Makefile b/devel/wizardkit/Makefile
index b4ac7aa18666..6f7b61086284 100644
--- a/devel/wizardkit/Makefile
+++ b/devel/wizardkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= wizardkit
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel gnustep
MASTER_SITES= http://download.gna.org/pmanager/0.2/
DISTNAME= WizardKit-${PORTVERSION}
diff --git a/finance/expense/Makefile b/finance/expense/Makefile
index beb51e4a581a..db14e0fa6cd0 100644
--- a/finance/expense/Makefile
+++ b/finance/expense/Makefile
@@ -2,7 +2,7 @@
PORTNAME= expense
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= finance gnustep
MASTER_SITES= http://www.eskimo.com/~pburns/Expense/files/
DISTNAME= Expense-${PORTVERSION}
diff --git a/ftp/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile
index 26c5ec279e01..2dc20338a3ac 100644
--- a/ftp/gnustep-ftp/Makefile
+++ b/ftp/gnustep-ftp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ftp
PORTVERSION= 0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ftp gnustep
MASTER_SITES= SAVANNAH/gap
PKGNAMEPREFIX= gnustep-
diff --git a/ftp/waiho/Makefile b/ftp/waiho/Makefile
index 70a075a03a61..23746aae9681 100644
--- a/ftp/waiho/Makefile
+++ b/ftp/waiho/Makefile
@@ -2,7 +2,7 @@
PORTNAME= waiho
PORTVERSION= 0.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= ftp gnustep
MASTER_SITES= http://www.roard.com/waiho/download/
DISTNAME= Waiho-${PORTVERSION}
diff --git a/games/fortunate/Makefile b/games/fortunate/Makefile
index e82af916b241..81cd23013fa2 100644
--- a/games/fortunate/Makefile
+++ b/games/fortunate/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fortunate
PORTVERSION= 3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnustep
MASTER_SITES= GNUSTEP_CH
diff --git a/games/gmastermind/Makefile b/games/gmastermind/Makefile
index 8f313ef4bfc7..521b1c41cc2b 100644
--- a/games/gmastermind/Makefile
+++ b/games/gmastermind/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gmastermind
PORTVERSION= 0.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= GMastermind-${PORTVERSION}
diff --git a/games/gmines/Makefile b/games/gmines/Makefile
index f0781a77c230..b9c9ae5be38e 100644
--- a/games/gmines/Makefile
+++ b/games/gmines/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gmines
PORTVERSION= 0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= GMines-${PORTVERSION}
diff --git a/games/gnustep-ladder/Makefile b/games/gnustep-ladder/Makefile
index eb64b4ed686c..fc83c7a55014 100644
--- a/games/gnustep-ladder/Makefile
+++ b/games/gnustep-ladder/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ladder
PORTVERSION= 1.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnustep
MASTER_SITES= SAVANNAH/gap
PKGNAMEPREFIX= gnustep-
diff --git a/games/gnustep-sudoku/Makefile b/games/gnustep-sudoku/Makefile
index d6f6f8ad0d63..746d03ffd6f8 100644
--- a/games/gnustep-sudoku/Makefile
+++ b/games/gnustep-sudoku/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sudoku
PORTVERSION= 0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnustep
MASTER_SITES= SAVANNAH/gap
PKGNAMEPREFIX= gnustep-
diff --git a/games/gomoku/Makefile b/games/gomoku/Makefile
index a152e0cc8fb0..27d2bf230ab7 100644
--- a/games/gomoku/Makefile
+++ b/games/gomoku/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gomoku
PORTVERSION= 1.2.9
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnustep
MASTER_SITES= http://www.gnustep.it/nicola/Applications/Gomoku/
DISTNAME= Gomoku-${PORTVERSION}
diff --git a/games/grubik/Makefile b/games/grubik/Makefile
index 6f1d6099511e..3ef3fb1dbbf6 100644
--- a/games/grubik/Makefile
+++ b/games/grubik/Makefile
@@ -2,7 +2,7 @@
PORTNAME= grubik
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnustep
MASTER_SITES= http://debian.uni-essen.de/misc/GNUstep/Apps/Recreational/
DISTNAME= GRubik
@@ -17,8 +17,6 @@ USE_GNUSTEP= back build
post-patch:
${RM} -r ${WRKSRC}/GRubik.app/ix86
- ${REINPLACE_CMD} -e 's|^//|# //|' \
- -e "/GNUSTEP_INSTALLATION_DIR/d" ${WRKSRC}/GNUmakefile
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/GRubik.app/GRubik
diff --git a/games/grubik/files/patch-GNUmakefile b/games/grubik/files/patch-GNUmakefile
new file mode 100644
index 000000000000..9cc8656aaff6
--- /dev/null
+++ b/games/grubik/files/patch-GNUmakefile
@@ -0,0 +1,21 @@
+--- GNUmakefile.orig 2017-08-13 19:04:30 UTC
++++ GNUmakefile
+@@ -1,8 +1,3 @@
+-
+-GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+-
+-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
+-
+ include $(GNUSTEP_MAKEFILES)/common.make
+
+ # The application to be compiled
+@@ -16,9 +11,6 @@ GRubik_OBJC_FILES = main.m \
+
+ SHARED_CFLAGS += -g
+
+-# The Resource files to be copied into the app's resources directory
+-// GRubik_RESOURCE_FILES = Icons/*
+-
+ -include GNUmakefile.preamble
+
+ -include GNUmakefile.local
diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile
index 069ad45fe5ac..9477b511579e 100644
--- a/games/gshisen/Makefile
+++ b/games/gshisen/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gshisen
PORTVERSION= 1.3.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= GShisen-${PORTVERSION}
diff --git a/games/jigsaw/Makefile b/games/jigsaw/Makefile
index ff16961258e4..b3fbd5c17621 100644
--- a/games/jigsaw/Makefile
+++ b/games/jigsaw/Makefile
@@ -2,7 +2,7 @@
PORTNAME= jigsaw
PORTVERSION= 0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= Jigsaw-${PORTVERSION}
diff --git a/games/lapispuzzle/Makefile b/games/lapispuzzle/Makefile
index 65eac24cf19e..9bb84814f509 100644
--- a/games/lapispuzzle/Makefile
+++ b/games/lapispuzzle/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lapispuzzle
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= LapisPuzzle-${PORTVERSION}
diff --git a/games/nextgo/Makefile b/games/nextgo/Makefile
index 45b42fcdc174..9fcc251f7def 100644
--- a/games/nextgo/Makefile
+++ b/games/nextgo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= nextgo
PORTVERSION= 3.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= NeXTGo-${PORTVERSION}
diff --git a/games/nextgo/files/patch-GNUmakefile b/games/nextgo/files/patch-GNUmakefile
new file mode 100644
index 000000000000..6798d5aff6d6
--- /dev/null
+++ b/games/nextgo/files/patch-GNUmakefile
@@ -0,0 +1,11 @@
+--- GNUmakefile.orig 2017-08-13 18:43:49 UTC
++++ GNUmakefile
+@@ -28,8 +28,6 @@
+
+ #GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
+
+-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Library/Makefiles
+-
+ NeXTGo_MAIN_MODEL_FILE = NeXTGo.gorm
+
+ include $(GNUSTEP_MAKEFILES)/common.make
diff --git a/games/nextgo/files/patch-smartgo.h b/games/nextgo/files/patch-smartgo.h
index 77e08ff5e3b8..729b20aaf459 100644
--- a/games/nextgo/files/patch-smartgo.h
+++ b/games/nextgo/files/patch-smartgo.h
@@ -1,6 +1,6 @@
---- smartgo.h.orig Sun Jan 12 05:01:52 2003
-+++ smartgo.h Sat Nov 18 17:18:57 2006
-@@ -122,7 +122,7 @@
+--- smartgo.h.orig 2003-01-12 04:01:52 UTC
++++ smartgo.h
+@@ -122,7 +122,7 @@ typedef struct _node {
extern node* parse_tree(char* inputBuffer);
/* Routines from smartgoeval.c needed by other routines. */
@@ -9,7 +9,7 @@
/* Routines from smartgotree.c needed by other routines. */
-@@ -134,7 +134,7 @@
+@@ -134,7 +134,7 @@ extern node* findLast0(node* currentNode
extern node* forwardOneVariant(node* currentNode);
extern node* backOneVariant(node* currentNode);
extern void clearNodeFlags(node* currentNode);
diff --git a/games/oolite/Makefile b/games/oolite/Makefile
index cd3ea70d089d..ced028f3b94c 100644
--- a/games/oolite/Makefile
+++ b/games/oolite/Makefile
@@ -3,7 +3,7 @@
PORTNAME= oolite
PORTVERSION= 1.84
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games gnustep
MASTER_SITES= https://github.com/OoliteProject/oolite/releases/download/1.84/
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
diff --git a/graphics/cenon/Makefile b/graphics/cenon/Makefile
index a4a96f136be3..c0027134db23 100644
--- a/graphics/cenon/Makefile
+++ b/graphics/cenon/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cenon
-PORTVERSION= 4.0.2
-PORTREVISION= 3
+PORTVERSION= 4.0.3
CATEGORIES= graphics gnustep
MASTER_SITES= http://www.cenon.zone/download/source/
DISTNAME= Cenon-${MAINVERSION}
@@ -15,16 +14,20 @@ MAINTAINER= theraven@FreeBSD.org
COMMENT= Vector graphics tool for GNUstep
USES= tar:bzip2 gnustep
-USE_GNUSTEP= back build
+USE_GNUSTEP= gui base build
WRKSRC= ${WRKDIR}/Cenon
-MAINVERSION= 4.0.2
+MAINVERSION= 4.0.5
FULLVERSION= 4.0.0
CENON_LIB_DIR= ${GNUSTEP_SYSTEM_ROOT}/Library/Cenon
OPTIONS_DEFINE= FULL_LIBRARY
FULL_LIBRARY_DESC= Install complete Cenon Library
+# Work around the fact that GNUstep doesn't define a constant for a higher
+# version of AppKit that it supports.
+OBJCFLAGS+=-DNSAppKitVersionNumber10_8=1200
+
.include <bsd.port.options.mk>
DISTFILES+= CenonLibrary-${FULLVERSION}-1${EXTRACT_SUFX}
@@ -39,4 +42,8 @@ pre-install:
-C ${STAGEDIR}${GNUSTEP_SYSTEM_ROOT}/Library/ \
--exclude COPYING --exclude '._*'
+post-stage:
+ ${RM} ${STAGEDIR}${GNUSTEP_SYSTEM_ROOT}/Library/README
+ ${RM} ${STAGEDIR}${GNUSTEP_SYSTEM_ROOT}/Library/._README
+
.include <bsd.port.mk>
diff --git a/graphics/cenon/distinfo b/graphics/cenon/distinfo
index 8cd1dcb2ad2a..b006b641f5e6 100644
--- a/graphics/cenon/distinfo
+++ b/graphics/cenon/distinfo
@@ -1,4 +1,5 @@
-SHA256 (cenon/Cenon-4.0.2.tar.bz2) = d228ff779f3967c6324eb7a081132a3d5d2237f03a23adcdfd4cae2fa7b0eb2f
-SIZE (cenon/Cenon-4.0.2.tar.bz2) = 4150615
+TIMESTAMP = 1495787886
+SHA256 (cenon/Cenon-4.0.5.tar.bz2) = 7c159d9de557f597e757d933ee2b055f04fd2b49371c28853b5285eb2894224c
+SIZE (cenon/Cenon-4.0.5.tar.bz2) = 10710712
SHA256 (cenon/CenonLibrary-4.0.0-1.tar.bz2) = b329331a4b5b40d93eeeddd98f6922a53401b6e4f437538cd98392f8828cbb44
SIZE (cenon/CenonLibrary-4.0.0-1.tar.bz2) = 2131692
diff --git a/graphics/cenon/files/patch-DocView.m b/graphics/cenon/files/patch-DocView.m
new file mode 100644
index 000000000000..3124c94d9e63
--- /dev/null
+++ b/graphics/cenon/files/patch-DocView.m
@@ -0,0 +1,13 @@
+--- DocView.m.orig 2017-05-26 08:51:18 UTC
++++ DocView.m
+@@ -101,6 +101,10 @@
+ - (void)joinSelection:(id)change messages:(BOOL)messages;
+ @end
+
++@interface Dummy
++- (CGFloat)backingScaleFactor;
++@end
++
+ NSString *e2PboardType = @"Cenon Graphic List";
+
+ static NSRect selectionRect = {{0.0, 0.0}, {0.0, 0.0}}; // shared rect for drawing the selection rect in -drawRect:
diff --git a/graphics/cenon/pkg-plist b/graphics/cenon/pkg-plist
index 246fb6a13720..e47a81a7fd04 100644
--- a/graphics/cenon/pkg-plist
+++ b/graphics/cenon/pkg-plist
@@ -13,6 +13,7 @@ GNUstep/System/Applications/Cenon.app/Resources/CropMarks/middledown.cenon/docum
GNUstep/System/Applications/Cenon.app/Resources/CropMarks/middledown.cenon/output
GNUstep/System/Applications/Cenon.app/Resources/CropMarks/rightup.cenon/document
GNUstep/System/Applications/Cenon.app/Resources/CropMarks/rightup.cenon/output
+GNUstep/System/Applications/Cenon.app/Resources/InspectorPanel.nib/._keyedobjects.nib
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/Contour.nib/classes.nib
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/Contour.nib/info.nib
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/Contour.nib/keyedobjects.nib
@@ -53,6 +54,8 @@ GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPGroup.nib/keyedo
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPImage.nib/classes.nib
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPImage.nib/info.nib
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPImage.nib/keyedobjects.nib
+GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPLine3D.nib/data.classes
+GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPLine3D.nib/objects.nib
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPLine.nib/classes.nib
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPLine.nib/info.nib
GNUstep/System/Applications/Cenon.app/Resources/English.lproj/IPLine.nib/keyedobjects.nib
@@ -206,6 +209,8 @@ GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPGroup.nib/keyedob
GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPImage.nib/classes.nib
GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPImage.nib/info.nib
GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPImage.nib/keyedobjects.nib
+GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPLine3D.nib/data.classes
+GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPLine3D.nib/objects.nib
GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPLine.nib/classes.nib
GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPLine.nib/info.nib
GNUstep/System/Applications/Cenon.app/Resources/German.lproj/IPLine.nib/keyedobjects.nib
@@ -326,7 +331,8 @@ GNUstep/System/Applications/Cenon.app/Resources/InspectorPanel.nib/classes.nib
GNUstep/System/Applications/Cenon.app/Resources/InspectorPanel.nib/info.nib
GNUstep/System/Applications/Cenon.app/Resources/InspectorPanel.nib/keyedobjects.nib
GNUstep/System/Applications/Cenon.app/Resources/SinkingMetrics.plist
-GNUstep/System/Applications/Cenon.app/Resources/ToolPanel.xib
+GNUstep/System/Applications/Cenon.app/Resources/English.lproj/ToolPanel.xib
+GNUstep/System/Applications/Cenon.app/Resources/German.lproj/ToolPanel.xib
GNUstep/System/Applications/Cenon.app/Resources/alignHCenter.tiff
GNUstep/System/Applications/Cenon.app/Resources/alignHLeft.tiff
GNUstep/System/Applications/Cenon.app/Resources/alignHRight.tiff
@@ -589,6 +595,4 @@ GNUstep/System/Library/Devices/hpgl/.dir.tiff
GNUstep/System/Library/Devices/hpgl/hpgl_8Pen.dev
GNUstep/System/Library/Projects/.dir.tiff
GNUstep/System/Library/Projects/Cenon.cenon/document
-GNUstep/System/Library/Projects/Cenon.cenon/output
-GNUstep/System/Library/README
GNUstep/System/Tools/Cenon
diff --git a/graphics/fortytwo/Makefile b/graphics/fortytwo/Makefile
index 21fb830437b5..f77aa5e97a2e 100644
--- a/graphics/fortytwo/Makefile
+++ b/graphics/fortytwo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fortytwo
PORTVERSION= 0.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= graphics gnustep
MASTER_SITES= SF/${PORTNAME}/FT%20%2842%29/${PORTVERSION}
DISTFILES= FT-${PORTVERSION}-src.tgz \
diff --git a/graphics/gnustep-slideshow/Makefile b/graphics/gnustep-slideshow/Makefile
index 909ee6234d9f..556cc23e27b4 100644
--- a/graphics/gnustep-slideshow/Makefile
+++ b/graphics/gnustep-slideshow/Makefile
@@ -2,7 +2,7 @@
PORTNAME= slideshow
PORTVERSION= 0.3.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics gnustep
MASTER_SITES= http://download.gna.org/gsimageapps/
PKGNAMEPREFIX= gnustep-
diff --git a/graphics/gnustep-slideshowkit/Makefile b/graphics/gnustep-slideshowkit/Makefile
index 5ce9a2997792..4cb2c46a3de4 100644
--- a/graphics/gnustep-slideshowkit/Makefile
+++ b/graphics/gnustep-slideshowkit/Makefile
@@ -2,11 +2,11 @@
PORTNAME= slideshowkit
PORTVERSION= 0.0.1
-PORTREVISION= 20050212
+PORTREVISION= 20050213
CATEGORIES= graphics gnustep
MASTER_SITES= http://download.gna.org/gsimageapps/
PKGNAMEPREFIX= gnustep-
-DISTNAME= SlideShowKit-${PORTVERSION}
+DISTNAME= SlideShowKit-20050212
MAINTAINER= ports@FreeBSD.org
COMMENT= SlideShow Framework
diff --git a/graphics/graphos/Makefile b/graphics/graphos/Makefile
index 311ab1c0d510..797491ec47f9 100644
--- a/graphics/graphos/Makefile
+++ b/graphics/graphos/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= graphos
-PORTVERSION= 0.5
-PORTREVISION= 3
+PORTVERSION= 0.6
CATEGORIES= graphics gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= Graphos-${PORTVERSION}
@@ -13,7 +12,7 @@ COMMENT= Vector drawing application centered around bezier paths
LICENSE= GPLv2
USES= gnustep
-USE_GNUSTEP= back build
+USE_GNUSTEP= build base gui
USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
.include <bsd.port.mk>
diff --git a/graphics/graphos/distinfo b/graphics/graphos/distinfo
index 4a7020007c12..8ac9b811bed8 100644
--- a/graphics/graphos/distinfo
+++ b/graphics/graphos/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Graphos-0.5.tar.gz) = 0195dd6481fd60d24dd95ea15c89683b8db6130b57681a6042c5cc9b4a482c08
-SIZE (Graphos-0.5.tar.gz) = 169743
+TIMESTAMP = 1495367600
+SHA256 (Graphos-0.6.tar.gz) = c400814806a84c0e8b33bfa6c2010f4b543bf069b2a6d3bcb893ecac2b0f6b7b
+SIZE (Graphos-0.6.tar.gz) = 140416
diff --git a/graphics/graphos/pkg-plist b/graphics/graphos/pkg-plist
index 07777d670992..54d8812d44ca 100644
--- a/graphics/graphos/pkg-plist
+++ b/graphics/graphos/pkg-plist
@@ -20,6 +20,7 @@ GNUstep/System/Applications/Graphos.app/Resources/bezier.tiff
GNUstep/System/Applications/Graphos.app/Resources/blackarrow.tiff
GNUstep/System/Applications/Graphos.app/Resources/circle.tiff
GNUstep/System/Applications/Graphos.app/Resources/graphos_appicon_48.tif
+GNUstep/System/Applications/Graphos.app/Resources/graphos_doc_icon_48.tif
GNUstep/System/Applications/Graphos.app/Resources/hand.tiff
GNUstep/System/Applications/Graphos.app/Resources/magnify.tiff
GNUstep/System/Applications/Graphos.app/Resources/paint.tiff
diff --git a/graphics/imageviewer/Makefile b/graphics/imageviewer/Makefile
index e5bc7a3b4b11..1a180e99e4a2 100644
--- a/graphics/imageviewer/Makefile
+++ b/graphics/imageviewer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= imageviewer
PORTVERSION= 0.6.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics gnustep
MASTER_SITES= http://www.nice.ch/~phip/ \
LOCAL/dinoex
diff --git a/graphics/laternamagica/Makefile b/graphics/laternamagica/Makefile
index 21d8a3f3d71a..a9b5744686f9 100644
--- a/graphics/laternamagica/Makefile
+++ b/graphics/laternamagica/Makefile
@@ -2,7 +2,7 @@
PORTNAME= laternamagica
PORTVERSION= 0.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= LaternaMagica-${PORTVERSION}
diff --git a/graphics/pikopixel/Makefile b/graphics/pikopixel/Makefile
index b9fb92f9da10..54ce66900f7e 100644
--- a/graphics/pikopixel/Makefile
+++ b/graphics/pikopixel/Makefile
@@ -2,10 +2,10 @@
# $FreeBSD$
PORTNAME= pikopixel
-PORTVERSION= 0.9
+PORTVERSION= 1.0
CATEGORIES= graphics gnustep
MASTER_SITES= http://twilightedge.com/downloads/
-DISTNAME= PikoPixel1.0b5.Sources
+DISTNAME= PikoPixel.Sources.1.0-b8
WRKSRC_SUBDIR= PikoPixel
MAINTAINER= theraven@FreeBSD.org
@@ -14,7 +14,7 @@ COMMENT= Application for drawing and editing pixel-art images
LICENSE= AGPLv3
LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE_agpl-3.0.txt
-USES= gnustep zip
+USES= gnustep
USE_GNUSTEP= gui build
diff --git a/graphics/pikopixel/distinfo b/graphics/pikopixel/distinfo
index 91169341639b..fdafe176ea63 100644
--- a/graphics/pikopixel/distinfo
+++ b/graphics/pikopixel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PikoPixel1.0b5.Sources.zip) = 7924c185e52b1de7900461672fc8481628bd12ad46b5ce433a20fcd31d5dc019
-SIZE (PikoPixel1.0b5.Sources.zip) = 856367
+TIMESTAMP = 1502620401
+SHA256 (PikoPixel.Sources.1.0-b8.tar.gz) = b4985b7baec145af7027429bb8b6c8c936ff3797f1c8c6a0d9718ff2b5b45031
+SIZE (PikoPixel.Sources.1.0-b8.tar.gz) = 538896
diff --git a/graphics/pikopixel/pkg-plist b/graphics/pikopixel/pkg-plist
index 7857ff267340..2b3a364eeabc 100644
--- a/graphics/pikopixel/pkg-plist
+++ b/graphics/pikopixel/pkg-plist
@@ -1,7 +1,17 @@
GNUstep/System/Applications/PikoPixel.app/PikoPixel
+GNUstep/System/Applications/PikoPixel.app/Resources/arrow_left_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/arrow_outline_left_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/arrow_outline_right_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/arrow_right_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/blend_mode_icon_linear.png
+GNUstep/System/Applications/PikoPixel.app/Resources/blend_mode_icon_standard.png
+GNUstep/System/Applications/PikoPixel.app/Resources/checkerboard_segment.png
+GNUstep/System/Applications/PikoPixel.app/Resources/color_ramp_cursor.png
GNUstep/System/Applications/PikoPixel.app/Resources/ColorPickerPopupPanel.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ColorPickerPopupPanel.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ColorPickerPopupPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/diagonal_checkerboard_segment.png
+GNUstep/System/Applications/PikoPixel.app/Resources/diagonal_lines_segment.png
GNUstep/System/Applications/PikoPixel.app/Resources/DocumentBackgroundSettingsSheet.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/DocumentBackgroundSettingsSheet.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/DocumentBackgroundSettingsSheet.nib/keyedobjects.nib
@@ -32,34 +42,43 @@ GNUstep/System/Applications/PikoPixel.app/Resources/DocumentSizeSheet.nib/keyedo
GNUstep/System/Applications/PikoPixel.app/Resources/DocumentWindow.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/DocumentWindow.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/DocumentWindow.nib/keyedobjects.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/eraser_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/eraser_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/eraser_tool_overlay_outline_pattern.png
GNUstep/System/Applications/PikoPixel.app/Resources/ExportPanelAccessoryView.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ExportPanelAccessoryView.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ExportPanelAccessoryView.nib/keyedobjects.nib
-GNUstep/System/Applications/PikoPixel.app/Resources/GNUstepAppIcon.tiff
-GNUstep/System/Applications/PikoPixel.app/Resources/HotkeySettings.nib/classes.nib
-GNUstep/System/Applications/PikoPixel.app/Resources/HotkeySettings.nib/info.nib
-GNUstep/System/Applications/PikoPixel.app/Resources/HotkeySettings.nib/keyedobjects.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/eyedropper_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/eyedropper_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/freehand_select_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/freehand_select_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/GNUstepAppIcon.png
+GNUstep/System/Applications/PikoPixel.app/Resources/gridpatternpreview_foreground.png
+GNUstep/System/Applications/PikoPixel.app/Resources/gridtype_crosshairs_segment.png
+GNUstep/System/Applications/PikoPixel.app/Resources/gridtype_dots_segment.png
+GNUstep/System/Applications/PikoPixel.app/Resources/gridtype_largedots_segment.png
+GNUstep/System/Applications/PikoPixel.app/Resources/gridtype_lines_segment.png
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_ar.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_be.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_bg.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_cs.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_da.plist
-GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_de.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_de_AT.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_de_CH.plist
+GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_de.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_el.plist
-GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_en.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_en_AU.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_en_CA.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_en_GB.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_en_US.plist
+GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_en.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_es.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_et.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_fa.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_fi.plist
-GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_fr.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_fr_CA.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_fr_CH.plist
+GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_fr.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_he.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_hr.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_hu.plist
@@ -73,8 +92,8 @@ GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_mk.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_mt.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_nb.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_ne.plist
-GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_nl.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_nl_BE.plist
+GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_nl.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_pl.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_ps.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_pt_BR.plist
@@ -90,8 +109,13 @@ GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_tr.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_uk.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_uz.plist
GNUstep/System/Applications/PikoPixel.app/Resources/Hotkeys_vi.plist
+GNUstep/System/Applications/PikoPixel.app/Resources/HotkeySettings.nib/classes.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/HotkeySettings.nib/info.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/HotkeySettings.nib/keyedobjects.nib
GNUstep/System/Applications/PikoPixel.app/Resources/Info-gnustep.plist
GNUstep/System/Applications/PikoPixel.app/Resources/InfoPlist.strings
+GNUstep/System/Applications/PikoPixel.app/Resources/isometric_checkerboard_segment.png
+GNUstep/System/Applications/PikoPixel.app/Resources/isometric_lines_segment.png
GNUstep/System/Applications/PikoPixel.app/Resources/KeyboardNameToLocale.plist
GNUstep/System/Applications/PikoPixel.app/Resources/LayerControlButtonImageViews.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/LayerControlButtonImageViews.nib/info.nib
@@ -102,16 +126,39 @@ GNUstep/System/Applications/PikoPixel.app/Resources/LayerControlsPopupPanel.nib/
GNUstep/System/Applications/PikoPixel.app/Resources/LayersPanel.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/LayersPanel.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/LayersPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/line_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/line_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/magnifier_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/magnifier_cursor.png
GNUstep/System/Applications/PikoPixel.app/Resources/MainMenu.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/MainMenu.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/MainMenu.nib/keyedobjects.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/marching_ants_pattern.png
+GNUstep/System/Applications/PikoPixel.app/Resources/minus_button_overlay_small.png
+GNUstep/System/Applications/PikoPixel.app/Resources/minus_button_overlay.png
+GNUstep/System/Applications/PikoPixel.app/Resources/move_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/move_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/move_selection_outline_cursor.png
GNUstep/System/Applications/PikoPixel.app/Resources/NavigatorPopupPanel.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/NavigatorPopupPanel.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/NavigatorPopupPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/neko.png
+GNUstep/System/Applications/PikoPixel.app/Resources/oval_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/oval_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/paintcan_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/paintcan_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/pencil_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/pencil_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/pencil_segment.png
GNUstep/System/Applications/PikoPixel.app/Resources/PikoPixel.desktop
+GNUstep/System/Applications/PikoPixel.app/Resources/plus_button_overlay_small.png
+GNUstep/System/Applications/PikoPixel.app/Resources/plus_button_overlay.png
GNUstep/System/Applications/PikoPixel.app/Resources/PreviewPanel.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/PreviewPanel.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/PreviewPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/rect_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/rect_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/resize_control.png
GNUstep/System/Applications/PikoPixel.app/Resources/SamplerImagePanel.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/SamplerImagePanel.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/SamplerImagePanel.nib/keyedobjects.nib
@@ -121,6 +168,13 @@ GNUstep/System/Applications/PikoPixel.app/Resources/SamplerImagePopupPanel.nib/k
GNUstep/System/Applications/PikoPixel.app/Resources/ScreencastPopupPanel.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ScreencastPopupPanel.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ScreencastPopupPanel.nib/keyedobjects.nib
+GNUstep/System/Applications/PikoPixel.app/Resources/selection_rect_button.png
+GNUstep/System/Applications/PikoPixel.app/Resources/selection_rect_cursor.png
+GNUstep/System/Applications/PikoPixel.app/Resources/selection_tool_overlay_add_pattern.png
+GNUstep/System/Applications/PikoPixel.app/Resources/selection_tool_overlay_subtract_pattern.png
+GNUstep/System/Applications/PikoPixel.app/Resources/solid_segment.png
+GNUstep/System/Applications/PikoPixel.app/Resources/target_draw_layer_icon.png
+GNUstep/System/Applications/PikoPixel.app/Resources/target_enabled_layers_icon.png
GNUstep/System/Applications/PikoPixel.app/Resources/ToolModifierTipsPanel.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ToolModifierTipsPanel.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ToolModifierTipsPanel.nib/keyedobjects.nib
@@ -131,57 +185,6 @@ GNUstep/System/Applications/PikoPixel.app/Resources/ToolsPanel.nib/keyedobjects.
GNUstep/System/Applications/PikoPixel.app/Resources/ToolsPopupPanel.nib/classes.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ToolsPopupPanel.nib/info.nib
GNUstep/System/Applications/PikoPixel.app/Resources/ToolsPopupPanel.nib/keyedobjects.nib
-GNUstep/System/Applications/PikoPixel.app/Resources/arrow_left_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/arrow_outline_left_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/arrow_outline_right_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/arrow_right_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/checkerboard_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/diagonal_checkerboard_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/diagonal_lines_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/eraser_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/eraser_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/eraser_tool_overlay_outline_pattern.png
-GNUstep/System/Applications/PikoPixel.app/Resources/eyedropper_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/eyedropper_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/freehand_select_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/freehand_select_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/gridtype_crosshairs_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/gridtype_dots_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/gridtype_largedots_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/gridtype_lines_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/isometric_checkerboard_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/isometric_lines_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/layers_panel_background.png
-GNUstep/System/Applications/PikoPixel.app/Resources/line_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/line_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/magnifier_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/magnifier_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/marching_ants_pattern.png
-GNUstep/System/Applications/PikoPixel.app/Resources/minus_button_overlay.png
-GNUstep/System/Applications/PikoPixel.app/Resources/minus_button_overlay_small.png
-GNUstep/System/Applications/PikoPixel.app/Resources/move_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/move_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/move_selection_outline_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/neko.png
-GNUstep/System/Applications/PikoPixel.app/Resources/oval_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/oval_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/paintcan_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/paintcan_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/pencil_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/pencil_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/pencil_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/plus_button_overlay.png
-GNUstep/System/Applications/PikoPixel.app/Resources/plus_button_overlay_small.png
-GNUstep/System/Applications/PikoPixel.app/Resources/rect_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/rect_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/resize_control.png
-GNUstep/System/Applications/PikoPixel.app/Resources/selection_rect_button.png
-GNUstep/System/Applications/PikoPixel.app/Resources/selection_rect_cursor.png
-GNUstep/System/Applications/PikoPixel.app/Resources/selection_tool_overlay_add_pattern.png
-GNUstep/System/Applications/PikoPixel.app/Resources/selection_tool_overlay_subtract_pattern.png
-GNUstep/System/Applications/PikoPixel.app/Resources/solid_segment.png
-GNUstep/System/Applications/PikoPixel.app/Resources/target_draw_layer_icon.png
-GNUstep/System/Applications/PikoPixel.app/Resources/target_enabled_layers_icon.png
GNUstep/System/Applications/PikoPixel.app/Resources/view_draw_layer_icon.png
GNUstep/System/Applications/PikoPixel.app/Resources/view_enabled_layers_icon.png
GNUstep/System/Applications/PikoPixel.app/Resources/wand_button.png
diff --git a/graphics/pixen/Makefile b/graphics/pixen/Makefile
index d2842c6c65de..6f80ebc2e638 100644
--- a/graphics/pixen/Makefile
+++ b/graphics/pixen/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pixen
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics gnustep
MASTER_SITES= http://download.gna.org/gsimageapps/
DISTNAME= Pixen-${PORTVERSION}
diff --git a/graphics/preview/Makefile b/graphics/preview/Makefile
index c85a3f0e35a7..87fbbc8433cb 100644
--- a/graphics/preview/Makefile
+++ b/graphics/preview/Makefile
@@ -2,7 +2,7 @@
PORTNAME= preview
PORTVERSION= 0.8.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics gnustep
MASTER_SITES= http://download.gna.org/gsimageapps/
PKGNAMEPREFIX= gnustep-
diff --git a/graphics/price/Makefile b/graphics/price/Makefile
index 55e4dade6414..51f44eeb60b0 100644
--- a/graphics/price/Makefile
+++ b/graphics/price/Makefile
@@ -3,7 +3,7 @@
PORTNAME= price
PORTVERSION= 1.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnustep
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
DISTNAME= PRICE-${PORTVERSION}
diff --git a/japanese/jishyo/Makefile b/japanese/jishyo/Makefile
index c0d585dfc204..87b8147a6161 100644
--- a/japanese/jishyo/Makefile
+++ b/japanese/jishyo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jishyo
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= japanese gnustep
MASTER_SITES= http://www.eskimo.com/~pburns/Dictionaries/files/
DISTNAME= Jishyo-${PORTVERSION}
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 6857c2ae30b0..63d4ad473819 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnustep-base
-PORTVERSION= 1.24.8
-PORTREVISION= 6
+PORTVERSION= 1.25.0
CATEGORIES= lang devel gnustep
MASTER_SITES= GNUSTEP/core
@@ -22,7 +21,7 @@ LIB_DEPENDS+= libgcrypt.so:security/libgcrypt
RUN_DEPENDS+= ${LOCALBASE}/GNUstep/System/Library/Makefiles/GNUstep.sh:devel/gnustep-make
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-procfs --disable-mixedabi
+CONFIGURE_ARGS= --disable-procfs --disable-mixedabi --with-installation-domain=SYSTEM
CONFIGURE_ENV= OBJCFLAGS='-fobjc-runtime=gnustep-1.7 -fblocks'
USES= pkgconfig iconv gnustep
USE_GNUSTEP= build
@@ -73,7 +72,5 @@ post-extract:
post-install:
${INSTALL_DATA} ${FILESDIR}/gdomap_if ${STAGEDIR}${ETCDIR}
- ${RMDIR} ${STAGEHEADER}/gnustep/base
- ${RMDIR} ${STAGEHEADER}/GNUstepBase/unicode
.include <bsd.port.mk>
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index 997b2a3927ec..be4029d2922c 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnustep-base-1.24.8.tar.gz) = 5b2a7042bc5001e97ac090143244a4344a6cba72cee53f3840e2492d3db443cb
-SIZE (gnustep-base-1.24.8.tar.gz) = 3515290
+TIMESTAMP = 1495189059
+SHA256 (gnustep-base-1.25.0.tar.gz) = f5159a7d70e06b9dfb96c5f8ac572e3a5e6cf8de7bafb056bc9b2e0c4f93c347
+SIZE (gnustep-base-1.25.0.tar.gz) = 3528599
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index e49d389383d4..82d64f026633 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -21,8 +21,6 @@ GNUstep/System/Library/Documentation/man/man1/xmlparse.1.gz
GNUstep/System/Library/Documentation/man/man8/gdomap.8.gz
GNUstep/System/Library/Headers/Foundation/Foundation.h
GNUstep/System/Library/Headers/Foundation/FoundationErrors.h
-GNUstep/System/Library/Headers/Foundation/GSMime.h
-GNUstep/System/Library/Headers/Foundation/GSXML.h
GNUstep/System/Library/Headers/Foundation/NSAffineTransform.h
GNUstep/System/Library/Headers/Foundation/NSArchiver.h
GNUstep/System/Library/Headers/Foundation/NSArray.h
@@ -162,6 +160,7 @@ GNUstep/System/Library/Headers/GNUstepBase/NSCalendarDate+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSData+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSDebug+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSFileHandle+GNUstepBase.h
+GNUstep/System/Library/Headers/GNUstepBase/NSHashTable+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSLock+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSMutableString+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSNetServices+GNUstepBase.h
@@ -174,12 +173,6 @@ GNUstep/System/Library/Headers/GNUstepBase/NSTask+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSThread+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSURL+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/Unicode.h
-GNUstep/System/Library/Headers/gnustep/unicode/caseconv.h
-GNUstep/System/Library/Headers/gnustep/unicode/cop.h
-GNUstep/System/Library/Headers/gnustep/unicode/cyrillic.h
-GNUstep/System/Library/Headers/gnustep/unicode/decomp.h
-GNUstep/System/Library/Headers/gnustep/unicode/latin2.h
-GNUstep/System/Library/Headers/gnustep/unicode/nextstep.h
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/English.lproj/Localizable.strings
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Esperanto.lproj/Localizable.strings
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/French.lproj/Localizable.strings
@@ -324,6 +317,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Eirunepe
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/El_Salvador
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Ensenada
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Fort_Nelson
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Fort_Wayne
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Fortaleza
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Glace_Bay
@@ -397,6 +391,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Porto_Acre
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Porto_Velho
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Puerto_Rico
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Punta_Arenas
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Rainy_River
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Rankin_Inlet
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Recife
@@ -452,10 +447,12 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Aqtobe
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ashgabat
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ashkhabad
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Atyrau
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Baghdad
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Bahrain
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Baku
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Bangkok
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Barnaul
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Beirut
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Bishkek
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Brunei
@@ -471,6 +468,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Dili
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Dubai
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Dushanbe
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Famagusta
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Gaza
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Harbin
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Hebron
@@ -527,6 +525,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Thimbu
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Thimphu
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Tokyo
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Tomsk
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ujung_Pandang
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ulaanbaatar
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ulan_Bator
@@ -535,6 +534,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Vientiane
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Vladivostok
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Yakutsk
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Yangon
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Yekaterinburg
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Yerevan
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Atlantic/Azores
@@ -632,6 +632,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Etc/Zulu
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Amsterdam
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Andorra
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Astrakhan
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Athens
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Belfast
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Belgrade
@@ -652,6 +653,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Jersey
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Kaliningrad
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Kiev
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Kirov
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Lisbon
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Ljubljana
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/London
@@ -672,6 +674,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Samara
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/San_Marino
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Sarajevo
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Saratov
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Simferopol
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Skopje
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Sofia
@@ -679,6 +682,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Tallinn
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Tirane
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Tiraspol
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Ulyanovsk
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Uzhgorod
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Vaduz
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Vatican
diff --git a/lang/gscheme/Makefile b/lang/gscheme/Makefile
index eeef15b84413..d2c1449128d4 100644
--- a/lang/gscheme/Makefile
+++ b/lang/gscheme/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gscheme
PORTVERSION= 0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= lang gnustep
MASTER_SITES= http://www.gnustep.it/marko/GScheme/ \
LOCAL/dinoex
diff --git a/mail/addresses-goodies/Makefile b/mail/addresses-goodies/Makefile
index 593308e6d49d..5d067c98c026 100644
--- a/mail/addresses-goodies/Makefile
+++ b/mail/addresses-goodies/Makefile
@@ -2,7 +2,7 @@
PORTNAME= addresses
PORTVERSION= 0.4.8
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail gnustep
MASTER_SITES= SAVANNAH/gap
PKGNAMESUFFIX= -goodies${PKGNAMESUFFIX2}
diff --git a/mail/addresses/Makefile b/mail/addresses/Makefile
index 2b774e7de476..9aad4dc8e6b0 100644
--- a/mail/addresses/Makefile
+++ b/mail/addresses/Makefile
@@ -3,7 +3,7 @@
PORTNAME= addresses
PORTVERSION= 0.4.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= Addresses-${PORTVERSION}
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index 8d4324c76f0d..3d84a8f94e60 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnumail
PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail gnustep
MASTER_SITES= http://download.gna.org/gnustep-nonfsf/
DISTNAME= GNUMail-${PORTVERSION}
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 1050f9e8baba..4fcac3e828f2 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -3,6 +3,7 @@
PORTNAME= pantomime
PORTVERSION= 1.2.2
+PORTREVISION= 1
CATEGORIES= mail gnustep
MASTER_SITES= http://download.gna.org/gnustep-nonfsf/
DISTNAME= Pantomime-${PORTVERSION}
diff --git a/math/edenmath/Makefile b/math/edenmath/Makefile
index a77bd10b6241..1b8130031bc5 100644
--- a/math/edenmath/Makefile
+++ b/math/edenmath/Makefile
@@ -3,7 +3,7 @@
PORTNAME= edenmath
PORTVERSION= 1.1.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= math gnustep
MASTER_SITES= http://www.eskimo.com/~pburns/EdenMath/files/
DISTNAME= EdenMath_GNUstep-${PORTVERSION}
diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index 9faaa4408d71..749f6f1d567b 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnustep-examples
PORTVERSION= 1.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= misc gnustep
MASTER_SITES= GNUSTEP/usr-apps
diff --git a/multimedia/poe/Makefile b/multimedia/poe/Makefile
index bdb38e0c1fd8..2bea55222094 100644
--- a/multimedia/poe/Makefile
+++ b/multimedia/poe/Makefile
@@ -2,7 +2,7 @@
PORTNAME= poe
PORTVERSION= 0.5.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= multimedia gnustep
MASTER_SITES= http://www.eskimo.com/~pburns/Poe/files/
DISTNAME= Poe-${PORTVERSION}
diff --git a/net/remotedesk/Makefile b/net/remotedesk/Makefile
index fe4abfa62ac4..3a1f941feba1 100644
--- a/net/remotedesk/Makefile
+++ b/net/remotedesk/Makefile
@@ -2,7 +2,7 @@
PORTNAME= remotedesk
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= RemoteDesk-${PORTVERSION}
diff --git a/net/zillion/Makefile b/net/zillion/Makefile
index 3d203ad0a061..c490ab268587 100644
--- a/net/zillion/Makefile
+++ b/net/zillion/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zillion
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net gnustep
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DISTNAME= ${PORTNAME}-0_1
diff --git a/news/lusernet/Makefile b/news/lusernet/Makefile
index 2284684e4961..ea9288a43740 100644
--- a/news/lusernet/Makefile
+++ b/news/lusernet/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lusernet
PORTVERSION= 0.4.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= news gnustep
MASTER_SITES= LOCAL/dinoex
DISTNAME= LuserNET-${PORTVERSION}
diff --git a/print/gspdf/Makefile b/print/gspdf/Makefile
index 5fe9d9da0844..58a310926b20 100644
--- a/print/gspdf/Makefile
+++ b/print/gspdf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gspdf
PORTVERSION= 0.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= GSPdf-${PORTVERSION}
diff --git a/science/fisicalab/Makefile b/science/fisicalab/Makefile
index 42968f9a8e88..224670061dde 100644
--- a/science/fisicalab/Makefile
+++ b/science/fisicalab/Makefile
@@ -2,7 +2,7 @@
PORTNAME= fisicalab
PORTVERSION= 0.3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= science gnustep
MASTER_SITES= SAVANNAH
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
index da4092a771b8..a892ae9b4ffc 100644
--- a/science/gtamsanalyzer/Makefile
+++ b/science/gtamsanalyzer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gtamsanalyzer
PORTVERSION= 0.42
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= science gnustep
MASTER_SITES= SF/tamsys/gnustep%20tams/GTAMSAnalyzer%2${PORTVERSION}
DISTNAME= GTAMSAnalyzer.src.${PORTVERSION}
diff --git a/science/paje/Makefile b/science/paje/Makefile
index 40512583d9f9..57bbbf3a0e15 100644
--- a/science/paje/Makefile
+++ b/science/paje/Makefile
@@ -3,7 +3,7 @@
PORTNAME= paje
PORTVERSION= 1.97
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= science gnustep
MASTER_SITES= SF/${PORTNAME}/Releases
DISTNAME= Paje_${PORTVERSION}
@@ -15,10 +15,9 @@ COMMENT= Generic visualization tool for GNUstep (Gantt chart and more)
LICENSE= LGPL21
USES= gnustep
-USE_GNUSTEP= back build
+USE_GNUSTEP= gui base back build
WRKSRC= ${WRKDIR}/${DISTNAME}
-MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_SYSTEM_ROOT}
post-patch:
${REINPLACE_CMD} -e 's|^GNUSTEP_INSTALLATION_DOMAIN|#GNUSTEP_INSTALLATION_DOMAIN|' \
diff --git a/science/paje/files/patch-AggregatingFilter_GNUmakefile b/science/paje/files/patch-AggregatingFilter_GNUmakefile
new file mode 100644
index 000000000000..b2d13796e606
--- /dev/null
+++ b/science/paje/files/patch-AggregatingFilter_GNUmakefile
@@ -0,0 +1,18 @@
+--- AggregatingFilter/GNUmakefile.orig 2007-02-15 13:56:33 UTC
++++ AggregatingFilter/GNUmakefile
+@@ -1,8 +1,4 @@
+-ifeq "$(GNUSTEP_SYSTEM_ROOT)" ""
+- include Makefile
+-else
+-
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
+@@ -38,5 +34,3 @@ h.template
+ -include GNUmakefile.preamble
+ include $(GNUSTEP_MAKEFILES)/bundle.make
+ -include GNUmakefile.postamble
+-
+-endif
diff --git a/science/paje/files/patch-ContainerFilter_GNUmakefile b/science/paje/files/patch-ContainerFilter_GNUmakefile
new file mode 100644
index 000000000000..d36d083c3e04
--- /dev/null
+++ b/science/paje/files/patch-ContainerFilter_GNUmakefile
@@ -0,0 +1,8 @@
+--- ContainerFilter/GNUmakefile.orig 2005-05-01 00:09:07 UTC
++++ ContainerFilter/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-EntityTypeFilter_GNUmakefile b/science/paje/files/patch-EntityTypeFilter_GNUmakefile
new file mode 100644
index 000000000000..99a3a5215014
--- /dev/null
+++ b/science/paje/files/patch-EntityTypeFilter_GNUmakefile
@@ -0,0 +1,8 @@
+--- EntityTypeFilter/GNUmakefile.orig 2005-05-01 00:09:07 UTC
++++ EntityTypeFilter/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-FieldFilter_GNUmakefile b/science/paje/files/patch-FieldFilter_GNUmakefile
new file mode 100644
index 000000000000..ae9b89b64f07
--- /dev/null
+++ b/science/paje/files/patch-FieldFilter_GNUmakefile
@@ -0,0 +1,8 @@
+--- FieldFilter/GNUmakefile.orig 2005-05-01 00:09:07 UTC
++++ FieldFilter/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-FileReader_GNUmakefile b/science/paje/files/patch-FileReader_GNUmakefile
new file mode 100644
index 000000000000..f3892717c073
--- /dev/null
+++ b/science/paje/files/patch-FileReader_GNUmakefile
@@ -0,0 +1,11 @@
+--- FileReader/GNUmakefile.orig 2005-05-07 16:34:58 UTC
++++ FileReader/GNUmakefile
+@@ -24,7 +24,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
+ PACKAGE_NAME=FileReader
+ BUNDLE_NAME=FileReader
+ BUNDLE_EXTENSION=.bundle
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+ FileReader_PRINCIPAL_CLASS=PajeFileReader
+
+
diff --git a/science/paje/files/patch-General_GNUmakefile b/science/paje/files/patch-General_GNUmakefile
new file mode 100644
index 000000000000..58f39c5ea0b8
--- /dev/null
+++ b/science/paje/files/patch-General_GNUmakefile
@@ -0,0 +1,8 @@
+--- General/GNUmakefile.orig 2006-10-30 21:46:08 UTC
++++ General/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-NSArray+Additions.m b/science/paje/files/patch-General_NSArray+Additions.m
index f2946e66abb6..09f48530808b 100644
--- a/science/paje/files/patch-NSArray+Additions.m
+++ b/science/paje/files/patch-General_NSArray+Additions.m
@@ -1,5 +1,5 @@
---- General/NSArray+Additions.m.orig 2006-01-24 14:10:07.000000000 +0100
-+++ General/NSArray+Additions.m 2008-05-03 08:13:11.000000000 +0200
+--- General/NSArray+Additions.m.orig 2007-02-14 23:28:57 UTC
++++ General/NSArray+Additions.m
@@ -19,6 +19,7 @@
*/
diff --git a/science/paje/files/patch-ImbricationFilter_GNUmakefile b/science/paje/files/patch-ImbricationFilter_GNUmakefile
new file mode 100644
index 000000000000..a79cecb0b15d
--- /dev/null
+++ b/science/paje/files/patch-ImbricationFilter_GNUmakefile
@@ -0,0 +1,8 @@
+--- ImbricationFilter/GNUmakefile.orig 2005-05-01 00:09:07 UTC
++++ ImbricationFilter/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-OrderFilter_GNUmakefile b/science/paje/files/patch-OrderFilter_GNUmakefile
new file mode 100644
index 000000000000..d9b1dbecd360
--- /dev/null
+++ b/science/paje/files/patch-OrderFilter_GNUmakefile
@@ -0,0 +1,8 @@
+--- OrderFilter/GNUmakefile.orig 2005-05-01 00:09:07 UTC
++++ OrderFilter/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-PajeEventDecoder_GNUmakefile b/science/paje/files/patch-PajeEventDecoder_GNUmakefile
new file mode 100644
index 000000000000..0292fa99f220
--- /dev/null
+++ b/science/paje/files/patch-PajeEventDecoder_GNUmakefile
@@ -0,0 +1,11 @@
+--- PajeEventDecoder/GNUmakefile.orig 2004-12-13 22:15:43 UTC
++++ PajeEventDecoder/GNUmakefile
+@@ -24,7 +24,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
+ PACKAGE_NAME=PajeEventDecoder
+ BUNDLE_NAME=PajeEventDecoder
+ BUNDLE_EXTENSION=.bundle
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+ PajeEventDecoder_PRINCIPAL_CLASS=PajeEventDecoder
+
+
diff --git a/science/paje/files/patch-PajeSimulator_GNUmakefile b/science/paje/files/patch-PajeSimulator_GNUmakefile
new file mode 100644
index 000000000000..689794b28f9d
--- /dev/null
+++ b/science/paje/files/patch-PajeSimulator_GNUmakefile
@@ -0,0 +1,11 @@
+--- PajeSimulator/GNUmakefile.orig 2006-10-30 02:45:37 UTC
++++ PajeSimulator/GNUmakefile
+@@ -24,7 +24,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
+ PACKAGE_NAME=PajeSimulator
+ BUNDLE_NAME=PajeSimulator
+ BUNDLE_EXTENSION=.bundle
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+ PajeSimulator_PRINCIPAL_CLASS=PajeSimul
+
+
diff --git a/science/paje/files/patch-ReductionFilter_GNUmakefile b/science/paje/files/patch-ReductionFilter_GNUmakefile
new file mode 100644
index 000000000000..30151951829f
--- /dev/null
+++ b/science/paje/files/patch-ReductionFilter_GNUmakefile
@@ -0,0 +1,8 @@
+--- ReductionFilter/GNUmakefile.orig 2006-10-30 02:45:37 UTC
++++ ReductionFilter/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-DrawView+Drawing.m b/science/paje/files/patch-SpaceTimeViewer_DrawView+Drawing.m
index 5fd8e53a52f0..6b385b860b31 100644
--- a/science/paje/files/patch-DrawView+Drawing.m
+++ b/science/paje/files/patch-SpaceTimeViewer_DrawView+Drawing.m
@@ -1,4 +1,4 @@
---- SpaceTimeViewer/DrawView+Drawing.m.orig Mon Jan 9 02:13:30 2006
+--- SpaceTimeViewer/DrawView+Drawing.m.orig 2007-02-16 13:23:30 UTC
+++ SpaceTimeViewer/DrawView+Drawing.m
@@ -23,7 +23,11 @@
@@ -11,4 +11,4 @@
+# endif
#endif
- @implementation DrawView (Drawing)
+ #include "../General/Association.h"
diff --git a/science/paje/files/patch-DrawView+Finding.m b/science/paje/files/patch-SpaceTimeViewer_DrawView+Finding.m
index b16f75770b82..e406eacd0759 100644
--- a/science/paje/files/patch-DrawView+Finding.m
+++ b/science/paje/files/patch-SpaceTimeViewer_DrawView+Finding.m
@@ -1,4 +1,4 @@
---- SpaceTimeViewer/DrawView+Finding.m.orig 2006-10-29 20:52:48.000000000 +0100
+--- SpaceTimeViewer/DrawView+Finding.m.orig 2006-10-29 19:52:48 UTC
+++ SpaceTimeViewer/DrawView+Finding.m
@@ -24,7 +24,9 @@
#include "DrawView.h"
diff --git a/science/paje/files/patch-SpaceTimeViewer_GNUmakefile b/science/paje/files/patch-SpaceTimeViewer_GNUmakefile
new file mode 100644
index 000000000000..0ecfc715292b
--- /dev/null
+++ b/science/paje/files/patch-SpaceTimeViewer_GNUmakefile
@@ -0,0 +1,8 @@
+--- SpaceTimeViewer/GNUmakefile.orig 2005-06-29 21:08:47 UTC
++++ SpaceTimeViewer/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-StatViewer_GNUmakefile b/science/paje/files/patch-StatViewer_GNUmakefile
new file mode 100644
index 000000000000..85c3766c61d7
--- /dev/null
+++ b/science/paje/files/patch-StatViewer_GNUmakefile
@@ -0,0 +1,8 @@
+--- StatViewer/GNUmakefile.orig 2005-12-26 19:46:02 UTC
++++ StatViewer/GNUmakefile
+@@ -1,4 +1,4 @@
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
diff --git a/science/paje/files/patch-StorageController_GNUmakefile b/science/paje/files/patch-StorageController_GNUmakefile
new file mode 100644
index 000000000000..09546177f3c8
--- /dev/null
+++ b/science/paje/files/patch-StorageController_GNUmakefile
@@ -0,0 +1,17 @@
+--- StorageController/GNUmakefile.orig 2006-10-30 21:46:08 UTC
++++ StorageController/GNUmakefile
+@@ -1,8 +1,4 @@
+-ifeq "$(GNUSTEP_SYSTEM_ROOT)" ""
+- include Makefile
+-else
+-
+-BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles/Paje
++BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Bundles/Paje
+
+ include $(GNUSTEP_MAKEFILES)/common.make
+
+@@ -27,4 +23,3 @@ h.template
+ include $(GNUSTEP_MAKEFILES)/bundle.make
+ -include GNUmakefile.postamble
+
+-endif
diff --git a/sysutils/batmon/Makefile b/sysutils/batmon/Makefile
index 243fa75ef0d2..5c0e73feca65 100644
--- a/sysutils/batmon/Makefile
+++ b/sysutils/batmon/Makefile
@@ -2,6 +2,7 @@
PORTNAME= batmon
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= sysutils gnustep
MASTER_SITES= SAVANNAH/gap
diff --git a/sysutils/timemon/Makefile b/sysutils/timemon/Makefile
index 988a55d84079..73d8ef76d70b 100644
--- a/sysutils/timemon/Makefile
+++ b/sysutils/timemon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= timemon
PORTVERSION= 4.2
+PORTREVISION= 1
CATEGORIES= sysutils gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= TimeMon-${PORTVERSION}
diff --git a/textproc/duncan/Makefile b/textproc/duncan/Makefile
index bb5be58d704f..0ce15f4dacb9 100644
--- a/textproc/duncan/Makefile
+++ b/textproc/duncan/Makefile
@@ -3,6 +3,7 @@
PORTNAME= duncan
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= textproc gnustep
MASTER_SITES= http://www.eskimo.com/~pburns/Dictionaries/files/
DISTNAME= Duncan-${PORTVERSION}
diff --git a/textproc/easydiff/Makefile b/textproc/easydiff/Makefile
index b4b5dadb38bd..5a0fa92d5787 100644
--- a/textproc/easydiff/Makefile
+++ b/textproc/easydiff/Makefile
@@ -2,7 +2,7 @@
PORTNAME= easydiff
PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc gnustep
MASTER_SITES= GNUSTEP/usr-apps
DISTNAME= EasyDiff-${PORTVERSION}
diff --git a/textproc/latex-service/Makefile b/textproc/latex-service/Makefile
index 0a7d74b0b2ae..1391f0cf97ec 100644
--- a/textproc/latex-service/Makefile
+++ b/textproc/latex-service/Makefile
@@ -2,7 +2,7 @@
PORTNAME= latex
PORTVERSION= 0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc gnustep
MASTER_SITES= http://www.roard.com/latexservice/download/
PKGNAMESUFFIX= -service${PKGNAMESUFFIX2}
diff --git a/textproc/localize/Makefile b/textproc/localize/Makefile
index a70fc3ed295a..0a39322c0d75 100644
--- a/textproc/localize/Makefile
+++ b/textproc/localize/Makefile
@@ -2,7 +2,7 @@
PORTNAME= localize
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc gnustep
MASTER_SITES= http://www.eskimo.com/~pburns/Localize/files/
DISTNAME= Localize-20040424
diff --git a/textproc/popup/Makefile b/textproc/popup/Makefile
index 252a34828414..d401d88eb89d 100644
--- a/textproc/popup/Makefile
+++ b/textproc/popup/Makefile
@@ -2,7 +2,7 @@
PORTNAME= popup
PORTVERSION= 0.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc gnustep
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Popup-${PORTVERSION}pre1
DISTNAME= Popup-${PORTVERSION}pre1
diff --git a/www/grr/Makefile b/www/grr/Makefile
index be8b50789245..7d8bfdc77eb2 100644
--- a/www/grr/Makefile
+++ b/www/grr/Makefile
@@ -2,7 +2,7 @@
PORTNAME= grr
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= Grr-${PORTVERSION}
diff --git a/www/rsskit/Makefile b/www/rsskit/Makefile
index 69be14de3946..8c82f9b7c7fc 100644
--- a/www/rsskit/Makefile
+++ b/www/rsskit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= rsskit
PORTVERSION= 0.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= RSSKit-${PORTVERSION}
diff --git a/www/sogo2/Makefile b/www/sogo2/Makefile
index 9a353121fe05..45a3edef4c9e 100644
--- a/www/sogo2/Makefile
+++ b/www/sogo2/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sogo2
PORTVERSION= 2.3.22
+PORTREVISION= 1
CATEGORIES= www gnustep
MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
DISTNAME= SOGo-${PORTVERSION}
diff --git a/www/sogo3/Makefile b/www/sogo3/Makefile
index df33a0673dee..eff6fc5ecde2 100644
--- a/www/sogo3/Makefile
+++ b/www/sogo3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sogo3
PORTVERSION= 3.2.10
+PORTREVISION= 1
CATEGORIES= www gnustep
MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
DISTNAME= SOGo-${PORTVERSION}
diff --git a/x11-clocks/aclock/Makefile b/x11-clocks/aclock/Makefile
index 0d75bb42ce61..7f804792dc81 100644
--- a/x11-clocks/aclock/Makefile
+++ b/x11-clocks/aclock/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aclock
PORTVERSION= 0.4.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11-clocks gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= AClock-${PORTVERSION}
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index 16c5f495021e..6af55ee08f36 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gnustep-back
-PORTVERSION= 0.24.1
-PORTREVISION= 1
+PORTVERSION= 0.25.1
CATEGORIES= x11-toolkits gnustep
MASTER_SITES= GNUSTEP/core
diff --git a/x11-toolkits/gnustep-back/distinfo b/x11-toolkits/gnustep-back/distinfo
index 7229a4ce87a0..85e7327da6d2 100644
--- a/x11-toolkits/gnustep-back/distinfo
+++ b/x11-toolkits/gnustep-back/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnustep-back-0.24.1.tar.gz) = e255628e0f9be9b10359bb1be6690c50a0929bc383e6996966076492af02457e
-SIZE (gnustep-back-0.24.1.tar.gz) = 966529
+TIMESTAMP = 1495189160
+SHA256 (gnustep-back-0.25.1.tar.gz) = ea563b7d6e4bd8b13856306c94bfe06b0909b71e62ab70dccf1c208f4889e2bf
+SIZE (gnustep-back-0.25.1.tar.gz) = 974775
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 612583915215..0b57fc303c3d 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnustep-gui
-PORTVERSION= 0.24.1
-PORTREVISION= 6
+PORTVERSION= 0.25.1
CATEGORIES= x11-toolkits gnustep
MASTER_SITES= GNUSTEP/core
@@ -19,7 +18,7 @@ LIB_DEPENDS+= libgif.so:graphics/giflib
LIB_DEPENDS+= libicui18n.so:devel/icu
LIB_DEPENDS+= libsndfile.so:audio/libsndfile
LIB_DEPENDS+= libao.so:audio/libao
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libflite.a:audio/flite
+LIB_DEPENDS+= libflite.so:audio/flite
BROKEN_armv6= fails to package: chmod: GSSpeechServer.desktop: No such file or directory
diff --git a/x11-toolkits/gnustep-gui/distinfo b/x11-toolkits/gnustep-gui/distinfo
index 6e0e5f831b7d..619219772feb 100644
--- a/x11-toolkits/gnustep-gui/distinfo
+++ b/x11-toolkits/gnustep-gui/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnustep-gui-0.24.1.tar.gz) = a749573c99d668b83230cc40b8b215b13d62e795615799a873981406cf2bb728
-SIZE (gnustep-gui-0.24.1.tar.gz) = 2837611
+TIMESTAMP = 1495189097
+SHA256 (gnustep-gui-0.25.1.tar.gz) = 3aacb277976014cfd4394084066187430100657dea234da91d9ae5015e747c66
+SIZE (gnustep-gui-0.25.1.tar.gz) = 2888779
diff --git a/x11-toolkits/gnustep-gui/files/patch-Headers__AppKit__NSTableView.h b/x11-toolkits/gnustep-gui/files/patch-Headers__AppKit__NSTableView.h
deleted file mode 100644
index c86c39d940dc..000000000000
--- a/x11-toolkits/gnustep-gui/files/patch-Headers__AppKit__NSTableView.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Headers/AppKit/NSTableView.h
-+++ Headers/AppKit/NSTableView.h
-@@ -91,7 +91,7 @@
- BOOL _drawsGrid;
- NSColor *_gridColor;
- NSColor *_backgroundColor;
-- float _rowHeight;
-+ CGFloat _rowHeight;
- NSSize _intercellSpacing;
- id _delegate;
- NSTableHeaderView *_headerView;
diff --git a/x11-toolkits/gnustep-gui/pkg-plist b/x11-toolkits/gnustep-gui/pkg-plist
index 89f9418b2352..1b4925319734 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -811,3 +811,49 @@ GNUstep/System/Tools/gopen
GNUstep/System/Tools/make_services
GNUstep/System/Tools/say
GNUstep/System/Tools/set_show_service
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Affine-Transformations.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Application-Makefiles.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Basic-Controls.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Browsers.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Images-and-Imageviews.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Interface-Files.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Introduction.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Matrix-Controls.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Outlets-and-Actions.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Tableviews.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/The-view-concept.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/applicationmakefiles.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/basicconcepts.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/browsercontrols.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/conceptindex.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/controls.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/dataexchange.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/eventhandling.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/fdl.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/gnustepapplications.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/images.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/index.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/interfacefiles.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/matrix.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/outlineviews.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/tableview.html
+GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/theviewconcept.html
+GNUstep/System/Library/Documentation/man/man1/GSSpeechServer.1.gz
+GNUstep/System/Library/Documentation/man/man1/say.1.gz
+GNUstep/System/Library/Headers/AppKit/GSXibKeyedUnarchiver.h
+GNUstep/System/Library/Headers/AppKit/NSAnimationContext.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSXibKeyedUnarchiver.h
+GNUstep/System/Library/Headers/gnustep/gui/GSXibKeyedUnarchiver.h
+GNUstep/System/Library/Images/NSAdvanced.tiff
+GNUstep/System/Library/Images/NSCaution.tiff
+GNUstep/System/Library/Images/NSColorPanel.tiff
+GNUstep/System/Library/Images/NSFontPanel.tiff
+GNUstep/System/Library/Images/NSInfo.tiff
+GNUstep/System/Library/Images/NSPreferencesGeneral.tiff
+GNUstep/System/Library/Images/NSUserAccounts.tiff
+GNUstep/System/Library/Images/common_ApplicationFolder.tiff
+GNUstep/System/Library/Images/common_MultipleSelection.tiff
+GNUstep/System/Library/Images/common_RecyclerEmpty.tiff
+GNUstep/System/Library/Images/common_RecyclerFull.tiff
+GNUstep/System/Library/Images/common_VideoFolder.tiff
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Korean.lproj/Localizable.strings
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];