From 0d68bb91c05e1466e720de762dea0cb64d62693e Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Tue, 21 Jan 2003 03:30:12 +0000 Subject: Fix building with perl5.8 PR: ports/45031 Submitted by: Martin Klaffenboeck --- x11-toolkits/p5-Gtk/Makefile | 1 + x11-toolkits/p5-Gtk/files/patch-Gtk_Makefile.PL | 38 +++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) (limited to 'x11-toolkits/p5-Gtk') diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile index b0726065fab3..efcf29101520 100644 --- a/x11-toolkits/p5-Gtk/Makefile +++ b/x11-toolkits/p5-Gtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= Gtk PORTVERSION= 0.7008 +PORTREVISION= 1 CATEGORIES= x11-toolkits lang perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= Gtk diff --git a/x11-toolkits/p5-Gtk/files/patch-Gtk_Makefile.PL b/x11-toolkits/p5-Gtk/files/patch-Gtk_Makefile.PL index 8fa5e6894d27..a30abdf91469 100644 --- a/x11-toolkits/p5-Gtk/files/patch-Gtk_Makefile.PL +++ b/x11-toolkits/p5-Gtk/files/patch-Gtk_Makefile.PL @@ -1,5 +1,5 @@ ---- Gtk/Makefile.PL.orig Sat Mar 24 18:35:10 2001 -+++ Gtk/Makefile.PL Sun May 27 22:41:52 2001 +--- Gtk/Makefile.PL.orig Sun May 27 00:08:38 2001 ++++ Gtk/Makefile.PL Tue Jan 21 11:07:55 2003 @@ -40,8 +40,8 @@ $threadl = ""; } @@ -11,11 +11,43 @@ $libs =~ s/\s+/ /g; $inc =~ s/\s+/ /g; -@@ -160,3 +160,3 @@ +@@ -59,7 +59,7 @@ + + $gtk_hverstr = sprintf("0x%02x%02x%02x", $gtk_major, $gtk_minor, $gtk_micro); + +-push @defines, "-DGTK_HVER=$gtk_hverstr"; ++push @defines, "-DGTK_HVER=$gtk_hverstr -o \$*.o"; + + if (not defined $gtk_version) { + die "Unable to find Gtk version...\n"; +@@ -158,7 +158,7 @@ + 'XSPROTOARG' => '-noprototypes', + 'depend' => $depend, 'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" }, - 'OPTIMIZE' => '-O2 -g', + 'CCFLAGS' => '${CFLAGS}', 'MAN3PODS' => { + 'cookbook.pod' => '$(INST_MAN3DIR)/Gtk::cookbook.3pm', + 'Gtk.pm' => '$(INST_MAN3DIR)/Gtk.3pm', +@@ -187,12 +187,12 @@ + + } + +-sub MY::c_o { +- package MY; # so that "SUPER" works right +- my $inherited = shift->SUPER::c_o(@_); +- $inherited =~ s/CCCMD.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m; +- $inherited; +-} ++#sub MY::c_o { ++# package MY; # so that "SUPER" works right ++# my $inherited = shift->SUPER::c_o(@_); ++# $inherited =~ s/CCCMD.*$/$& -o \$*\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m; ++# $inherited; ++#} + + sub MY::const_config + { @@ -207,14 +207,14 @@ sub gtk_version { my($result); -- cgit v1.2.3