Attachment #31320 for bug #52238

View | Details | Raw Unified | Return to bug 52238
Collapse All | Expand All




#

PORTNAME=	GD2
PORTVERSION=	2.07
CATEGORIES=	graphics perl5
MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR=	GD

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>

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (GD-2.06.tar.gz) = 90025c06e22c91e22588cee1567d3c7c	1	MD5 (GD-2.07.tar.gz) = 7a44d308e082471e824fcbff044d8300

Lines 1-9 Link Here

(-)pkg-plist (-9 / +9 lines)
1	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD.pm	1	%%SITE_PERL%%/%%PERL_ARCH%%/GD.pm
2	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD/Polyline.pm	2	%%SITE_PERL%%/%%PERL_ARCH%%/GD/Polyline.pm
3	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/qd.pl	3	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/.packlist
4	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/.packlist	4	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.bs
5	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.bs	5	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/GD.so
6	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/GD.so	6	%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/autosplit.ix
7	lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD/autosplit.ix	7	%%SITE_PERL%%/%%PERL_ARCH%%/qd.pl
8	@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/GD	8	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD
9	@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/GD	9	@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/GD




--- 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)
 {




--- 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(

Return to bug 52238

Lines 6-12 Link Here

(-)Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= GD2	8	PORTNAME= GD2
9	PORTVERSION= 2.06	9	PORTVERSION= 2.07
10	CATEGORIES= graphics perl5	10	CATEGORIES= graphics perl5
11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}	11	MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
12	MASTER_SITE_SUBDIR= GD	12	MASTER_SITE_SUBDIR= GD
Lines 19-26 Link Here
19	LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2	19	LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd2
20		20
21	PERL_CONFIGURE= yes	21	PERL_CONFIGURE= yes
		22	CONFIGURE_ARGS= -options "JPEG,FT,XPM" -lib_gd_path ${LOCALBASE} -lib_ft_path ${X11BASE} -lib_png_path ${LOCALBASE} -lib_zlib_path ${LOCALBASE}
22		23
23	MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
24	MAN3= GD.3 GD::Polyline.3	24	MAN3= GD.3 GD::Polyline.3
25		25
26	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Added Link Here

(-)patch-GD.xs (+33 lines)
1	--- GD.xs.orig Thu Apr 24 07:00:11 2003
2	+++ GD.xs Wed May 14 17:33:13 2003
3	@@ -18,6 +18,30 @@
4	/* Copyright 1995 - 1998, Lincoln D. Stein. See accompanying README file for
5	usage restrictions */
6
7	+#ifndef PERL_REVISION
8	+# ifndef __PATCHLEVEL_H_INCLUDED__
9	+# include "patchlevel.h"
10	+# endif
11	+# ifndef PERL_REVISION
12	+# define PERL_REVISION (5)
13	+ /* Replace: 1 */
14	+# define PERL_VERSION PATCHLEVEL
15	+# define PERL_SUBVERSION SUBVERSION
16	+ /* Replace PERL_PATCHLEVEL with PERL_VERSION */
17	+ /* Replace: 0 */
18	+# endif
19	+#endif
20	+
21	+#if (PERL_VERSION == 5) && (PERL_SUBVERSION==3)
22	+#ifndef PL_na
23	+# define PL_na na
24	+#endif
25	+
26	+#ifndef SvPV_nolen
27	+# define SvPV_nolen(sv) SvPV(sv, PL_na)
28	+#endif
29	+#endif /* 5.00503 */
30	+
31	static int
32	not_here(char *s)
33	{

Removed Link Here

(-)files/patch-aa (-78 lines)
1	--- Makefile.PL.orig Wed Nov 27 16:29:57 2002
2	+++ Makefile.PL Sun Apr 13 02:25:57 2003
3	@@ -6,46 +6,23 @@
4
5
6	# =====> PATHS: CHECK AND ADJUST <=====
7	-my @INC = qw(-I/usr/local/include -I/usr/local/include/gd);
8	-my @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/local/lib);
9	-my @LIBS = qw(-lgd -lpng -lz);
10	-
11	-if ($^O eq 'VMS'){
12	- warn "This is a build on OpenVMS. In case of problems with the build\n";
13	- warn "do not bother Lincoln Stein but get in touch with\n";
14	- warn "Martin P.J. Zinser (zinser\@decus.de)\n\n";
15	-
16	- if ($ENV{"LIB_ROOT"} eq "") {
17	- warn "Define lib_root as a concealed logical pointing to the\n";
18	- warn "Top directory where you have your libraries installed\n";
19	- warn "E.g. define/job/trans=conc lib_root public$device:[public.util.libs.]\n";
20	- warn "Also define the logical pubbin to point to the location\n";
21	- warn "of the object libraries\n";
22	- warn "Then re-invoke Makefile.PL\n";
23	- warn "Exiting now...\n";
24	- exit;
25	- }
26	-
27	- @INC = qw(-I/lib_root/gd -I/lib_root/libpng -I/lib_root/zlib);
28	- @LIBPATH = qw(-Lpubbin);
29	- @LIBS = qw(-llibgd.olb -llibpng.olb -llibz.olb);
30	-}
31	+my @INC = qw(-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include -I${X11BASE}/include/X11);
32	+my @LIBPATH = qw(-L${LOCALBASE}/lib -L${X11BASE}/lib);
33	+my @LIBS = qw(-lfreetype -ljpeg -lgd -lpng -lz);
34
35	# path to libgd
36	warn "\n";
37	-my $PREFIX = lc prompt('Where is libgd installed?','/usr/lib');
38	+my $PREFIX = "$ENV{LOCALBASE}/lib";
39	+
40	unless ($PREFIX eq '/usr/lib') {
41	$PREFIX =~ s!/lib$!!;
42	unshift @INC,"-I$PREFIX/include";
43	unshift @LIBPATH,"-L$PREFIX/lib";
44	}
45
46	-# FEATURE FLAGS
47	-warn "\nPlease choose the features that match how libgd was built:\n";
48	-
49	-my $JPEG = lc prompt('Build JPEG support?','y') eq 'y';
50	-my $FT = lc prompt('Build FreeType support?','y') eq 'y';
51	-my $XPM = $^O !~ /^freebsd\|MSWin32$/ && lc prompt('Build XPM support?','y') eq 'y';
52	+$JPEG=1;
53	+$FT=1;
54	+$XPM=1;
55
56	my $FCGI = 0; # set to 1 to build compatability with fastCGI
57
58	@@ -61,16 +38,14 @@
59	push @INC, '-I/lib_root/ft2/include/freetype' if ($FT && $^O eq 'VMS');
60	push @INC, '-I/X11' if ($XPM && $^O eq 'VMS');
61
62	-# FreeBSD 3.3 with libgd built from ports croaks if -lXpm is specified
63	-if ($^O ne 'freebsd' && $^O ne 'MSWin32') {
64	+if ($^O ne 'MSWin32') {
65	push @LIBS,'-lX11','-lXpm' if $XPM;
66	}
67
68	my $CAPI = defined $ExtUtils::MakeMaker::CAPI_support ? 'TRUE' : 'FALSE';
69	-my $DEFINES = '';
70	-$DEFINES .= ' -DHAVE_JPEG' if $JPEG;
71	-$DEFINES .= ' -DHAVE_FT' if $FT;
72	-$DEFINES .= ' -DHAVE_XPM' if $XPM;
73	+my $DEFINES = '-DHAVE_JPEG -DHAVE_TTF';
74	+$DEFINES .= ' -DHAVE_FT' if $FT;
75	+$DEFINES .= ' -DHAVE_XPM' unless $^O eq 'MSWin32';
76	$DEFINES .= ' -DFCGI' if $FCGI;
77
78	WriteMakefile(