[22064] trunk/dports/x11/openMotif

[source_changes at macosforge.org]

Revision: 22064
          http://trac.macosforge.org/projects/macports/changeset/22064
Author:   yves at macports.org
Date:     2007-02-16 12:37:59 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
Patch from ticket:8975 for darwin 7

Modified Paths:
--------------
    trunk/dports/x11/openMotif/Portfile

Added Paths:
-----------
    trunk/dports/x11/openMotif/files/patch-freetype

Removed Paths:
-------------
    trunk/dports/x11/openMotif/files/patch-XmRenderTI.h
    trunk/dports/x11/openMotif/files/patch-config.h.in

Modified: trunk/dports/x11/openMotif/Portfile
===================================================================
--- trunk/dports/x11/openMotif/Portfile	2007-02-16 16:47:12 UTC (rev 22063)
+++ trunk/dports/x11/openMotif/Portfile	2007-02-16 20:37:59 UTC (rev 22064)
@@ -35,7 +35,7 @@
 build.env	LANG=C
 
 platform darwin 7 {
-    patchfiles-append patch-config.h.in
+    patchfiles-append patch-freetype
 }
 
 platform darwin 8 {

Deleted: trunk/dports/x11/openMotif/files/patch-XmRenderTI.h
===================================================================
--- trunk/dports/x11/openMotif/files/patch-XmRenderTI.h	2007-02-16 16:47:12 UTC (rev 22063)
+++ trunk/dports/x11/openMotif/files/patch-XmRenderTI.h	2007-02-16 20:37:59 UTC (rev 22064)
@@ -1,11 +0,0 @@
---- lib/Xm/XmRenderTI.h.orig	2006-03-15 02:07:00.000000000 -0500
-+++ lib/Xm/XmRenderTI.h	2006-03-15 02:07:47.000000000 -0500
-@@ -43,6 +43,8 @@
- 
- #include <Xm/XmP.h>
- #ifdef	USE_XFT
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <X11/Xft/Xft.h>
- #endif
- 

Deleted: trunk/dports/x11/openMotif/files/patch-config.h.in
===================================================================
--- trunk/dports/x11/openMotif/files/patch-config.h.in	2007-02-16 16:47:12 UTC (rev 22063)
+++ trunk/dports/x11/openMotif/files/patch-config.h.in	2007-02-16 20:37:59 UTC (rev 22064)
@@ -1,14 +0,0 @@
---- include/config.h.in.orig	2007-02-15 15:22:36.000000000 -0500
-+++ include/config.h.in	2007-02-15 15:25:38.000000000 -0500
-@@ -58,6 +58,11 @@
- /* Means we have discovered the FreeType library */
- #undef HAVE_FREETYPE
- 
-+#ifdef HAVE_FREETYPE
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
-+#endif
-+
- /* Define to 1 if you have the <freetype/freetype.h> header file. */
- #undef HAVE_FREETYPE_FREETYPE_H
- 

Added: trunk/dports/x11/openMotif/files/patch-freetype
===================================================================
--- trunk/dports/x11/openMotif/files/patch-freetype	                        (rev 0)
+++ trunk/dports/x11/openMotif/files/patch-freetype	2007-02-16 20:37:59 UTC (rev 22064)
@@ -0,0 +1,77 @@
+--- lib/Xm/DataF.c.orig	Tue Nov 14 17:30:37 2006
++++ lib/Xm/DataF.c	Tue Nov 14 17:31:40 2006
+@@ -58,6 +58,8 @@
+ #include "ImageCachI.h"
+ 
+ #ifdef USE_XFT
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <X11/Xft/Xft.h>
+ #include "XmRenderTI.h"
+ #endif
+--- lib/Xm/TabBox.c.orig	Tue Nov 14 17:31:55 2006
++++ lib/Xm/TabBox.c	Tue Nov 14 17:32:25 2006
+@@ -26,6 +26,8 @@
+ #include <Xm/DrawUtils.h>
+ 
+ #ifdef USE_XFT
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <X11/Xft/Xft.h>
+ #endif
+ 
+--- lib/Xm/TextF.c.orig	Tue Nov 14 17:32:38 2006
++++ lib/Xm/TextF.c	Tue Nov 14 17:32:59 2006
+@@ -89,6 +89,8 @@
+ #include "XmStringI.h"
+ #include <Xm/PrintSP.h>         /* for XmIsPrintShell */
+ #ifdef USE_XFT
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <X11/Xft/Xft.h>
+ #include "XmRenderTI.h"
+ #endif
+--- lib/Xm/TextFP.h.orig	Tue Nov 14 17:33:34 2006
++++ lib/Xm/TextFP.h	Tue Nov 14 17:33:52 2006
+@@ -44,6 +44,8 @@
+ #include <Xm/PrimitiveP.h>
+ #include <Xm/TextF.h>
+ #ifdef USE_XFT
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <X11/Xft/Xft.h>
+ #endif
+ 
+--- lib/Xm/TextIn.c.orig	Tue Nov 14 17:13:39 2006
++++ lib/Xm/TextIn.c	Tue Nov 14 17:22:32 2006
+@@ -88,6 +88,8 @@
+ #include "TravActI.h"
+ #include "TraversalI.h"
+ #ifdef USE_XFT
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <X11/Xft/Xft.h>
+ #endif
+ 
+--- lib/Xm/XmRenderT.c.orig	Tue Nov 14 17:34:21 2006
++++ lib/Xm/XmRenderT.c	Tue Nov 14 17:43:35 2006
+@@ -75,6 +75,8 @@
+ #include "XmStringI.h"
+ #include "XmTabListI.h"
+ #ifdef USE_XFT
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <X11/Xft/Xft.h>
+ #endif
+ 
+--- lib/Xm/XmRenderTI.h.orig	Tue Nov 14 17:29:53 2006
++++ lib/Xm/XmRenderTI.h	Tue Nov 14 16:49:05 2006
+@@ -43,6 +43,8 @@
+ 
+ #include <Xm/XmP.h>
+ #ifdef	USE_XFT
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #include <X11/Xft/Xft.h>
+ #endif
+ 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070216/07aad0bc/attachment.html