4 files changed, 73 insertions, 53 deletions

diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index 4d2053c1a760..1db42ad0df9a 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnustep-examples
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
@@ -24,12 +24,8 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 MAKEFILE=	GNUmakefile
 
-MAKE_APPS=	Finger GFractal GPuzzle HostAddress
-INSTALL_APPS=	Finger GFractal GPuzzle HostAddress
-
-post-patch:
-	${REINPLACE_CMD} -e 's|)/Makefiles|)/Library/Makefiles|' \
-		${WRKSRC}/gui/GPuzzle/GNUmakefile
+MAKE_APPS=	Finger GFractal HostAddress
+INSTALL_APPS=	Finger GFractal HostAddress
 
 post-build:
 .for i in ${MAKE_APPS}
diff --git a/misc/gnustep-examples/distinfo b/misc/gnustep-examples/distinfo
index 80a77e6caa44..b2f94fc0618a 100644
--- a/misc/gnustep-examples/distinfo
+++ b/misc/gnustep-examples/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnustep-examples-1.0.0.tar.gz) = 3409eca37e4a2f9f560cc06907a38e67
-SHA256 (gnustep-examples-1.0.0.tar.gz) = 4b48408f5103a30ec50a958028e9af9088a4b1bb6ad4f69546995201dfa72950
-SIZE (gnustep-examples-1.0.0.tar.gz) = 265320
+MD5 (gnustep-examples-1.1.0.tar.gz) = 8ebf37723c89c4fcd4093164ffa50a63
+SHA256 (gnustep-examples-1.1.0.tar.gz) = 987154a107ea2cdb978b0f3bf88df707cda53bf85a74727123d7df2e1fbb66cd
+SIZE (gnustep-examples-1.1.0.tar.gz) = 237563
diff --git a/misc/gnustep-examples/pkg-descr b/misc/gnustep-examples/pkg-descr
index bc08492aacdd..74d23e928ff1 100644
--- a/misc/gnustep-examples/pkg-descr
+++ b/misc/gnustep-examples/pkg-descr
@@ -4,7 +4,11 @@ The GNUstep example applications:
 # CurrencyConverter
 # Finger              It is a simple front-end to finger, ping and traceroute.
 # GFractal
-# GPuzzle             Using a tiff for a puzzle.
 # GSTest
 # HostAddress
 # Ink                 Text Editor
+# NSBrowserTest
+# NSImageTest
+# NSPanelTest
+# NSScreenTest
+# md5Digest
diff --git a/misc/gnustep-examples/pkg-plist b/misc/gnustep-examples/pkg-plist
index a6bda8c9e435..abab75ccce6e 100644
--- a/misc/gnustep-examples/pkg-plist
+++ b/misc/gnustep-examples/pkg-plist
@@ -42,12 +42,17 @@ Local/Applications/HostAddress.app/Resources/Info-gnustep.plist
 Local/Applications/HostAddress.app/library_paths.openapp
 Local/Applications/HostAddress.app/stamp.make
 Local/Applications/Ink.app/Ink
+Local/Applications/Ink.app/Resources/Document.gorm/data.classes
+Local/Applications/Ink.app/Resources/Document.gorm/data.info
+Local/Applications/Ink.app/Resources/Document.gorm/objects.gorm
+Local/Applications/Ink.app/Resources/English.lproj/MainMenu.gorm/data.classes
+Local/Applications/Ink.app/Resources/English.lproj/MainMenu.gorm/data.info
+Local/Applications/Ink.app/Resources/English.lproj/MainMenu.gorm/objects.gorm
 Local/Applications/Ink.app/Resources/FileIcon_rtf.tiff
 Local/Applications/Ink.app/Resources/FileIcon_txt.tiff
 Local/Applications/Ink.app/Resources/Info-gnustep.plist
 Local/Applications/Ink.app/Resources/Ink.desktop
 Local/Applications/Ink.app/Resources/Ink_app.tiff
-Local/Applications/Ink.app/Resources/Readme.rtf
 Local/Applications/Ink.app/library_paths.openapp
 Local/Applications/Ink.app/stamp.make
 Local/Applications/NSBrowserTest.app/NSBrowserTest
@@ -55,18 +60,28 @@ Local/Applications/NSBrowserTest.app/Resources/Info-gnustep.plist
 Local/Applications/NSBrowserTest.app/Resources/NSBrowserTest.desktop
 Local/Applications/NSBrowserTest.app/library_paths.openapp
 Local/Applications/NSBrowserTest.app/stamp.make
+Local/Applications/NSImageTest.app/NSImageTest
+Local/Applications/NSImageTest.app/Resources/Info-gnustep.plist
+Local/Applications/NSImageTest.app/Resources/NSImageTest.desktop
+Local/Applications/NSImageTest.app/library_paths.openapp
+Local/Applications/NSImageTest.app/stamp.make
 Local/Applications/NSPanelTest.app/NSPanelTest
-Local/Applications/NSPanelTest.app/library_paths.openapp
 Local/Applications/NSPanelTest.app/Resources/Info-gnustep.plist
-Local/Applications/NSPanelTest.app/Resources/icon.tiff
 Local/Applications/NSPanelTest.app/Resources/NSPanelTest.desktop
 Local/Applications/NSPanelTest.app/Resources/Test.strings
+Local/Applications/NSPanelTest.app/Resources/icon.tiff
+Local/Applications/NSPanelTest.app/library_paths.openapp
 Local/Applications/NSPanelTest.app/stamp.make
 Local/Applications/NSScreenTest.app/NSScreenTest
 Local/Applications/NSScreenTest.app/Resources/Info-gnustep.plist
 Local/Applications/NSScreenTest.app/Resources/NSScreenTest.desktop
 Local/Applications/NSScreenTest.app/library_paths.openapp
 Local/Applications/NSScreenTest.app/stamp.make
+Local/Applications/md5Digest.app/Resources/Info-gnustep.plist
+Local/Applications/md5Digest.app/Resources/md5Digest.desktop
+Local/Applications/md5Digest.app/library_paths.openapp
+Local/Applications/md5Digest.app/md5Digest
+Local/Applications/md5Digest.app/stamp.make
 Local/Library/ApplicationSupport/GSTest/Composite-test.bundle/Composite-test
 Local/Library/ApplicationSupport/GSTest/Composite-test.bundle/Resources/Info-gnustep.plist
 Local/Library/ApplicationSupport/GSTest/Composite-test.bundle/stamp.make
@@ -121,58 +136,63 @@ Local/Library/ApplicationSupport/GSTest/NSWindowStyleMask-test.bundle/stamp.make
 Local/Library/ApplicationSupport/GSTest/StringDrawing-test.bundle/Resources/Info-gnustep.plist
 Local/Library/ApplicationSupport/GSTest/StringDrawing-test.bundle/StringDrawing-test
 Local/Library/ApplicationSupport/GSTest/StringDrawing-test.bundle/stamp.make
-System/Applications/GPuzzle.app/GPuzzle
-System/Applications/GPuzzle.app/Resources/GPuzzle.desktop
-System/Applications/GPuzzle.app/Resources/Info-gnustep.plist
-System/Applications/GPuzzle.app/library_paths.openapp
-System/Applications/GPuzzle.app/stamp.make
-@dirrm System/Applications/GPuzzle.app/Resources
-@dirrm System/Applications/GPuzzle.app
-@dirrm Local/Library/ApplicationSupport/GSTest/Composite-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/Composite-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/CoordinateCheck-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/CoordinateCheck-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/GSHbox-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/GSHbox-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/KeyboardInput-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/KeyboardInput-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSColorWell-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSColorWell-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSSavePanel-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSSavePanel-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSScrollView-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSScrollView-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSSecureTextField-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSSecureTextField-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSSlider-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSSlider-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSSplitView-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSSplitView-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSTableView-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSTableView-test.bundle
-@dirrm Local/Library/ApplicationSupport/GSTest/NSTextView-test.bundle/Resources
-@dirrm Local/Library/ApplicationSupport/GSTest/NSTextView-test.bundle
+Local/Library/Services/example.service/Resources/Info-gnustep.plist
+Local/Library/Services/example.service/example
+@dirrm Local/Library/Services/example.service/Resources
+@dirrm Local/Library/Services/example.service
+@dirrm Local/Library/Services
 @dirrm Local/Library/ApplicationSupport/GSTest/StringDrawing-test.bundle/Resources
 @dirrm Local/Library/ApplicationSupport/GSTest/StringDrawing-test.bundle
 @dirrm Local/Library/ApplicationSupport/GSTest/NSWindowStyleMask-test.bundle/Resources
 @dirrm Local/Library/ApplicationSupport/GSTest/NSWindowStyleMask-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSTextView-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSTextView-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSTableView-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSTableView-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSSplitView-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSSplitView-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSSlider-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSSlider-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSSecureTextField-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSSecureTextField-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSScrollView-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSScrollView-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSSavePanel-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSSavePanel-test.bundle
 @dirrm Local/Library/ApplicationSupport/GSTest/NSOutlineView-test.bundle/Resources
 @dirrm Local/Library/ApplicationSupport/GSTest/NSOutlineView-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSColorWell-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSColorWell-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/KeyboardInput-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/KeyboardInput-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/GSHbox-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/GSHbox-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/CoordinateCheck-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/CoordinateCheck-test.bundle
+@dirrm Local/Library/ApplicationSupport/GSTest/Composite-test.bundle/Resources
+@dirrm Local/Library/ApplicationSupport/GSTest/Composite-test.bundle
 @dirrm Local/Library/ApplicationSupport/GSTest
 @dirrm Local/Library/ApplicationSupport
 @dirrmtry Local/Library
-@dirrm Local/Applications/NSPanelTest.app/Resources
-@dirrm Local/Applications/NSPanelTest.app
+@dirrm Local/Applications/md5Digest.app/Resources
+@dirrm Local/Applications/md5Digest.app
 @dirrm Local/Applications/NSScreenTest.app/Resources
 @dirrm Local/Applications/NSScreenTest.app
+@dirrm Local/Applications/NSPanelTest.app/Resources
+@dirrm Local/Applications/NSPanelTest.app
+@dirrm Local/Applications/NSImageTest.app/Resources
+@dirrm Local/Applications/NSImageTest.app
 @dirrm Local/Applications/NSBrowserTest.app/Resources
 @dirrm Local/Applications/NSBrowserTest.app
+@dirrm Local/Applications/Ink.app/Resources/English.lproj/MainMenu.gorm
+@dirrm Local/Applications/Ink.app/Resources/English.lproj
+@dirrm Local/Applications/Ink.app/Resources/Document.gorm
 @dirrm Local/Applications/Ink.app/Resources
 @dirrm Local/Applications/Ink.app
 @dirrm Local/Applications/HostAddress.app/Resources