aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2002-04-12 14:15:03 +0800
committervanilla <vanilla@FreeBSD.org>2002-04-12 14:15:03 +0800
commit5aa138b3ff8358192257fdaa7dabfd3849353e49 (patch)
treebfd79db2a07ced4e8490c3872821911f3de1f64c /graphics
parent040c70ea38d5274ab0ce58386c0f0cba6fd02832 (diff)
downloadfreebsd-ports-gnome-5aa138b3ff8358192257fdaa7dabfd3849353e49.tar.gz
freebsd-ports-gnome-5aa138b3ff8358192257fdaa7dabfd3849353e49.tar.zst
freebsd-ports-gnome-5aa138b3ff8358192257fdaa7dabfd3849353e49.zip
Upgrade to 1.211, add a patch to fix callback problem.
PR: plamabal @ #bsdchat of taiwan.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/p5-Gimp/Makefile4
-rw-r--r--graphics/p5-Gimp/distinfo2
-rw-r--r--graphics/p5-Gimp/files/patch-Gimp.pm49
-rw-r--r--graphics/p5-Gimp/files/patch-Gimp::Lib.xs13
-rw-r--r--graphics/p5-Gimp/files/patch-Gimp::Makefile.PL11
-rw-r--r--graphics/p5-Gimp/files/patch-Makefile.PL11
6 files changed, 87 insertions, 3 deletions
diff --git a/graphics/p5-Gimp/Makefile b/graphics/p5-Gimp/Makefile
index 246764207694..3f86f6efa5ee 100644
--- a/graphics/p5-Gimp/Makefile
+++ b/graphics/p5-Gimp/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= Gimp
-PORTVERSION= 1.21
-PORTREVISION= 1
+PORTVERSION= 1.211
+PORTREVISION= 0
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Gimp
diff --git a/graphics/p5-Gimp/distinfo b/graphics/p5-Gimp/distinfo
index bf45c3c5d395..39980d16792d 100644
--- a/graphics/p5-Gimp/distinfo
+++ b/graphics/p5-Gimp/distinfo
@@ -1 +1 @@
-MD5 (Gimp-1.21.tar.gz) = d66b1876ea7317e17f3ebc5513855f9e
+MD5 (Gimp-1.211.tar.gz) = e3bb65da0bc92a4e42b2257cf2adcaba
diff --git a/graphics/p5-Gimp/files/patch-Gimp.pm b/graphics/p5-Gimp/files/patch-Gimp.pm
new file mode 100644
index 000000000000..d5bac559a1ad
--- /dev/null
+++ b/graphics/p5-Gimp/files/patch-Gimp.pm
@@ -0,0 +1,49 @@
+--- Gimp.pm.orig Sat Dec 1 07:35:04 2001
++++ Gimp.pm Thu Apr 11 18:01:20 2002
+@@ -392,6 +392,7 @@
+ sub callback {
+ my $type = shift;
+ my @cb;
++ my @res;
+ if ($type eq "-run") {
+ local $function = shift;
+ local $in_run = 1;
+@@ -405,9 +406,7 @@
+ );
+ }
+ die_msg __"required callback 'run' not found\n" unless @cb;
+- my @res;
+ for (@cb) { @res = &$_ }
+- return wantarray ? @res : $res[0];
+ } elsif ($type eq "-net") {
+ local $in_net = 1;
+ _initialized_callback;
+@@ -420,7 +419,7 @@
+ );
+ }
+ die_msg __"required callback 'net' not found\n" unless @cb;
+- for (@cb) { &$_ }
++ for (@cb) { @res = &$_ }
+ } elsif ($type eq "-query") {
+ local $in_query = 1;
+ _initialized_callback;
+@@ -431,7 +430,7 @@
+ );
+ }
+ die_msg __"required callback 'query' not found\n" unless @cb;
+- for (@cb) { &$_ }
++ for (@cb) { @res = &$_ }
+ } elsif ($type eq "-quit") {
+ local $in_quit = 1;
+ {
+@@ -440,8 +439,9 @@
+ @{$callback{quiet}},
+ );
+ }
+- for (@cb) { &$_ }
++ for (@cb) { @res = &$_ }
+ }
++ return (wantarray) ? @res : $res[0];
+ }
+
+ sub register_callback($$) {
diff --git a/graphics/p5-Gimp/files/patch-Gimp::Lib.xs b/graphics/p5-Gimp/files/patch-Gimp::Lib.xs
new file mode 100644
index 000000000000..c7298a39d8d2
--- /dev/null
+++ b/graphics/p5-Gimp/files/patch-Gimp::Lib.xs
@@ -0,0 +1,13 @@
+--- Gimp/Lib.xs.orig Thu Apr 11 17:46:42 2002
++++ Gimp/Lib.xs Thu Apr 11 17:47:51 2002
+@@ -968,6 +968,10 @@
+ {
+ arg->data.d_image = unbless(sv, PKG_IMAGE , croak_str); break;
+ }
++ else if (sv_derived_from (sv, PKG_IMAGE) || SvROK(sv))
++ {
++ arg->data.d_image = unbless(SvRV(sv), PKG_IMAGE , croak_str); break;
++ }
+ else
+ strcpy (croak_str, __("argument incompatible with type IMAGE"));
+
diff --git a/graphics/p5-Gimp/files/patch-Gimp::Makefile.PL b/graphics/p5-Gimp/files/patch-Gimp::Makefile.PL
new file mode 100644
index 000000000000..dc862be8e4c1
--- /dev/null
+++ b/graphics/p5-Gimp/files/patch-Gimp::Makefile.PL
@@ -0,0 +1,11 @@
+--- Gimp/Makefile.PL.orig Thu Apr 11 17:54:39 2002
++++ Gimp/Makefile.PL Thu Apr 11 17:54:56 2002
+@@ -33,7 +33,7 @@
+ WriteMakefile(
+ 'NAME' => 'Gimp::Lib',
+ 'VERSION_FROM' => '../Gimp.pm',
+- 'INC' => "$INC1 $GIMP_INC_NOUI $CPPFLAGS $pdl_inc $CFLAGS",
++ 'INC' => "$INC1 $GIMP_INC_NOUI $CPPFLAGS $pdl_inc $CFLAGS -I/usr/local/include",
+ 'DEFINE' => "$DEFINE1 $DEFS",
+ 'macro' => { libdir => $libdir, exec_prefix => $exec_prefix, prefix => $prefix },
+ 'TYPEMAPS' => ["$topdir/typemap",@pdl_typemaps],
diff --git a/graphics/p5-Gimp/files/patch-Makefile.PL b/graphics/p5-Gimp/files/patch-Makefile.PL
new file mode 100644
index 000000000000..1016031a8554
--- /dev/null
+++ b/graphics/p5-Gimp/files/patch-Makefile.PL
@@ -0,0 +1,11 @@
+--- Makefile.PL.orig Sat Dec 1 07:02:29 2001
++++ Makefile.PL Thu Apr 11 17:52:04 2002
+@@ -333,7 +333,7 @@
+ 'Gimp/Config.pm' => '$(INST_LIBDIR)/Gimp/Config.pm',
+ },
+ 'LDFROM' => expand("\$(OBJECT) $LIBS $INTLLIBS"),
+- 'INC' => "$INC1 $GIMP_INC_NOUI $CPPFLAGS $CFLAGS",
++ 'INC' => "$INC1 $GIMP_INC_NOUI $CPPFLAGS $CFLAGS -I/usr/local/include",
+ 'DEFINE' => "$DEFINE1 $DEFS",
+ 'EXE_FILES' => \@EXE_FILES,
+ 'macro' => \%cfg,