- Use USE_LIBTOOL properly;

- add dozen missed files into pkg-plist;
- bump PORTREVISION.

18 files changed, 192 insertions, 108 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 10893a38f76b..189b12466d7d 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -35,14 +35,14 @@ USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-LIBTOOLFILES=	aclocal.m4
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1
-MAN5=		gimprc.5
+MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1 \
+		escputil-1.2.1 gimp-1.2.1 gimp-remote-1.2.1 gimptool-1.2.1
+MAN5=		gimprc.5 gimprc-1.2.5
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin
diff --git a/graphics/gimp-app-devel/files/patch-configure b/graphics/gimp-app-devel/files/patch-configure
index 69147a9d40c7..25dd31d25b59 100644
--- a/graphics/gimp-app-devel/files/patch-configure
+++ b/graphics/gimp-app-devel/files/patch-configure
@@ -1,6 +1,9 @@
---- configure.orig	Fri Jul 27 02:13:35 2001
-+++ configure	Wed Aug 15 21:59:29 2001
-@@ -574,7 +574,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Sun Feb 10 08:21:30 2002
++++ configure	Sun May 19 23:52:50 2002
+@@ -746,7 +746,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
  LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
@@ -8,8 +11,16 @@
 +LT_CURRENT=2
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
+ LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+@@ -5577,6 +5577,7 @@
  
-@@ -7116,8 +7116,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11957,8 +11958,8 @@
  
  fi
  
@@ -20,7 +31,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8234,11 +8234,6 @@
+@@ -13133,11 +13134,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/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 273a0a84d30f..22845e4045c2 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,9 +1,13 @@
 bin/escputil
+bin/escputil-1.2
 bin/gimp
+bin/gimp-1.2
 bin/gimp-config
 bin/gimp-remote
+bin/gimp-remote-1.2
 bin/gimp.setfont
 bin/gimptool
+bin/gimptool-1.2
 etc/gimp/1.2/gimprc
 etc/gimp/1.2/gimprc_user
 etc/gimp/1.2/gtkrc
@@ -88,25 +92,16 @@ include/libgimp/gimputils.h
 include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
 lib/libgck.a
-lib/libgck.la
 lib/libgck.so
 lib/libgck.so.%%SHLIBVER%%
 lib/libgimp.a
-lib/libgimp.la
 lib/libgimp.so
 lib/libgimp.so.%%SHLIBVER%%
 lib/libgimpui.a
-lib/libgimpui.la
 lib/libgimpui.so
 lib/libgimpui.so.%%SHLIBVER%%
-libexec/gimp/1.2/modules/libcolorsel_gtk.a
-libexec/gimp/1.2/modules/libcolorsel_gtk.la
 libexec/gimp/1.2/modules/libcolorsel_gtk.so
-libexec/gimp/1.2/modules/libcolorsel_triangle.a
-libexec/gimp/1.2/modules/libcolorsel_triangle.la
 libexec/gimp/1.2/modules/libcolorsel_triangle.so
-libexec/gimp/1.2/modules/libcolorsel_water.a
-libexec/gimp/1.2/modules/libcolorsel_water.la
 libexec/gimp/1.2/modules/libcolorsel_water.so
 libexec/gimp/1.2/plug-ins/AlienMap
 libexec/gimp/1.2/plug-ins/AlienMap2
@@ -1384,6 +1379,10 @@ share/locale/de/LC_MESSAGES/gimp-libgimp.mo
 share/locale/de/LC_MESSAGES/gimp-script-fu.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
+share/locale/el/LC_MESSAGES/gimp-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp-script-fu.mo
+share/locale/el/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/el/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp-std-plugins.mo
@@ -1452,6 +1451,10 @@ share/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/gimp.mo
+share/locale/ro/LC_MESSAGES/gimp-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp-script-fu.mo
+share/locale/ro/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ro/LC_MESSAGES/gimp.mo
 share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 10893a38f76b..189b12466d7d 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -35,14 +35,14 @@ USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-LIBTOOLFILES=	aclocal.m4
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1
-MAN5=		gimprc.5
+MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1 \
+		escputil-1.2.1 gimp-1.2.1 gimp-remote-1.2.1 gimptool-1.2.1
+MAN5=		gimprc.5 gimprc-1.2.5
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin
diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure
index 69147a9d40c7..25dd31d25b59 100644
--- a/graphics/gimp-app/files/patch-configure
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,6 +1,9 @@
---- configure.orig	Fri Jul 27 02:13:35 2001
-+++ configure	Wed Aug 15 21:59:29 2001
-@@ -574,7 +574,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Sun Feb 10 08:21:30 2002
++++ configure	Sun May 19 23:52:50 2002
+@@ -746,7 +746,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
  LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
@@ -8,8 +11,16 @@
 +LT_CURRENT=2
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
+ LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+@@ -5577,6 +5577,7 @@
  
-@@ -7116,8 +7116,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11957,8 +11958,8 @@
  
  fi
  
@@ -20,7 +31,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8234,11 +8234,6 @@
+@@ -13133,11 +13134,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/pkg-plist b/graphics/gimp-app/pkg-plist
index 273a0a84d30f..22845e4045c2 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,9 +1,13 @@
 bin/escputil
+bin/escputil-1.2
 bin/gimp
+bin/gimp-1.2
 bin/gimp-config
 bin/gimp-remote
+bin/gimp-remote-1.2
 bin/gimp.setfont
 bin/gimptool
+bin/gimptool-1.2
 etc/gimp/1.2/gimprc
 etc/gimp/1.2/gimprc_user
 etc/gimp/1.2/gtkrc
@@ -88,25 +92,16 @@ include/libgimp/gimputils.h
 include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
 lib/libgck.a
-lib/libgck.la
 lib/libgck.so
 lib/libgck.so.%%SHLIBVER%%
 lib/libgimp.a
-lib/libgimp.la
 lib/libgimp.so
 lib/libgimp.so.%%SHLIBVER%%
 lib/libgimpui.a
-lib/libgimpui.la
 lib/libgimpui.so
 lib/libgimpui.so.%%SHLIBVER%%
-libexec/gimp/1.2/modules/libcolorsel_gtk.a
-libexec/gimp/1.2/modules/libcolorsel_gtk.la
 libexec/gimp/1.2/modules/libcolorsel_gtk.so
-libexec/gimp/1.2/modules/libcolorsel_triangle.a
-libexec/gimp/1.2/modules/libcolorsel_triangle.la
 libexec/gimp/1.2/modules/libcolorsel_triangle.so
-libexec/gimp/1.2/modules/libcolorsel_water.a
-libexec/gimp/1.2/modules/libcolorsel_water.la
 libexec/gimp/1.2/modules/libcolorsel_water.so
 libexec/gimp/1.2/plug-ins/AlienMap
 libexec/gimp/1.2/plug-ins/AlienMap2
@@ -1384,6 +1379,10 @@ share/locale/de/LC_MESSAGES/gimp-libgimp.mo
 share/locale/de/LC_MESSAGES/gimp-script-fu.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
+share/locale/el/LC_MESSAGES/gimp-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp-script-fu.mo
+share/locale/el/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/el/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp-std-plugins.mo
@@ -1452,6 +1451,10 @@ share/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/gimp.mo
+share/locale/ro/LC_MESSAGES/gimp-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp-script-fu.mo
+share/locale/ro/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ro/LC_MESSAGES/gimp.mo
 share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 10893a38f76b..189b12466d7d 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -35,14 +35,14 @@ USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-LIBTOOLFILES=	aclocal.m4
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1
-MAN5=		gimprc.5
+MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1 \
+		escputil-1.2.1 gimp-1.2.1 gimp-remote-1.2.1 gimptool-1.2.1
+MAN5=		gimprc.5 gimprc-1.2.5
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin
diff --git a/graphics/gimp-devel/files/patch-configure b/graphics/gimp-devel/files/patch-configure
index 69147a9d40c7..25dd31d25b59 100644
--- a/graphics/gimp-devel/files/patch-configure
+++ b/graphics/gimp-devel/files/patch-configure
@@ -1,6 +1,9 @@
---- configure.orig	Fri Jul 27 02:13:35 2001
-+++ configure	Wed Aug 15 21:59:29 2001
-@@ -574,7 +574,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Sun Feb 10 08:21:30 2002
++++ configure	Sun May 19 23:52:50 2002
+@@ -746,7 +746,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
  LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
@@ -8,8 +11,16 @@
 +LT_CURRENT=2
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
+ LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+@@ -5577,6 +5577,7 @@
  
-@@ -7116,8 +7116,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11957,8 +11958,8 @@
  
  fi
  
@@ -20,7 +31,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8234,11 +8234,6 @@
+@@ -13133,11 +13134,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/pkg-plist b/graphics/gimp-devel/pkg-plist
index 273a0a84d30f..22845e4045c2 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -1,9 +1,13 @@
 bin/escputil
+bin/escputil-1.2
 bin/gimp
+bin/gimp-1.2
 bin/gimp-config
 bin/gimp-remote
+bin/gimp-remote-1.2
 bin/gimp.setfont
 bin/gimptool
+bin/gimptool-1.2
 etc/gimp/1.2/gimprc
 etc/gimp/1.2/gimprc_user
 etc/gimp/1.2/gtkrc
@@ -88,25 +92,16 @@ include/libgimp/gimputils.h
 include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
 lib/libgck.a
-lib/libgck.la
 lib/libgck.so
 lib/libgck.so.%%SHLIBVER%%
 lib/libgimp.a
-lib/libgimp.la
 lib/libgimp.so
 lib/libgimp.so.%%SHLIBVER%%
 lib/libgimpui.a
-lib/libgimpui.la
 lib/libgimpui.so
 lib/libgimpui.so.%%SHLIBVER%%
-libexec/gimp/1.2/modules/libcolorsel_gtk.a
-libexec/gimp/1.2/modules/libcolorsel_gtk.la
 libexec/gimp/1.2/modules/libcolorsel_gtk.so
-libexec/gimp/1.2/modules/libcolorsel_triangle.a
-libexec/gimp/1.2/modules/libcolorsel_triangle.la
 libexec/gimp/1.2/modules/libcolorsel_triangle.so
-libexec/gimp/1.2/modules/libcolorsel_water.a
-libexec/gimp/1.2/modules/libcolorsel_water.la
 libexec/gimp/1.2/modules/libcolorsel_water.so
 libexec/gimp/1.2/plug-ins/AlienMap
 libexec/gimp/1.2/plug-ins/AlienMap2
@@ -1384,6 +1379,10 @@ share/locale/de/LC_MESSAGES/gimp-libgimp.mo
 share/locale/de/LC_MESSAGES/gimp-script-fu.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
+share/locale/el/LC_MESSAGES/gimp-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp-script-fu.mo
+share/locale/el/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/el/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp-std-plugins.mo
@@ -1452,6 +1451,10 @@ share/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/gimp.mo
+share/locale/ro/LC_MESSAGES/gimp-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp-script-fu.mo
+share/locale/ro/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ro/LC_MESSAGES/gimp.mo
 share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 10893a38f76b..189b12466d7d 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -35,14 +35,14 @@ USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-LIBTOOLFILES=	aclocal.m4
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1
-MAN5=		gimprc.5
+MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1 \
+		escputil-1.2.1 gimp-1.2.1 gimp-remote-1.2.1 gimptool-1.2.1
+MAN5=		gimprc.5 gimprc-1.2.5
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin
diff --git a/graphics/gimp/files/patch-configure b/graphics/gimp/files/patch-configure
index 69147a9d40c7..25dd31d25b59 100644
--- a/graphics/gimp/files/patch-configure
+++ b/graphics/gimp/files/patch-configure
@@ -1,6 +1,9 @@
---- configure.orig	Fri Jul 27 02:13:35 2001
-+++ configure	Wed Aug 15 21:59:29 2001
-@@ -574,7 +574,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Sun Feb 10 08:21:30 2002
++++ configure	Sun May 19 23:52:50 2002
+@@ -746,7 +746,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
  LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
@@ -8,8 +11,16 @@
 +LT_CURRENT=2
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
+ LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+@@ -5577,6 +5577,7 @@
  
-@@ -7116,8 +7116,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11957,8 +11958,8 @@
  
  fi
  
@@ -20,7 +31,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8234,11 +8234,6 @@
+@@ -13133,11 +13134,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 273a0a84d30f..22845e4045c2 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1,9 +1,13 @@
 bin/escputil
+bin/escputil-1.2
 bin/gimp
+bin/gimp-1.2
 bin/gimp-config
 bin/gimp-remote
+bin/gimp-remote-1.2
 bin/gimp.setfont
 bin/gimptool
+bin/gimptool-1.2
 etc/gimp/1.2/gimprc
 etc/gimp/1.2/gimprc_user
 etc/gimp/1.2/gtkrc
@@ -88,25 +92,16 @@ include/libgimp/gimputils.h
 include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
 lib/libgck.a
-lib/libgck.la
 lib/libgck.so
 lib/libgck.so.%%SHLIBVER%%
 lib/libgimp.a
-lib/libgimp.la
 lib/libgimp.so
 lib/libgimp.so.%%SHLIBVER%%
 lib/libgimpui.a
-lib/libgimpui.la
 lib/libgimpui.so
 lib/libgimpui.so.%%SHLIBVER%%
-libexec/gimp/1.2/modules/libcolorsel_gtk.a
-libexec/gimp/1.2/modules/libcolorsel_gtk.la
 libexec/gimp/1.2/modules/libcolorsel_gtk.so
-libexec/gimp/1.2/modules/libcolorsel_triangle.a
-libexec/gimp/1.2/modules/libcolorsel_triangle.la
 libexec/gimp/1.2/modules/libcolorsel_triangle.so
-libexec/gimp/1.2/modules/libcolorsel_water.a
-libexec/gimp/1.2/modules/libcolorsel_water.la
 libexec/gimp/1.2/modules/libcolorsel_water.so
 libexec/gimp/1.2/plug-ins/AlienMap
 libexec/gimp/1.2/plug-ins/AlienMap2
@@ -1384,6 +1379,10 @@ share/locale/de/LC_MESSAGES/gimp-libgimp.mo
 share/locale/de/LC_MESSAGES/gimp-script-fu.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
+share/locale/el/LC_MESSAGES/gimp-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp-script-fu.mo
+share/locale/el/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/el/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp-std-plugins.mo
@@ -1452,6 +1451,10 @@ share/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/gimp.mo
+share/locale/ro/LC_MESSAGES/gimp-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp-script-fu.mo
+share/locale/ro/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ro/LC_MESSAGES/gimp.mo
 share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 10893a38f76b..189b12466d7d 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -35,14 +35,14 @@ USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-LIBTOOLFILES=	aclocal.m4
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1
-MAN5=		gimprc.5
+MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1 \
+		escputil-1.2.1 gimp-1.2.1 gimp-remote-1.2.1 gimptool-1.2.1
+MAN5=		gimprc.5 gimprc-1.2.5
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin
diff --git a/graphics/gimp1/files/patch-configure b/graphics/gimp1/files/patch-configure
index 69147a9d40c7..25dd31d25b59 100644
--- a/graphics/gimp1/files/patch-configure
+++ b/graphics/gimp1/files/patch-configure
@@ -1,6 +1,9 @@
---- configure.orig	Fri Jul 27 02:13:35 2001
-+++ configure	Wed Aug 15 21:59:29 2001
-@@ -574,7 +574,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Sun Feb 10 08:21:30 2002
++++ configure	Sun May 19 23:52:50 2002
+@@ -746,7 +746,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
  LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
@@ -8,8 +11,16 @@
 +LT_CURRENT=2
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
+ LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+@@ -5577,6 +5577,7 @@
  
-@@ -7116,8 +7116,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11957,8 +11958,8 @@
  
  fi
  
@@ -20,7 +31,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8234,11 +8234,6 @@
+@@ -13133,11 +13134,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 273a0a84d30f..22845e4045c2 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1,9 +1,13 @@
 bin/escputil
+bin/escputil-1.2
 bin/gimp
+bin/gimp-1.2
 bin/gimp-config
 bin/gimp-remote
+bin/gimp-remote-1.2
 bin/gimp.setfont
 bin/gimptool
+bin/gimptool-1.2
 etc/gimp/1.2/gimprc
 etc/gimp/1.2/gimprc_user
 etc/gimp/1.2/gtkrc
@@ -88,25 +92,16 @@ include/libgimp/gimputils.h
 include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
 lib/libgck.a
-lib/libgck.la
 lib/libgck.so
 lib/libgck.so.%%SHLIBVER%%
 lib/libgimp.a
-lib/libgimp.la
 lib/libgimp.so
 lib/libgimp.so.%%SHLIBVER%%
 lib/libgimpui.a
-lib/libgimpui.la
 lib/libgimpui.so
 lib/libgimpui.so.%%SHLIBVER%%
-libexec/gimp/1.2/modules/libcolorsel_gtk.a
-libexec/gimp/1.2/modules/libcolorsel_gtk.la
 libexec/gimp/1.2/modules/libcolorsel_gtk.so
-libexec/gimp/1.2/modules/libcolorsel_triangle.a
-libexec/gimp/1.2/modules/libcolorsel_triangle.la
 libexec/gimp/1.2/modules/libcolorsel_triangle.so
-libexec/gimp/1.2/modules/libcolorsel_water.a
-libexec/gimp/1.2/modules/libcolorsel_water.la
 libexec/gimp/1.2/modules/libcolorsel_water.so
 libexec/gimp/1.2/plug-ins/AlienMap
 libexec/gimp/1.2/plug-ins/AlienMap2
@@ -1384,6 +1379,10 @@ share/locale/de/LC_MESSAGES/gimp-libgimp.mo
 share/locale/de/LC_MESSAGES/gimp-script-fu.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
+share/locale/el/LC_MESSAGES/gimp-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp-script-fu.mo
+share/locale/el/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/el/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp-std-plugins.mo
@@ -1452,6 +1451,10 @@ share/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/gimp.mo
+share/locale/ro/LC_MESSAGES/gimp-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp-script-fu.mo
+share/locale/ro/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ro/LC_MESSAGES/gimp.mo
 share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 10893a38f76b..189b12466d7d 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	1.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -35,14 +35,14 @@ USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-LIBTOOLFILES=	aclocal.m4
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1
-MAN5=		gimprc.5
+MAN1=		escputil.1 gimp.1 gimptool.1 gimp-remote.1 \
+		escputil-1.2.1 gimp-1.2.1 gimp-remote-1.2.1 gimptool-1.2.1
+MAN5=		gimprc.5 gimprc-1.2.5
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin
diff --git a/graphics/gimpshop/files/patch-configure b/graphics/gimpshop/files/patch-configure
index 69147a9d40c7..25dd31d25b59 100644
--- a/graphics/gimpshop/files/patch-configure
+++ b/graphics/gimpshop/files/patch-configure
@@ -1,6 +1,9 @@
---- configure.orig	Fri Jul 27 02:13:35 2001
-+++ configure	Wed Aug 15 21:59:29 2001
-@@ -574,7 +574,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Sun Feb 10 08:21:30 2002
++++ configure	Sun May 19 23:52:50 2002
+@@ -746,7 +746,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
  LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
@@ -8,8 +11,16 @@
 +LT_CURRENT=2
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
+ LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+@@ -5577,6 +5577,7 @@
  
-@@ -7116,8 +7116,8 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11957,8 +11958,8 @@
  
  fi
  
@@ -20,7 +31,7 @@
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -8234,11 +8234,6 @@
+@@ -13133,11 +13134,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 273a0a84d30f..22845e4045c2 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1,9 +1,13 @@
 bin/escputil
+bin/escputil-1.2
 bin/gimp
+bin/gimp-1.2
 bin/gimp-config
 bin/gimp-remote
+bin/gimp-remote-1.2
 bin/gimp.setfont
 bin/gimptool
+bin/gimptool-1.2
 etc/gimp/1.2/gimprc
 etc/gimp/1.2/gimprc_user
 etc/gimp/1.2/gtkrc
@@ -88,25 +92,16 @@ include/libgimp/gimputils.h
 include/libgimp/gimpvector.h
 include/libgimp/gimpwidgets.h
 lib/libgck.a
-lib/libgck.la
 lib/libgck.so
 lib/libgck.so.%%SHLIBVER%%
 lib/libgimp.a
-lib/libgimp.la
 lib/libgimp.so
 lib/libgimp.so.%%SHLIBVER%%
 lib/libgimpui.a
-lib/libgimpui.la
 lib/libgimpui.so
 lib/libgimpui.so.%%SHLIBVER%%
-libexec/gimp/1.2/modules/libcolorsel_gtk.a
-libexec/gimp/1.2/modules/libcolorsel_gtk.la
 libexec/gimp/1.2/modules/libcolorsel_gtk.so
-libexec/gimp/1.2/modules/libcolorsel_triangle.a
-libexec/gimp/1.2/modules/libcolorsel_triangle.la
 libexec/gimp/1.2/modules/libcolorsel_triangle.so
-libexec/gimp/1.2/modules/libcolorsel_water.a
-libexec/gimp/1.2/modules/libcolorsel_water.la
 libexec/gimp/1.2/modules/libcolorsel_water.so
 libexec/gimp/1.2/plug-ins/AlienMap
 libexec/gimp/1.2/plug-ins/AlienMap2
@@ -1384,6 +1379,10 @@ share/locale/de/LC_MESSAGES/gimp-libgimp.mo
 share/locale/de/LC_MESSAGES/gimp-script-fu.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/de/LC_MESSAGES/gimp.mo
+share/locale/el/LC_MESSAGES/gimp-libgimp.mo
+share/locale/el/LC_MESSAGES/gimp-script-fu.mo
+share/locale/el/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/el/LC_MESSAGES/gimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp-std-plugins.mo
@@ -1452,6 +1451,10 @@ share/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/gimp.mo
+share/locale/ro/LC_MESSAGES/gimp-libgimp.mo
+share/locale/ro/LC_MESSAGES/gimp-script-fu.mo
+share/locale/ro/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ro/LC_MESSAGES/gimp.mo
 share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo