Upgrade to 1.38.

PR:		37365
Submitted by:	Kimura Fuyuki <fuyuki@mj.0038.net>

Drop maintainership.

12 files changed, 30 insertions, 57 deletions

diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 0fc5849ca2a1..e82825c53801 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	GD
-PORTVERSION=	1.33
+PORTVERSION=	1.38
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	demon@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
diff --git a/graphics/p5-GD/distinfo b/graphics/p5-GD/distinfo
index 9c31fafdc662..db48f19c6681 100644
--- a/graphics/p5-GD/distinfo
+++ b/graphics/p5-GD/distinfo
@@ -1 +1 @@
-MD5 (GD-1.33.tar.gz) = 48d9f13b2652a56a08a02ea5ed1aadf6
+MD5 (GD-1.38.tar.gz) = 89e238d9c9a3113a1b89e005921cd5c3
diff --git a/graphics/p5-GD/files/patch-aa b/graphics/p5-GD/files/patch-aa
index 5a406c8e41d6..ebc0ff9f427a 100644
--- a/graphics/p5-GD/files/patch-aa
+++ b/graphics/p5-GD/files/patch-aa
@@ -1,7 +1,7 @@
 --- Makefile.PL.orig	Sat Aug  5 04:59:22 2000
 +++ Makefile.PL	Thu May 10 06:36:36 2001
-@@ -3,38 +3,17 @@
- warn "NOTICE: This module requires libgd 1.8.3 or higher (shared library version 4.X).\n";
+@@ -3,40 +3,17 @@
+ warn "NOTICE: This module requires libgd 1.8.4 or higher (shared library version 4.X).\n";
  
  # =====> PATHS: CHECK AND ADJUST <=====
 -my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
@@ -14,6 +14,7 @@
 -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 $GIF		= lc prompt('Build GIF support (for patched versions of gd)?','n') 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/local/lib -L/usr/X11R6/lib);
 +my @LIBS    = qw(-lfreetype -ljpeg -lgd -lpng -lz);
@@ -25,9 +26,9 @@
 -
 -#### no user-serviceable parts below #####
 -
--push @LIBS,'-lttf' if $TTF;
+-push @LIBS,'-lfreetype' if $TTF;
 -push @LIBS,'-ljpeg' if $JPEG;
--push @LIBS, '-lm' unless $^O eq 'MSWin32';
+-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') { 
@@ -40,7 +41,8 @@
 -$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
 -$DEFINES    .= ' -DHAVE_TTF'  if $TTF;
 -$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
-+my $DEFINES = '-DHAVE_JPEG -DHAVE_FREETYPE';
+-$DEFINES    .= ' -DHAVE_GIF'  if $GIF;
++my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
 +$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
  $DEFINES    .= ' -DFCGI'      if $FCGI;
  
diff --git a/graphics/p5-GD/files/patch-ab b/graphics/p5-GD/files/patch-ab
deleted file mode 100644
index 74379f65316f..000000000000
--- a/graphics/p5-GD/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- GD.xs.orig	Thu Aug 24 18:41:47 2000
-+++ GD.xs	Mon Mar 19 12:45:05 2001
-@@ -1278,7 +1278,7 @@
- 	    img = NULL;
- 	  }
- 
--	  err = gdImageStringTTF(img,brect,fgcolor,fontname,ptsize,angle,x,y,string);
-+	  err = gdImageStringFT(img,brect,fgcolor,fontname,ptsize,angle,x,y,string);
- 	  if (err) {
- 	    errormsg = perl_get_sv("@",0);
- 	    if (errormsg != NULL)
diff --git a/graphics/p5-GD1/Makefile b/graphics/p5-GD1/Makefile
index 0fc5849ca2a1..e82825c53801 100644
--- a/graphics/p5-GD1/Makefile
+++ b/graphics/p5-GD1/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	GD
-PORTVERSION=	1.33
+PORTVERSION=	1.38
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	demon@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
diff --git a/graphics/p5-GD1/distinfo b/graphics/p5-GD1/distinfo
index 9c31fafdc662..db48f19c6681 100644
--- a/graphics/p5-GD1/distinfo
+++ b/graphics/p5-GD1/distinfo
@@ -1 +1 @@
-MD5 (GD-1.33.tar.gz) = 48d9f13b2652a56a08a02ea5ed1aadf6
+MD5 (GD-1.38.tar.gz) = 89e238d9c9a3113a1b89e005921cd5c3
diff --git a/graphics/p5-GD1/files/patch-aa b/graphics/p5-GD1/files/patch-aa
index 5a406c8e41d6..ebc0ff9f427a 100644
--- a/graphics/p5-GD1/files/patch-aa
+++ b/graphics/p5-GD1/files/patch-aa
@@ -1,7 +1,7 @@
 --- Makefile.PL.orig	Sat Aug  5 04:59:22 2000
 +++ Makefile.PL	Thu May 10 06:36:36 2001
-@@ -3,38 +3,17 @@
- warn "NOTICE: This module requires libgd 1.8.3 or higher (shared library version 4.X).\n";
+@@ -3,40 +3,17 @@
+ warn "NOTICE: This module requires libgd 1.8.4 or higher (shared library version 4.X).\n";
  
  # =====> PATHS: CHECK AND ADJUST <=====
 -my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
@@ -14,6 +14,7 @@
 -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 $GIF		= lc prompt('Build GIF support (for patched versions of gd)?','n') 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/local/lib -L/usr/X11R6/lib);
 +my @LIBS    = qw(-lfreetype -ljpeg -lgd -lpng -lz);
@@ -25,9 +26,9 @@
 -
 -#### no user-serviceable parts below #####
 -
--push @LIBS,'-lttf' if $TTF;
+-push @LIBS,'-lfreetype' if $TTF;
 -push @LIBS,'-ljpeg' if $JPEG;
--push @LIBS, '-lm' unless $^O eq 'MSWin32';
+-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') { 
@@ -40,7 +41,8 @@
 -$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
 -$DEFINES    .= ' -DHAVE_TTF'  if $TTF;
 -$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
-+my $DEFINES = '-DHAVE_JPEG -DHAVE_FREETYPE';
+-$DEFINES    .= ' -DHAVE_GIF'  if $GIF;
++my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
 +$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
  $DEFINES    .= ' -DFCGI'      if $FCGI;
  
diff --git a/graphics/p5-GD1/files/patch-ab b/graphics/p5-GD1/files/patch-ab
deleted file mode 100644
index 74379f65316f..000000000000
--- a/graphics/p5-GD1/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- GD.xs.orig	Thu Aug 24 18:41:47 2000
-+++ GD.xs	Mon Mar 19 12:45:05 2001
-@@ -1278,7 +1278,7 @@
- 	    img = NULL;
- 	  }
- 
--	  err = gdImageStringTTF(img,brect,fgcolor,fontname,ptsize,angle,x,y,string);
-+	  err = gdImageStringFT(img,brect,fgcolor,fontname,ptsize,angle,x,y,string);
- 	  if (err) {
- 	    errormsg = perl_get_sv("@",0);
- 	    if (errormsg != NULL)
diff --git a/graphics/p5-GD2/Makefile b/graphics/p5-GD2/Makefile
index 0fc5849ca2a1..e82825c53801 100644
--- a/graphics/p5-GD2/Makefile
+++ b/graphics/p5-GD2/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	GD
-PORTVERSION=	1.33
+PORTVERSION=	1.38
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	demon@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
diff --git a/graphics/p5-GD2/distinfo b/graphics/p5-GD2/distinfo
index 9c31fafdc662..db48f19c6681 100644
--- a/graphics/p5-GD2/distinfo
+++ b/graphics/p5-GD2/distinfo
@@ -1 +1 @@
-MD5 (GD-1.33.tar.gz) = 48d9f13b2652a56a08a02ea5ed1aadf6
+MD5 (GD-1.38.tar.gz) = 89e238d9c9a3113a1b89e005921cd5c3
diff --git a/graphics/p5-GD2/files/patch-aa b/graphics/p5-GD2/files/patch-aa
index 5a406c8e41d6..ebc0ff9f427a 100644
--- a/graphics/p5-GD2/files/patch-aa
+++ b/graphics/p5-GD2/files/patch-aa
@@ -1,7 +1,7 @@
 --- Makefile.PL.orig	Sat Aug  5 04:59:22 2000
 +++ Makefile.PL	Thu May 10 06:36:36 2001
-@@ -3,38 +3,17 @@
- warn "NOTICE: This module requires libgd 1.8.3 or higher (shared library version 4.X).\n";
+@@ -3,40 +3,17 @@
+ warn "NOTICE: This module requires libgd 1.8.4 or higher (shared library version 4.X).\n";
  
  # =====> PATHS: CHECK AND ADJUST <=====
 -my @INC     = qw(-I/usr/local/include -I/usr/local/include/gd); 
@@ -14,6 +14,7 @@
 -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 $GIF		= lc prompt('Build GIF support (for patched versions of gd)?','n') 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/local/lib -L/usr/X11R6/lib);
 +my @LIBS    = qw(-lfreetype -ljpeg -lgd -lpng -lz);
@@ -25,9 +26,9 @@
 -
 -#### no user-serviceable parts below #####
 -
--push @LIBS,'-lttf' if $TTF;
+-push @LIBS,'-lfreetype' if $TTF;
 -push @LIBS,'-ljpeg' if $JPEG;
--push @LIBS, '-lm' unless $^O eq 'MSWin32';
+-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') { 
@@ -40,7 +41,8 @@
 -$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
 -$DEFINES    .= ' -DHAVE_TTF'  if $TTF;
 -$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
-+my $DEFINES = '-DHAVE_JPEG -DHAVE_FREETYPE';
+-$DEFINES    .= ' -DHAVE_GIF'  if $GIF;
++my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
 +$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
  $DEFINES    .= ' -DFCGI'      if $FCGI;
  
diff --git a/graphics/p5-GD2/files/patch-ab b/graphics/p5-GD2/files/patch-ab
deleted file mode 100644
index 74379f65316f..000000000000
--- a/graphics/p5-GD2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- GD.xs.orig	Thu Aug 24 18:41:47 2000
-+++ GD.xs	Mon Mar 19 12:45:05 2001
-@@ -1278,7 +1278,7 @@
- 	    img = NULL;
- 	  }
- 
--	  err = gdImageStringTTF(img,brect,fgcolor,fontname,ptsize,angle,x,y,string);
-+	  err = gdImageStringFT(img,brect,fgcolor,fontname,ptsize,angle,x,y,string);
- 	  if (err) {
- 	    errormsg = perl_get_sv("@",0);
- 	    if (errormsg != NULL)