update to 2.30

ok sturm@
This commit is contained in:
steven 2005-12-22 23:21:50 +00:00
parent 9feb012185
commit 330ff379f6
5 changed files with 26 additions and 137 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.20 2005/10/24 05:03:48 fgsch Exp $ # $OpenBSD: Makefile,v 1.21 2005/12/22 23:21:50 steven Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} SHARED_ONLY= Yes
COMMENT= "module to interface with the GD graphics library" COMMENT= "module to interface with the GD graphics library"
DISTNAME= GD-1.41 DISTNAME= GD-2.30
PKGNAME= p5-${DISTNAME}p3 PKGNAME= p5-${DISTNAME}
CATEGORIES= graphics perl5 CATEGORIES= graphics perl5
HOMEPAGE= http://stein.cshl.org/WWW/software/GD HOMEPAGE= http://stein.cshl.org/WWW/software/GD
@ -17,18 +17,16 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= freetype jpeg m png z WANTLIB= fontconfig freetype jpeg m png z
USE_X11= Yes
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/} MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/}
LIB_DEPENDS= gd.18::graphics/gd LIB_DEPENDS= gd.20.28::graphics/gd
MODULES= converters/libiconv
USE_X11= Yes
CONFIGURE_STYLE= perl CONFIGURE_STYLE= perl
post-patch:
@perl -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g;" \
-e "s,%%X11BASE%%,${X11BASE},g" ${WRKSRC}/Makefile.PL
.include <bsd.port.mk> .include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (GD-1.41.tar.gz) = 9f11b3f6bb73f04d2bc3f02df0662bdd MD5 (GD-2.30.tar.gz) = cbc232526c0b348582f386abea802fbc
RMD160 (GD-1.41.tar.gz) = d8bb06a6693e45a723d058cd4defaac66cb7913a RMD160 (GD-2.30.tar.gz) = e4378b5f699e76f0e1bfaa9f8c66a0b7a8ad24bf
SHA1 (GD-1.41.tar.gz) = 465db66734d3893f9037ea0cc72e6ca0559b7b95 SHA1 (GD-2.30.tar.gz) = 5cb325960a963c53979639922abcbe51f8759231
SIZE (GD-1.41.tar.gz) = 366673 SIZE (GD-2.30.tar.gz) = 253655

View File

@ -1,74 +0,0 @@
$OpenBSD: patch-GD_xs,v 1.3 2005/10/24 05:03:48 fgsch Exp $
--- GD.xs.orig Sat Jul 20 12:43:49 2002
+++ GD.xs Fri Oct 21 07:40:55 2005
@@ -17,6 +17,7 @@
#endif
/* Copyright 1995 - 1998, Lincoln D. Stein. See accompanying README file for
usage restrictions */
+#define gdFree free
static int
not_here(char *s)
@@ -339,7 +340,7 @@ static gdIOCtx* newDynamicCtx (char* dat
ctx->ctx.getBuf = bufGetBuf;
ctx->ctx.seek = bufSeek;
ctx->ctx.tell = bufTell;
- ctx->ctx.free = bufFree;
+ ctx->ctx.gd_free = bufFree;
ctx->ctx.putC = NULL;
ctx->ctx.putBuf = NULL;
return (gdIOCtx*)ctx;
@@ -392,7 +393,7 @@ gdnewFromPngData(packname="GD::Image", i
data = SvPV(imageData,len);
ctx = newDynamicCtx(data,len);
RETVAL = (GD__Image) gdImageCreateFromPngCtx(ctx);
- (ctx->free)(ctx);
+ (ctx->gd_free)(ctx);
OUTPUT:
RETVAL
@@ -409,7 +410,7 @@ gdnewFromGdData(packname="GD::Image", im
data = SvPV(imageData,len);
ctx = newDynamicCtx(data,len);
RETVAL = (GD__Image) gdImageCreateFromGdCtx(ctx);
- (ctx->free)(ctx);
+ (ctx->gd_free)(ctx);
OUTPUT:
RETVAL
@@ -426,7 +427,7 @@ gdnewFromGd2Data(packname="GD::Image", i
data = SvPV(imageData,len);
ctx = newDynamicCtx(data,len);
RETVAL = (GD__Image) gdImageCreateFromGd2Ctx(ctx);
- (ctx->free)(ctx);
+ (ctx->gd_free)(ctx);
OUTPUT:
RETVAL
@@ -445,7 +446,7 @@ gdnewFromGifData(packname="GD::Image", i
data = SvPV(imageData,len);
ctx = newDynamicCtx(data,len);
RETVAL = (GD__Image) gdImageCreateFromGifCtx(ctx);
- ctx->free(ctx);
+ ctx->gd_free(ctx);
#else
errormsg = perl_get_sv("@",0);
sv_setpv(errormsg,"libgd was not built with gif support\n");
@@ -469,7 +470,7 @@ gdnewFromJpegData(packname="GD::Image",
data = SvPV(imageData,len);
ctx = newDynamicCtx(data,len);
RETVAL = (GD__Image) gdImageCreateFromJpegCtx(ctx);
- (ctx->free)(ctx);
+ (ctx->gd_free)(ctx);
#else
errormsg = perl_get_sv("@",0);
sv_setpv(errormsg,"libgd was not built with jpeg support\n");
@@ -491,7 +492,7 @@ gdnewFromWBMPData(packname="GD::Image",
data = SvPV(imageData,len);
ctx = newDynamicCtx(data,len);
RETVAL = (GD__Image) gdImageCreateFromWBMPCtx(ctx);
- (ctx->free)(ctx);
+ (ctx->gd_free)(ctx);
OUTPUT:
RETVAL

View File

@ -1,45 +0,0 @@
$OpenBSD: patch-Makefile_PL,v 1.3 2005/10/24 05:03:48 fgsch Exp $
--- Makefile.PL.orig Sat Oct 22 20:27:34 2005
+++ Makefile.PL Sat Oct 22 20:29:19 2005
@@ -1,35 +1,25 @@
use ExtUtils::MakeMaker qw(prompt WriteMakefile);
-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 @INC = qw(-I%%LOCALBASE%%/include -I%%X11BASE%%/include);
+my @LIBPATH = qw(-L%%LOCALBASE%%/lib -L%%X11BASE%%/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 $JPEG = 1;
+my $TTF = 1;
+my $XPM = 0;
+my $GIF = 1;
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;
-}
my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
my $DEFINES = '';

View File

@ -1,11 +1,21 @@
@comment $OpenBSD: PLIST,v 1.9 2004/09/15 00:50:10 espie Exp $ @comment $OpenBSD: PLIST,v 1.10 2005/12/22 23:21:50 steven Exp $
bin/bdf2gdfont.pl
${P5ARCH}/ ${P5ARCH}/
${P5ARCH}/GD/
${P5ARCH}/GD.pm ${P5ARCH}/GD.pm
${P5ARCH}/GD/Image.pm
${P5ARCH}/GD/Polygon.pm
${P5ARCH}/GD/Polyline.pm
${P5ARCH}/GD/Simple.pm
${P5ARCH}/auto/ ${P5ARCH}/auto/
${P5ARCH}/auto/GD/ ${P5ARCH}/auto/GD/
${P5ARCH}/auto/GD/GD.bs ${P5ARCH}/auto/GD/GD.bs
${P5ARCH}/auto/GD/GD.so ${P5ARCH}/auto/GD/GD.so
${P5ARCH}/auto/GD/autosplit.ix ${P5ARCH}/auto/GD/autosplit.ix
@comment ${P5ARCH}/patch_gd.pl
${P5ARCH}/qd.pl ${P5ARCH}/qd.pl
@man man/man1/bdf2gdfont.pl.1
@man man/man3p/GD.3p @man man/man3p/GD.3p
@man man/man3p/GD::Image.3p
@man man/man3p/GD::Polygon.3p
@man man/man3p/GD::Polyline.3p
@man man/man3p/GD::Simple.3p