From b70c8211c518444bcdf146af11fac52911e4e355 Mon Sep 17 00:00:00 2001
From: dinoex <dinoex@FreeBSD.org>
Date: Thu, 15 Aug 2013 19:12:46 +0000
Subject: - fix option GD_FONTS - fix bdftogd and bump PORTREVISION PR:	
 181250

---
 graphics/gd/Makefile            |  2 +-
 graphics/gd/files/patch-bdftogd | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'graphics')

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index a316a98f89cd..09b1603821b9 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libgd
 PORTVERSION=	2.1.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://cdn.bitbucket.org/libgd/gd-libgd/downloads/
diff --git a/graphics/gd/files/patch-bdftogd b/graphics/gd/files/patch-bdftogd
index b0eb14d63c05..6f45a5211459 100644
--- a/graphics/gd/files/patch-bdftogd
+++ b/graphics/gd/files/patch-bdftogd
@@ -1,5 +1,5 @@
 --- src/bdftogd.orig	2013-06-25 11:58:23.000000000 +0200
-+++ src/bdftogd	2013-08-01 07:06:11.000000000 +0200
++++ src/bdftogd	2013-08-15 21:03:29.000000000 +0200
 @@ -24,6 +24,9 @@
  my $filename = shift;
  $filename = 'gd' . $filename unless $filename =~ /^gd/i;
@@ -10,12 +10,23 @@
  if (-f "$filename.c") { die "File $filename.c already exists, won't overwrite\n"; }
  if (-f "$filename.h") { die "File $filename.h already exists, won't overwrite\n"; }
  
-@@ -177,28 +180,40 @@
+@@ -139,6 +142,10 @@
+ 
+ $info
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "$filename.h"
+ 
+ char ${gdname}Data[] = {
+@@ -177,28 +184,40 @@
  	${gdname}Data
  };
  
 -gdFontPtr ${gdname} = &${gdname}Rep;
-+BGD_EXPORT_DATA_IMPL gdFontPtr ${gdname} = &${gdname}Rep;
++BGD_EXPORT_DATA_PROT gdFontPtr ${gdname} = &${gdname}Rep;
  
 -/* This file has not been truncated. */
 +BGD_DECLARE(gdFontPtr)
@@ -44,8 +55,8 @@
  #include "gd.h"
  
 -extern gdFontPtr $gdname;
-+   BGD_EXPORT_DATA_PROT  gdFontPtr $gdname;
-+   BGD_DECLARE(gdFontPtr) $gdfunc(void);
++extern BGD_EXPORT_DATA_PROT  gdFontPtr $gdname;
++BGD_DECLARE(gdFontPtr) $gdfunc(void);
  
 +#ifdef __cplusplus
 +}
-- 
cgit