2 files changed, 11 insertions, 16 deletions

diff --git a/misc/gnustep-examples/Makefile b/misc/gnustep-examples/Makefile
index fcb561ddc781..1ffa0c4892d4 100644
--- a/misc/gnustep-examples/Makefile
+++ b/misc/gnustep-examples/Makefile
@@ -6,12 +6,7 @@
 #
 
 PORTNAME=	gnustep-examples
-.if defined(WITH_GNUSTEP_DEVEL)
 PORTVERSION=	1.3.0
-.else
-PORTVERSION=	1.2.0
-PORTREVISION=	1
-.endif
 CATEGORIES=	misc gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	core
diff --git a/misc/gnustep-examples/pkg-plist b/misc/gnustep-examples/pkg-plist
index 1146a7eac5aa..a1c6477e3168 100644
--- a/misc/gnustep-examples/pkg-plist
+++ b/misc/gnustep-examples/pkg-plist
@@ -46,7 +46,7 @@ GNUstep/Local/Applications/Ink.app/Resources/FileIcon_rtf.tiff
 GNUstep/Local/Applications/Ink.app/Resources/FileIcon_txt.tiff
 GNUstep/Local/Applications/Ink.app/Resources/Info-gnustep.plist
 GNUstep/Local/Applications/Ink.app/Resources/Ink.desktop
-%%GNUSTEP_DEVEL%%GNUstep/Local/Applications/Ink.app/Resources/Ink_app.ico
+GNUstep/Local/Applications/Ink.app/Resources/Ink_app.ico
 GNUstep/Local/Applications/Ink.app/Resources/Ink_app.tiff
 GNUstep/Local/Applications/Ink.app/stamp.make
 GNUstep/Local/Applications/MyGL.app/MyGL
@@ -96,9 +96,9 @@ GNUstep/Local/Library/ApplicationSupport/GSTest/NSAnimation-test.bundle/stamp.ma
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle/NSBox-test
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle/Resources/Info-gnustep.plist
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle/stamp.make
-%%GNUSTEP_DEVEL%%GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle/NSButton-test
-%%GNUSTEP_DEVEL%%GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle/Resources/Info-gnustep.plist
-%%GNUSTEP_DEVEL%%GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle/NSButton-test
+GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle/stamp.make
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle/NSColorList-test
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle/Resources/Info-gnustep.plist
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle/stamp.make
@@ -108,9 +108,9 @@ GNUstep/Local/Library/ApplicationSupport/GSTest/NSColorWell-test.bundle/stamp.ma
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle/NSForm-test
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle/Resources/Info-gnustep.plist
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle/stamp.make
-%%GNUSTEP_DEVEL%%GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/NSOpenPanel-test
-%%GNUSTEP_DEVEL%%GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/Resources/Info-gnustep.plist
-%%GNUSTEP_DEVEL%%GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/stamp.make
+GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/NSOpenPanel-test
+GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/Resources/Info-gnustep.plist
+GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/stamp.make
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSOutlineView-test.bundle/NSOutlineView-test
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSOutlineView-test.bundle/Resources/Info-gnustep.plist
 GNUstep/Local/Library/ApplicationSupport/GSTest/NSOutlineView-test.bundle/stamp.make
@@ -183,16 +183,16 @@ GNUstep/Local/Tools/md5Digest
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSSavePanel-test.bundle
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSOutlineView-test.bundle/Resources
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSOutlineView-test.bundle
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/Resources
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle
+@dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSOpenPanel-test.bundle
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle/Resources
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSForm-test.bundle
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSColorWell-test.bundle/Resources
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSColorWell-test.bundle
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle/Resources
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSColorList-test.bundle
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle/Resources
-%%GNUSTEP_DEVEL%%@dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle
+@dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle/Resources
+@dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSButton-test.bundle
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle/Resources
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSBox-test.bundle
 @dirrm GNUstep/Local/Library/ApplicationSupport/GSTest/NSAnimation-test.bundle/Resources