Upgrade to 1.2.1.

36 files changed, 120 insertions, 54 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 66acb9e1499b..be16df4668a7 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.2/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PORTVERSION}/ \
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 049128a2074b..6b2aaf576dd7 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.0.tar.bz2) = 56d8aadb8ae8539173c078f9416a1f14
+MD5 (gimp-1.2.1.tar.bz2) = 0839d75836cf08210efe1d44a5613f5f
diff --git a/graphics/gimp-app-devel/files/gimp.setfont b/graphics/gimp-app-devel/files/gimp.setfont
index 34f91f9b5b26..995843d495db 100644
--- a/graphics/gimp-app-devel/files/gimp.setfont
+++ b/graphics/gimp-app-devel/files/gimp.setfont
@@ -7,7 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
-$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
index 0b229998f225..e4368c65d1ae 100644
--- a/graphics/gimp-app-devel/files/patch-ah
+++ b/graphics/gimp-app-devel/files/patch-ah
@@ -1,6 +1,15 @@
---- configure.orig	Tue Oct 31 12:10:14 2000
-+++ configure	Sun Nov 12 23:44:36 2000
-@@ -3478,7 +3478,10 @@
+--- configure.orig	Mon Jan 22 10:48:18 2001
++++ configure	Wed Jan 24 07:24:23 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_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
@@ -12,7 +21,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7148,8 +7151,8 @@
+@@ -7147,8 +7150,8 @@
  
  fi
  
@@ -23,7 +32,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8476,11 +8479,6 @@
+@@ -8263,11 +8266,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-devel/files/patch-am b/graphics/gimp-app-devel/files/patch-am
index 1ab114f461a2..45c58cbe59fe 100644
--- a/graphics/gimp-app-devel/files/patch-am
+++ b/graphics/gimp-app-devel/files/patch-am
@@ -17,4 +17,3 @@
 +  fpsetmask(0);
  
    g_set_prgname (g_basename (progname));
- 
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index b17acb6a4917..178d6c078045 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -295,6 +295,7 @@ share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
+share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/galaxy.gbr
@@ -598,6 +599,7 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 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
@@ -717,6 +719,7 @@ share/gimp/help/C/filters/gz.html
 share/gimp/help/C/filters/hrz.html
 share/gimp/help/C/filters/index.html
 share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/mblur.html
 share/gimp/help/C/filters/miff.html
 share/gimp/help/C/filters/oilify.html
 share/gimp/help/C/filters/pat.html
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 66acb9e1499b..be16df4668a7 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.2/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PORTVERSION}/ \
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 049128a2074b..6b2aaf576dd7 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.0.tar.bz2) = 56d8aadb8ae8539173c078f9416a1f14
+MD5 (gimp-1.2.1.tar.bz2) = 0839d75836cf08210efe1d44a5613f5f
diff --git a/graphics/gimp-app/files/gimp.setfont b/graphics/gimp-app/files/gimp.setfont
index 34f91f9b5b26..995843d495db 100644
--- a/graphics/gimp-app/files/gimp.setfont
+++ b/graphics/gimp-app/files/gimp.setfont
@@ -7,7 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
-$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index 0b229998f225..e4368c65d1ae 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,6 +1,15 @@
---- configure.orig	Tue Oct 31 12:10:14 2000
-+++ configure	Sun Nov 12 23:44:36 2000
-@@ -3478,7 +3478,10 @@
+--- configure.orig	Mon Jan 22 10:48:18 2001
++++ configure	Wed Jan 24 07:24:23 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_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
@@ -12,7 +21,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7148,8 +7151,8 @@
+@@ -7147,8 +7150,8 @@
  
  fi
  
@@ -23,7 +32,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8476,11 +8479,6 @@
+@@ -8263,11 +8266,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-am b/graphics/gimp-app/files/patch-am
index 1ab114f461a2..45c58cbe59fe 100644
--- a/graphics/gimp-app/files/patch-am
+++ b/graphics/gimp-app/files/patch-am
@@ -17,4 +17,3 @@
 +  fpsetmask(0);
  
    g_set_prgname (g_basename (progname));
- 
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index b17acb6a4917..178d6c078045 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -295,6 +295,7 @@ share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
+share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/galaxy.gbr
@@ -598,6 +599,7 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 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
@@ -717,6 +719,7 @@ share/gimp/help/C/filters/gz.html
 share/gimp/help/C/filters/hrz.html
 share/gimp/help/C/filters/index.html
 share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/mblur.html
 share/gimp/help/C/filters/miff.html
 share/gimp/help/C/filters/oilify.html
 share/gimp/help/C/filters/pat.html
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 66acb9e1499b..be16df4668a7 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.2/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PORTVERSION}/ \
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 049128a2074b..6b2aaf576dd7 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.0.tar.bz2) = 56d8aadb8ae8539173c078f9416a1f14
+MD5 (gimp-1.2.1.tar.bz2) = 0839d75836cf08210efe1d44a5613f5f
diff --git a/graphics/gimp-devel/files/gimp.setfont b/graphics/gimp-devel/files/gimp.setfont
index 34f91f9b5b26..995843d495db 100644
--- a/graphics/gimp-devel/files/gimp.setfont
+++ b/graphics/gimp-devel/files/gimp.setfont
@@ -7,7 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
-$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index 0b229998f225..e4368c65d1ae 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -1,6 +1,15 @@
---- configure.orig	Tue Oct 31 12:10:14 2000
-+++ configure	Sun Nov 12 23:44:36 2000
-@@ -3478,7 +3478,10 @@
+--- configure.orig	Mon Jan 22 10:48:18 2001
++++ configure	Wed Jan 24 07:24:23 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_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
@@ -12,7 +21,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7148,8 +7151,8 @@
+@@ -7147,8 +7150,8 @@
  
  fi
  
@@ -23,7 +32,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8476,11 +8479,6 @@
+@@ -8263,11 +8266,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp-devel/files/patch-am b/graphics/gimp-devel/files/patch-am
index 1ab114f461a2..45c58cbe59fe 100644
--- a/graphics/gimp-devel/files/patch-am
+++ b/graphics/gimp-devel/files/patch-am
@@ -17,4 +17,3 @@
 +  fpsetmask(0);
  
    g_set_prgname (g_basename (progname));
- 
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index b17acb6a4917..178d6c078045 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -295,6 +295,7 @@ share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
+share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/galaxy.gbr
@@ -598,6 +599,7 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 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
@@ -717,6 +719,7 @@ share/gimp/help/C/filters/gz.html
 share/gimp/help/C/filters/hrz.html
 share/gimp/help/C/filters/index.html
 share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/mblur.html
 share/gimp/help/C/filters/miff.html
 share/gimp/help/C/filters/oilify.html
 share/gimp/help/C/filters/pat.html
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 66acb9e1499b..be16df4668a7 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.2/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PORTVERSION}/ \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 049128a2074b..6b2aaf576dd7 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.0.tar.bz2) = 56d8aadb8ae8539173c078f9416a1f14
+MD5 (gimp-1.2.1.tar.bz2) = 0839d75836cf08210efe1d44a5613f5f
diff --git a/graphics/gimp/files/gimp.setfont b/graphics/gimp/files/gimp.setfont
index 34f91f9b5b26..995843d495db 100644
--- a/graphics/gimp/files/gimp.setfont
+++ b/graphics/gimp/files/gimp.setfont
@@ -7,7 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
-$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index 0b229998f225..e4368c65d1ae 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,6 +1,15 @@
---- configure.orig	Tue Oct 31 12:10:14 2000
-+++ configure	Sun Nov 12 23:44:36 2000
-@@ -3478,7 +3478,10 @@
+--- configure.orig	Mon Jan 22 10:48:18 2001
++++ configure	Wed Jan 24 07:24:23 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_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
@@ -12,7 +21,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7148,8 +7151,8 @@
+@@ -7147,8 +7150,8 @@
  
  fi
  
@@ -23,7 +32,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8476,11 +8479,6 @@
+@@ -8263,11 +8266,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp/files/patch-am b/graphics/gimp/files/patch-am
index 1ab114f461a2..45c58cbe59fe 100644
--- a/graphics/gimp/files/patch-am
+++ b/graphics/gimp/files/patch-am
@@ -17,4 +17,3 @@
 +  fpsetmask(0);
  
    g_set_prgname (g_basename (progname));
- 
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index b17acb6a4917..178d6c078045 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -295,6 +295,7 @@ share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
+share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/galaxy.gbr
@@ -598,6 +599,7 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 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
@@ -717,6 +719,7 @@ share/gimp/help/C/filters/gz.html
 share/gimp/help/C/filters/hrz.html
 share/gimp/help/C/filters/index.html
 share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/mblur.html
 share/gimp/help/C/filters/miff.html
 share/gimp/help/C/filters/oilify.html
 share/gimp/help/C/filters/pat.html
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 66acb9e1499b..be16df4668a7 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.2/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PORTVERSION}/ \
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 049128a2074b..6b2aaf576dd7 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.0.tar.bz2) = 56d8aadb8ae8539173c078f9416a1f14
+MD5 (gimp-1.2.1.tar.bz2) = 0839d75836cf08210efe1d44a5613f5f
diff --git a/graphics/gimp1/files/gimp.setfont b/graphics/gimp1/files/gimp.setfont
index 34f91f9b5b26..995843d495db 100644
--- a/graphics/gimp1/files/gimp.setfont
+++ b/graphics/gimp1/files/gimp.setfont
@@ -7,7 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
-$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index 0b229998f225..e4368c65d1ae 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,6 +1,15 @@
---- configure.orig	Tue Oct 31 12:10:14 2000
-+++ configure	Sun Nov 12 23:44:36 2000
-@@ -3478,7 +3478,10 @@
+--- configure.orig	Mon Jan 22 10:48:18 2001
++++ configure	Wed Jan 24 07:24:23 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_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
@@ -12,7 +21,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7148,8 +7151,8 @@
+@@ -7147,8 +7150,8 @@
  
  fi
  
@@ -23,7 +32,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8476,11 +8479,6 @@
+@@ -8263,11 +8266,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp1/files/patch-am b/graphics/gimp1/files/patch-am
index 1ab114f461a2..45c58cbe59fe 100644
--- a/graphics/gimp1/files/patch-am
+++ b/graphics/gimp1/files/patch-am
@@ -17,4 +17,3 @@
 +  fpsetmask(0);
  
    g_set_prgname (g_basename (progname));
- 
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index b17acb6a4917..178d6c078045 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -295,6 +295,7 @@ share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
+share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/galaxy.gbr
@@ -598,6 +599,7 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 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
@@ -717,6 +719,7 @@ share/gimp/help/C/filters/gz.html
 share/gimp/help/C/filters/hrz.html
 share/gimp/help/C/filters/index.html
 share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/mblur.html
 share/gimp/help/C/filters/miff.html
 share/gimp/help/C/filters/oilify.html
 share/gimp/help/C/filters/pat.html
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 66acb9e1499b..be16df4668a7 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.2/v${PORTVERSION}/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/v1.2/v${PORTVERSION}/ \
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 049128a2074b..6b2aaf576dd7 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.0.tar.bz2) = 56d8aadb8ae8539173c078f9416a1f14
+MD5 (gimp-1.2.1.tar.bz2) = 0839d75836cf08210efe1d44a5613f5f
diff --git a/graphics/gimpshop/files/gimp.setfont b/graphics/gimpshop/files/gimp.setfont
index 34f91f9b5b26..995843d495db 100644
--- a/graphics/gimpshop/files/gimp.setfont
+++ b/graphics/gimpshop/files/gimp.setfont
@@ -7,7 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
-$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
index 0b229998f225..e4368c65d1ae 100644
--- a/graphics/gimpshop/files/patch-ah
+++ b/graphics/gimpshop/files/patch-ah
@@ -1,6 +1,15 @@
---- configure.orig	Tue Oct 31 12:10:14 2000
-+++ configure	Sun Nov 12 23:44:36 2000
-@@ -3478,7 +3478,10 @@
+--- configure.orig	Mon Jan 22 10:48:18 2001
++++ configure	Wed Jan 24 07:24:23 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_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
@@ -12,7 +21,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7148,8 +7151,8 @@
+@@ -7147,8 +7150,8 @@
  
  fi
  
@@ -23,7 +32,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8476,11 +8479,6 @@
+@@ -8263,11 +8266,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimpshop/files/patch-am b/graphics/gimpshop/files/patch-am
index 1ab114f461a2..45c58cbe59fe 100644
--- a/graphics/gimpshop/files/patch-am
+++ b/graphics/gimpshop/files/patch-am
@@ -17,4 +17,3 @@
 +  fpsetmask(0);
  
    g_set_prgname (g_basename (progname));
- 
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index b17acb6a4917..178d6c078045 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -295,6 +295,7 @@ share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.gbr
 share/gimp/brushes/confetti.gbr
+share/gimp/brushes/confetti.gih
 share/gimp/brushes/dunes.gbr
 share/gimp/brushes/hsparks.gih
 share/gimp/brushes/galaxy.gbr
@@ -598,6 +599,7 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 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
@@ -717,6 +719,7 @@ share/gimp/help/C/filters/gz.html
 share/gimp/help/C/filters/hrz.html
 share/gimp/help/C/filters/index.html
 share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/mblur.html
 share/gimp/help/C/filters/miff.html
 share/gimp/help/C/filters/oilify.html
 share/gimp/help/C/filters/pat.html