Hi,

the patch below updates HighlighterKit from 0.1.1 to 0.1.2. Getting rid of a 
bunch of patches, and now the new version allows to use themes for the 
highlighting.

Added a LIBDIR variable to the SUBST_VARS to not have a large bunch of changes 
in the PLIST when the SHLIB_VERSION changes the next time. 

OK?

Sebastian

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/highlighterkit/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile    20 May 2011 07:29:49 -0000      1.4
+++ Makefile    9 Apr 2012 17:06:10 -0000
@@ -2,9 +2,9 @@
 
 COMMENT =      framework for highlighting and coloring syntax
 
-DISTNAME =     HighlighterKit-0.1.1
+DISTNAME =     HighlighterKit-0.1.2
 
-SHARED_LIBS =  HighlighterKit 0.0
+SHARED_LIBS =  HighlighterKit 0.1
 
 HOMEPAGE =     http://wiki.gnustep.org/index.php/HighlighterKit
 MASTER_SITES = http://download.gna.org/gnustep-nonfsf/
@@ -14,6 +14,9 @@
 MODGNUSTEP_NEEDS_GUI =         NO
 
 BUILD_DEPENDS +=       x11/gnustep/gui
+
+LIBDIR =       
lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/${LIBHighlighterKit_VERSION}
+SUBST_VARS +=  LIBDIR
 
 MAKE_FLAGS =   HighlighterKit_INTERFACE_VERSION=${LIBHighlighterKit_VERSION}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gnustep/highlighterkit/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo    20 May 2011 07:29:49 -0000      1.2
+++ distinfo    9 Apr 2012 17:06:10 -0000
@@ -1,5 +1,5 @@
-MD5 (gnustep/HighlighterKit-0.1.1.tar.gz) = lYuvTuvzfgUBtoCyJ2pENg==
-RMD160 (gnustep/HighlighterKit-0.1.1.tar.gz) = 8N6KDclelWc/OjYeFmvLBAPsiiM=
-SHA1 (gnustep/HighlighterKit-0.1.1.tar.gz) = ns3hLsism780Ao9vKtr+Z6XLjb0=
-SHA256 (gnustep/HighlighterKit-0.1.1.tar.gz) = 
Sg70fyGpxl20ROUNTZ8LD6Hj9LpLwX8yvUXK82O1Kd0=
-SIZE (gnustep/HighlighterKit-0.1.1.tar.gz) = 53277
+MD5 (gnustep/HighlighterKit-0.1.2.tar.gz) = ObearaLiYXx9T+bJENwuQA==
+RMD160 (gnustep/HighlighterKit-0.1.2.tar.gz) = x6CPWuLGwYlcEoKVX3uFtjdkFsU=
+SHA1 (gnustep/HighlighterKit-0.1.2.tar.gz) = cnAp937ujcGAv8EvdSRJeFmC31Y=
+SHA256 (gnustep/HighlighterKit-0.1.2.tar.gz) = 
lLcsQ9FrD/KYScMoSpRLUf1CVXp3Iw8uN1qPIgDSPkE=
+SIZE (gnustep/HighlighterKit-0.1.2.tar.gz) = 54467
Index: patches/patch-HKSyntaxDefinition_m
===================================================================
RCS file: patches/patch-HKSyntaxDefinition_m
diff -N patches/patch-HKSyntaxDefinition_m
--- patches/patch-HKSyntaxDefinition_m  20 May 2011 07:29:49 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-HKSyntaxDefinition_m,v 1.1 2011/05/20 07:29:49 sebastia Exp $
-
-fix build with gcc-2.95
-
---- HKSyntaxDefinition.m.orig  Wed May 18 08:21:41 2011
-+++ HKSyntaxDefinition.m       Wed May 18 08:22:52 2011
-@@ -219,13 +219,13 @@ SearchBundlesForSyntaxFile (NSArray *bundles, NSString
- + (NSString *) findSyntaxFileForType: (NSString *) type
- {
-   NSEnumerator * e;
--  NSString * directory;
-+  NSString *directory;
-+  NSString *file;
-   NSFileManager * fm = [NSFileManager defaultManager];
- 
-   // make the search case insensitive
-   type = [type lowercaseString];
- 
--  NSString *file;
- 
-   // first we look into all the app's bundles, as they might contain
-   // the latest version of the syntax file
-@@ -249,9 +249,10 @@ SearchBundlesForSyntaxFile (NSArray *bundles, NSString
- 
-           while ((origPath = [de nextObject]) != nil)
-             {
-+             NSString *path;
-               origPath = [subpath stringByAppendingPathComponent: origPath];
- 
--              NSString * path = [origPath lowercaseString];
-+              path = [origPath lowercaseString];
- 
-               if ([[path pathExtension] isEqualToString: @"syntax"] &&
-                 [[[path lastPathComponent] stringByDeletingPathExtension]
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gnustep/highlighterkit/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST   18 Apr 2011 12:33:36 -0000      1.2
+++ pkg/PLIST   9 Apr 2012 17:06:10 -0000
@@ -7,25 +7,27 @@
 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/
-lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Headers/
-lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Headers/HKSyntaxDefinition.h
-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
-lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/C.syntax
-lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/GNUmakefile.syntax
-lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/GSmarkup.syntax
-lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/Info-gnustep.plist
-lib/GNUstep/Frameworks/HighlighterKit.framework/Versions/0.0/Resources/ObjC++.syntax
-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}
+${LIBDIR}/
+${LIBDIR}/Headers/
+${LIBDIR}/Headers/HKSyntaxDefinition.h
+${LIBDIR}/Headers/HKSyntaxHighlighter.h
+${LIBDIR}/Headers/HKTextPattern.h
+${LIBDIR}/Headers/HighlighterKit.h
+${LIBDIR}/HighlighterKit
+${LIBDIR}/Resources/
+${LIBDIR}/Resources/C++.syntax
+${LIBDIR}/Resources/C-Header.syntax
+${LIBDIR}/Resources/C.syntax
+${LIBDIR}/Resources/ChangeLog.syntax
+${LIBDIR}/Resources/GNUmakefile.syntax
+${LIBDIR}/Resources/GSmarkup.syntax
+${LIBDIR}/Resources/Generic.syntax
+${LIBDIR}/Resources/Info-gnustep.plist
+${LIBDIR}/Resources/ObjC++.syntax
+${LIBDIR}/Resources/ObjC.syntax
+${LIBDIR}/Resources/Plist.syntax
+${LIBDIR}/Resources/Strings.syntax
+@lib ${LIBDIR}/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}

Reply via email to