aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/Uses/gnustep.mk6
-rw-r--r--Mk/Uses/iconv.mk1
-rw-r--r--Mk/Uses/objc.mk7
-rw-r--r--databases/sqlclient/Makefile3
-rw-r--r--databases/sqlclient/distinfo4
-rw-r--r--databases/sqlclient/pkg-plist52
-rw-r--r--deskutils/charmap/Makefile1
-rw-r--r--deskutils/gworkspace-gwmetadata/Makefile3
-rw-r--r--deskutils/gworkspace-gwmetadata/distinfo4
-rw-r--r--deskutils/gworkspace/Makefile3
-rw-r--r--deskutils/gworkspace/distinfo4
-rw-r--r--deskutils/gworkspace/pkg-plist4
-rw-r--r--devel/gnustep-make/Makefile3
-rw-r--r--devel/gnustep-make/distinfo4
-rw-r--r--devel/gnustep-make/pkg-plist3
-rw-r--r--devel/gorm/Makefile3
-rw-r--r--devel/gorm/distinfo4
-rw-r--r--devel/gorm/pkg-plist5
-rw-r--r--devel/performance/Makefile3
-rw-r--r--devel/performance/distinfo4
-rw-r--r--devel/performance/pkg-plist7
-rw-r--r--ftp/gnustep-ftp/Makefile3
-rw-r--r--ftp/gnustep-ftp/distinfo4
-rw-r--r--ftp/gnustep-ftp/pkg-plist5
-rw-r--r--lang/gnustep-base/Makefile3
-rw-r--r--lang/gnustep-base/distinfo4
-rw-r--r--lang/gnustep-base/pkg-plist34
-rw-r--r--lang/libobjc2/Makefile19
-rw-r--r--lang/libobjc2/distinfo4
-rw-r--r--lang/libobjc2/files/patch-arc.m30
-rw-r--r--mail/gnumail/Makefile3
-rw-r--r--mail/gnumail/distinfo4
-rw-r--r--mail/gnumail/pkg-plist38
-rw-r--r--mail/pantomime/Makefile10
-rw-r--r--mail/pantomime/distinfo4
-rw-r--r--mail/pantomime/pkg-plist176
-rw-r--r--misc/gnustep-examples/Makefile26
-rw-r--r--x11-toolkits/gnustep-back/Makefile3
-rw-r--r--x11-toolkits/gnustep-back/distinfo4
-rw-r--r--x11-toolkits/gnustep-gui/Makefile3
-rw-r--r--x11-toolkits/gnustep-gui/distinfo4
-rw-r--r--x11-toolkits/gnustep-gui/files/patch-Headers__AppKit__NSTableView.h11
-rw-r--r--x11-toolkits/gnustep-gui/pkg-plist147
-rw-r--r--x11/terminal.app/Makefile3
44 files changed, 343 insertions, 327 deletions
diff --git a/Mk/Uses/gnustep.mk b/Mk/Uses/gnustep.mk
index 3029171fabfc..416605ce051c 100644
--- a/Mk/Uses/gnustep.mk
+++ b/Mk/Uses/gnustep.mk
@@ -33,9 +33,13 @@ GNUSTEP_LOCAL_TOOLS= ${GNUSTEP_LOCAL_ROOT}/Tools
LIB_DIRS+= ${GNUSTEP_SYSTEM_LIBRARIES} \
${GNUSTEP_LOCAL_LIBRARIES}
-.for a in FLAGS CFLAGS CPPFLAGS OBJCFLAGS INCLUDE_DIRS LDFLAGS LIB_DIRS
+.for a in CFLAGS CPPFLAGS CXXFLAGS OBJCCFLAGS OBJCFLAGS LDFLAGS
+MAKE_ENV+= ADDITIONAL_${a}="${ADDITIONAL_${a}} ${${a}}"
+.endfor
+.for a in FLAGS INCLUDE_DIRS LIB_DIRS
MAKE_ENV+= ADDITIONAL_${a}="${ADDITIONAL_${a}}"
.endfor
+MAKE_ARGS+=messages=yes
MAKEFILE= GNUmakefile
#MAKE_ENV+= GNUSTEP_CONFIG_FILE=${PORTSDIR}/devel/gnustep-make/files/GNUstep.conf
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk
index 6e2af9462c1c..fa7a4598ff2c 100644
--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@@ -44,6 +44,7 @@ BUILD_DEPENDS+= libiconv>=1.14_8:${PORTSDIR}/converters/libiconv
CPPFLAGS+= -DLIBICONV_PLUG
CFLAGS+= -DLIBICONV_PLUG
CXXFLAGS+= -DLIBICONV_PLUG
+OBJCFLAGS+= -DLIBICONV_PLUG
.endif
.endif
diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk
index 41ec8914a4ce..96888a8ebd6b 100644
--- a/Mk/Uses/objc.mk
+++ b/Mk/Uses/objc.mk
@@ -10,8 +10,9 @@
.if !defined(_INCLUDE_USES_OBJC_MK)
_INCLUDE_USES_OBJC_MK= yes
-.if !empty(objc_ARGS)
-IGNORE= USES=objc takes no arguments
+objc_ARGS?=
+.if !empty(objc_ARGS) && ! ${objc_ARGS:Mcompiler}
+IGNORE= USES=objc only accepts no arguments or 'compiler'
.endif
_CCVERSION!= ${CC} --version
@@ -56,9 +57,11 @@ LDFLAGS+= -B${LOCALBASE}/bin
.endif
.endif
+.if ! ${objc_ARGS:Mcompiler}
LIB_DEPENDS+= libobjc.so.4.6:${PORTSDIR}/lang/libobjc2
OBJCFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+.endif
CONFIGURE_ENV+= OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}"
MAKE_ENV+= OBJC="${CC}" OBJCFLAGS="${OBJCFLAGS}"
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 876244a5b64b..93d013be54f9 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= sqlclient
-PORTVERSION= 1.7.0
-PORTREVISION= 2
+PORTVERSION= 1.8.1
CATEGORIES= databases gnustep
MASTER_SITES= GNUSTEP/libs
DISTNAME= SQLClient-${PORTVERSION}
diff --git a/databases/sqlclient/distinfo b/databases/sqlclient/distinfo
index 8ff81835e35c..4db01de0b563 100644
--- a/databases/sqlclient/distinfo
+++ b/databases/sqlclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SQLClient-1.7.0.tar.gz) = 8f9c9491f774fce3bf369e407c8f22091c597baddc1a4b0bfe8ccb251bb79462
-SIZE (SQLClient-1.7.0.tar.gz) = 164218
+SHA256 (SQLClient-1.8.1.tar.gz) = c6cb9d0033b496b52b698f1f80007b6acd215441683cf1a1c22f67a96198074f
+SIZE (SQLClient-1.8.1.tar.gz) = 148622
diff --git a/databases/sqlclient/pkg-plist b/databases/sqlclient/pkg-plist
index 9344ef35872e..cc85726f8e38 100644
--- a/databases/sqlclient/pkg-plist
+++ b/databases/sqlclient/pkg-plist
@@ -1,27 +1,29 @@
-GNUstep/Local/Library/Bundles/SQLClient/ECPG.bundle/ECPG
-GNUstep/Local/Library/Bundles/SQLClient/ECPG.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Bundles/SQLClient/ECPG.bundle/stamp.make
-GNUstep/Local/Library/Bundles/SQLClient/ECPG_libs.bundle/ECPG_libs
-GNUstep/Local/Library/Bundles/SQLClient/ECPG_libs.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Bundles/SQLClient/ECPG_libs.bundle/stamp.make
-GNUstep/Local/Library/Bundles/SQLClient/MySQL.bundle/MySQL
-GNUstep/Local/Library/Bundles/SQLClient/MySQL.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Bundles/SQLClient/MySQL.bundle/stamp.make
-GNUstep/Local/Library/Bundles/SQLClient/MySQL_libs.bundle/MySQL_libs
-GNUstep/Local/Library/Bundles/SQLClient/MySQL_libs.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Bundles/SQLClient/MySQL_libs.bundle/stamp.make
-GNUstep/Local/Library/Bundles/SQLClient/Postgres.bundle/Postgres
-GNUstep/Local/Library/Bundles/SQLClient/Postgres.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Bundles/SQLClient/Postgres.bundle/stamp.make
-GNUstep/Local/Library/Bundles/SQLClient/Postgres_libs.bundle/Postgres_libs
-GNUstep/Local/Library/Bundles/SQLClient/Postgres_libs.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Bundles/SQLClient/Postgres_libs.bundle/stamp.make
-GNUstep/Local/Library/Bundles/SQLClient/SQLite.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Bundles/SQLClient/SQLite.bundle/SQLite
-GNUstep/Local/Library/Bundles/SQLClient/SQLite.bundle/stamp.make
-GNUstep/Local/Library/Bundles/SQLClient/SQLite_libs.bundle/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Bundles/SQLClient/SQLite_libs.bundle/SQLite_libs
-GNUstep/Local/Library/Bundles/SQLClient/SQLite_libs.bundle/stamp.make
+GNUstep/Local/Library/Bundles/SQLClient1.8/ECPG.bundle/ECPG
+GNUstep/Local/Library/Bundles/SQLClient1.8/ECPG.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/SQLClient1.8/ECPG.bundle/stamp.make
+GNUstep/Local/Library/Bundles/SQLClient1.8/ECPG_libs.bundle/ECPG_libs
+GNUstep/Local/Library/Bundles/SQLClient1.8/ECPG_libs.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/SQLClient1.8/ECPG_libs.bundle/stamp.make
+GNUstep/Local/Library/Bundles/SQLClient1.8/MySQL.bundle/MySQL
+GNUstep/Local/Library/Bundles/SQLClient1.8/MySQL.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/SQLClient1.8/MySQL.bundle/stamp.make
+GNUstep/Local/Library/Bundles/SQLClient1.8/MySQL_libs.bundle/MySQL_libs
+GNUstep/Local/Library/Bundles/SQLClient1.8/MySQL_libs.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/SQLClient1.8/MySQL_libs.bundle/stamp.make
+GNUstep/Local/Library/Bundles/SQLClient1.8/Postgres.bundle/Postgres
+GNUstep/Local/Library/Bundles/SQLClient1.8/Postgres.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/SQLClient1.8/Postgres.bundle/stamp.make
+GNUstep/Local/Library/Bundles/SQLClient1.8/Postgres_libs.bundle/Postgres_libs
+GNUstep/Local/Library/Bundles/SQLClient1.8/Postgres_libs.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/SQLClient1.8/Postgres_libs.bundle/stamp.make
+GNUstep/Local/Library/Bundles/SQLClient1.8/SQLite.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/SQLClient1.8/SQLite.bundle/SQLite
+GNUstep/Local/Library/Bundles/SQLClient1.8/SQLite.bundle/stamp.make
+GNUstep/Local/Library/Bundles/SQLClient1.8/SQLite_libs.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/Bundles/SQLClient1.8/SQLite_libs.bundle/SQLite_libs
+GNUstep/Local/Library/Bundles/SQLClient1.8/SQLite_libs.bundle/stamp.make
+GNUstep/Local/Library/Libraries/libSQLClient.so.1.8
+GNUstep/Local/Library/Libraries/libSQLClient.so.1.8.0
GNUstep/Local/Library/Documentation/SQLClient/OrderedSymbolDeclarations.plist
GNUstep/Local/Library/Documentation/SQLClient/SQLClient.gsdoc
GNUstep/Local/Library/Documentation/SQLClient/SQLClient.html
@@ -29,5 +31,3 @@ GNUstep/Local/Library/Documentation/SQLClient/SQLClient.igsdoc
GNUstep/Local/Library/Documentation/SQLClient/dependencies
GNUstep/Local/Library/Headers/SQLClient/SQLClient.h
GNUstep/Local/Library/Libraries/libSQLClient.so
-GNUstep/Local/Library/Libraries/libSQLClient.so.1.7
-GNUstep/Local/Library/Libraries/libSQLClient.so.1.7.0
diff --git a/deskutils/charmap/Makefile b/deskutils/charmap/Makefile
index a2feb6136aff..0e784cb56243 100644
--- a/deskutils/charmap/Makefile
+++ b/deskutils/charmap/Makefile
@@ -12,7 +12,6 @@ COMMENT= Character map for GNUstep
LICENSE= GPLv2
-BROKEN= Newer version does not work with recent objective C
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USES= gnustep
USE_GNUSTEP= back build
diff --git a/deskutils/gworkspace-gwmetadata/Makefile b/deskutils/gworkspace-gwmetadata/Makefile
index fa7a122a47f8..e98c18716f46 100644
--- a/deskutils/gworkspace-gwmetadata/Makefile
+++ b/deskutils/gworkspace-gwmetadata/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gworkspace
-PORTVERSION= 0.9.2
-PORTREVISION= 4
+PORTVERSION= 0.9.3
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 7157c731eed8..139637a1e2a3 100644
--- a/deskutils/gworkspace-gwmetadata/distinfo
+++ b/deskutils/gworkspace-gwmetadata/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gworkspace-0.9.2.tar.gz) = 5239ef983fd4358e152fcfb5cd1f6c30366d04357c26c74719eb05da849af4fb
-SIZE (gworkspace-0.9.2.tar.gz) = 4289262
+SHA256 (gworkspace-0.9.3.tar.gz) = 238343a8c4e447debec75ff49f4657f74a4256a49862899214a2c80616c79049
+SIZE (gworkspace-0.9.3.tar.gz) = 3833838
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index 53f9c510208d..af001257f6b9 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gworkspace
-PORTVERSION= 0.9.2
-PORTREVISION= 2
+PORTVERSION= 0.9.3
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 7157c731eed8..139637a1e2a3 100644
--- a/deskutils/gworkspace/distinfo
+++ b/deskutils/gworkspace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gworkspace-0.9.2.tar.gz) = 5239ef983fd4358e152fcfb5cd1f6c30366d04357c26c74719eb05da849af4fb
-SIZE (gworkspace-0.9.2.tar.gz) = 4289262
+SHA256 (gworkspace-0.9.3.tar.gz) = 238343a8c4e447debec75ff49f4657f74a4256a49862899214a2c80616c79049
+SIZE (gworkspace-0.9.3.tar.gz) = 3833838
diff --git a/deskutils/gworkspace/pkg-plist b/deskutils/gworkspace/pkg-plist
index 93b49169d64b..35298548abce 100644
--- a/deskutils/gworkspace/pkg-plist
+++ b/deskutils/gworkspace/pkg-plist
@@ -66,9 +66,6 @@ GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/Recycler
GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/RunExternal.rtfd/Run-panel.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/RunExternal.rtfd/TXT.rtf
GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/RunExternal.rtfd/dummy.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/SViewer.rtfd/TXT.rtf
-GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/SViewer.rtfd/dummy.tiff
-GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/SViewer.rtfd/spatial.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf.rtfd/TXT.rtf
GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf.rtfd/TabbedShelf-develop.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Help/TabbedShelf.rtfd/dummy.tiff
@@ -178,7 +175,6 @@ GNUstep/System/Applications/GWorkspace.app/Resources/SlideMask.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/SmallCellHighlight.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/SmallCellHighlightSmall.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Localizable.strings
-GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Localizable.strings~
GNUstep/System/Applications/GWorkspace.app/Resources/TileHighlight.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-0.tiff
GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-1.tiff
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 3b02b532c4cb..d9db05a02d79 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnustep-make
-PORTVERSION= 2.6.6
-PORTREVISION= 4
+PORTVERSION= 2.6.7
CATEGORIES= devel gnustep
MASTER_SITES= GNUSTEP/core
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index d57e7dc371b2..58a5fd441cc1 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnustep-make-2.6.6.tar.gz) = bcef14d875ff70b26dfc9e892f33bd3665e3d5d9b12eca0c4f2aae133aca981d
-SIZE (gnustep-make-2.6.6.tar.gz) = 576589
+SHA256 (gnustep-make-2.6.7.tar.gz) = 112b57737c3dcc66c78a5c88925ae1d672673d256d9935598e98bcd687d051e4
+SIZE (gnustep-make-2.6.7.tar.gz) = 583730
diff --git a/devel/gnustep-make/pkg-plist b/devel/gnustep-make/pkg-plist
index 65e22c0e4ddd..74b014073ca5 100644
--- a/devel/gnustep-make/pkg-plist
+++ b/devel/gnustep-make/pkg-plist
@@ -2,6 +2,7 @@ GNUstep/GNUstep.conf
GNUstep/System/Library/Documentation/man/man1/debugapp.1.gz
GNUstep/System/Library/Documentation/man/man1/openapp.1.gz
GNUstep/System/Library/Documentation/man/man1/gnustep-config.1.gz
+GNUstep/System/Library/Documentation/man/man1/gnustep-tests.1.gz
GNUstep/System/Library/Documentation/man/man1/opentool.1.gz
GNUstep/System/Library/Documentation/man/man7/GNUstep.7.gz
GNUstep/System/Library/Documentation/man/man7/library-combo.7.gz
@@ -85,6 +86,7 @@ GNUstep/System/Library/Makefiles/aggregate.make
GNUstep/System/Library/Makefiles/app-wrapper.template
GNUstep/System/Library/Makefiles/application.make
GNUstep/System/Library/Makefiles/bundle.make
+GNUstep/System/Library/Makefiles/bake_debian_files.sh
GNUstep/System/Library/Makefiles/clean_cpu.sh
GNUstep/System/Library/Makefiles/clean_os.sh
GNUstep/System/Library/Makefiles/clean_vendor.sh
@@ -96,7 +98,6 @@ GNUstep/System/Library/Makefiles/config.make
GNUstep/System/Library/Makefiles/config.sub
GNUstep/System/Library/Makefiles/cpu.sh
GNUstep/System/Library/Makefiles/ctool.make
-GNUstep/System/Library/Makefiles/deb-equivs-control.template
GNUstep/System/Library/Makefiles/documentation.make
GNUstep/System/Library/Makefiles/empty.make
GNUstep/System/Library/Makefiles/executable.template
diff --git a/devel/gorm/Makefile b/devel/gorm/Makefile
index d27c044a42f5..780e7f93a55b 100644
--- a/devel/gorm/Makefile
+++ b/devel/gorm/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gorm
-PORTVERSION= 1.2.20
-PORTREVISION= 2
+PORTVERSION= 1.2.22
CATEGORIES= devel gnustep
MASTER_SITES= GNUSTEP/dev-apps
diff --git a/devel/gorm/distinfo b/devel/gorm/distinfo
index 4f354c2a739a..d62f850c7835 100644
--- a/devel/gorm/distinfo
+++ b/devel/gorm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gorm-1.2.20.tar.gz) = 1428bee51999e1915017a1d283a6ad73a94cabdddb7a0d5ad0e9f79bec92d6c0
-SIZE (gorm-1.2.20.tar.gz) = 691424
+SHA256 (gorm-1.2.22.tar.gz) = b15aca762a41a233535cdcadf3e0ce8cfcfbb48c31857eef246ca5d68bb105d7
+SIZE (gorm-1.2.22.tar.gz) = 695453
diff --git a/devel/gorm/pkg-plist b/devel/gorm/pkg-plist
index 3bc8bcfc4f02..9f031333ecc5 100644
--- a/devel/gorm/pkg-plist
+++ b/devel/gorm/pkg-plist
@@ -352,7 +352,6 @@ GNUstep/System/Library/Headers/GormObjCHeaderParser/OCIVar.h
GNUstep/System/Library/Headers/GormObjCHeaderParser/OCIVarDecl.h
GNUstep/System/Library/Headers/GormObjCHeaderParser/OCMethod.h
GNUstep/System/Library/Headers/GormObjCHeaderParser/ParserFunctions.h
-GNUstep/System/Library/Headers/GormPrefs/GormColorsPref.h
GNUstep/System/Library/Headers/GormPrefs/GormGeneralPref.h
GNUstep/System/Library/Headers/GormPrefs/GormGuidelinePref.h
GNUstep/System/Library/Headers/GormPrefs/GormHeadersPref.h
@@ -386,12 +385,12 @@ GNUstep/System/Library/Libraries/libGorm.so
GNUstep/System/Library/Libraries/libGorm.so.1
GNUstep/System/Library/Libraries/libGorm.so.1.1.0
GNUstep/System/Library/Libraries/libGormCore.so
+GNUstep/System/Library/Libraries/libGormCore.so.%%VERSION%%
GNUstep/System/Library/Libraries/libGormCore.so.1
-GNUstep/System/Library/Libraries/libGormCore.so.1.2.20
GNUstep/System/Library/Libraries/libGormObjCHeaderParser.so
GNUstep/System/Library/Libraries/libGormObjCHeaderParser.so.1
GNUstep/System/Library/Libraries/libGormObjCHeaderParser.so.1.1.0
GNUstep/System/Library/Libraries/libGormPrefs.so
+GNUstep/System/Library/Libraries/libGormPrefs.so.%%VERSION%%
GNUstep/System/Library/Libraries/libGormPrefs.so.1
-GNUstep/System/Library/Libraries/libGormPrefs.so.1.2.20
GNUstep/System/Tools/Gorm
diff --git a/devel/performance/Makefile b/devel/performance/Makefile
index c9bb6373f456..586284a3271e 100644
--- a/devel/performance/Makefile
+++ b/devel/performance/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= performance
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= devel gnustep
MASTER_SITES= GNUSTEP/libs
DISTNAME= Performance-${PORTVERSION}
diff --git a/devel/performance/distinfo b/devel/performance/distinfo
index 03371cc70233..f15b98dd4908 100644
--- a/devel/performance/distinfo
+++ b/devel/performance/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Performance-0.4.0.tar.gz) = e55c1a8d9e6f1e3ba146490d1b0cf7b84e124410a50070ab3b27ecfc4aab6a1c
-SIZE (Performance-0.4.0.tar.gz) = 48527
+SHA256 (Performance-0.5.0.tar.gz) = 305fe21705a9774becb58f076542919da38c36867d946b69f735fecfa5bc8459
+SIZE (Performance-0.5.0.tar.gz) = 50569
diff --git a/devel/performance/pkg-plist b/devel/performance/pkg-plist
index b0785f15883b..fa67511a95c6 100644
--- a/devel/performance/pkg-plist
+++ b/devel/performance/pkg-plist
@@ -14,6 +14,8 @@ GNUstep/Local/Library/Documentation/Performance/GSThroughput.gsdoc
GNUstep/Local/Library/Documentation/Performance/GSThroughput.html
GNUstep/Local/Library/Documentation/Performance/GSTicker.gsdoc
GNUstep/Local/Library/Documentation/Performance/GSTicker.html
+GNUstep/Local/Library/Documentation/Performance/GSUniqued.gsdoc
+GNUstep/Local/Library/Documentation/Performance/GSUniqued.html
GNUstep/Local/Library/Documentation/Performance/OrderedSymbolDeclarations.plist
GNUstep/Local/Library/Documentation/Performance/Performance.igsdoc
GNUstep/Local/Library/Documentation/Performance/dependencies
@@ -25,6 +27,7 @@ GNUstep/Local/Library/Headers/Performance/GSSkipMutableArray.h
GNUstep/Local/Library/Headers/Performance/GSThreadPool.h
GNUstep/Local/Library/Headers/Performance/GSThroughput.h
GNUstep/Local/Library/Headers/Performance/GSTicker.h
+GNUstep/Local/Library/Headers/Performance/GSUniqued.h
GNUstep/Local/Library/Libraries/libPerformance.so
-GNUstep/Local/Library/Libraries/libPerformance.so.0.4
-GNUstep/Local/Library/Libraries/libPerformance.so.0.4.0
+GNUstep/Local/Library/Libraries/libPerformance.so.%%VERSION%%
+GNUstep/Local/Library/Libraries/libPerformance.so.0.5
diff --git a/ftp/gnustep-ftp/Makefile b/ftp/gnustep-ftp/Makefile
index ca5241469bba..2d7e2eeafd81 100644
--- a/ftp/gnustep-ftp/Makefile
+++ b/ftp/gnustep-ftp/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ftp
-PORTVERSION= 0.4
-PORTREVISION= 2
+PORTVERSION= 0.5
CATEGORIES= ftp gnustep
MASTER_SITES= SAVANNAH/gap
PKGNAMEPREFIX= gnustep-
diff --git a/ftp/gnustep-ftp/distinfo b/ftp/gnustep-ftp/distinfo
index 41604b829632..03839f52c349 100644
--- a/ftp/gnustep-ftp/distinfo
+++ b/ftp/gnustep-ftp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FTP-0.4.tar.gz) = 62a742e7b526ca1581ca641f6f444974c69640c1703b269c5b6cce6bfe15520c
-SIZE (FTP-0.4.tar.gz) = 123290
+SHA256 (FTP-0.5.tar.gz) = 159b297df1d797f6a4af2aa353380eeecc99078db27ecc5172e90c5bc3f06073
+SIZE (FTP-0.5.tar.gz) = 132587
diff --git a/ftp/gnustep-ftp/pkg-plist b/ftp/gnustep-ftp/pkg-plist
index 4d6558272fa9..80b7a5d83d1a 100644
--- a/ftp/gnustep-ftp/pkg-plist
+++ b/ftp/gnustep-ftp/pkg-plist
@@ -1,3 +1,4 @@
+
GNUstep/Local/Applications/FTP.app/FTP
GNUstep/Local/Applications/FTP.app/Resources/FTP.desktop
GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/arrow_left.tiff
@@ -6,6 +7,10 @@ GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/data.classes
GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/data.info
GNUstep/Local/Applications/FTP.app/Resources/FTP.gorm/objects.gorm
GNUstep/Local/Applications/FTP.app/Resources/FTP_icon_gs.tif
+GNUstep/Local/Applications/FTP.app/Resources/GetName.gorm/FTP_icon_gs.tif
+GNUstep/Local/Applications/FTP.app/Resources/GetName.gorm/data.classes
+GNUstep/Local/Applications/FTP.app/Resources/GetName.gorm/data.info
+GNUstep/Local/Applications/FTP.app/Resources/GetName.gorm/objects.gorm
GNUstep/Local/Applications/FTP.app/Resources/Info-gnustep.plist
GNUstep/Local/Applications/FTP.app/Resources/arrow_left.tiff
GNUstep/Local/Applications/FTP.app/Resources/arrow_right.tiff
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index d326613fdb08..0a9f043e696d 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnustep-base
-PORTVERSION= 1.24.6
-PORTREVISION= 7
+PORTVERSION= 1.24.8
CATEGORIES= lang devel gnustep
MASTER_SITES= GNUSTEP/core
diff --git a/lang/gnustep-base/distinfo b/lang/gnustep-base/distinfo
index 9bbdb1c5dbee..997b2a3927ec 100644
--- a/lang/gnustep-base/distinfo
+++ b/lang/gnustep-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnustep-base-1.24.6.tar.gz) = b6d7bed40c52330928a1e27f8c7b5f8fcf24ede2113542546dcf157a9366d72a
-SIZE (gnustep-base-1.24.6.tar.gz) = 3502981
+SHA256 (gnustep-base-1.24.8.tar.gz) = 5b2a7042bc5001e97ac090143244a4344a6cba72cee53f3840e2492d3db443cb
+SIZE (gnustep-base-1.24.8.tar.gz) = 3515290
diff --git a/lang/gnustep-base/pkg-plist b/lang/gnustep-base/pkg-plist
index 2952a9840012..dd41c7afdef1 100644
--- a/lang/gnustep-base/pkg-plist
+++ b/lang/gnustep-base/pkg-plist
@@ -6,12 +6,15 @@ GNUstep/System/Library/DTDs/gsdoc-1_0_1.dtd
GNUstep/System/Library/DTDs/gsdoc-1_0_1.rnc
GNUstep/System/Library/DTDs/gsdoc-1_0_2.dtd
GNUstep/System/Library/DTDs/gsdoc-1_0_3.dtd
+GNUstep/System/Library/DTDs/gsdoc-1_0_4.dtd
GNUstep/System/Library/DTDs/plist-0_9.dtd
+GNUstep/System/Library/Documentation/man/man1/HTMLLinker.1.gz
GNUstep/System/Library/Documentation/man/man1/autogsdoc.1.gz
GNUstep/System/Library/Documentation/man/man1/cvtenc.1.gz
GNUstep/System/Library/Documentation/man/man1/defaults.1.gz
GNUstep/System/Library/Documentation/man/man1/gdnc.1.gz
GNUstep/System/Library/Documentation/man/man1/gspath.1.gz
+GNUstep/System/Library/Documentation/man/man1/make_strings.1.gz
GNUstep/System/Library/Documentation/man/man1/pldes.1.gz
GNUstep/System/Library/Documentation/man/man1/sfparse.1.gz
GNUstep/System/Library/Documentation/man/man1/xmlparse.1.gz
@@ -122,10 +125,11 @@ GNUstep/System/Library/Headers/Foundation/NSURLProtectionSpace.h
GNUstep/System/Library/Headers/Foundation/NSURLProtocol.h
GNUstep/System/Library/Headers/Foundation/NSURLRequest.h
GNUstep/System/Library/Headers/Foundation/NSURLResponse.h
+GNUstep/System/Library/Headers/Foundation/NSUUID.h
GNUstep/System/Library/Headers/Foundation/NSUndoManager.h
GNUstep/System/Library/Headers/Foundation/NSUserDefaults.h
+GNUstep/System/Library/Headers/Foundation/NSUserNotification.h
GNUstep/System/Library/Headers/Foundation/NSUtilities.h
-GNUstep/System/Library/Headers/Foundation/NSUUID.h
GNUstep/System/Library/Headers/Foundation/NSValue.h
GNUstep/System/Library/Headers/Foundation/NSValueTransformer.h
GNUstep/System/Library/Headers/Foundation/NSXMLDTD.h
@@ -147,7 +151,6 @@ GNUstep/System/Library/Headers/GNUstepBase/GSIMap.h
GNUstep/System/Library/Headers/GNUstepBase/GSLocale.h
GNUstep/System/Library/Headers/GNUstepBase/GSLock.h
GNUstep/System/Library/Headers/GNUstepBase/GSMime.h
-GNUstep/System/Library/Headers/GNUstepBase/NSNetServices+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/GSObjCRuntime.h
GNUstep/System/Library/Headers/GNUstepBase/GSUnion.h
GNUstep/System/Library/Headers/GNUstepBase/GSVersionMacros.h
@@ -161,6 +164,7 @@ GNUstep/System/Library/Headers/GNUstepBase/NSDebug+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSFileHandle+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
GNUstep/System/Library/Headers/GNUstepBase/NSNumber+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSObject+GNUstepBase.h
GNUstep/System/Library/Headers/GNUstepBase/NSProcessInfo+GNUstepBase.h
@@ -179,6 +183,7 @@ 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
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/GSTLS/ca-certificates.crt
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/German.lproj/Localizable.strings
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Info-gnustep.plist
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Italian.lproj/Localizable.strings
@@ -207,11 +212,6 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/create-abbrevs.m
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/create-regions.m
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/nstimezone.m
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/GSTLS/ca-certificates.crt
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Creston
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Khandyga
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ust-Nera
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Busingen
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/regions
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Abidjan
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Africa/Accra
@@ -280,8 +280,8 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/La_Rioja
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Mendoza
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Rio_Gallegos
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/San_Juan
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Salta
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/San_Juan
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/San_Luis
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Tucuman
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Argentina/Ushuaia
@@ -311,6 +311,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Coral_Harbour
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Cordoba
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Costa_Rica
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Creston
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Cuiaba
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Curacao
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Danmarkshavn
@@ -386,8 +387,8 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/Beulah
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/Center
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/North_Dakota/New_Salem
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Panama
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Ojinaga
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Panama
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Pangnirtung
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Paramaribo
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/America/Phoenix
@@ -433,13 +434,14 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Casey
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Davis
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/DumontDUrville
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Mawson
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Macquarie
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Mawson
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/McMurdo
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Palmer
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Rothera
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/South_Pole
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Syowa
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Troll
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Antarctica/Vostok
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Arctic/Longyearbyen
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Aden
@@ -458,6 +460,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
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
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Calcutta
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Chita
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Choibalsan
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Chongqing
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Chungking
@@ -485,6 +488,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kashgar
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kathmandu
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Katmandu
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Khandyga
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kolkata
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Krasnoyarsk
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Kuala_Lumpur
@@ -508,15 +512,13 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Qyzylorda
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Rangoon
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Riyadh
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Riyadh87
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Riyadh88
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Riyadh89
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Saigon
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Sakhalin
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Samarkand
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Seoul
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Shanghai
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Singapore
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Srednekolymsk
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Taipei
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Tashkent
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Tbilisi
@@ -529,6 +531,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
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
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Urumqi
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Asia/Ust-Nera
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
@@ -637,6 +640,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Brussels
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Bucharest
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Budapest
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Busingen
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Chisinau
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Copenhagen
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Europe/Dublin
@@ -746,9 +750,6 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mexico/BajaNorte
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mexico/BajaSur
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mexico/General
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mideast/Riyadh87
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mideast/Riyadh88
-GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Mideast/Riyadh89
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/NZ
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/NZ-CHAT
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Navajo
@@ -756,6 +757,7 @@ GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/PST8PDT
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Apia
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Auckland
+GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Bougainville
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Chatham
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Chuuk
GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Pacific/Easter
diff --git a/lang/libobjc2/Makefile b/lang/libobjc2/Makefile
index d135f51c576b..76d44f3322a8 100644
--- a/lang/libobjc2/Makefile
+++ b/lang/libobjc2/Makefile
@@ -5,30 +5,21 @@ PORTNAME= libobjc2
PORTVERSION= 1.7
PORTREVISION= 1
CATEGORIES= lang devel gnustep
-MASTER_SITES= http://download.gna.org/gnustep/
+USE_GITHUB= yes
+GH_ACCOUNT= gnustep
+GH_PROJECT= libobjc2
+GH_TAGNAME= 857edd9
MAINTAINER= theraven@FreeBSD.org
COMMENT= Replacement Objective-C runtime supporting modern Objective-C features
SSP_UNSAFE= yes
-USES= cmake tar:bzip2
+USES= cmake objc:compiler
BROKEN_powerpc= Does not compile on powerpc: Unsupported relocation type 10
.include <bsd.port.options.mk>
-_CLANG!= if [ -f /usr/bin/clang ] ; then /usr/bin/clang --version | head -1 | \
- ${SED} -e 's/.*clang version \([0-9]\)\.\([0-9]\).*/\1\2/' ; else ${ECHO} 0 ; fi
-
-.if ${_CLANG} < 34
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
-CC= ${LOCALBASE}/bin/clang34
-CXX= ${LOCALBASE}/bin/clang++34
-.else
-CC= /usr/bin/clang
-CXX= /usr/bin/clang++
-.endif
-
SHLIB_MAJOR= 4
SHLIB_MINOR= 6
diff --git a/lang/libobjc2/distinfo b/lang/libobjc2/distinfo
index 074720374190..cd317ee95c77 100644
--- a/lang/libobjc2/distinfo
+++ b/lang/libobjc2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libobjc2-1.7.tar.bz2) = 3a1b4af6ff6f3d8e57bfb27401d1b249670ac2e92ba54ad5683ff3d4439d3cc1
-SIZE (libobjc2-1.7.tar.bz2) = 132662
+SHA256 (gnustep-libobjc2-1.7-857edd9_GH0.tar.gz) = c69add3a57465d56e406b4307d6e734232a13a31336cdfefebe3c29abb9d25e8
+SIZE (gnustep-libobjc2-1.7-857edd9_GH0.tar.gz) = 173442
diff --git a/lang/libobjc2/files/patch-arc.m b/lang/libobjc2/files/patch-arc.m
deleted file mode 100644
index 1dc141a73067..000000000000
--- a/lang/libobjc2/files/patch-arc.m
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./arc.m.orig 2013-03-12 08:51:59.000000000 +0000
-+++ ./arc.m 2014-01-13 15:04:54.000000000 +0000
-@@ -219,15 +219,18 @@
- }
- else
- {
-- [AutoreleasePool class];
-- useARCAutoreleasePool = class_respondsToSelector(AutoreleasePool,
-- SELECTOR(_ARCCompatibleAutoreleasePool));
-- NewAutoreleasePool = class_getMethodImplementation(object_getClass(AutoreleasePool),
-- SELECTOR(new));
-- DeleteAutoreleasePool = class_getMethodImplementation(AutoreleasePool,
-- SELECTOR(release));
-- AutoreleaseAdd = class_getMethodImplementation(object_getClass(AutoreleasePool),
-- SELECTOR(addObject:));
-+ useARCAutoreleasePool = (0 != class_getInstanceMethod(AutoreleasePool,
-+ SELECTOR(_ARCCompatibleAutoreleasePool)));
-+ if (!useARCAutoreleasePool)
-+ {
-+ [AutoreleasePool class];
-+ NewAutoreleasePool = class_getMethodImplementation(object_getClass(AutoreleasePool),
-+ SELECTOR(new));
-+ DeleteAutoreleasePool = class_getMethodImplementation(AutoreleasePool,
-+ SELECTOR(release));
-+ AutoreleaseAdd = class_getMethodImplementation(object_getClass(AutoreleasePool),
-+ SELECTOR(addObject:));
-+ }
- }
- }
- }
diff --git a/mail/gnumail/Makefile b/mail/gnumail/Makefile
index 611dd7e9c8ff..5278e12e7c34 100644
--- a/mail/gnumail/Makefile
+++ b/mail/gnumail/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnumail
-PORTVERSION= 1.2.0
-PORTREVISION= 6
+PORTVERSION= 1.2.2
CATEGORIES= mail gnustep
MASTER_SITES= http://download.gna.org/gnustep-nonfsf/
DISTNAME= GNUMail-${PORTVERSION}
diff --git a/mail/gnumail/distinfo b/mail/gnumail/distinfo
index 9a1cf6563b1d..98514bf214f8 100644
--- a/mail/gnumail/distinfo
+++ b/mail/gnumail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (GNUMail-1.2.0.tar.gz) = 792512276b253d79362736fb0cb7d614d5a980ea356d03d6adec4d0dd0f6ef2c
-SIZE (GNUMail-1.2.0.tar.gz) = 1380032
+SHA256 (GNUMail-1.2.2.tar.gz) = 31a0c34c3afe20afb6b8ebc41002d2f9dbc2134ceda2032e67e64cb7d884d8af
+SIZE (GNUMail-1.2.2.tar.gz) = 1397764
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index cfc68a574972..a3f41c559950 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -1,3 +1,4 @@
+@dir GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
GNUstep/Local/Applications/GNUMail.app/GNUMail
GNUstep/Local/Applications/GNUMail.app/Resources/AddressBook_32.tiff
GNUstep/Local/Applications/GNUMail.app/Resources/AddressManager_32.tiff
@@ -176,6 +177,27 @@ GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Compose
GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
GNUstep/Local/Library/ApplicationSupport/GNUMail/Compose.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Emoticon
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face1.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face10.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face11.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face13.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face14.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face15.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face19.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face2.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face3.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face4.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face5.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face6.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face8.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/Resources/emoticon-face9.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Emoticon.bundle/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Face.bundle/Face
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Face.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Face.bundle/Resources/stamp.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/Face.bundle/stamp.make
GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Filtering
GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Filtering.tiff
GNUstep/Local/Library/ApplicationSupport/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
@@ -191,6 +213,21 @@ GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/MIME
GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/Resources/mime.tiff
GNUstep/Local/Library/ApplicationSupport/GNUMail/MIME.prefs/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/PGP
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/clear_20.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/clear_48.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_20.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_48.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/encrypted_80.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/pgp-mail.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed+encrypted_80.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_20.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_48.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/signed_80.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/unsigned_20.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/Resources/unsigned_48.tiff
+GNUstep/Local/Library/ApplicationSupport/GNUMail/PGP.bundle/stamp.make
GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Receiving
GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
GNUstep/Local/Library/ApplicationSupport/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
@@ -222,4 +259,3 @@ GNUstep/Local/Library/Libraries/libGNUMail.so
GNUstep/Local/Library/Libraries/libGNUMail.so.%%MAJORVERSION%%
GNUstep/Local/Library/Libraries/libGNUMail.so.%%VERSION%%
GNUstep/Local/Tools/GNUMail
-@dir GNUstep/Local/Library/Frameworks/GNUMail.framework/Versions/%%MAJORVERSION%%/Headers
diff --git a/mail/pantomime/Makefile b/mail/pantomime/Makefile
index 9bd7173f6d83..c9c842985b71 100644
--- a/mail/pantomime/Makefile
+++ b/mail/pantomime/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= pantomime
-PORTVERSION= 1.2.0
-PORTREVISION= 6
+PORTVERSION= 1.2.2
CATEGORIES= mail gnustep
MASTER_SITES= http://download.gna.org/gnustep-nonfsf/
DISTNAME= Pantomime-${PORTVERSION}
@@ -13,7 +12,12 @@ COMMENT= Mail/MIME handling library for GNUstep
LICENSE= LGPL21
-USES= gnustep
+# The use of libiconv shouldn't be necessary, but a build dependency installs
+# it and we end up picking up the header.
+MAKE_ARGS+= LIBRARIES_DEPEND_UPON='${ICONV_LIB} -lssl'
+MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
+USES= gnustep iconv
+USE_OPENSSL= yes
USE_GNUSTEP= back build
USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
diff --git a/mail/pantomime/distinfo b/mail/pantomime/distinfo
index 147eca5f4e10..ad68c88b7b52 100644
--- a/mail/pantomime/distinfo
+++ b/mail/pantomime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Pantomime-1.2.0.tar.gz) = c6484634dd0611d07108e7e006a2c6bdbe3e72b23de7473440df9a559f6b6218
-SIZE (Pantomime-1.2.0.tar.gz) = 466206
+SHA256 (Pantomime-1.2.2.tar.gz) = f87b6b362b56c2b22667e614432f222604e318e61340a13b30c8277b180a3be8
+SIZE (Pantomime-1.2.2.tar.gz) = 468276
diff --git a/mail/pantomime/pkg-plist b/mail/pantomime/pkg-plist
index 59f882ea511e..d59ed4f87d28 100644
--- a/mail/pantomime/pkg-plist
+++ b/mail/pantomime/pkg-plist
@@ -1,88 +1,88 @@
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Headers
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Pantomime
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Resources
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWCacheManager.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWCharset.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWConnection.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWConstants.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWContainer.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWDNSManager.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFlags.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFolder.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFolderInformation.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPCacheManager.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPFolder.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPMessage.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPStore.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_1.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_10.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_11.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_13.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_14.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_15.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_2.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_3.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_4.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_5.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_6.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_7.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_8.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_9.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWInternetAddress.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWKOI8_R.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWKOI8_U.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalCacheManager.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder+maildir.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder+mbox.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalMessage.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalStore.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMD5.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMIMEMultipart.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMIMEUtility.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMessage.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3CacheManager.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3CacheObject.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Folder.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Message.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Store.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWParser.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPart.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWRegEx.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWSMTP.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWSendmail.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWService.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWStore.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWTCPConnection.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWTransport.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWURLName.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWUUFile.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWVirtualFolder.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1250.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1251.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1252.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1253.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1254.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSData+Extensions.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSFileManager+Extensions.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSScanner+Extensions.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSString+Extensions.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/Pantomime.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/io.h
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Pantomime
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj/InfoPlist.strings
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj/InfoPlist.strings
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/Info-gnustep.plist
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so.%%LIBVERSION%%
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so.%%VERSION%%
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/Current
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/Resources/English.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/Pantomime.framework/Versions/Resources/German.lproj/Localizable.strings
-GNUstep/Local/Library/Frameworks/Pantomime.framework/libPantomime.so
-GNUstep/Local/Library/Headers/Pantomime
-GNUstep/Local/Library/Libraries/libPantomime.so
-GNUstep/Local/Library/Libraries/libPantomime.so.%%LIBVERSION%%
-GNUstep/Local/Library/Libraries/libPantomime.so.%%VERSION%%
+GNUstep/System/Library/Frameworks/Pantomime.framework/Headers
+GNUstep/System/Library/Frameworks/Pantomime.framework/Pantomime
+GNUstep/System/Library/Frameworks/Pantomime.framework/Resources
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWCacheManager.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWCharset.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWConnection.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWConstants.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWContainer.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWDNSManager.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFlags.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFolder.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWFolderInformation.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPCacheManager.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPFolder.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPMessage.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWIMAPStore.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_1.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_10.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_11.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_13.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_14.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_15.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_2.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_3.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_4.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_5.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_6.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_7.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_8.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWISO8859_9.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWInternetAddress.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWKOI8_R.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWKOI8_U.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalCacheManager.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder+maildir.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder+mbox.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalFolder.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalMessage.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWLocalStore.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMD5.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMIMEMultipart.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMIMEUtility.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWMessage.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3CacheManager.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3CacheObject.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Folder.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Message.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPOP3Store.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWParser.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWPart.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWRegEx.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWSMTP.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWSendmail.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWService.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWStore.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWTCPConnection.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWTransport.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWURLName.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWUUFile.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWVirtualFolder.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1250.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1251.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1252.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1253.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/CWWINDOWS_1254.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSData+Extensions.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSFileManager+Extensions.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSScanner+Extensions.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/NSString+Extensions.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/Pantomime.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Headers/io.h
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Pantomime
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/English.lproj/InfoPlist.strings
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj/InfoPlist.strings
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/German.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/Resources/Info-gnustep.plist
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so.%%LIBVERSION%%
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/%%LIBVERSION%%/libPantomime.so.%%VERSION%%
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/Current
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/Resources/English.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/Pantomime.framework/Versions/Resources/German.lproj/Localizable.strings
+GNUstep/System/Library/Frameworks/Pantomime.framework/libPantomime.so
+GNUstep/System/Library/Headers/Pantomime
+GNUstep/System/Library/Libraries/libPantomime.so
+GNUstep/System/Library/Libraries/libPantomime.so.%%LIBVERSION%%
+GNUstep/System/Library/Libraries/libPantomime.so.%%VERSION%%
diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index c3658a881591..851d8d1c15e9 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -7,22 +7,30 @@ CATEGORIES= misc gnustep
MASTER_SITES= GNUSTEP/usr-apps
MAINTAINER= ports@FreeBSD.org
-COMMENT= GNUstep example applications
-BROKEN= Not converted to USES=gnustep
-
-USE_GNUSTEP= yes
-USE_GNUSTEP_BACK= yes
-USE_GNUSTEP_BUILD= yes
-USE_GNUSTEP_INSTALL= yes
-USE_GL= yes
+USES= gnustep
+USE_GNUSTEP= back build
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GNUSTEP_MAKE_DIRS+= . gui/Finger gui/GFractal gui/HostAddress gui/MyGL
-MAKE_ENV+= GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
post-patch:
${REINPLACE_CMD} -e 's|^//|#|' \
${WRKSRC}/gui/GFractal/GNUmakefile
+do-build:
+.for i in ${USE_GNUSTEP_MAKE_DIRS}
+ @(cd ${BUILD_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+.endfor
+
+# ---------------------------------------------------------------------------
+# source GNUstep.sh
+#
+do-install:
+.for i in ${USE_GNUSTEP_MAKE_DIRS}
+ @(cd ${INSTALL_WRKSRC}/${i}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endfor
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile
index a8346214708f..996febe21641 100644
--- a/x11-toolkits/gnustep-back/Makefile
+++ b/x11-toolkits/gnustep-back/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gnustep-back
-PORTVERSION= 0.24.0
-PORTREVISION= 5
+PORTVERSION= 0.24.1
CATEGORIES= x11-toolkits gnustep
MASTER_SITES= GNUSTEP/core
diff --git a/x11-toolkits/gnustep-back/distinfo b/x11-toolkits/gnustep-back/distinfo
index 8a910c122ad2..7229a4ce87a0 100644
--- a/x11-toolkits/gnustep-back/distinfo
+++ b/x11-toolkits/gnustep-back/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnustep-back-0.24.0.tar.gz) = 5fc2ed70076d1cd9d51bf3ad85c71a42bfd29e3fd7c22421cc1de739695c3d62
-SIZE (gnustep-back-0.24.0.tar.gz) = 966735
+SHA256 (gnustep-back-0.24.1.tar.gz) = e255628e0f9be9b10359bb1be6690c50a0929bc383e6996966076492af02457e
+SIZE (gnustep-back-0.24.1.tar.gz) = 966529
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index f53adf139aa4..222ec7fee99a 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gnustep-gui
-PORTVERSION= 0.24.0
-PORTREVISION= 5
+PORTVERSION= 0.24.1
CATEGORIES= x11-toolkits gnustep
MASTER_SITES= GNUSTEP/core
diff --git a/x11-toolkits/gnustep-gui/distinfo b/x11-toolkits/gnustep-gui/distinfo
index 48a5660aafec..6e0e5f831b7d 100644
--- a/x11-toolkits/gnustep-gui/distinfo
+++ b/x11-toolkits/gnustep-gui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnustep-gui-0.24.0.tar.gz) = afcbe6633d24a9ee56efdf3d5b990b7baaa0b7f6288d2b72feb233e599fbd234
-SIZE (gnustep-gui-0.24.0.tar.gz) = 2816889
+SHA256 (gnustep-gui-0.24.1.tar.gz) = a749573c99d668b83230cc40b8b215b13d62e795615799a873981406cf2bb728
+SIZE (gnustep-gui-0.24.1.tar.gz) = 2837611
diff --git a/x11-toolkits/gnustep-gui/files/patch-Headers__AppKit__NSTableView.h b/x11-toolkits/gnustep-gui/files/patch-Headers__AppKit__NSTableView.h
new file mode 100644
index 000000000000..c86c39d940dc
--- /dev/null
+++ b/x11-toolkits/gnustep-gui/files/patch-Headers__AppKit__NSTableView.h
@@ -0,0 +1,11 @@
+--- 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 57eda005b191..89f9418b2352 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -1,44 +1,7 @@
-GNUstep/System/Applications/GSSpeechServer.app/GSSpeechServer
-GNUstep/System/Applications/GSSpeechServer.app/Resources/GSSpeechServer.desktop
-GNUstep/System/Applications/GSSpeechServer.app/Resources/Info-gnustep.plist
-GNUstep/System/Applications/GSSpeechServer.app/stamp.make
-GNUstep/System/Library/Bundles/AudioOutput.nssound/AudioOutput
-GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/AudioOutput.nssound/stamp.make
+
%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/GSCUPS
%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources/Info-gnustep.plist
%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/stamp.make
-GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR
-GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/stamp.make
-GNUstep/System/Library/Bundles/Sndfile.nssound/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/Sndfile.nssound/Sndfile
-GNUstep/System/Library/Bundles/Sndfile.nssound/stamp.make
-GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/RTFConverter
-GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/stamp.make
-GNUstep/System/Library/Bundles/libgmodel.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/libgmodel.bundle/libgmodel
-GNUstep/System/Library/Bundles/libgmodel.bundle/stamp.make
-GNUstep/System/Library/ColorPickers/NamedPicker.bundle/NamedPicker
-GNUstep/System/Library/ColorPickers/NamedPicker.bundle/Resources/GSNamedColorPicker.tiff
-GNUstep/System/Library/ColorPickers/NamedPicker.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/ColorPickers/NamedPicker.bundle/stamp.make
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj/StandardPicker.strings
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj/StandardPicker.strings
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSCMYKColorPicker.tiff
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSGrayColorPicker.tiff
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSHSBColorPicker.tiff
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSRGBColorPicker.tiff
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj/StandardPicker.strings
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj/StandardPicker.strings
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/StandardPicker
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/stamp.make
-GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources/GSWheelColorPicker.tiff
-GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/ColorPickers/WheelPicker.bundle/WheelPicker
-GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ClassesTOC.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ClassesTOC.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/Functions.gsdoc
@@ -69,25 +32,6 @@ GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/General.igsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/OpenStepCompliance.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/dependencies
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_1.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_10.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_11.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_12.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_13.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_14.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_15.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_16.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_2.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_3.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_4.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_5.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_6.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_7.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_8.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_9.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_abt.html
-%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit_fot.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ClassesTOC.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ClassesTOC.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ConstantsTOC.gsdoc
@@ -332,12 +276,52 @@ GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
%%PORTDOCS%%GNUstep/System/Library/Documentation/User/Gui/GuiUser/KeyboardSetup.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/User/Gui/GuiUser/LanguageSetup.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/User/Gui/GuiUser/dependencies
+%%PORTDOCS%%GNUstep/System/Library/Documentation/info/AppKit.info
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/gclose.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/gcloseall.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/gopen.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/make_services.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/set_show_service.1.gz
-%%PORTDOCS%%GNUstep/System/Library/Documentation/info/AppKit.info
+@dir GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual
+@dir GNUstep/System/Library/Themes
+GNUstep/System/Applications/GSSpeechServer.app/GSSpeechServer
+GNUstep/System/Applications/GSSpeechServer.app/Resources/GSSpeechServer.desktop
+GNUstep/System/Applications/GSSpeechServer.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/GSSpeechServer.app/stamp.make
+GNUstep/System/Library/Bundles/AudioOutput.nssound/AudioOutput
+GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/AudioOutput.nssound/stamp.make
+GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR
+GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/stamp.make
+GNUstep/System/Library/Bundles/Sndfile.nssound/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/Sndfile.nssound/Sndfile
+GNUstep/System/Library/Bundles/Sndfile.nssound/stamp.make
+GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/RTFConverter
+GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/stamp.make
+GNUstep/System/Library/Bundles/libgmodel.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/libgmodel.bundle/libgmodel
+GNUstep/System/Library/Bundles/libgmodel.bundle/stamp.make
+GNUstep/System/Library/ColorPickers/NamedPicker.bundle/NamedPicker
+GNUstep/System/Library/ColorPickers/NamedPicker.bundle/Resources/GSNamedColorPicker.tiff
+GNUstep/System/Library/ColorPickers/NamedPicker.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ColorPickers/NamedPicker.bundle/stamp.make
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSCMYKColorPicker.tiff
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSGrayColorPicker.tiff
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSHSBColorPicker.tiff
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSRGBColorPicker.tiff
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/StandardPicker
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/stamp.make
+GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources/GSWheelColorPicker.tiff
+GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ColorPickers/WheelPicker.bundle/WheelPicker
+GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
GNUstep/System/Library/Headers/AppKit/AppKit.h
GNUstep/System/Library/Headers/AppKit/AppKitDefines.h
GNUstep/System/Library/Headers/AppKit/AppKitExceptions.h
@@ -367,9 +351,9 @@ GNUstep/System/Library/Headers/AppKit/GSPDFPrintOperation.h
GNUstep/System/Library/Headers/AppKit/GSPasteboardServer.h
GNUstep/System/Library/Headers/AppKit/GSPrintOperation.h
GNUstep/System/Library/Headers/AppKit/GSPrinting.h
+GNUstep/System/Library/Headers/AppKit/GSServicesManager.h
GNUstep/System/Library/Headers/AppKit/GSSoundSink.h
GNUstep/System/Library/Headers/AppKit/GSSoundSource.h
-GNUstep/System/Library/Headers/AppKit/GSServicesManager.h
GNUstep/System/Library/Headers/AppKit/GSTable.h
GNUstep/System/Library/Headers/AppKit/GSTextConverter.h
GNUstep/System/Library/Headers/AppKit/GSTheme.h
@@ -380,7 +364,10 @@ GNUstep/System/Library/Headers/AppKit/GSTypesetter.h
GNUstep/System/Library/Headers/AppKit/GSVbox.h
GNUstep/System/Library/Headers/AppKit/GSVersion.h
GNUstep/System/Library/Headers/AppKit/GSWindowDecorationView.h
+GNUstep/System/Library/Headers/AppKit/GSXibElement.h
GNUstep/System/Library/Headers/AppKit/GSXibLoading.h
+GNUstep/System/Library/Headers/AppKit/GSXibObjectContainer.h
+GNUstep/System/Library/Headers/AppKit/GSXibParser.h
GNUstep/System/Library/Headers/AppKit/IMConnectors.h
GNUstep/System/Library/Headers/AppKit/IMCustomObject.h
GNUstep/System/Library/Headers/AppKit/IMLoading.h
@@ -401,6 +388,8 @@ GNUstep/System/Library/Headers/AppKit/NSButtonCell.h
GNUstep/System/Library/Headers/AppKit/NSCachedImageRep.h
GNUstep/System/Library/Headers/AppKit/NSCell.h
GNUstep/System/Library/Headers/AppKit/NSClipView.h
+GNUstep/System/Library/Headers/AppKit/NSCollectionView.h
+GNUstep/System/Library/Headers/AppKit/NSCollectionViewItem.h
GNUstep/System/Library/Headers/AppKit/NSColor.h
GNUstep/System/Library/Headers/AppKit/NSColorList.h
GNUstep/System/Library/Headers/AppKit/NSColorPanel.h
@@ -469,6 +458,7 @@ GNUstep/System/Library/Headers/AppKit/NSParagraphStyle.h
GNUstep/System/Library/Headers/AppKit/NSPasteboard.h
GNUstep/System/Library/Headers/AppKit/NSPopUpButton.h
GNUstep/System/Library/Headers/AppKit/NSPopUpButtonCell.h
+GNUstep/System/Library/Headers/AppKit/NSPopover.h
GNUstep/System/Library/Headers/AppKit/NSPrintInfo.h
GNUstep/System/Library/Headers/AppKit/NSPrintOperation.h
GNUstep/System/Library/Headers/AppKit/NSPrintPanel.h
@@ -496,6 +486,8 @@ GNUstep/System/Library/Headers/AppKit/NSSpellChecker.h
GNUstep/System/Library/Headers/AppKit/NSSpellProtocol.h
GNUstep/System/Library/Headers/AppKit/NSSpellServer.h
GNUstep/System/Library/Headers/AppKit/NSSplitView.h
+GNUstep/System/Library/Headers/AppKit/NSStatusBar.h
+GNUstep/System/Library/Headers/AppKit/NSStatusItem.h
GNUstep/System/Library/Headers/AppKit/NSStepper.h
GNUstep/System/Library/Headers/AppKit/NSStepperCell.h
GNUstep/System/Library/Headers/AppKit/NSStringDrawing.h
@@ -519,6 +511,9 @@ GNUstep/System/Library/Headers/AppKit/NSTokenFieldCell.h
GNUstep/System/Library/Headers/AppKit/NSToolbar.h
GNUstep/System/Library/Headers/AppKit/NSToolbarItem.h
GNUstep/System/Library/Headers/AppKit/NSToolbarItemGroup.h
+GNUstep/System/Library/Headers/AppKit/NSTrackingArea.h
+GNUstep/System/Library/Headers/AppKit/NSTreeController.h
+GNUstep/System/Library/Headers/AppKit/NSTreeNode.h
GNUstep/System/Library/Headers/AppKit/NSUserDefaultsController.h
GNUstep/System/Library/Headers/AppKit/NSUserInterfaceValidation.h
GNUstep/System/Library/Headers/AppKit/NSView.h
@@ -553,9 +548,9 @@ GNUstep/System/Library/Headers/GNUstepGUI/GSPDFPrintOperation.h
GNUstep/System/Library/Headers/GNUstepGUI/GSPasteboardServer.h
GNUstep/System/Library/Headers/GNUstepGUI/GSPrintOperation.h
GNUstep/System/Library/Headers/GNUstepGUI/GSPrinting.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSServicesManager.h
GNUstep/System/Library/Headers/GNUstepGUI/GSSoundSink.h
GNUstep/System/Library/Headers/GNUstepGUI/GSSoundSource.h
-GNUstep/System/Library/Headers/GNUstepGUI/GSServicesManager.h
GNUstep/System/Library/Headers/GNUstepGUI/GSTable.h
GNUstep/System/Library/Headers/GNUstepGUI/GSTextConverter.h
GNUstep/System/Library/Headers/GNUstepGUI/GSTheme.h
@@ -566,7 +561,10 @@ GNUstep/System/Library/Headers/GNUstepGUI/GSTypesetter.h
GNUstep/System/Library/Headers/GNUstepGUI/GSVbox.h
GNUstep/System/Library/Headers/GNUstepGUI/GSVersion.h
GNUstep/System/Library/Headers/GNUstepGUI/GSWindowDecorationView.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSXibElement.h
GNUstep/System/Library/Headers/GNUstepGUI/GSXibLoading.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSXibObjectContainer.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSXibParser.h
GNUstep/System/Library/Headers/GNUstepGUI/IMConnectors.h
GNUstep/System/Library/Headers/GNUstepGUI/IMCustomObject.h
GNUstep/System/Library/Headers/GNUstepGUI/IMLoading.h
@@ -595,9 +593,9 @@ GNUstep/System/Library/Headers/gnustep/gui/GSPDFPrintOperation.h
GNUstep/System/Library/Headers/gnustep/gui/GSPasteboardServer.h
GNUstep/System/Library/Headers/gnustep/gui/GSPrintOperation.h
GNUstep/System/Library/Headers/gnustep/gui/GSPrinting.h
+GNUstep/System/Library/Headers/gnustep/gui/GSServicesManager.h
GNUstep/System/Library/Headers/gnustep/gui/GSSoundSink.h
GNUstep/System/Library/Headers/gnustep/gui/GSSoundSource.h
-GNUstep/System/Library/Headers/gnustep/gui/GSServicesManager.h
GNUstep/System/Library/Headers/gnustep/gui/GSTable.h
GNUstep/System/Library/Headers/gnustep/gui/GSTextConverter.h
GNUstep/System/Library/Headers/gnustep/gui/GSTheme.h
@@ -608,7 +606,10 @@ GNUstep/System/Library/Headers/gnustep/gui/GSTypesetter.h
GNUstep/System/Library/Headers/gnustep/gui/GSVbox.h
GNUstep/System/Library/Headers/gnustep/gui/GSVersion.h
GNUstep/System/Library/Headers/gnustep/gui/GSWindowDecorationView.h
+GNUstep/System/Library/Headers/gnustep/gui/GSXibElement.h
GNUstep/System/Library/Headers/gnustep/gui/GSXibLoading.h
+GNUstep/System/Library/Headers/gnustep/gui/GSXibObjectContainer.h
+GNUstep/System/Library/Headers/gnustep/gui/GSXibParser.h
GNUstep/System/Library/Headers/gnustep/gui/IMConnectors.h
GNUstep/System/Library/Headers/gnustep/gui/IMCustomObject.h
GNUstep/System/Library/Headers/gnustep/gui/IMLoading.h
@@ -618,8 +619,10 @@ GNUstep/System/Library/Images/GSSearch.tiff
GNUstep/System/Library/Images/GSStop.tiff
GNUstep/System/Library/Images/LogoGNUstep.tiff
GNUstep/System/Library/Images/MagnifyGlass.tiff
+GNUstep/System/Library/Images/NSAddTemplate.tiff
GNUstep/System/Library/Images/NSComboArrow.tiff
GNUstep/System/Library/Images/NSRatingLevelIndicator.tiff
+GNUstep/System/Library/Images/NSRemoveTemplate.tiff
GNUstep/System/Library/Images/common_2DCheckMark.tiff
GNUstep/System/Library/Images/common_2DDash.tiff
GNUstep/System/Library/Images/common_3DArrowDown.tiff
@@ -658,6 +661,7 @@ GNUstep/System/Library/Images/common_HelpLink.tiff
GNUstep/System/Library/Images/common_Home.tiff
GNUstep/System/Library/Images/common_HomeDirectory.tiff
GNUstep/System/Library/Images/common_ImageFolder.tiff
+GNUstep/System/Library/Images/common_Info.tiff
GNUstep/System/Library/Images/common_LeftTabStop.tiff
GNUstep/System/Library/Images/common_LibraryFolder.tiff
GNUstep/System/Library/Images/common_MiniWindowTile.tiff
@@ -694,6 +698,10 @@ GNUstep/System/Library/Images/common_Root_Sparc.tiff
GNUstep/System/Library/Images/common_Root_Sparc2.tiff
GNUstep/System/Library/Images/common_SliderHoriz.tiff
GNUstep/System/Library/Images/common_SliderVert.tiff
+GNUstep/System/Library/Images/common_StepperDown.tiff
+GNUstep/System/Library/Images/common_StepperDownHighlighted.tiff
+GNUstep/System/Library/Images/common_StepperUp.tiff
+GNUstep/System/Library/Images/common_StepperUpHighlighted.tiff
GNUstep/System/Library/Images/common_SwitchOff.tiff
GNUstep/System/Library/Images/common_SwitchOn.tiff
GNUstep/System/Library/Images/common_TabDownSelectedLeft.tiff
@@ -709,6 +717,7 @@ GNUstep/System/Library/Images/common_TabSelectedToUnSelectedJunction.tiff
GNUstep/System/Library/Images/common_TabUnSelectedJunction.tiff
GNUstep/System/Library/Images/common_TabUnSelectedLeft.tiff
GNUstep/System/Library/Images/common_TabUnSelectedRight.tiff
+GNUstep/System/Library/Images/common_TabUnSelectedToSelectedJunction.tiff
GNUstep/System/Library/Images/common_Tile.tiff
GNUstep/System/Library/Images/common_ToolbarClippedItemsMark.tiff
GNUstep/System/Library/Images/common_ToolbarCustomizeToolbarItem.tiff
@@ -802,19 +811,3 @@ GNUstep/System/Tools/gopen
GNUstep/System/Tools/make_services
GNUstep/System/Tools/say
GNUstep/System/Tools/set_show_service
-GNUstep/System/Library/Headers/AppKit/NSTreeController.h
-GNUstep/System/Library/Images/NSAddTemplate.tiff
-GNUstep/System/Library/Images/common_Info.tiff
-GNUstep/System/Library/Headers/AppKit/NSCollectionView.h
-GNUstep/System/Library/Headers/AppKit/NSCollectionViewItem.h
-GNUstep/System/Library/Headers/AppKit/NSPopover.h
-GNUstep/System/Library/Headers/AppKit/NSStatusBar.h
-GNUstep/System/Library/Headers/AppKit/NSStatusItem.h
-GNUstep/System/Library/Headers/AppKit/NSTrackingArea.h
-GNUstep/System/Library/Headers/AppKit/NSTreeNode.h
-GNUstep/System/Library/Images/common_StepperDown.tiff
-GNUstep/System/Library/Images/common_StepperDownHighlighted.tiff
-GNUstep/System/Library/Images/common_StepperUp.tiff
-GNUstep/System/Library/Images/common_StepperUpHighlighted.tiff
-GNUstep/System/Library/Images/common_TabUnSelectedToSelectedJunction.tiff
-@dir GNUstep/System/Library/Themes
diff --git a/x11/terminal.app/Makefile b/x11/terminal.app/Makefile
index 48aab2b569e6..dfc51dbd59c4 100644
--- a/x11/terminal.app/Makefile
+++ b/x11/terminal.app/Makefile
@@ -14,9 +14,10 @@ COMMENT= Terminal Emulator for GNUstep
LICENSE= GPLv2 # only
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gnustep
+USES= gnustep iconv
USE_GNUSTEP= back build
+MAKE_ARGS+= Terminal_TOOL_LIBS='${ICONV_LIB} -lutil'
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
post-install: