Upgrade to 1.30.

4 files changed, 43 insertions, 18 deletions

diff --git a/graphics/p5-GD2/Makefile b/graphics/p5-GD2/Makefile
index ee1f1fef3f50..e491bdff443a 100644
--- a/graphics/p5-GD2/Makefile
+++ b/graphics/p5-GD2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	GD
-PORTVERSION=	1.27
+PORTVERSION=	1.30
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
diff --git a/graphics/p5-GD2/distinfo b/graphics/p5-GD2/distinfo
index 2f6d6cb4b57f..3a30865a87ed 100644
--- a/graphics/p5-GD2/distinfo
+++ b/graphics/p5-GD2/distinfo
@@ -1 +1 @@
-MD5 (GD-1.27.tar.gz) = 6ff031721c5c9ea8a5f8ca3049616c35
+MD5 (GD-1.30.tar.gz) = 81e422fb2d4839b6be7fc39f492ffbf1
diff --git a/graphics/p5-GD2/files/patch-aa b/graphics/p5-GD2/files/patch-aa
index a85cfb53ccd5..6d9f7676f3ab 100644
--- a/graphics/p5-GD2/files/patch-aa
+++ b/graphics/p5-GD2/files/patch-aa
@@ -1,23 +1,47 @@
---- Makefile.PL.orig	Thu Mar 23 03:20:12 2000
-+++ Makefile.PL	Sun Apr 23 17:53:41 2000
-@@ -4,15 +4,12 @@
- my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
+--- Makefile.PL.orig	Fri Jun 23 11:31:50 2000
++++ Makefile.PL	Thu Nov  9 13:38:26 2000
+@@ -3,38 +3,17 @@
+ warn "NOTICE: This module requires libgd 1.8.3 or higher (shared library version 4.X).\n";
+ 
+ # =====> PATHS: CHECK AND ADJUST <=====
+-my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
+-my @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
+-my @LIBS    = qw(-lgd -lpng -lz);
+-
+-# FEATURE FLAGS
+-warn "\nPlease choose the features that match how libgd was built:\n";
+-
+-my $JPEG    = lc prompt('Build JPEG support?','y') eq 'y';
+-my $TTF     = lc prompt('Build FreeType support?','y') eq 'y';
+-my $XPM     = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
++my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd -I/usr/local/include/freetype -I/usr/X11R6/include -I/usr/X11R6/include/X11); 
++my @LIBPATH = qw(-L/usr/X11R6/lib -L/usr/local/lib );
++my @LIBS    = qw(-lttf -ljpeg -lgd -lpng -lz);
+ 
+ my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
  
- # CHECK AND ADJUST
--my @extrainc    = qw(-I/usr/local/include -I/usr/local/include/gd); 
--my @extrasearch = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
--my @extralibs   = qw(-lgd -lpng -lttf -lz -ljpeg);
-+my @extrainc    = qw(-I/usr/local/include -I/usr/local/include/gd -I/usr/local/include/freetype -I/usr/X11R6/include -I/usr/X11R6/include/X11); 
-+my @extrasearch = qw(-L/usr/X11R6/lib -L/usr/local/lib );
-+my @extralibs;
-+push @extralibs, @extrasearch, '-lgd', '-lpng', '-lttf', '-lz', '-ljpeg';
- push @extralibs, '-lm' unless $^O eq 'MSWin32';
+-warn "\nIf you experience compile problems, please check the \@INC, \@LIBPATH and \@LIBS\n",
+-     "arrays defined in Makefile.PL and manually adjust, if necessary.\n\n";
+-
+-#### no user-serviceable parts below #####
+-
+-push @LIBS,'-lttf' if $TTF;
+-push @LIBS,'-ljpeg' if $JPEG;
+-push @LIBS, '-lm' unless $^O eq 'MSWin32';
 -
 -# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified 
 -if ($^O ne 'freebsd' && $^O ne 'MSWin32') { 
--  push @extralibs,'-lX11','-lXpm'; 
+-  push @LIBS,'-lX11','-lXpm' if $XPM; 
 -} 
-+push @extralibs, '-lXpm -lX11' unless $^O eq 'MSWin32';
++push @LIBS,'-lX11','-lXpm' unless $^O eq 'MSWin32';
+ 
+ my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
+-my $DEFINES = '';
+-$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
+-$DEFINES    .= ' -DHAVE_TTF'  if $TTF;
+-$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
++my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
++$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
+ $DEFINES    .= ' -DFCGI'      if $FCGI;
  
  WriteMakefile(
-     'NAME'	=> 'GD',
diff --git a/graphics/p5-GD2/pkg-plist b/graphics/p5-GD2/pkg-plist
index 9bfe3964be5b..d87ad5c57600 100644
--- a/graphics/p5-GD2/pkg-plist
+++ b/graphics/p5-GD2/pkg-plist
@@ -1,4 +1,5 @@
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/patch_gd.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/qd.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.bs