5 files changed, 113 insertions, 53 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 2171163f9547..89dbf6480898 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,9 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.2.1
-PORTREVISION=	2
-PORTEPOCH=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 6b2aaf576dd7..7ae55b0c96c8 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.1.tar.bz2) = 0839d75836cf08210efe1d44a5613f5f
+MD5 (gimp-1.2.2.tar.bz2) = 680c01b0fc35cd68c540eb9d236f5e1a
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-configure
index e4368c65d1ae..69147a9d40c7 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,27 +1,15 @@
---- configure.orig	Mon Jan 22 10:48:18 2001
-+++ configure	Wed Jan 24 07:24:23 2001
+--- configure.orig	Fri Jul 27 02:13:35 2001
++++ configure	Wed Aug 15 21:59:29 2001
 @@ -574,7 +574,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
  LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
 -LT_CURRENT=`expr $GIMP_MICRO_VERSION - $GIMP_INTERFACE_AGE`
-+LT_CURRENT=1
++LT_CURRENT=2
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
  
-@@ -3470,7 +3470,10 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
-+		   INTLDEPS='-lintl'
-+		   INTLLIBS=$INTLDEPS
-+		   LIBS=`echo $LIBS | sed -e 's/-lintl//'`
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -7147,8 +7150,8 @@
+@@ -7116,8 +7116,8 @@
  
  fi
  
@@ -32,7 +20,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8263,11 +8266,6 @@
+@@ -8234,11 +8234,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp-app/files/patch-plug-ins_Makefile.in b/graphics/gimp-app/files/patch-plug-ins_Makefile.in
index 3662e91fff77..829f78c7162b 100644
--- a/graphics/gimp-app/files/patch-plug-ins_Makefile.in
+++ b/graphics/gimp-app/files/patch-plug-ins_Makefile.in
@@ -1,11 +1,11 @@
---- plug-ins/Makefile.in.orig	Mon Nov 13 08:16:29 2000
-+++ plug-ins/Makefile.in	Mon Nov 13 08:16:45 2000
-@@ -111,7 +111,7 @@
- GT_NO = @GT_NO@
- GT_YES = @GT_YES@
+--- plug-ins/Makefile.in.orig	Fri Jul 27 21:36:22 2001
++++ plug-ins/Makefile.in	Wed Aug 15 22:02:54 2001
+@@ -113,7 +113,7 @@
+ HAVE_FINITE = @HAVE_FINITE@
  HAVE_GTK_DOC = @HAVE_GTK_DOC@
+ HAVE_ISFINITE = @HAVE_ISFINITE@
 -HELPBROWSER = @HELPBROWSER@
 +#HELPBROWSER = @HELPBROWSER@
  HTML_DIR = @HTML_DIR@
- INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
  INSTOBJEXT = @INSTOBJEXT@
+ INTLBISON = @INTLBISON@
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 178d6c078045..970610be655c 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -297,6 +297,7 @@ share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
 share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
+share/gimp/brushes/feltpen.gih
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/galaxy.gbr
 share/gimp/brushes/galaxy_big.gbr
@@ -601,7 +602,6 @@ share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
 share/gimp/help/C/bug_submission.html
 share/gimp/help/C/channels/channel_to_selection.html
-share/gimp/help/C/channels/channels.html
 share/gimp/help/C/channels/delete_channel.html
 @exec mkdir -p %D/share/gimp/help/C/channels
 @exec ln -sf %D/share/gimp/help/C/dialogs/channels %D/share/gimp/help/C/channels/dialogs
@@ -682,7 +682,6 @@ share/gimp/help/C/dialogs/preferences/preferences.html
 share/gimp/help/C/dialogs/preferences/session.html
 share/gimp/help/C/dialogs/really_close.html
 share/gimp/help/C/dialogs/really_quit.html
-share/gimp/help/C/dialogs/revert_image.html
 share/gimp/help/C/dialogs/scale_image.html
 share/gimp/help/C/dialogs/scale_layer_warn.html
 share/gimp/help/C/dialogs/set_canvas_size.html
@@ -700,52 +699,115 @@ share/gimp/help/C/file/index.html
 share/gimp/help/C/file/last_opened.html
 @exec ln -sf %D/share/gimp/help/C/open %D/share/gimp/help/C/file/open
 @unexec rm -f %D/share/gimp/help/C/file/open
+share/gimp/help/C/file/revert.html
 share/gimp/help/C/file/quit.html
 @exec ln -sf %D/share/gimp/help/C/save %D/share/gimp/help/C/file/save
 @unexec rm -f %D/share/gimp/help/C/file/save
 share/gimp/help/C/file_formats.html
+share/gimp/help/C/filters/alienmap.html
+share/gimp/help/C/filters/alienmap2.html
+share/gimp/help/C/filters/align_layers.html
 share/gimp/help/C/filters/applycanvas.html
+share/gimp/help/C/filters/autocrop.html
+share/gimp/help/C/filters/autostretch_hsv.html
 share/gimp/help/C/filters/blinds.html
 share/gimp/help/C/filters/blur.html
 share/gimp/help/C/filters/bz2.html
+share/gimp/help/C/filters/borderaverage.html
+share/gimp/help/C/filters/burst.html
+share/gimp/help/C/filters/c_astretch.html
+share/gimp/help/C/filters/centerguide.html
+share/gimp/help/C/filters/checkerboard.html
+share/gimp/help/C/filters/color_enhance.html
+share/gimp/help/C/filters/colorify.html
+share/gimp/help/C/filters/colortoalpha.html
+share/gimp/help/C/filters/compose.html
 share/gimp/help/C/filters/cubism.html
+share/gimp/help/C/filters/decompose.html
+share/gimp/help/C/filters/ditherize.html
+share/gimp/help/C/filters/dust.html
+share/gimp/help/C/filters/exchange.html
+share/gimp/help/C/filters/fade-alpha.html
+share/gimp/help/C/filters/fit-text.html
 share/gimp/help/C/filters/fits.html
+share/gimp/help/C/filters/flame.html
+share/gimp/help/C/filters/fp.html
+share/gimp/help/C/filters/frame_filter.html
+share/gimp/help/C/filters/gap_filter.html
 share/gimp/help/C/filters/gauss_iir.html
 share/gimp/help/C/filters/gauss_rle.html
+share/gimp/help/C/filters/gee_zoom.html
+share/gimp/help/C/filters/gfig.html
 share/gimp/help/C/filters/gih.html
+share/gimp/help/C/filters/gradmap.html
+share/gimp/help/C/filters/grid.html
 share/gimp/help/C/filters/gqbist.html
 share/gimp/help/C/filters/gtm.html
+share/gimp/help/C/filters/guide_remove.html
+share/gimp/help/C/filters/guidegrid.html
+share/gimp/help/C/filters/guides_to_selection.html
+share/gimp/help/C/filters/guillotine.html
 share/gimp/help/C/filters/gz.html
+share/gimp/help/C/filters/hot.html
 share/gimp/help/C/filters/hrz.html
 share/gimp/help/C/filters/index.html
+share/gimp/help/C/filters/jigsaw.html
 share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/layerfuncs.html
+share/gimp/help/C/filters/mail.html
+share/gimp/help/C/filters/mapcolor.html
+share/gimp/help/C/filters/max_rgb.html
+share/gimp/help/C/filters/maze.html
 share/gimp/help/C/filters/mblur.html
 share/gimp/help/C/filters/miff.html
+share/gimp/help/C/filters/mosaic.html
+share/gimp/help/C/filters/noisify.html
+share/gimp/help/C/filters/none.html
+share/gimp/help/C/filters/normalize.html
 share/gimp/help/C/filters/oilify.html
 share/gimp/help/C/filters/pat.html
 share/gimp/help/C/filters/pixelize.html
+share/gimp/help/C/filters/plasma.html
 share/gimp/help/C/filters/png.html
 share/gimp/help/C/filters/pnm.html
 share/gimp/help/C/filters/print.html
 share/gimp/help/C/filters/psd.html
 share/gimp/help/C/filters/psp.html
+share/gimp/help/C/filters/randomblends.html
+share/gimp/help/C/filters/randomize.html
+share/gimp/help/C/filters/rcm.html
+share/gimp/help/C/filters/repdup.html
 share/gimp/help/C/filters/repeat_last.html
 share/gimp/help/C/filters/reshow_last.html
 share/gimp/help/C/filters/ripple.html
+share/gimp/help/C/filters/rotate.html
+share/gimp/help/C/filters/roundsel.html
+share/gimp/help/C/filters/sample_colorize.html
 share/gimp/help/C/filters/scatter_hsv.html
-share/gimp/help/C/filters/semiflatten.html
-share/gimp/help/C/filters/sgi.html
+share/gimp/help/C/filters/sel2path.html
+share/gimp/help/C/filters/sel_gauss.html
 share/gimp/help/C/filters/sharpen.html
 share/gimp/help/C/filters/shift.html
+share/gimp/help/C/filters/sgi.html
+share/gimp/help/C/filters/semiflatten.html
+share/gimp/help/C/filters/smooth_palette.html
+share/gimp/help/C/filters/snoise.html
+share/gimp/help/C/filters/spread.html
+share/gimp/help/C/filters/stampify.html
 share/gimp/help/C/filters/sunras.html
+share/gimp/help/C/filters/terral_text.html
+share/gimp/help/C/filters/tex-to-float.html
 share/gimp/help/C/filters/tga.html
+share/gimp/help/C/filters/threshold_alpha.html
 share/gimp/help/C/filters/tiff.html
 share/gimp/help/C/filters/tile.html
+share/gimp/help/C/filters/tileable_blur.html
 share/gimp/help/C/filters/url.html
 share/gimp/help/C/filters/vinvert.html
-share/gimp/help/C/filters/undocumented_filter.html
 share/gimp/help/C/filters/wmf.html
+share/gimp/help/C/filters/xachvision.html
 share/gimp/help/C/filters/xwd.html
+share/gimp/help/C/filters/zealouscrop.html
 share/gimp/help/C/gimp_license.html
 share/gimp/help/C/gimp_remote.html
 share/gimp/help/C/gimptool.html
@@ -922,32 +984,43 @@ share/gimp/help/C/tools/smudge.html
 share/gimp/help/C/tools/text.html
 share/gimp/help/C/tools/threshold.html
 share/gimp/help/C/tools/transform.html
-share/gimp/help/C/tools/transform_perspective.html
-share/gimp/help/C/tools/transform_rotate.html
-share/gimp/help/C/tools/transform_scale.html
-share/gimp/help/C/tools/transform_shear.html
 share/gimp/help/C/using_gimp.html
 share/gimp/help/C/why_gimp.html
-share/gimp/help/images/anchor_icon.png
-share/gimp/help/images/delete_icon.png
-share/gimp/help/images/duplicate_icon.png
+share/gimp/help/images/add_point.png
+share/gimp/help/images/anchor_layer.png
+share/gimp/help/images/channel_to_selection.png
+share/gimp/help/images/delete_channel.png
+share/gimp/help/images/delete_directory.png
+share/gimp/help/images/delete_layer.png
+share/gimp/help/images/delete_path.png
+share/gimp/help/images/dotted_square.png
+share/gimp/help/images/duplicate_channel.png
+share/gimp/help/images/duplicate_layer.png
+share/gimp/help/images/duplicate_path.png
+share/gimp/help/images/edit_point.png
 share/gimp/help/images/eek.png
+share/gimp/help/images/geezoom.png
 share/gimp/help/images/layers_example.png
 share/gimp/help/images/layers_overview.png
-share/gimp/help/images/lower_icon.png
-share/gimp/help/images/new_icon.png
-share/gimp/help/images/note.gif
-share/gimp/help/images/pen_add_icon.png
-share/gimp/help/images/pen_delete_icon.png
-share/gimp/help/images/pen_edit_icon.png
-share/gimp/help/images/pen_normal_icon.png
-share/gimp/help/images/raise_icon.png
-share/gimp/help/images/selection_to_path_icon.png
-share/gimp/help/images/stroke_icon.png
-share/gimp/help/images/tip.gif
-share/gimp/help/images/to_selection_icon.png
-share/gimp/help/images/warning.gif
-share/gimp/help/images/wilber.png
+share/gimp/help/images/lower_channel.png
+share/gimp/help/images/lower_directory.png
+share/gimp/help/images/lower_layer.png
+share/gimp/help/images/new_channel.png
+share/gimp/help/images/new_directory.png
+share/gimp/help/images/new_path.png
+share/gimp/help/images/new_point.png
+share/gimp/help/images/note.png
+share/gimp/help/images/path_to_selection.png
+share/gimp/help/images/preview_box.png
+share/gimp/help/images/raise_channel.png
+share/gimp/help/images/raise_directory.png
+share/gimp/help/images/raise_layer.png
+share/gimp/help/images/red_square.png
+share/gimp/help/images/remove_point.png
+share/gimp/help/images/selection_to_path.png
+share/gimp/help/images/stroke_path.png
+share/gimp/help/images/tip.png
+share/gimp/help/images/warning.png
 share/gimp/palettes/Bears
 share/gimp/palettes/Bgold
 share/gimp/palettes/Blues
@@ -1150,6 +1223,7 @@ share/gimp/tips/gimp_tips.ko.txt
 share/gimp/tips/gimp_tips.pl.txt
 share/gimp/tips/gimp_tips.ru.txt
 share/gimp/tips/gimp_tips.txt
+share/gimp/tips/gimp_tips.tr.txt
 share/gimp/tips/gimp_tips.uk.txt
 share/gimp/user_install
 share/locale/ca/LC_MESSAGES/gimp-libgimp.mo