cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

whack back into shape for naddy

Browse Source 
perl 5.8.0 fixes in patch-Gtk_Makefile_PL from freebsd
This commit is contained in:
jcs 2003-02-02 19:14:24 +00:00
parent f2b62b475d
commit 22bccce129
3 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/p5-Gtk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2002/12/29 20:31:41 fgsch Exp $ # $OpenBSD: Makefile,v 1.12 2003/02/02 19:14:24 jcs Exp $
COMMENT= "set of modules to use Gtk+ libraries from Perl" COMMENT= "set of modules to use Gtk+ libraries from Perl"
@ -44,6 +44,7 @@ FAKE_FLAGS= ${MAKE_FLAGS} \
INSTALLSITELIB="${PERLDIR}" \ INSTALLSITELIB="${PERLDIR}" \
INSTALLSITEARCH="${PERLDIR}/${MACHINE_ARCH}-openbsd" \ INSTALLSITEARCH="${PERLDIR}/${MACHINE_ARCH}-openbsd" \
INSTALLMAN3DIR="${DESTDIR}/${PREFIX}/man/man3p" \ INSTALLMAN3DIR="${DESTDIR}/${PREFIX}/man/man3p" \
INSTALLSITEMAN3DIR="${DESTDIR}/${PREFIX}/man/man3p"
FLAVORS= gtkglarea FLAVORS= gtkglarea
FLAVOR?= FLAVOR?=

34
x11/p5-Gtk/patches/patch-Gtk_Makefile_PL
View File

@ -1,6 +1,15 @@
$OpenBSD: patch-Gtk_Makefile_PL,v 1.1 2001/12/09 05:06:01 jcs Exp $ # $OpenBSD: patch-Gtk_Makefile_PL,v 1.2 2003/02/02 19:14:25 jcs Exp $
--- Gtk/Makefile.PL.orig Sat Dec 8 22:31:00 2001 --- Gtk/Makefile.PL.orig Sat May 26 11:08:38 2001
+++ Gtk/Makefile.PL Sat Dec 8 22:31:15 2001 +++ Gtk/Makefile.PL Sun Feb 2 11:44:25 2003
@@ -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";
@@ -160,11 +160,11 @@ @@ -160,11 +160,11 @@
'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" }, 'dist' => { COMPRESS=>"gzip", SUFFIX=>"gz" },
'OPTIMIZE' => '-O2 -g', 'OPTIMIZE' => '-O2 -g',
@ -18,3 +27,22 @@ $OpenBSD: patch-Gtk_Makefile_PL,v 1.1 2001/12/09 05:06:01 jcs Exp $
}, },
$gtk->get_makefile_vars, $gtk->get_makefile_vars,
); );
@@ -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.*$/$&\n\t\@if test -f `basename \$*.o` -a "`basename \$*.o`" != "\$*.o"; then mv `basename \$*.o` \$*.o; fi/m;
+# $inherited;
+#}
sub MY::const_config
{

12
x11/p5-Gtk/patches/patch-Makefile_PL Normal file
View File

@ -0,0 +1,12 @@
# $OpenBSD: patch-Makefile_PL,v 1.1 2003/02/02 19:14:25 jcs Exp $
--- Makefile.PL.orig Sun Feb 2 11:55:47 2003
+++ Makefile.PL Sun Feb 2 11:57:03 2003
@@ -22,7 +22,7 @@
check => sub {ccompile('#include <gtkgl/gtkglarea.h>', "", `gtk-config --cflags`,
"-lgtkgl -lGL -lGLU " . `gtk-config --libs`)}},
gdkpixbuf => {order => 2, dir => 'GdkPixbuf', depends => [qw(gtk)],
- check => sub {cconfig('gdk-pixbuf-config --version', '0\.(8|9|1\d)\.?')}},
+ check => sub {cconfig('gdk-pixbuf-config --version', '0\.(8|9|1\d|2\d)\.?')}},
gtkhtml => {order => 2, dir => 'GtkHTML', depends => [qw(gtk)],
check => sub {cconfig('gnome-config --modversion gtkhtml', 'gtkhtml-0\.[89]')}},
gtkxmhtml => {order => 2, dir => 'GtkXmHTML', depends => [qw(gtk)],