cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update GNUstep examples to 1.4.0, adding a couple of new examples to GSTest

Browse Source 
while there, switch to use SUBST_CMD instead of hand-rolled perl
in pre-configure
This commit is contained in:
sebastia 2013-09-01 13:04:09 +00:00
parent c82427c541
commit 61044fe14b
7 changed files with 80 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11/gnustep/examples/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.20 2013/04/25 16:40:11 sebastia Exp $
# $OpenBSD: Makefile,v 1.21 2013/09/01 13:04:09 sebastia Exp $
COMMENT= GNUstep example applications
DISTNAME= gnustep-examples-1.3.0
REVISION = 8
DISTNAME= gnustep-examples-1.4.0
CATEGORIES= misc
@ -11,14 +10,12 @@ HOMEPAGE= http://www.gnustep.org/experience/examples.html
WANTLIB= GL GLU c m pthread
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=usr-apps/}
MODULES= x11/gnustep
pre-configure:
@perl -pi -e 's,!!X11BASE!!,${X11BASE},g' \
${WRKSRC}/gui/MyGL/GNUmakefile
@perl -pi -e 's,!!PREFIX!!,${PREFIX},g' \
${WRKSRC}/gui/MyGL/AppController.m
${SUBST_CMD} ${WRKSRC}/gui/MyGL/GNUmakefile \
${WRKSRC}/gui/MyGL/AppController.m
.include <bsd.port.mk>

4
x11/gnustep/examples/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnustep/gnustep-examples-1.3.0.tar.gz) = foSLnNbf4A8QH3HHbie7Rv2Kdq7v3xnlzgUI4EE7Ihw=
SIZE (gnustep/gnustep-examples-1.3.0.tar.gz) = 295888
SHA256 (gnustep/gnustep-examples-1.4.0.tar.gz) = Szh094swFAcABpmjrBLLPQWj93KnIw8DPFCCBnJA/8E=
SIZE (gnustep/gnustep-examples-1.4.0.tar.gz) = 681536

12
x11/gnustep/examples/patches/patch-gui_GFractal_GNUmakefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gui_GFractal_GNUmakefile,v 1.1 2010/10/24 17:07:24 naddy Exp $
--- gui/GFractal/GNUmakefile.orig Sun Oct 24 10:57:36 2010
+++ gui/GFractal/GNUmakefile Sun Oct 24 11:00:26 2010
@@ -14,7 +14,7 @@ GFractal_OBJC_FILES = main.m \
# The Resource files to be copied into the app's resources directory
-// GFractal_RESOURCE_FILES = Icons/*
+#GFractal_RESOURCE_FILES = Icons/*
include $(GNUSTEP_MAKEFILES)/application.make

22
x11/gnustep/examples/patches/patch-gui_MyGL_AppController_m
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-gui_MyGL_AppController_m,v 1.5 2013/08/07 19:17:01 naddy Exp $
--- gui/MyGL/AppController.m.orig Thu Apr 15 01:01:19 2010
+++ gui/MyGL/AppController.m Wed Aug 7 20:35:43 2013
@@ -410,7 +410,7 @@ static void Normalize (Vector *v)
$OpenBSD: patch-gui_MyGL_AppController_m,v 1.6 2013/09/01 13:04:09 sebastia Exp $
--- gui/MyGL/AppController.m.orig Thu May 19 09:45:25 2011
+++ gui/MyGL/AppController.m Sun Sep 1 14:40:57 2013
@@ -413,7 +413,7 @@ static void Normalize (Vector *v)
h = [MySAX new];
p = [GSXMLParser parserWithSAXHandler:h
- withContentsOfFile:@"girl.dae"];
+ withContentsOfFile:@"!!PREFIX!!/libexec/GNUstep/MyGL.app/Resources/girl.dae"];
if ([p parse])
{
[meshArray addObject:[h currentMesh]];
h = [MySAX new];
p = [GSXMLParser parserWithSAXHandler:h
- withContentsOfFile:@"girl.dae"];
+ withContentsOfFile:@"${LOCALBASE}/libexec/GNUstep/MyGL.app/Resources/girl.dae"];
if ([p parse])
{
[meshArray addObject:[h currentMesh]];

6
x11/gnustep/examples/patches/patch-gui_MyGL_GNUmakefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-gui_MyGL_GNUmakefile,v 1.4 2012/07/08 14:15:11 sebastia Exp $
$OpenBSD: patch-gui_MyGL_GNUmakefile,v 1.5 2013/09/01 13:04:09 sebastia Exp $
--- gui/MyGL/GNUmakefile.orig Sat Mar 13 02:20:22 2010
+++ gui/MyGL/GNUmakefile Mon Jul 2 19:26:06 2012
@@ -7,13 +7,14 @@ MyGL_MAIN_MODEL_FILE=MyGL.gorm
@ -13,8 +13,8 @@ $OpenBSD: patch-gui_MyGL_GNUmakefile,v 1.4 2012/07/08 14:15:11 sebastia Exp $
ADDITIONAL_TOOL_LIBS += -lopengl32 -lglu32 -lm
else
-ADDITIONAL_TOOL_LIBS += -lGL -lGLU -lm
+ADDITIONAL_TOOL_LIBS += -L!!X11BASE!!/lib -lGL -lGLU -lm
+ADDITIONAL_INCLUDE_DIRS += -I!!X11BASE!!/include
+ADDITIONAL_TOOL_LIBS += -L${X11BASE}/lib -lGL -lGLU -lm
+ADDITIONAL_INCLUDE_DIRS += -I${X11BASE}/include
endif
include $(GNUSTEP_MAKEFILES)/application.make

17
x11/gnustep/examples/patches/patch-gui_MyGL_main_m
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-gui_MyGL_main_m,v 1.1 2011/06/27 06:34:55 sebastia Exp $
fix startup of MyGL
--- gui/MyGL/main.m.orig Sat Jun 25 13:10:10 2011
+++ gui/MyGL/main.m Sat Jun 25 13:10:39 2011
@@ -2,9 +2,5 @@
int main(int argc, char **argv)
{
- CREATE_AUTORELEASE_POOL(pool);
- [NSApplication sharedApplication];
- [NSApp run];
- DESTROY(pool);
- return 0;
+ return NSApplicationMain (argc, argv);
}

60
x11/gnustep/examples/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2013/04/25 16:40:11 sebastia Exp $
@comment $OpenBSD: PLIST,v 1.8 2013/09/01 13:04:10 sebastia Exp $
bin/Calculator
bin/CurrencyConverter
bin/Finger
@ -30,6 +30,37 @@ lib/GNUstep/ApplicationSupport/GSTest/GSHbox-test.bundle/
lib/GNUstep/ApplicationSupport/GSTest/GSHbox-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/GSHbox-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/GSHbox-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/
@bin lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Image-test
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/1.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/138x92dpi.tiff
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/2.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/3.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/4.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/5.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/6.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/7.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/8.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/9.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/92x92dpi.tiff
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/fourcorners.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/gs.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/pdfexample.pdf
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/plasma.png
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/svgexample.svg
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/Resources/testTIFFIconWithAllImages72DPI.tiff
lib/GNUstep/ApplicationSupport/GSTest/Image-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/
@bin lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/ImageSelection-test
lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/Resources/test72DPIAnd288DPI.tiff
lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/Resources/testICNSIcon.icns
lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/Resources/testTIFFIconWithAllImages72DPI.tiff
lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/Resources/testTIFFIconWithAllImages72DPIDescendingSize.tiff
lib/GNUstep/ApplicationSupport/GSTest/ImageSelection-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/KeyboardInput-test.bundle/
@bin lib/GNUstep/ApplicationSupport/GSTest/KeyboardInput-test.bundle/KeyboardInput-test
lib/GNUstep/ApplicationSupport/GSTest/KeyboardInput-test.bundle/Resources/
@ -75,6 +106,11 @@ lib/GNUstep/ApplicationSupport/GSTest/NSOutlineView-test.bundle/
lib/GNUstep/ApplicationSupport/GSTest/NSOutlineView-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/NSOutlineView-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/NSOutlineView-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/NSProgressIndicator-test.bundle/
@bin lib/GNUstep/ApplicationSupport/GSTest/NSProgressIndicator-test.bundle/NSProgressIndicator-test
lib/GNUstep/ApplicationSupport/GSTest/NSProgressIndicator-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/NSProgressIndicator-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/NSProgressIndicator-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/NSSavePanel-test.bundle/
@bin lib/GNUstep/ApplicationSupport/GSTest/NSSavePanel-test.bundle/NSSavePanel-test
lib/GNUstep/ApplicationSupport/GSTest/NSSavePanel-test.bundle/Resources/
@ -115,16 +151,38 @@ lib/GNUstep/ApplicationSupport/GSTest/NSViewAnimation-test.bundle/
lib/GNUstep/ApplicationSupport/GSTest/NSViewAnimation-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/NSViewAnimation-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/NSViewAnimation-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/NSWindow-test.bundle/
@bin lib/GNUstep/ApplicationSupport/GSTest/NSWindow-test.bundle/NSWindow-test
lib/GNUstep/ApplicationSupport/GSTest/NSWindow-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/NSWindow-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/NSWindow-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/NSWindowStyleMask-test.bundle/
@bin lib/GNUstep/ApplicationSupport/GSTest/NSWindowStyleMask-test.bundle/NSWindowStyleMask-test
lib/GNUstep/ApplicationSupport/GSTest/NSWindowStyleMask-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/NSWindowStyleMask-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/NSWindowStyleMask-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/PixelExactDrawing-test.bundle/
@bin lib/GNUstep/ApplicationSupport/GSTest/PixelExactDrawing-test.bundle/PixelExactDrawing-test
lib/GNUstep/ApplicationSupport/GSTest/PixelExactDrawing-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/PixelExactDrawing-test.bundle/Resources/Info-gnustep.plist
lib/GNUstep/ApplicationSupport/GSTest/PixelExactDrawing-test.bundle/Resources/pixelExact1.tiff
lib/GNUstep/ApplicationSupport/GSTest/PixelExactDrawing-test.bundle/Resources/pixelExact2.tiff
lib/GNUstep/ApplicationSupport/GSTest/PixelExactDrawing-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/StringDrawing-test.bundle/
lib/GNUstep/ApplicationSupport/GSTest/StringDrawing-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/StringDrawing-test.bundle/Resources/Info-gnustep.plist
@bin lib/GNUstep/ApplicationSupport/GSTest/StringDrawing-test.bundle/StringDrawing-test
lib/GNUstep/ApplicationSupport/GSTest/StringDrawing-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/TextSystem-test.bundle/
lib/GNUstep/ApplicationSupport/GSTest/TextSystem-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/TextSystem-test.bundle/Resources/Info-gnustep.plist
@bin lib/GNUstep/ApplicationSupport/GSTest/TextSystem-test.bundle/TextSystem-test
lib/GNUstep/ApplicationSupport/GSTest/TextSystem-test.bundle/stamp.make
lib/GNUstep/ApplicationSupport/GSTest/Transparency-test.bundle/
lib/GNUstep/ApplicationSupport/GSTest/Transparency-test.bundle/Resources/
lib/GNUstep/ApplicationSupport/GSTest/Transparency-test.bundle/Resources/Info-gnustep.plist
@bin lib/GNUstep/ApplicationSupport/GSTest/Transparency-test.bundle/Transparency-test
lib/GNUstep/ApplicationSupport/GSTest/Transparency-test.bundle/stamp.make
lib/GNUstep/Services/example.service/
lib/GNUstep/Services/example.service/Resources/
lib/GNUstep/Services/example.service/Resources/Info-gnustep.plist