Update gimp to 1.2.2:

This release fixes a large number of bugs, adds a couple of new
translations, and features a complete rewrite of the help pages

3 files changed, 163 insertions, 41 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 3baad004448..f2053836c6b 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.68 2001/06/11 06:34:36 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2001/07/29 01:27:01 hubertf Exp $
 
-DISTNAME=		gimp-1.2.1
+DISTNAME=		gimp-1.2.2
 CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.1/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.1/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.2/v1.2.1/
+MASTER_SITES=		ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.2/ \
+			ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.2/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.2/v1.2.2/
 EXTRACT_SUFX=		.tar.bz2
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${GIMP_DATA}${EXTRACT_SUFX}
@@ -36,10 +36,10 @@ CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}" \
 			--disable-perl \
 			--disable-python
 CONFIGURE_ENV=		GNOME_CONFIG=no \
-			INTLDEPS="-I${LOCALBASE}/include"
+			INTLDEPS="-I${BUILDLINK_DIR}/include"
 
-CPPFLAGS=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
+CPPFLAGS=		-I${BUILDLINK_DIR}/include
+LDFLAGS+=		-L${BUILDLINK_DIR}/lib
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"
@@ -61,4 +61,6 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/gimp.m4 \
 	  ${LOCALBASE}/share/aclocal/gimp.m4
 
+.include "../../devel/gettext-lib/buildlink.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index ce425502119..62025993bc5 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:14 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/29 01:27:02 hubertf Exp $
 
-SHA1 (gimp-1.2.1.tar.bz2) = e27252fc6190bb40e54f59e291e9393192b8eb04
-Size (gimp-1.2.1.tar.bz2) = 9369031 bytes
+SHA1 (gimp-1.2.2.tar.bz2) = f15e282f1dec5e2b6e08faf95b52e31459a1956f
+Size (gimp-1.2.2.tar.bz2) = 9846904 bytes
 SHA1 (gimp-data-extras-1.2.0.tar.bz2) = 93e966544a4f507e2b9045e0cc0745bd0ae1ee81
 Size (gimp-data-extras-1.2.0.tar.bz2) = 4432926 bytes
 SHA1 (patch-aa) = 0ae8628c25550be60e88b8f0470051b63aba57d3
diff --git a/graphics/gimp/pkg/PLIST b/graphics/gimp/pkg/PLIST
index 00bba453ef4..12062ea1b3e 100644
--- a/graphics/gimp/pkg/PLIST
+++ b/graphics/gimp/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2001/03/12 11:23:04 skrll Exp $
+@comment $NetBSD: PLIST,v 1.28 2001/07/29 01:27:02 hubertf Exp $
 bin/escputil
 bin/gimp
 bin/gimp-config
@@ -256,20 +256,20 @@ lib/gimp/1.2/plug-ins/xpm
 lib/gimp/1.2/plug-ins/xwd
 lib/gimp/1.2/plug-ins/zealouscrop
 lib/libgck-1.2.so
-lib/libgck-1.2.so.0
-lib/libgck-1.2.so.0.1
+lib/libgck-1.2.so.2
+lib/libgck-1.2.so.2.0
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
 lib/libgimp-1.2.so
-lib/libgimp-1.2.so.0
-lib/libgimp-1.2.so.0.1
+lib/libgimp-1.2.so.2
+lib/libgimp-1.2.so.2.0
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
 lib/libgimpui-1.2.so
-lib/libgimpui-1.2.so.0
-lib/libgimpui-1.2.so.0.1
+lib/libgimpui-1.2.so.2
+lib/libgimpui-1.2.so.2.0
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
@@ -328,6 +328,7 @@ share/gimp/1.2/brushes/cloth.gbr
 share/gimp/1.2/brushes/confetti.gbr
 share/gimp/1.2/brushes/confetti.gih
 share/gimp/1.2/brushes/dunes.gbr
+share/gimp/1.2/brushes/feltpen.gih
 share/gimp/1.2/brushes/flower.gbr
 share/gimp/1.2/brushes/flower_large.gbr
 share/gimp/1.2/brushes/galaxy.gbr
@@ -662,7 +663,6 @@ share/gimp/1.2/gradients/Yellow_Contrast
 share/gimp/1.2/gradients/Yellow_Orange
 share/gimp/1.2/help/C/bug_submission.html
 share/gimp/1.2/help/C/channels/channel_to_selection.html
-share/gimp/1.2/help/C/channels/channels.html
 share/gimp/1.2/help/C/channels/delete_channel.html
 share/gimp/1.2/help/C/channels/dialogs
 share/gimp/1.2/help/C/channels/duplicate_channel.html
@@ -741,7 +741,6 @@ share/gimp/1.2/help/C/dialogs/preferences/preferences.html
 share/gimp/1.2/help/C/dialogs/preferences/session.html
 share/gimp/1.2/help/C/dialogs/really_close.html
 share/gimp/1.2/help/C/dialogs/really_quit.html
-share/gimp/1.2/help/C/dialogs/revert_image.html
 share/gimp/1.2/help/C/dialogs/scale_image.html
 share/gimp/1.2/help/C/dialogs/scale_layer_warn.html
 share/gimp/1.2/help/C/dialogs/set_canvas_size.html
@@ -756,50 +755,113 @@ share/gimp/1.2/help/C/file/index.html
 share/gimp/1.2/help/C/file/last_opened.html
 share/gimp/1.2/help/C/file/open
 share/gimp/1.2/help/C/file/quit.html
+share/gimp/1.2/help/C/file/revert.html
 share/gimp/1.2/help/C/file/save
 share/gimp/1.2/help/C/file_formats.html
+share/gimp/1.2/help/C/filters/alienmap.html
+share/gimp/1.2/help/C/filters/alienmap2.html
+share/gimp/1.2/help/C/filters/align_layers.html
 share/gimp/1.2/help/C/filters/applycanvas.html
+share/gimp/1.2/help/C/filters/autocrop.html
+share/gimp/1.2/help/C/filters/autostretch_hsv.html
 share/gimp/1.2/help/C/filters/blinds.html
 share/gimp/1.2/help/C/filters/blur.html
+share/gimp/1.2/help/C/filters/borderaverage.html
+share/gimp/1.2/help/C/filters/burst.html
 share/gimp/1.2/help/C/filters/bz2.html
+share/gimp/1.2/help/C/filters/c_astretch.html
+share/gimp/1.2/help/C/filters/centerguide.html
+share/gimp/1.2/help/C/filters/checkerboard.html
+share/gimp/1.2/help/C/filters/color_enhance.html
+share/gimp/1.2/help/C/filters/colorify.html
+share/gimp/1.2/help/C/filters/colortoalpha.html
+share/gimp/1.2/help/C/filters/compose.html
 share/gimp/1.2/help/C/filters/cubism.html
+share/gimp/1.2/help/C/filters/decompose.html
+share/gimp/1.2/help/C/filters/ditherize.html
+share/gimp/1.2/help/C/filters/dust.html
+share/gimp/1.2/help/C/filters/exchange.html
+share/gimp/1.2/help/C/filters/fade-alpha.html
+share/gimp/1.2/help/C/filters/fit-text.html
 share/gimp/1.2/help/C/filters/fits.html
+share/gimp/1.2/help/C/filters/flame.html
+share/gimp/1.2/help/C/filters/fp.html
+share/gimp/1.2/help/C/filters/frame_filter.html
+share/gimp/1.2/help/C/filters/gap_filter.html
 share/gimp/1.2/help/C/filters/gauss_iir.html
 share/gimp/1.2/help/C/filters/gauss_rle.html
+share/gimp/1.2/help/C/filters/gee_zoom.html
+share/gimp/1.2/help/C/filters/gfig.html
 share/gimp/1.2/help/C/filters/gih.html
 share/gimp/1.2/help/C/filters/gqbist.html
+share/gimp/1.2/help/C/filters/gradmap.html
+share/gimp/1.2/help/C/filters/grid.html
 share/gimp/1.2/help/C/filters/gtm.html
+share/gimp/1.2/help/C/filters/guide_remove.html
+share/gimp/1.2/help/C/filters/guidegrid.html
+share/gimp/1.2/help/C/filters/guides_to_selection.html
+share/gimp/1.2/help/C/filters/guillotine.html
 share/gimp/1.2/help/C/filters/gz.html
+share/gimp/1.2/help/C/filters/hot.html
 share/gimp/1.2/help/C/filters/hrz.html
 share/gimp/1.2/help/C/filters/index.html
+share/gimp/1.2/help/C/filters/jigsaw.html
 share/gimp/1.2/help/C/filters/jpeg.html
+share/gimp/1.2/help/C/filters/layerfuncs.html
+share/gimp/1.2/help/C/filters/mail.html
+share/gimp/1.2/help/C/filters/mapcolor.html
+share/gimp/1.2/help/C/filters/max_rgb.html
+share/gimp/1.2/help/C/filters/maze.html
 share/gimp/1.2/help/C/filters/mblur.html
 share/gimp/1.2/help/C/filters/miff.html
+share/gimp/1.2/help/C/filters/mosaic.html
+share/gimp/1.2/help/C/filters/noisify.html
+share/gimp/1.2/help/C/filters/none.html
+share/gimp/1.2/help/C/filters/normalize.html
 share/gimp/1.2/help/C/filters/oilify.html
 share/gimp/1.2/help/C/filters/pat.html
 share/gimp/1.2/help/C/filters/pixelize.html
+share/gimp/1.2/help/C/filters/plasma.html
 share/gimp/1.2/help/C/filters/png.html
 share/gimp/1.2/help/C/filters/pnm.html
 share/gimp/1.2/help/C/filters/print.html
 share/gimp/1.2/help/C/filters/psd.html
 share/gimp/1.2/help/C/filters/psp.html
+share/gimp/1.2/help/C/filters/randomblends.html
+share/gimp/1.2/help/C/filters/randomize.html
+share/gimp/1.2/help/C/filters/rcm.html
+share/gimp/1.2/help/C/filters/repdup.html
 share/gimp/1.2/help/C/filters/repeat_last.html
 share/gimp/1.2/help/C/filters/reshow_last.html
 share/gimp/1.2/help/C/filters/ripple.html
+share/gimp/1.2/help/C/filters/rotate.html
+share/gimp/1.2/help/C/filters/roundsel.html
+share/gimp/1.2/help/C/filters/sample_colorize.html
 share/gimp/1.2/help/C/filters/scatter_hsv.html
+share/gimp/1.2/help/C/filters/sel2path.html
+share/gimp/1.2/help/C/filters/sel_gauss.html
 share/gimp/1.2/help/C/filters/semiflatten.html
 share/gimp/1.2/help/C/filters/sgi.html
 share/gimp/1.2/help/C/filters/sharpen.html
 share/gimp/1.2/help/C/filters/shift.html
+share/gimp/1.2/help/C/filters/smooth_palette.html
+share/gimp/1.2/help/C/filters/snoise.html
+share/gimp/1.2/help/C/filters/spread.html
+share/gimp/1.2/help/C/filters/stampify.html
 share/gimp/1.2/help/C/filters/sunras.html
+share/gimp/1.2/help/C/filters/terral_text.html
+share/gimp/1.2/help/C/filters/tex-to-float.html
 share/gimp/1.2/help/C/filters/tga.html
+share/gimp/1.2/help/C/filters/threshold_alpha.html
 share/gimp/1.2/help/C/filters/tiff.html
 share/gimp/1.2/help/C/filters/tile.html
-share/gimp/1.2/help/C/filters/undocumented_filter.html
+share/gimp/1.2/help/C/filters/tileable_blur.html
 share/gimp/1.2/help/C/filters/url.html
 share/gimp/1.2/help/C/filters/vinvert.html
 share/gimp/1.2/help/C/filters/wmf.html
+share/gimp/1.2/help/C/filters/xachvision.html
 share/gimp/1.2/help/C/filters/xwd.html
+share/gimp/1.2/help/C/filters/zealouscrop.html
 share/gimp/1.2/help/C/gimp_license.html
 share/gimp/1.2/help/C/gimp_remote.html
 share/gimp/1.2/help/C/gimptool.html
@@ -939,31 +1001,43 @@ share/gimp/1.2/help/C/tools/smudge.html
 share/gimp/1.2/help/C/tools/text.html
 share/gimp/1.2/help/C/tools/threshold.html
 share/gimp/1.2/help/C/tools/transform.html
-share/gimp/1.2/help/C/tools/transform_perspective.html
-share/gimp/1.2/help/C/tools/transform_rotate.html
-share/gimp/1.2/help/C/tools/transform_scale.html
-share/gimp/1.2/help/C/tools/transform_shear.html
 share/gimp/1.2/help/C/using_gimp.html
 share/gimp/1.2/help/C/why_gimp.html
-share/gimp/1.2/help/images/anchor_icon.png
-share/gimp/1.2/help/images/delete_icon.png
-share/gimp/1.2/help/images/duplicate_icon.png
+share/gimp/1.2/help/images/add_point.png
+share/gimp/1.2/help/images/anchor_layer.png
+share/gimp/1.2/help/images/channel_to_selection.png
+share/gimp/1.2/help/images/delete_channel.png
+share/gimp/1.2/help/images/delete_directory.png
+share/gimp/1.2/help/images/delete_layer.png
+share/gimp/1.2/help/images/delete_path.png
+share/gimp/1.2/help/images/dotted_square.png
+share/gimp/1.2/help/images/duplicate_channel.png
+share/gimp/1.2/help/images/duplicate_layer.png
+share/gimp/1.2/help/images/duplicate_path.png
+share/gimp/1.2/help/images/edit_point.png
 share/gimp/1.2/help/images/eek.png
+share/gimp/1.2/help/images/geezoom.png
 share/gimp/1.2/help/images/layers_example.png
 share/gimp/1.2/help/images/layers_overview.png
-share/gimp/1.2/help/images/lower_icon.png
-share/gimp/1.2/help/images/new_icon.png
-share/gimp/1.2/help/images/note.gif
-share/gimp/1.2/help/images/pen_add_icon.png
-share/gimp/1.2/help/images/pen_delete_icon.png
-share/gimp/1.2/help/images/pen_edit_icon.png
-share/gimp/1.2/help/images/pen_normal_icon.png
-share/gimp/1.2/help/images/raise_icon.png
-share/gimp/1.2/help/images/selection_to_path_icon.png
-share/gimp/1.2/help/images/stroke_icon.png
-share/gimp/1.2/help/images/tip.gif
-share/gimp/1.2/help/images/to_selection_icon.png
-share/gimp/1.2/help/images/warning.gif
+share/gimp/1.2/help/images/lower_channel.png
+share/gimp/1.2/help/images/lower_directory.png
+share/gimp/1.2/help/images/lower_layer.png
+share/gimp/1.2/help/images/new_channel.png
+share/gimp/1.2/help/images/new_directory.png
+share/gimp/1.2/help/images/new_path.png
+share/gimp/1.2/help/images/new_point.png
+share/gimp/1.2/help/images/note.png
+share/gimp/1.2/help/images/path_to_selection.png
+share/gimp/1.2/help/images/preview_box.png
+share/gimp/1.2/help/images/raise_channel.png
+share/gimp/1.2/help/images/raise_directory.png
+share/gimp/1.2/help/images/raise_layer.png
+share/gimp/1.2/help/images/red_square.png
+share/gimp/1.2/help/images/remove_point.png
+share/gimp/1.2/help/images/selection_to_path.png
+share/gimp/1.2/help/images/stroke_path.png
+share/gimp/1.2/help/images/tip.png
+share/gimp/1.2/help/images/warning.png
 share/gimp/1.2/help/images/wilber.png
 share/gimp/1.2/palettes/Bears
 share/gimp/1.2/palettes/Bgold
@@ -1276,6 +1350,7 @@ share/gimp/1.2/tips/gimp_tips.ja.txt
 share/gimp/1.2/tips/gimp_tips.ko.txt
 share/gimp/1.2/tips/gimp_tips.pl.txt
 share/gimp/1.2/tips/gimp_tips.ru.txt
+share/gimp/1.2/tips/gimp_tips.tr.txt
 share/gimp/1.2/tips/gimp_tips.txt
 share/gimp/1.2/tips/gimp_tips.uk.txt
 share/gimp/1.2/user_install
@@ -1339,10 +1414,18 @@ share/locale/ko/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ko/LC_MESSAGES/gimp-script-fu.mo
 share/locale/ko/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/ko/LC_MESSAGES/gimp.mo
+share/locale/lt/LC_MESSAGES/gimp-libgimp.mo
+share/locale/lt/LC_MESSAGES/gimp-script-fu.mo
+share/locale/lt/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/lt/LC_MESSAGES/gimp.mo
 share/locale/nl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/nl/LC_MESSAGES/gimp.mo
+share/locale/nn/LC_MESSAGES/gimp-libgimp.mo
+share/locale/nn/LC_MESSAGES/gimp-script-fu.mo
+share/locale/nn/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/nn/LC_MESSAGES/gimp.mo
 share/locale/no/LC_MESSAGES/gimp-libgimp.mo
 share/locale/no/LC_MESSAGES/gimp-script-fu.mo
 share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
@@ -1367,10 +1450,45 @@ share/locale/sv/LC_MESSAGES/gimp-libgimp.mo
 share/locale/sv/LC_MESSAGES/gimp-script-fu.mo
 share/locale/sv/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/sv/LC_MESSAGES/gimp.mo
+share/locale/tr/LC_MESSAGES/gimp-libgimp.mo
+share/locale/tr/LC_MESSAGES/gimp-script-fu.mo
+share/locale/tr/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/tr/LC_MESSAGES/gimp.mo
 share/locale/uk/LC_MESSAGES/gimp-libgimp.mo
 share/locale/uk/LC_MESSAGES/gimp-script-fu.mo
 share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/uk/LC_MESSAGES/gimp.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
+@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
+@dirrm share/locale/uk/LC_MESSAGES
+@dirrm share/locale/tr/LC_MESSAGES
+@dirrm share/locale/sv/LC_MESSAGES
+@dirrm share/locale/sk/LC_MESSAGES
+@dirrm share/locale/ru/LC_MESSAGES
+@dirrm share/locale/pt_BR/LC_MESSAGES
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/no/LC_MESSAGES
+@dirrm share/locale/nn/LC_MESSAGES
+@dirrm share/locale/nl/LC_MESSAGES
+@dirrm share/locale/lt/LC_MESSAGES
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ja/LC_MESSAGES
+@dirrm share/locale/it/LC_MESSAGES
+@dirrm share/locale/hu/LC_MESSAGES
+@dirrm share/locale/hr/LC_MESSAGES
+@dirrm share/locale/gl/LC_MESSAGES
+@dirrm share/locale/ga/LC_MESSAGES
+@dirrm share/locale/fr/LC_MESSAGES
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/es/LC_MESSAGES
+@dirrm share/locale/en_GB/LC_MESSAGES
+@dirrm share/locale/de/LC_MESSAGES
+@dirrm share/locale/da/LC_MESSAGES
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/ca/LC_MESSAGES
 @dirrm share/gimp/1.2/tips
 @dirrm share/gimp/1.2/scripts
 @dirrm share/gimp/1.2/patterns
@@ -1424,8 +1542,10 @@ share/locale/uk/LC_MESSAGES/gimp.mo
 @dirrm lib/gimp/1.2/plug-ins
 @dirrm lib/gimp/1.2/modules
 @dirrm lib/gimp/1.2
+@dirrm lib/gimp
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm etc/gimp/1.2
+@dirrm etc/gimp
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gimp.m4 ${LOCALBASE}/share/aclocal/gimp.m4
 @unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gimp.m4