[Midnightbsd-cvs] mports: x11-fonts/gnustep-mknfonts: this requires freetype2

[laffer1 at midnightbsd.org]

Log Message:
-----------
this requires freetype2

Modified Files:
--------------
    mports/x11-fonts/gnustep-mknfonts:
        Makefile (r1.2 -> r1.3)

Added Files:
-----------
    mports/x11-fonts/gnustep-mknfonts/files:
        patch-mknfonts-m (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-fonts/gnustep-mknfonts/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-fonts/gnustep-mknfonts/Makefile -L x11-fonts/gnustep-mknfonts/Makefile -u -r1.2 -r1.3
--- x11-fonts/gnustep-mknfonts/Makefile
+++ x11-fonts/gnustep-mknfonts/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mknfonts
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts gnustep
 MASTER_SITES=	http://ftp.debian.org/debian/pool/main/m/mknfonts.tool/
 PKGNAMEPREFIX=	gnustep-
@@ -12,6 +12,8 @@
 COMMENT=	Create nfont files for use with GNUstep art backend
 LICENSE=	unknown
 
+LIB_DEPENDS=    freetype.9:${PORTSDIR}/print/freetype2
+
 USE_GNUSTEP=	yes
 USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BASE=	yes
--- /dev/null
+++ x11-fonts/gnustep-mknfonts/files/patch-mknfonts-m
@@ -0,0 +1,66 @@
+--- mknfonts.m.old	Sun Aug 13 19:35:51 2006
++++ mknfonts.m	Sun Aug 13 19:37:33 2006
+@@ -71,13 +71,10 @@
+   int i;
+ 
+   *traits = 0;
+-//  printf("do '%@'\n", s);
+   while ([s length] > 0)
+     {
+-//      printf("  got '%@'\n", s);
+       if ([s hasSuffix: @"-"] || [s hasSuffix: @" "])
+ 	{
+-//	  printf("  do -\n");
+ 	  s = [s substringToIndex: [s length] - 1];
+ 	  continue;
+ 	}
+@@ -85,7 +82,6 @@
+ 	{
+ 	  if (![s hasSuffix: suffix[i].str])
+ 	    continue;
+-//	  printf("  found '%@'\n", suffix[i].str);
+ 	  if (suffix[i].weight != -1)
+ 	    *weight = suffix[i].weight;
+ 	  (*traits) |= suffix[i].trait;
+@@ -95,7 +91,6 @@
+       if (!suffix[i].str)
+ 	break;
+     }
+-//  printf("end up with '%@'\n", s);
+   return [s length];
+ }
+ 
+@@ -158,21 +153,21 @@
+ 
+ 	if (FT_New_Face(ftlib,[[files objectAtIndex: 0] cString],0,&face))
+ 	{
+-		fprintf(stderr,"unable to open %@, ignoring\n",[files objectAtIndex: 0]);
++		fprintf(stderr,"unable to open %s, ignoring\n",[[files objectAtIndex: 0] cString]);
+ 		return NO;
+ 	}
+ 	for (i=1;i<[files count];i++)
+ 	{
+ 		if (FT_Attach_File(face,[[files objectAtIndex: i] cString]))
+ 		{
+-			fprintf(stderr,"warning: unable to attach %@\n",[files objectAtIndex: i]);
++			fprintf(stderr,"warning: unable to attach %s\n",[[files objectAtIndex: i] cString]);
+ 		}
+ 	}
+ 
+ 	psname=FT_Get_Postscript_Name(face);
+ 	if (!psname)
+ 	{
+-		fprintf(stderr,"couldn't get postscript name for %@, ignoring\n",[files objectAtIndex: 0]);
++		fprintf(stderr,"couldn't get postscript name for %s, ignoring\n",[[files objectAtIndex: 0] cString]);
+ 		return NO;
+ 	}
+ 	postScriptName=[[NSString alloc] initWithCString: psname];
+@@ -182,7 +177,7 @@
+ 
+ 	if (traits_from_string(faceName,&foo,&bar))
+ 	{
+-		fprintf(stderr,"warning: couldn't fully parse '%@' (%@)\n",faceName,postScriptName);
++		fprintf(stderr,"warning: couldn't fully parse '%s' (%s)\n",[faceName cString],[postScriptName cString]);
+ 	}
+ 
+ 	FT_Done_Face(face);