From eaedb60beb392c32ba98bf247d7919966f259cf2 Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Fri, 28 Apr 2017 20:25:19 +0000
Subject: [PATCH] Update to 2.66

- Fix LICENSE
- Strip shared library
- Clean up and sort PLIST

Changes:	http://search.cpan.org/dist/GD/ChangeLog
---
 graphics/p5-GD/Makefile                | 12 ++++--
 graphics/p5-GD/distinfo                |  5 ++-
 graphics/p5-GD/files/patch-Build.PL    | 43 -------------------
 graphics/p5-GD/files/patch-Makefile.PL | 59 ++++++++++++++++++++++++++
 graphics/p5-GD/pkg-plist               |  9 ++--
 5 files changed, 73 insertions(+), 55 deletions(-)
 delete mode 100644 graphics/p5-GD/files/patch-Build.PL
 create mode 100644 graphics/p5-GD/files/patch-Makefile.PL

diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 653ff06ce252..e1b0b624fdea 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	GD
-PORTVERSION=	2.56
-PORTREVISION=	4
+PORTVERSION=	2.66
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -10,12 +9,17 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to Gd Graphics Library version2
 
-LICENSE=	ART10 GPLv1 GPLv2 GPLv3
+LICENSE=	ART20 GPLv1+
 LICENSE_COMB=	dual
 
+BUILD_DEPENDS=	p5-ExtUtils-PkgConfig>=0:devel/p5-ExtUtils-PkgConfig
 LIB_DEPENDS=	libgd.so:graphics/gd
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
-USE_PERL5=	modbuild
+USE_PERL5=	configure
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/GD/GD.so
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD/distinfo b/graphics/p5-GD/distinfo
index a316f22189f6..2390a2cf42e8 100644
--- a/graphics/p5-GD/distinfo
+++ b/graphics/p5-GD/distinfo
@@ -1,2 +1,3 @@
-SHA256 (GD-2.56.tar.gz) = 1f103d1c98de8621504642ed7fb79f1b40f5f6a63c2abe9390a8ab78617248f9
-SIZE (GD-2.56.tar.gz) = 273441
+TIMESTAMP = 1493375431
+SHA256 (GD-2.66.tar.gz) = ea28343301b82ea862bc58c0c2d1953a074e23cf8d1d09df94c05c52f1c98281
+SIZE (GD-2.66.tar.gz) = 253000
diff --git a/graphics/p5-GD/files/patch-Build.PL b/graphics/p5-GD/files/patch-Build.PL
deleted file mode 100644
index a54ac5c7fa66..000000000000
--- a/graphics/p5-GD/files/patch-Build.PL
+++ /dev/null
@@ -1,43 +0,0 @@
---- Build.PL.orig	2014-10-28 01:34:54 UTC
-+++ Build.PL
-@@ -28,40 +28,6 @@ if (-d '/usr/lib64') {
-   @LIBPATH = (@LIBPATH,@libs64);
- }
- 
--#############################################################################################
--# Build options passed in to script to support reproducible builds via Makefiles
--#############################################################################################
--my $result = GetOptions("options=s"       => \$options,
--			"lib_gd_path=s"   => \$lib_gd_path,
--			"lib_ft_path=s"   => \$lib_ft_path,
--			"lib_png_path=s"  => \$lib_png_path,
--			"lib_jpeg_path=s" => \$lib_jpeg_path,
--			"lib_xpm_path=s"  => \$lib_xpm_path,
--			"lib_zlib_path=s" => \$lib_zlib_path,
--		       );
--unless ($result) {
--  die <<END;
--Usage: perl Build.PL [options]
--
--Configure GD module.
--
-- Options:
--     -options       "JPEG,FT,PNG,GIF,XPM,ANIMGIF"   feature options, separated by commas
--     -lib_gd_path   path            path to libgd
--     -lib_ft_path   path            path to Freetype library
--     -lib_png_path  path            path to libpng
--     -lib_jpeg_path path            path to libjpeg
--     -lib_xpm_path  path            path to libxpm
--     -lib_zlib_path path            path to libpng
--     -ignore_missing_gd             Ignore missing or old libgd installations and try to compile anyway
--
--If no options are passed on the command line.  The program will
--attempt to autoconfigure itself with the gdlib-config program (present
--in GD versions 2.0.27 or later).  Otherwise it will prompt for these
--values interactively.
--END
--}
--
- if( defined($options) )
- {
-     print "Included Features:          $options\n";
diff --git a/graphics/p5-GD/files/patch-Makefile.PL b/graphics/p5-GD/files/patch-Makefile.PL
new file mode 100644
index 000000000000..4343f08b24bd
--- /dev/null
+++ b/graphics/p5-GD/files/patch-Makefile.PL
@@ -0,0 +1,59 @@
+--- Makefile.PL.orig	2017-04-23 12:06:14 UTC
++++ Makefile.PL
+@@ -20,20 +20,6 @@ my $AUTOCONFIG = 0;      # global set by
+ my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,
+     $lib_zlib_path,$lib_fontconfig_path,$force,$FCGI,$gdlib_config_path);
+ 
+-use Getopt::Long;
+-my $result = GetOptions("ignore_missing_gd" => \$force,
+-                        "options=s"       => \$options,
+-			"lib_gd_path=s"   => \$lib_gd_path,
+-			"lib_ft_path=s"   => \$lib_ft_path,
+-			"lib_png_path=s"  => \$lib_png_path,
+-			"lib_jpeg_path=s" => \$lib_jpeg_path,
+-			"lib_xpm_path=s"  => \$lib_xpm_path,
+-			"lib_zlib_path=s" => \$lib_zlib_path,
+-                        "lib_fontconfig_path=s" => \$lib_fontconfig_path,
+-                        "gdlib_config_path=s" => \$gdlib_config_path,
+-                        "fcgi"            => \$FCGI,
+-		       );
+-
+ unless (try_to_autoconfigure() || $force) {
+     die <<END;
+ **UNRECOVERABLE ERROR**
+@@ -57,35 +43,6 @@ if (-d '/usr/lib64') {
+   @LIBPATH = (@LIBPATH,@libs64);
+ }
+ 
+-#############################################################################################
+-# Build options passed in to script to support reproducible builds via Makefiles
+-#############################################################################################
+-unless ($result) {
+-  print STDERR <<END;
+-Usage: perl Makefile.PL [options]
+-
+-Configure GD module.
+-
+- Options:
+-     --options       "JPEG,FT,PNG,GIF,XPM,ANIMGIF"   feature options, separated by commas
+-     --lib_gd_path   path            path to libgd (/usr/lib)
+-     --lib_ft_path   path            path to Freetype library (/usr)
+-     --lib_png_path  path            path to libpng (/usr)
+-     --lib_jpeg_path path            path to libjpeg (/usr)
+-     --lib_xpm_path  path            path to libxpm (/usr)
+-     --lib_zlib_path path            path to libpng (/usr)
+-     --lib_fontconfig_path path      path to libfontconfig (/usr)
+-     --gdlib_config_path path        path to gdlib-config (/usr/bin)
+-     --ignore_missing_gd             Ignore missing or old libgd installations and try to compile anyway
+-     --fcgi                          build for FastCGI compatibility, i.e. no PerlIO
+-
+-If no options are passed on the command line.  The program will
+-attempt to autoconfigure itself with the gdlib-config program or pkgconfig/gdlib.pc
+-(present in GD versions 2.0.27 or later).  Otherwise it will prompt for these
+-values interactively.
+-END
+-}
+-
+ if( defined($options) )
+ {
+     print "Included Features:          $options\n";
diff --git a/graphics/p5-GD/pkg-plist b/graphics/p5-GD/pkg-plist
index 26aca7e5f01b..bf5492c22d5f 100644
--- a/graphics/p5-GD/pkg-plist
+++ b/graphics/p5-GD/pkg-plist
@@ -1,8 +1,4 @@
-@comment bin/README
-@comment bin/bdf2gdfont.PLS
 bin/bdf2gdfont.pl
-@comment bin/bdftogd
-@comment bin/cvtbdf.pl
 %%SITE_ARCH%%/GD.pm
 %%SITE_ARCH%%/GD/Group.pm
 %%SITE_ARCH%%/GD/Image.pm
@@ -10,10 +6,11 @@ bin/bdf2gdfont.pl
 %%SITE_ARCH%%/GD/Polyline.pm
 %%SITE_ARCH%%/GD/Simple.pm
 %%SITE_ARCH%%/auto/GD/GD.so
+%%SITE_ARCH%%/auto/GD/autosplit.ix
+%%PERL5_MAN1%%/bdf2gdfont.pl.1.gz
 %%PERL5_MAN3%%/GD.3.gz
+%%PERL5_MAN3%%/GD::Group.3.gz
 %%PERL5_MAN3%%/GD::Image.3.gz
 %%PERL5_MAN3%%/GD::Polygon.3.gz
 %%PERL5_MAN3%%/GD::Polyline.3.gz
 %%PERL5_MAN3%%/GD::Simple.3.gz
-@comment %%PERL5_MAN1%%/bdf2gdfont.PLS.1.gz
-%%PERL5_MAN1%%/bdf2gdfont.pl.1.gz