cope with gd changes and avoid hardcoding paths.
sturm@ ok.
This commit is contained in:
fgsch
parent
b4aa799d4b
commit
af50ef5815
@ -1,24 +1,25 @@
|
||||
# $OpenBSD: Makefile,v 1.19 2005/10/21 10:29:17 fgsch Exp $
|
||||
# $OpenBSD: Makefile,v 1.20 2005/10/24 05:03:48 fgsch Exp $
|
||||
|
||||
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
|
||||
|
||||
COMMENT= "module to interface with the GD graphics library"
|
||||
|
||||
DISTNAME= GD-1.41
|
||||
PKGNAME= p5-${DISTNAME}p2
|
||||
PKGNAME= p5-${DISTNAME}p3
|
||||
CATEGORIES= graphics perl5
|
||||
|
||||
HOMEPAGE= http://stein.cshl.org/WWW/software/GD
|
||||
MAINTAINER= Jim Geovedi <jim@corebsd.or.id>
|
||||
|
||||
MODULES= converters/libiconv
|
||||
|
||||
# Artistic License
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= jpeg m png ttf z
|
||||
|
||||
WANTLIB= freetype jpeg m png z
|
||||
|
||||
USE_X11= Yes
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=GD/}
|
||||
|
||||
@ -26,4 +27,8 @@ LIB_DEPENDS= gd.18::graphics/gd
|
||||
|
||||
CONFIGURE_STYLE= perl
|
||||
|
||||
post-patch:
|
||||
@perl -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g;" \
|
||||
-e "s,%%X11BASE%%,${X11BASE},g" ${WRKSRC}/Makefile.PL
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-GD_pm,v 1.1 2002/11/30 05:31:47 brad Exp $
|
||||
--- GD.pm.orig Sun Nov 24 03:42:23 2002
|
||||
+++ GD.pm Sun Nov 24 03:41:55 2002
|
||||
@@ -58,7 +58,7 @@ $VERSION = "1.41";
|
||||
|
||||
# documentation error
|
||||
*GD::Polygon::delete = \&GD::Polygon::deletePt;
|
||||
-*GD::Image::stringTTF = \&GD::Image::stringFT;
|
||||
+*GD::Image::stringFT = \&GD::Image::stringTTF;
|
||||
|
||||
sub AUTOLOAD {
|
||||
# This AUTOLOAD is used to 'autoload' constants from the constant()
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-GD_xs,v 1.2 2005/10/21 10:29:17 fgsch Exp $
|
||||
$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 Thu Oct 20 20:41:29 2005
|
||||
+++ 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
|
||||
@ -72,21 +72,3 @@ $OpenBSD: patch-GD_xs,v 1.2 2005/10/21 10:29:17 fgsch Exp $
|
||||
OUTPUT:
|
||||
RETVAL
|
||||
|
||||
@@ -1351,7 +1352,7 @@ gdstringUp(image,font,x,y,s,color)
|
||||
}
|
||||
|
||||
void
|
||||
-gdstringFT(image,fgcolor,fontname,ptsize,angle,x,y,string)
|
||||
+gdstringTTF(image,fgcolor,fontname,ptsize,angle,x,y,string)
|
||||
SV * image
|
||||
int fgcolor
|
||||
char * fontname
|
||||
@@ -1376,7 +1377,7 @@ gdstringFT(image,fgcolor,fontname,ptsize
|
||||
img = NULL;
|
||||
}
|
||||
|
||||
- err = gdImageStringFT(img,brect,fgcolor,fontname,ptsize,angle,x,y,string);
|
||||
+ err = gdImageStringTTF(img,brect,fgcolor,fontname,ptsize,angle,x,y,string);
|
||||
if (err) {
|
||||
errormsg = perl_get_sv("@",0);
|
||||
if (errormsg != NULL)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile_PL,v 1.2 2002/11/30 05:28:40 brad Exp $
|
||||
--- Makefile.PL.orig Wed Jun 19 19:02:59 2002
|
||||
+++ Makefile.PL Sun Nov 24 14:31:44 2002
|
||||
$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);
|
||||
|
||||
@ -9,8 +9,8 @@ $OpenBSD: patch-Makefile_PL,v 1.2 2002/11/30 05:28:40 brad Exp $
|
||||
# =====> 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/usr/local/include);
|
||||
+my @LIBPATH = qw(-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
|
||||
@ -23,7 +23,7 @@ $OpenBSD: patch-Makefile_PL,v 1.2 2002/11/30 05:28:40 brad Exp $
|
||||
+my $JPEG = 1;
|
||||
+my $TTF = 1;
|
||||
+my $XPM = 0;
|
||||
+my $GIF = 0;
|
||||
+my $GIF = 1;
|
||||
|
||||
my $FCGI = 0; # set to 1 to build compatability with fastCGI
|
||||
|
||||
@ -32,8 +32,7 @@ $OpenBSD: patch-Makefile_PL,v 1.2 2002/11/30 05:28:40 brad Exp $
|
||||
-
|
||||
#### no user-serviceable parts below #####
|
||||
|
||||
-push @LIBS,'-lfreetype' if $TTF;
|
||||
+push @LIBS,'-lttf' if $TTF;
|
||||
push @LIBS,'-lfreetype' if $TTF;
|
||||
push @LIBS,'-ljpeg' if $JPEG;
|
||||
push @LIBS, '-lm' unless $^O eq 'MSWin32';
|
||||
-
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-t_GD_t,v 1.1 2002/11/30 05:31:47 brad Exp $
|
||||
--- t/GD.t.orig Mon Jul 22 14:26:26 2002
|
||||
+++ t/GD.t Sun Nov 24 14:50:08 2002
|
||||
@@ -284,9 +284,9 @@ sub test7 {
|
||||
);
|
||||
|
||||
# Some TTFs
|
||||
- $im->stringFT($black,FONT,12.0,0.0,20,20,"Hello world!") || return;
|
||||
- $im->stringFT($red,FONT,14.0,0.0,20,80,"Hello world!") || return;
|
||||
- $im->stringFT($blue,FONT,30.0,-0.5,60,100,"Goodbye cruel world!") || die $@;
|
||||
+ $im->stringTTF($black,FONT,12.0,0.0,20,20,"Hello world!") || return;
|
||||
+ $im->stringTTF($red,FONT,14.0,0.0,20,80,"Hello world!") || return;
|
||||
+ $im->stringTTF($blue,FONT,30.0,-0.5,60,100,"Goodbye cruel world!") || die $@;
|
||||
$im->png;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user