Changes 2.0.2:

- several build fixes (#140115, #142907, #143069)
- allow plug-ins to register menu entries from within init() (#139969)
- fixed focus issues with tool dialogs (#139349)
- allow to load grayscale TGA files
- a couple of string and i18n fixes (#140296, #140039, #137036, #142996)
- fixed crash in template editor (#140315)
- fixed crash in IWarp plug-in (#140554)
- fixed snap to guides (#140649)
- made the PNG plug-in handle empty colormaps (#142029)
- fixed bug in text editor dialog (#141792)
- fixed Old Photo script-fu (#142326)
- fixed glitch in the Curves tool dialog (#142506)
- don't allow tablet pressure to become negative (#123811)
- improved range of tablet pressure values (#142808)
- better defaults for tablet pressure (#143626)
- fixed use of screen color picker with XInput devices (#143166)
- actually return values from the run function of Python scripts (#141338)
- documentation fixes (#142618)
- fixed bug in the save routine of the TIFF plug-in (#143522)
- don't let Curve Bend silently apply the layer mask (#134748)
- fixed bug in Blur plug-in (#142318)
- fixed mask offsets after crop operations (#143860)
- let extensions run synchronously when called via PDB (#140112)
- updated (and some new) translations

6 files changed, 62 insertions, 64 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 6eb0592cf6c..05f70a514a6 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.99 2004/05/27 01:09:36 reed Exp $
-#
+# $NetBSD: Makefile,v 1.100 2004/06/21 19:48:41 adam Exp $
 
-DISTNAME=	gimp-2.0.1
-PKGREVISION=	1
+DISTNAME=	gimp-2.0.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v2.0/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v2.0/ \
-		ftp://ftp.tuwien.ac.at/graphics/gimp/gimp/v2.0/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.0/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/v2.0/ \
+		ftp://ftp.sunet.se/pub/gnu/gimp/v2.0/ \
+		ftp://ftp.gwdb.de/pub/misc/grafik/gimp/gimp/v2.0/ \
+		ftp://ftp.minet.net/pub/gimp/v2.0/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index f7070501441..b62fe79479c 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/04/16 16:16:50 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/06/21 19:48:41 adam Exp $
 bin/gimp
 bin/gimp-2.0
 bin/gimp-remote
@@ -314,42 +314,42 @@ lib/libgimp-2.0.a
 lib/libgimp-2.0.la
 lib/libgimp-2.0.so
 lib/libgimp-2.0.so.0
-lib/libgimp-2.0.so.0.1
+lib/libgimp-2.0.so.0.2
 lib/libgimpbase-2.0.a
 lib/libgimpbase-2.0.la
 lib/libgimpbase-2.0.so
 lib/libgimpbase-2.0.so.0
-lib/libgimpbase-2.0.so.0.1
+lib/libgimpbase-2.0.so.0.2
 lib/libgimpcolor-2.0.a
 lib/libgimpcolor-2.0.la
 lib/libgimpcolor-2.0.so
 lib/libgimpcolor-2.0.so.0
-lib/libgimpcolor-2.0.so.0.1
+lib/libgimpcolor-2.0.so.0.2
 lib/libgimpmath-2.0.a
 lib/libgimpmath-2.0.la
 lib/libgimpmath-2.0.so
 lib/libgimpmath-2.0.so.0
-lib/libgimpmath-2.0.so.0.1
+lib/libgimpmath-2.0.so.0.2
 lib/libgimpmodule-2.0.a
 lib/libgimpmodule-2.0.la
 lib/libgimpmodule-2.0.so
 lib/libgimpmodule-2.0.so.0
-lib/libgimpmodule-2.0.so.0.1
+lib/libgimpmodule-2.0.so.0.2
 lib/libgimpthumb-2.0.a
 lib/libgimpthumb-2.0.la
 lib/libgimpthumb-2.0.so
 lib/libgimpthumb-2.0.so.0
-lib/libgimpthumb-2.0.so.0.1
+lib/libgimpthumb-2.0.so.0.2
 lib/libgimpui-2.0.a
 lib/libgimpui-2.0.la
 lib/libgimpui-2.0.so
 lib/libgimpui-2.0.so.0
-lib/libgimpui-2.0.so.0.1
+lib/libgimpui-2.0.so.0.2
 lib/libgimpwidgets-2.0.a
 lib/libgimpwidgets-2.0.la
 lib/libgimpwidgets-2.0.so
 lib/libgimpwidgets-2.0.so.0
-lib/libgimpwidgets-2.0.so.0.1
+lib/libgimpwidgets-2.0.so.0.2
 lib/pkgconfig/gimp-2.0.pc
 lib/pkgconfig/gimpthumb-2.0.pc
 lib/pkgconfig/gimpui-2.0.pc
@@ -1256,7 +1256,6 @@ share/gimp/2.0/scripts/starscape-logo.scm
 share/gimp/2.0/scripts/swirltile.scm
 share/gimp/2.0/scripts/swirly-pattern.scm
 share/gimp/2.0/scripts/t-o-p-logo.scm
-share/gimp/2.0/scripts/test-sphere.scm
 share/gimp/2.0/scripts/text-circle.scm
 share/gimp/2.0/scripts/textured-logo.scm
 share/gimp/2.0/scripts/tileblur.scm
@@ -1640,6 +1639,10 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gimp20-libgimp.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gimp20-script-fu.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gimp20-std-plug-ins.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gimp20.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gimp20-libgimp.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gimp20-script-fu.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gimp20-std-plug-ins.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gimp20.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gimp20-std-plug-ins.mo
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index a2e6523dd42..b7765c3feb7 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2004/06/01 10:09:31 shannonjr Exp $
+$NetBSD: distinfo,v 1.12 2004/06/21 19:48:41 adam Exp $
 
-SHA1 (gimp-2.0.1.tar.bz2) = 001b76ab22367a9245f1c3be3fd7c55240b1edbf
-Size (gimp-2.0.1.tar.bz2) = 13467677 bytes
+SHA1 (gimp-2.0.2.tar.bz2) = 7f131edac6b143d1ff8324fd5ba61c1386810447
+Size (gimp-2.0.2.tar.bz2) = 13788996 bytes
 SHA1 (patch-aa) = b233a944fa69481685770aa4d5b24a07f127afcf
-SHA1 (patch-ab) = 1b50ef4dfebb70a2e06a97decaa135526767cbcb
-SHA1 (patch-ac) = a45e93e27d0078c5120eed5017de385ce7f29175
-SHA1 (patch-ad) = 39eadbc4822fedf09d962ab500afa9d735db92a4
+SHA1 (patch-ab) = 0270e0377dfef24ff8729bf3ae2fae65dd9064c4
+SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca
 SHA1 (patch-ae) = f8f85be1a1559427e70064d0a0e18211ec5c1c87
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index d1b03165547..192985e1b3f 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,8 +1,35 @@
-$NetBSD: patch-ab,v 1.8 2004/04/15 08:37:38 adam Exp $
+$NetBSD: patch-ab,v 1.9 2004/06/21 19:48:41 adam Exp $
 
---- configure.orig	2004-04-13 21:08:57.000000000 +0000
+--- configure.orig	2004-06-16 10:03:06.000000000 +0000
 +++ configure
-@@ -32586,7 +32586,7 @@ fi;
+@@ -27307,8 +27307,16 @@ if test "x$enable_altivec" = xyes; then
+   echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5
+ echo $ECHO_N "checking whether we can compile Altivec code... $ECHO_C" >&6
+ 
++  gimp_save_CFLAGS=$CFLAGS
++  case `uname` in
++    Darwin)
++      CFLAGS="$CFLAGS -faltivec"
++      ;;
++    *)
++      ;;
++  esac
+   cat >conftest.$ac_ext <<_ACEOF
+-asm ("vand %v0, %v0, %v0");
++asm ("vand v0, v0, v0");
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -27348,7 +27356,7 @@ enable_altivec=no
+ echo "${ECHO_T}no" >&6
+     { echo "$as_me:$LINENO: WARNING: The assembler does not support the Altivec command set." >&5
+ echo "$as_me: WARNING: The assembler does not support the Altivec command set." >&2;}
+-
++    CFLAGS=$gimp_save_CFLAGS
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+@@ -32672,7 +32680,7 @@ fi;
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
deleted file mode 100644
index 8449fef6e76..00000000000
--- a/graphics/gimp/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2004/05/03 06:45:28 adam Exp $
-
---- configure.orig	Sun May  2 21:28:07 2004
-+++ configure
-@@ -27221,8 +27221,16 @@ if test "x$enable_altivec" = xyes; then
-   echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5
- echo $ECHO_N "checking whether we can compile Altivec code... $ECHO_C" >&6
- 
-+  gimp_save_CFLAGS=$CFLAGS
-+  case `uname` in
-+    Darwin)
-+      CFLAGS="$CFLAGS -faltivec"
-+      ;;
-+    *)
-+      ;;
-+  esac
-   cat >conftest.$ac_ext <<_ACEOF
--asm ("vand %v0, %v0, %v0");
-+asm ("vand v0, v0, v0");
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -27262,7 +27270,7 @@ enable_altivec=no
- echo "${ECHO_T}no" >&6
-     { echo "$as_me:$LINENO: WARNING: The assembler does not support the Altivec command set." >&5
- echo "$as_me: WARNING: The assembler does not support the Altivec command set." >&2;}
--
-+    CFLAGS=$gimp_save_CFLAGS
- fi
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad
index c88da0e2929..4bebff238a9 100644
--- a/graphics/gimp/patches/patch-ad
+++ b/graphics/gimp/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2004/05/03 06:45:28 adam Exp $
+$NetBSD: patch-ad,v 1.4 2004/06/21 19:48:41 adam Exp $
 
---- app/base/cpu-accel.c.orig	Sun May  2 23:15:36 2004
+--- app/base/cpu-accel.c.orig	2004-06-15 09:21:39.000000000 +0000
 +++ app/base/cpu-accel.c
-@@ -366,7 +366,7 @@ arch_accel (void)
+@@ -395,7 +395,7 @@ arch_accel (void)
    canjump = 1;
  
    asm volatile ("mtspr 256, %0\n\t"
--		"vand %%v0, %%v0, %%v0"
-+		"vand v0, v0, v0"
- 		:
- 		: "r" (-1));
+-                "vand %%v0, %%v0, %%v0"
++                "vand v0, v0, v0"
+                 :
+                 : "r" (-1));