From 0f95f34341f868cbe6aeebfa6e9548ecb899a4f8 Mon Sep 17 00:00:00 2001 From: sebastia Date: Mon, 18 Apr 2011 12:33:04 +0000 Subject: [PATCH] bump, use full path to find mount in patch, PLIst changes due to framework OK landry@, ajacoutot@ --- x11/gnustep/gworkspace/Makefile | 4 ++-- .../gworkspace/patches/patch-FSNode_FSNodeRep_m | 12 +++++++----- x11/gnustep/gworkspace/pkg/PLIST | 15 +++++++++++++-- x11/gnustep/highlighterkit/Makefile | 3 ++- x11/gnustep/highlighterkit/pkg/PLIST | 6 +++++- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/x11/gnustep/gworkspace/Makefile b/x11/gnustep/gworkspace/Makefile index c3ef293bfeb..a0b1106df7e 100644 --- a/x11/gnustep/gworkspace/Makefile +++ b/x11/gnustep/gworkspace/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2011/01/14 13:07:13 sebastia Exp $ +# $OpenBSD: Makefile,v 1.13 2011/04/18 12:33:04 sebastia Exp $ COMMENT= GNUstep workspace manager DISTNAME= gworkspace-0.8.8 -REVISION= 6 +REVISION= 7 CATEGORIES= x11 diff --git a/x11/gnustep/gworkspace/patches/patch-FSNode_FSNodeRep_m b/x11/gnustep/gworkspace/patches/patch-FSNode_FSNodeRep_m index a844c44bb93..51ae68e8a97 100644 --- a/x11/gnustep/gworkspace/patches/patch-FSNode_FSNodeRep_m +++ b/x11/gnustep/gworkspace/patches/patch-FSNode_FSNodeRep_m @@ -1,13 +1,15 @@ -$OpenBSD: patch-FSNode_FSNodeRep_m,v 1.1 2011/01/14 13:07:13 sebastia Exp $ +$OpenBSD: patch-FSNode_FSNodeRep_m,v 1.2 2011/04/18 12:33:04 sebastia Exp $ OpenBSD and NetBSD don't have the -p mount option ---- FSNode/FSNodeRep.m.orig Wed Jan 12 08:16:20 2011 -+++ FSNode/FSNodeRep.m Wed Jan 12 08:20:08 2011 -@@ -757,7 +757,9 @@ static FSNodeRep *shared = nil; +--- FSNode/FSNodeRep.m.orig Sat Jun 19 01:21:36 2010 ++++ FSNode/FSNodeRep.m Tue Apr 5 19:00:32 2011 +@@ -756,8 +756,10 @@ static FSNodeRep *shared = nil; + NSPipe *pipe = [NSPipe pipe]; NSFileHandle *handle = [pipe fileHandleForReading]; - [task setLaunchPath: @"mount"]; +- [task setLaunchPath: @"mount"]; ++ [task setLaunchPath: @"/sbin/mount"]; +#if !defined(__OpenBSD__) && !defined(__NetBSD__) [task setArguments: [NSArray arrayWithObject: @"-p"]]; +#endif diff --git a/x11/gnustep/gworkspace/pkg/PLIST b/x11/gnustep/gworkspace/pkg/PLIST index d74c47cd7e1..fa2ee024f93 100644 --- a/x11/gnustep/gworkspace/pkg/PLIST +++ b/x11/gnustep/gworkspace/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2011/01/10 18:28:01 sebastia Exp $ +@comment $OpenBSD: PLIST,v 1.7 2011/04/18 12:33:04 sebastia Exp $ bin/GWorkspace bin/MDFinder bin/Recycler @@ -292,10 +292,12 @@ lib/GNUstep/Bundles/XmlExtractor.extr/Resources/Info-gnustep.plist @bin lib/GNUstep/Bundles/XmlExtractor.extr/XmlExtractor lib/GNUstep/Bundles/XmlExtractor.extr/stamp.make lib/GNUstep/Frameworks/FSNode.framework/ +lib/GNUstep/Frameworks/FSNode.framework/FSNode lib/GNUstep/Frameworks/FSNode.framework/Headers lib/GNUstep/Frameworks/FSNode.framework/Resources lib/GNUstep/Frameworks/FSNode.framework/Versions/ lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/ +lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/FSNode lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/Headers/ lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/Headers/FSNBrowser.h lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/Headers/FSNBrowserCell.h @@ -322,15 +324,18 @@ lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/Resources/MultipleSelection lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/Resources/Recycler.tiff lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/Resources/RecyclerFull.tiff lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/Resources/Workspace.tiff +@lib lib/GNUstep/Frameworks/FSNode.framework/Versions/0.0/libFSNode.so.${LIBFSNode_VERSION} lib/GNUstep/Frameworks/FSNode.framework/Versions/Current lib/GNUstep/Frameworks/Inspector.framework/ lib/GNUstep/Frameworks/Inspector.framework/Headers +lib/GNUstep/Frameworks/Inspector.framework/Inspector lib/GNUstep/Frameworks/Inspector.framework/Resources lib/GNUstep/Frameworks/Inspector.framework/Versions/ lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/ lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Headers/ lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Headers/ContentViewersProtocol.h lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Headers/Inspector.h +lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Inspector lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Resources/ lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Resources/Date-0.tiff lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Resources/Date-1.tiff @@ -427,9 +432,11 @@ lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Resources/switchMultiple lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Resources/switchOff.tiff lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Resources/switchOn.tiff lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/Resources/tiffPboard.tiff +@lib lib/GNUstep/Frameworks/Inspector.framework/Versions/0.0/libInspector.so.${LIBInspector_VERSION} lib/GNUstep/Frameworks/Inspector.framework/Versions/Current lib/GNUstep/Frameworks/MDKit.framework/ lib/GNUstep/Frameworks/MDKit.framework/Headers +lib/GNUstep/Frameworks/MDKit.framework/MDKit lib/GNUstep/Frameworks/MDKit.framework/Resources lib/GNUstep/Frameworks/MDKit.framework/Versions/ lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/ @@ -443,6 +450,7 @@ lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Headers/MDKQueryManager.h lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Headers/MDKWindow.h lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Headers/MDKit.h lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Headers/SQLite.h +lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/MDKit lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Resources/ lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Resources/English.lproj/ lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Resources/English.lproj/Help.rtfd/ @@ -498,14 +506,17 @@ lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Resources/switchOff.tiff lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Resources/switchOn.tiff lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Resources/whiteArrowDown.tiff lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/Resources/whiteArrowRight.tiff +@lib lib/GNUstep/Frameworks/MDKit.framework/Versions/0.0/libMDKit.so.${LIBMDKit_VERSION} lib/GNUstep/Frameworks/MDKit.framework/Versions/Current lib/GNUstep/Frameworks/Operation.framework/ lib/GNUstep/Frameworks/Operation.framework/Headers +lib/GNUstep/Frameworks/Operation.framework/Operation lib/GNUstep/Frameworks/Operation.framework/Resources lib/GNUstep/Frameworks/Operation.framework/Versions/ lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/ lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Headers/ lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Headers/Operation.h +lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Operation lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Resources/ lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Resources/English.lproj/ lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Resources/English.lproj/FileOperationWin.gorm/ @@ -515,6 +526,7 @@ lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Resources/English.lproj/ lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Resources/English.lproj/Localizable.strings lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Resources/Info-gnustep.plist lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/Resources/Operation.tiff +@lib lib/GNUstep/Frameworks/Operation.framework/Versions/0.0/libOperation.so.${LIBOperation_VERSION} lib/GNUstep/Frameworks/Operation.framework/Versions/Current lib/GNUstep/Services/thumbnailer.service/ lib/GNUstep/Services/thumbnailer.service/Resources/ @@ -525,7 +537,6 @@ lib/GNUstep/Services/thumbnailer.service/Resources/Info-gnustep.plist @lib lib/libInspector.so.${LIBInspector_VERSION} @lib lib/libMDKit.so.${LIBMDKit_VERSION} @lib lib/libOperation.so.${LIBOperation_VERSION} -libexec/GNUstep/ libexec/GNUstep/GWorkspace.app/ @bin libexec/GNUstep/GWorkspace.app/GWorkspace libexec/GNUstep/GWorkspace.app/Resources/ diff --git a/x11/gnustep/highlighterkit/Makefile b/x11/gnustep/highlighterkit/Makefile index a1b1b22991a..88fc653db57 100644 --- a/x11/gnustep/highlighterkit/Makefile +++ b/x11/gnustep/highlighterkit/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/01/07 07:33:32 sebastia Exp $ +# $OpenBSD: Makefile,v 1.2 2011/04/18 12:33:36 sebastia Exp $ COMMENT = framework for highlighting and coloring syntax DISTNAME = HighlighterKit-0.1 +REVISION = 0 PKGNAME = ${DISTNAME:L} SHARED_LIBS = HighlighterKit 0.0 diff --git a/x11/gnustep/highlighterkit/pkg/PLIST b/x11/gnustep/highlighterkit/pkg/PLIST index 951c945cea9..adaecfc4096 100644 --- a/x11/gnustep/highlighterkit/pkg/PLIST +++ b/x11/gnustep/highlighterkit/pkg/PLIST @@ -1,9 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/01/07 07:33:32 sebastia Exp $ +@comment $OpenBSD: PLIST,v 1.2 2011/04/18 12:33:36 sebastia Exp $ include/HighlighterKit lib/GNUstep/ lib/GNUstep/Frameworks/ lib/GNUstep/Frameworks/HighlighterKit.framework/ lib/GNUstep/Frameworks/HighlighterKit.framework/Headers +lib/GNUstep/Frameworks/HighlighterKit.framework/HighlighterKit lib/GNUstep/Frameworks/HighlighterKit.framework/Resources lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/ lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/ @@ -12,6 +13,7 @@ lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Headers/HKSyntaxDef lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Headers/HKSyntaxHighlighter.h lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Headers/HKTextPattern.h lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Headers/HighlighterKit.h +lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/HighlighterKit lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/ lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/C++.syntax lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/C-Header.syntax @@ -23,5 +25,7 @@ lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/ObjC++.sy lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/ObjC.syntax lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/Plist.syntax lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/Strings.syntax +@lib lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/libHighlighterKit.so.${LIBHighlighterKit_VERSION} lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/Current +@lib lib/GNUstep/Frameworks/HighlighterKit.framework/libHighlighterKit.so.${LIBHighlighterKit_VERSION} @lib lib/libHighlighterKit.so.${LIBHighlighterKit_VERSION}