1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

Upgrade to 1.25

This commit is contained in:
Vanilla I. Shu 2000-02-27 07:28:56 +00:00
parent 40037665cd
commit d96a76b77b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=26330
9 changed files with 42 additions and 39 deletions

View File

@ -1,13 +1,13 @@
# New ports collection makefile for: p5-GD # New ports collection makefile for: p5-GD
# Version required: 1.18 # Version required: 1.25
# Date created: June 26th 1997 # Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org> # Whom: James FitzGibbon <jfitz@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# #
DISTNAME= GD-1.23 DISTNAME= GD-1.25
PKGNAME= p5-GD-1.23 PKGNAME= p5-GD-1.25
CATEGORIES= graphics perl5 CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD MASTER_SITE_SUBDIR= GD

View File

@ -1 +1 @@
MD5 (GD-1.23.tar.gz) = 886dfacaec1837c05ffd2d673cd83a4f MD5 (GD-1.25.tar.gz) = 8a9fefb48798629b2d716abbd1ec9d6d

View File

@ -1,24 +1,25 @@
--- Makefile.PL.orig Thu Nov 11 17:15:38 1999 --- Makefile.PL.orig Tue Feb 22 03:52:27 2000
+++ Makefile.PL Sat Dec 11 19:38:50 1999 +++ Makefile.PL Sun Feb 27 15:11:28 2000
@@ -4,18 +4,12 @@ @@ -4,18 +4,13 @@
my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE'; my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
# CHECK AND ADJUST # CHECK AND ADJUST
-my @extrasearch = qw( -L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib ); -my @extrasearch = qw( -L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
-my @extrainc = '-I/usr/local/include', '-I/usr/local/include/gd'; -my @extrainc = ('-I/usr/local/include', '-I/usr/local/include/gd');
+my @extrasearch = qw( -L/usr/X11R6/lib -L/usr/local/lib ); +my @extrasearch = qw( -L/usr/X11R6/lib -L/usr/local/lib );
+my @extrainc = 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 @extrainc = ('-I/usr/local/include', '-I/usr/local/include/gd -I/usr/local/include/freetype -I/usr/X11R6/include -I/usr/X11R6/include/X11');
my @extralibs; my @extralibs;
-push @extralibs, '-lgd','-lz','-lpng','-lttf'; -push @extralibs, '-lgd','-lpng','-lttf','-lz';
+push @extralibs,@extrasearch,'-lgd','-lz','-lpng','-lttf','-lXpm','-lX11'; +push @extralibs, @extrasearch, '-lgd','-lpng','-lttf','-lz';
push @extralibs, "-lm" unless $^O eq 'MSWin32'; push @extralibs, "-lm" unless $^O eq 'MSWin32';
-push @extralibs,'-lX11' unless $^O eq 'MSWin32';
- -
-# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified -# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified
-if ($^O ne 'freebsd') { -if ($^O ne 'freebsd') {
- push @extralibs,@extrasearch,'-lX11','-lXpm'; - push @extralibs,'-lXpm';
-} -}
- +push @extralibs,'-lXpm -lX11' unless $^O eq 'MSWin32';
WriteMakefile( WriteMakefile(
'NAME' => 'GD', 'NAME' => 'GD',

View File

@ -1,13 +1,13 @@
# New ports collection makefile for: p5-GD # New ports collection makefile for: p5-GD
# Version required: 1.18 # Version required: 1.25
# Date created: June 26th 1997 # Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org> # Whom: James FitzGibbon <jfitz@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# #
DISTNAME= GD-1.23 DISTNAME= GD-1.25
PKGNAME= p5-GD-1.23 PKGNAME= p5-GD-1.25
CATEGORIES= graphics perl5 CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD MASTER_SITE_SUBDIR= GD

View File

@ -1 +1 @@
MD5 (GD-1.23.tar.gz) = 886dfacaec1837c05ffd2d673cd83a4f MD5 (GD-1.25.tar.gz) = 8a9fefb48798629b2d716abbd1ec9d6d

View File

@ -1,24 +1,25 @@
--- Makefile.PL.orig Thu Nov 11 17:15:38 1999 --- Makefile.PL.orig Tue Feb 22 03:52:27 2000
+++ Makefile.PL Sat Dec 11 19:38:50 1999 +++ Makefile.PL Sun Feb 27 15:11:28 2000
@@ -4,18 +4,12 @@ @@ -4,18 +4,13 @@
my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE'; my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
# CHECK AND ADJUST # CHECK AND ADJUST
-my @extrasearch = qw( -L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib ); -my @extrasearch = qw( -L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
-my @extrainc = '-I/usr/local/include', '-I/usr/local/include/gd'; -my @extrainc = ('-I/usr/local/include', '-I/usr/local/include/gd');
+my @extrasearch = qw( -L/usr/X11R6/lib -L/usr/local/lib ); +my @extrasearch = qw( -L/usr/X11R6/lib -L/usr/local/lib );
+my @extrainc = 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 @extrainc = ('-I/usr/local/include', '-I/usr/local/include/gd -I/usr/local/include/freetype -I/usr/X11R6/include -I/usr/X11R6/include/X11');
my @extralibs; my @extralibs;
-push @extralibs, '-lgd','-lz','-lpng','-lttf'; -push @extralibs, '-lgd','-lpng','-lttf','-lz';
+push @extralibs,@extrasearch,'-lgd','-lz','-lpng','-lttf','-lXpm','-lX11'; +push @extralibs, @extrasearch, '-lgd','-lpng','-lttf','-lz';
push @extralibs, "-lm" unless $^O eq 'MSWin32'; push @extralibs, "-lm" unless $^O eq 'MSWin32';
-push @extralibs,'-lX11' unless $^O eq 'MSWin32';
- -
-# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified -# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified
-if ($^O ne 'freebsd') { -if ($^O ne 'freebsd') {
- push @extralibs,@extrasearch,'-lX11','-lXpm'; - push @extralibs,'-lXpm';
-} -}
- +push @extralibs,'-lXpm -lX11' unless $^O eq 'MSWin32';
WriteMakefile( WriteMakefile(
'NAME' => 'GD', 'NAME' => 'GD',

View File

@ -1,13 +1,13 @@
# New ports collection makefile for: p5-GD # New ports collection makefile for: p5-GD
# Version required: 1.18 # Version required: 1.25
# Date created: June 26th 1997 # Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org> # Whom: James FitzGibbon <jfitz@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# #
DISTNAME= GD-1.23 DISTNAME= GD-1.25
PKGNAME= p5-GD-1.23 PKGNAME= p5-GD-1.25
CATEGORIES= graphics perl5 CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD MASTER_SITE_SUBDIR= GD

View File

@ -1 +1 @@
MD5 (GD-1.23.tar.gz) = 886dfacaec1837c05ffd2d673cd83a4f MD5 (GD-1.25.tar.gz) = 8a9fefb48798629b2d716abbd1ec9d6d

View File

@ -1,24 +1,25 @@
--- Makefile.PL.orig Thu Nov 11 17:15:38 1999 --- Makefile.PL.orig Tue Feb 22 03:52:27 2000
+++ Makefile.PL Sat Dec 11 19:38:50 1999 +++ Makefile.PL Sun Feb 27 15:11:28 2000
@@ -4,18 +4,12 @@ @@ -4,18 +4,13 @@
my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE'; my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
# CHECK AND ADJUST # CHECK AND ADJUST
-my @extrasearch = qw( -L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib ); -my @extrasearch = qw( -L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib );
-my @extrainc = '-I/usr/local/include', '-I/usr/local/include/gd'; -my @extrainc = ('-I/usr/local/include', '-I/usr/local/include/gd');
+my @extrasearch = qw( -L/usr/X11R6/lib -L/usr/local/lib ); +my @extrasearch = qw( -L/usr/X11R6/lib -L/usr/local/lib );
+my @extrainc = 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 @extrainc = ('-I/usr/local/include', '-I/usr/local/include/gd -I/usr/local/include/freetype -I/usr/X11R6/include -I/usr/X11R6/include/X11');
my @extralibs; my @extralibs;
-push @extralibs, '-lgd','-lz','-lpng','-lttf'; -push @extralibs, '-lgd','-lpng','-lttf','-lz';
+push @extralibs,@extrasearch,'-lgd','-lz','-lpng','-lttf','-lXpm','-lX11'; +push @extralibs, @extrasearch, '-lgd','-lpng','-lttf','-lz';
push @extralibs, "-lm" unless $^O eq 'MSWin32'; push @extralibs, "-lm" unless $^O eq 'MSWin32';
-push @extralibs,'-lX11' unless $^O eq 'MSWin32';
- -
-# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified -# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified
-if ($^O ne 'freebsd') { -if ($^O ne 'freebsd') {
- push @extralibs,@extrasearch,'-lX11','-lXpm'; - push @extralibs,'-lXpm';
-} -}
- +push @extralibs,'-lXpm -lX11' unless $^O eq 'MSWin32';
WriteMakefile( WriteMakefile(
'NAME' => 'GD', 'NAME' => 'GD',