Attachment 31320 Details for Bug 52238 – p5-GD2-2.07.diff

[patch] p5-GD2-2.07.diff

p5-GD2-2.07.diff (text/plain), 6.39 KB, created by Mathieu Arnold on 2003-05-14 16:50:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2003-05-14 16:50:16 UTC

Size: 6.39 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/graphics/p5-GD2/Makefile,v
>retrieving revision 1.32
>diff -u -b -w -r1.32 Makefile
>--- Makefile	2003/04/03 09:45:31	1.32
>+++ Makefile	2003/05/14 15:36:32
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	GD2
>-PORTVERSION=	2.06
>+PORTVERSION=	2.07
> CATEGORIES=	graphics perl5
> MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
> MASTER_SITE_SUBDIR=	GD
>@@ -19,8 +19,8 @@
> LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
> 
> PERL_CONFIGURE=	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 GD::Polyline.3
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/graphics/p5-GD2/distinfo,v
>retrieving revision 1.12
>diff -u -b -w -r1.12 distinfo
>--- distinfo	2003/04/03 00:28:50	1.12
>+++ distinfo	2003/05/14 15:36:32
>@@ -1 +1 @@
>-MD5 (GD-2.06.tar.gz) = 90025c06e22c91e22588cee1567d3c7c
>+MD5 (GD-2.07.tar.gz) = 7a44d308e082471e824fcbff044d8300
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/graphics/p5-GD2/pkg-plist,v
>retrieving revision 1.9
>diff -u -b -w -r1.9 pkg-plist
>--- pkg-plist	2003/04/03 00:28:50	1.9
>+++ pkg-plist	2003/05/14 15:36:32
>@@ -1,9 +1,9 @@
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD.pm
>-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD/Polyline.pm
>-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
>-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/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
>Index: files/patch-GD.xs
>===================================================================
>RCS file: patch-GD.xs
>diff -N patch-GD.xs
>--- /dev/null	Wed May 14 03:20:22 2003
>+++ patch-GD.xs	Wed May 14 10:36:32 2003
>@@ -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)
>+ {
>Index: files/patch-aa
>===================================================================
>RCS file: patch-aa
>diff -N patch-aa
>--- files/patch-aa	Wed May 14 10:36:32 2003
>+++ /dev/null	Wed May 14 03:20:22 2003
>@@ -1,78 +0,0 @@
>---- Makefile.PL.orig	Wed Nov 27 16:29:57 2002
>-+++ Makefile.PL	Sun Apr 13 02:25:57 2003
>-@@ -6,46 +6,23 @@
>- 
>- 
>- # =====> 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);
>--
>--if ($^O eq 'VMS'){
>--  warn "This is a build on OpenVMS. In case of problems with the build\n";
>--  warn "do not bother Lincoln Stein but get in touch with\n";
>--  warn "Martin P.J. Zinser (zinser\@decus.de)\n\n";
>--
>--  if ($ENV{"LIB_ROOT"} eq "") {
>--    warn "Define lib_root as a concealed logical pointing to the\n";
>--    warn "Top directory where you have your libraries installed\n";
>--    warn "E.g. define/job/trans=conc lib_root public$device:[public.util.libs.]\n";
>--    warn "Also define the logical pubbin to point to the location\n";
>--    warn "of the object libraries\n";
>--    warn "Then re-invoke Makefile.PL\n";
>--    warn "Exiting now...\n";
>--    exit;
>--  }
>--
>--  @INC     = qw(-I/lib_root/gd -I/lib_root/libpng -I/lib_root/zlib);
>--  @LIBPATH = qw(-Lpubbin);
>--  @LIBS    = qw(-llibgd.olb -llibpng.olb -llibz.olb);
>--}
>-+my @INC     = qw(-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include -I${X11BASE}/include/X11);
>-+my @LIBPATH = qw(-L${LOCALBASE}/lib -L${X11BASE}/lib);
>-+my @LIBS    = qw(-lfreetype -ljpeg -lgd -lpng -lz);
>- 
>- # path to libgd
>- warn "\n";
>--my $PREFIX = lc prompt('Where is libgd installed?','/usr/lib');
>-+my $PREFIX = "$ENV{LOCALBASE}/lib";
>-+
>- unless ($PREFIX eq '/usr/lib') {
>-   $PREFIX =~ s!/lib$!!;
>-   unshift @INC,"-I$PREFIX/include";
>-   unshift @LIBPATH,"-L$PREFIX/lib";
>- }
>- 
>--# 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 $FT      = lc prompt('Build FreeType support?','y') eq 'y';
>--my $XPM     = $^O !~ /^freebsd|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
>-+$JPEG=1;
>-+$FT=1;
>-+$XPM=1;
>- 
>- my $FCGI    = 0;   # set to 1 to build compatability with fastCGI
>- 
>-@@ -61,16 +38,14 @@
>- push @INC, '-I/lib_root/ft2/include/freetype' if ($FT && $^O eq 'VMS');
>- push @INC, '-I/X11' if ($XPM && $^O eq 'VMS');
>- 
>--# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified 
>--if ($^O ne 'freebsd' && $^O ne 'MSWin32') { 
>-+if ($^O ne 'MSWin32') { 
>-   push @LIBS,'-lX11','-lXpm' if $XPM; 
>- } 
>- 
>- my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
>--my $DEFINES = '';
>--$DEFINES    .= ' -DHAVE_JPEG' if $JPEG;
>--$DEFINES    .= ' -DHAVE_FT'   if $FT;
>--$DEFINES    .= ' -DHAVE_XPM'  if $XPM;
>-+my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
>-+$DEFINES    .= ' -DHAVE_FT' if $FT;
>-+$DEFINES    .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
>- $DEFINES    .= ' -DFCGI'      if $FCGI;
>- 
>- WriteMakefile(

Actions: View | Diff

Attachments on bug 52238: 31320