o Main modification

  graphics/gd(based on 1.8.4)    -> graphics/gd1
  graphics/gd2(based on 2.0.15)  -> graphics/gd
  graphics/p5-GD(based on 1.41)  -> graphics/p5-GD1
  graphics/p5-GD2(based on 2.07) -> graphics/p5-GD
  japanese/gd                    -> japanese/gd1
  japanese/gd2                   -> japanese/gd
o Include some feature
  WITH_XPM(w/, w/o WITHOUT_X11)
o Chase this modification
o Fix build error [1]

PR:		ports/54540
Submitted by:	Ports Fury
Approved by:	maintainer (blanket)
Reported by:	bento via kris [1]

6 files changed, 59 insertions, 79 deletions

diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 6f501f95d60e..f70e0576bdfc 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,33 +1,26 @@
-# New ports collection makefile for:    p5-GD
-# Date created:				June 26th 1997
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
+# New ports collection makefile for:	p5-GD
+# Date created:				March 11, 2003
+# Whom:					Philip M. Gollucci <philip@p6m7g8.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	GD
-PORTVERSION=	1.41
-PORTREVISION=	1
+PORTVERSION=	2.07
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GD
 PKGNAMEPREFIX=	p5-
+DISTNAME=	GD-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A perl5 interface to Gd Graphics Library
+MAINTAINER=	philip@p6m7g8.com
+COMMENT=	A perl5 interface to Gd Graphics Library version2
 
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
 
 PERL_CONFIGURE=	yes
-USE_REINPLACE=	yes
+CONFIGURE_ARGS=	-options "JPEG,FT,XPM" -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE}
 
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		GD.3
-
-post-patch:
-	${REINPLACE_CMD} \
-		-e 's,@@LOCALBASE@@,${LOCALBASE},g' \
-		-e 's,@@X11BASE@@,${X11BASE},g' \
-		${WRKSRC}/Makefile.PL
+MAN3=		GD.3 GD::Polyline.3
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-GD/distinfo b/graphics/p5-GD/distinfo
index 04586f6731af..8c7737fc0055 100644
--- a/graphics/p5-GD/distinfo
+++ b/graphics/p5-GD/distinfo
@@ -1 +1 @@
-MD5 (GD-1.41.tar.gz) = 9f11b3f6bb73f04d2bc3f02df0662bdd
+MD5 (GD-2.07.tar.gz) = 7a44d308e082471e824fcbff044d8300
diff --git a/graphics/p5-GD/files/patch-GD.xs b/graphics/p5-GD/files/patch-GD.xs
new file mode 100644
index 000000000000..fc34f5f463be
--- /dev/null
+++ b/graphics/p5-GD/files/patch-GD.xs
@@ -0,0 +1,33 @@
+--- GD.xs.orig	Thu Apr 24 07:00:11 2003
++++ GD.xs	Wed May 14 17:33:13 2003
+@@ -18,6 +18,30 @@
+ /* Copyright 1995 - 1998, Lincoln D. Stein.  See accompanying README file for
+ 	usage restrictions */
+ 
++#ifndef PERL_REVISION
++#   ifndef __PATCHLEVEL_H_INCLUDED__
++#       include "patchlevel.h"
++#   endif
++#   ifndef PERL_REVISION
++#       define PERL_REVISION    (5)
++        /* Replace: 1 */
++#       define PERL_VERSION     PATCHLEVEL
++#       define PERL_SUBVERSION  SUBVERSION
++        /* Replace PERL_PATCHLEVEL with PERL_VERSION */
++        /* Replace: 0 */
++#   endif
++#endif
++
++#if (PERL_VERSION == 5) && (PERL_SUBVERSION==3)
++#ifndef PL_na
++# define PL_na na
++#endif
++
++#ifndef SvPV_nolen
++# define SvPV_nolen(sv) SvPV(sv, PL_na)
++#endif
++#endif /* 5.00503 */
++
+ static int
+ not_here(char *s)
+ {
diff --git a/graphics/p5-GD/files/patch-aa b/graphics/p5-GD/files/patch-aa
deleted file mode 100644
index b0d25fd004db..000000000000
--- a/graphics/p5-GD/files/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
---- Makefile.PL.orig	Wed Jun 19 14:02:59 2002
-+++ Makefile.PL	Sat Jun 22 21:25:18 2002
-@@ -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); 
--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 $GIF		= lc prompt('Build GIF support (for patched versions of gd)?','n') eq 'y';
-+my @INC     = qw(-I@@LOCALBASE@@/include/gd -I@@LOCALBASE@@/include/freetype -I@@LOCALBASE@@/include -I@@X11BASE@@/include/X11 -I@@X11BASE@@/include); 
-+my @LIBPATH = qw(-L@@LOCALBASE@@/lib -L@@X11BASE@@/lib);
-+my @LIBS    = qw(-lfreetype -ljpeg -lgd1 -lpng -lz);
- 
- my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
- 
--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,'-lfreetype' 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 @LIBS,'-lX11','-lXpm' if $XPM; 
--} 
-+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;
--$DEFINES    .= ' -DHAVE_GIF'  if $GIF;
-+my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
-+$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
- $DEFINES    .= ' -DFCGI'      if $FCGI;
- 
- WriteMakefile(
diff --git a/graphics/p5-GD/pkg-descr b/graphics/p5-GD/pkg-descr
index 0124434aae6d..69d40ab54e8c 100644
--- a/graphics/p5-GD/pkg-descr
+++ b/graphics/p5-GD/pkg-descr
@@ -1,4 +1,6 @@
-       GD.pm is a port of Thomas Boutell's gd graphics library
-       (see below).  GD allows you to create color drawings using
-       a large number of graphics primitives, and emit the
-       drawings as GIF files.
+GD.pm is a Perl interface to Thomas Boutell's gd graphics library
+(version 2.01 or higher). GD allows you to create color drawings
+using a large number of graphics primitives, and emit the drawings
+as PNG files.
+
+WWW: http://stein.cshl.org/WWW/software/GD/
diff --git a/graphics/p5-GD/pkg-plist b/graphics/p5-GD/pkg-plist
index d87ad5c57600..3c98e9f34dc7 100644
--- a/graphics/p5-GD/pkg-plist
+++ b/graphics/p5-GD/pkg-plist
@@ -1,8 +1,9 @@
-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
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD
+%%SITE_PERL%%/%%PERL_ARCH%%/GD.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/GD/Polyline.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
+%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GD