Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Apr 2003 02:36:29 GMT
From:      "Philip M. Gollucci" <philip@p6m7g8.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        sotnikov@kyivstar.net
Subject:   ports/50890: Updated patch file (missing -DHAVE_FT for freetype)
Message-ID:  <200304130236.h3D2aTHU069373@p6m7g8.com>
Resent-Message-ID: <200304130640.h3D6e17g061632@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         50890
>Category:       ports
>Synopsis:       Updated patch file (missing -DHAVE_FT for freetype)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 12 23:40:01 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Philip M. Gollucci
>Release:        FreeBSD 5.0-RELEASE i386
>Organization:
P6M7G8 Consulting
>Environment:
System: FreeBSD p6m7g8.com 5.0-RELEASE FreeBSD 5.0-RELEASE #0: Thu Jan 16 22:16:53 GMT 2003 root@hollin.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386


>Description:
 Hello,

  I've used port p5-GD2 and encoutered some problems with stringFT
  fuction, - it not works. I've found that the problem in
  files/patch-aa.
  Below is my patch to your patch, may be You found it usefull :)

  
--- files/patch-aa.orig Fri Apr 11 20:16:43 2003
+++ files/patch-aa      Fri Apr 11 20:15:27 2003
@@ -70,7 +70,7 @@
 -$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
 -$DEFINES    .= ' -DHAVE_FT'   if $FT;
 -$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
-++my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
+++my $DEFINES = '-DHAVE_JPEG -DHAVE_FT';
 ++$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
  $DEFINES    .= ' -DFCGI'      if $FCGI;
  

 If I've disturbed You without reason, please excuse me.

-- 
  Vladimir Sotnikov

Based ont his, I've patch the patch-aa file myself.  I noticed I had to many +'s in the defines line.
In addition to that, I've added -DHAVE_FT.  I have however left the if $FT inplace.  Supposedly for us,
this will always be true since libgd2 depends on freetype2.



>How-To-Repeat:
>Fix:

--- patch.diff begins here ---
Index: patch-aa
===================================================================
RCS file: /home/ncvs/ports/graphics/p5-GD2/files/patch-aa,v
retrieving revision 1.9
diff -u -r1.9 patch-aa
--- patch-aa	2003/04/03 09:40:13	1.9
+++ patch-aa	2003/04/13 06:31:40
@@ -1,5 +1,5 @@
---- Makefile.PL.orig	Wed Nov 27 08:29:57 2002
-+++ Makefile.PL	Thu Apr  3 01:35:53 2003
+--- Makefile.PL.orig	Wed Nov 27 16:29:57 2002
++++ Makefile.PL	Sun Apr 13 02:25:57 2003
 @@ -6,46 +6,23 @@
  
  
@@ -55,7 +55,7 @@
  
  my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
  
-@@ -61,16 +38,13 @@
+@@ -61,16 +38,14 @@
  push @INC, '-I/lib_root/ft2/include/freetype' if ($FT && $^O eq 'VMS');
  push @INC, '-I/X11' if ($XPM && $^O eq 'VMS');
  
@@ -70,8 +70,9 @@
 -$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
 -$DEFINES    .= ' -DHAVE_FT'   if $FT;
 -$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
-++my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
-++$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
++my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
++$DEFINES    .= ' -DHAVE_FT' if $FT;
++$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
  $DEFINES    .= ' -DFCGI'      if $FCGI;
  
  WriteMakefile(
--- patch.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:


Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304130236.h3D2aTHU069373>