20 files changed, 215 insertions, 30 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index e7bf43e18972..529d73084ca2 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.3.23
-PORTREVISION=	1
+PORTVERSION=	2.0.pre1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+#MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/testing
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.pre/pre/}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program (unstable development version)
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 24a65f1470fa..5d706e75122b 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.3.23.tar.bz2) = 1f30a6979d62241915964db034c4f306
+MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
diff --git a/graphics/gimp-app-devel/files/patch-app_core_gimpimage-contiguous-region.c b/graphics/gimp-app-devel/files/patch-app_core_gimpimage-contiguous-region.c
new file mode 100644
index 000000000000..3a2dd2af0b86
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-app_core_gimpimage-contiguous-region.c
@@ -0,0 +1,11 @@
+--- app/core/gimpimage-contiguous-region.c.orig	Wed Jan  7 15:13:01 2004
++++ app/core/gimpimage-contiguous-region.c	Wed Jan  7 15:20:20 2004
+@@ -416,7 +416,7 @@
+   guchar *m;
+   guchar  s_color[MAX_CHANNELS];
+   guchar  diff;
+-  gint    col_bytes = bytes;;
++  gint    col_bytes = bytes;
+   Tile   *s_tile    = NULL;
+   Tile   *m_tile    = NULL;
+ 
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 14c93f02dfb2..db907126b195 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -45,8 +45,6 @@ include/gimp-1.3/libgimp/gimpmenu.h
 include/gimp-1.3/libgimp/gimpmessage_pdb.h
 include/gimp-1.3/libgimp/gimpmisc.h
 include/gimp-1.3/libgimp/gimpmisc_pdb.h
-include/gimp-1.3/libgimp/gimpmisctools_pdb.h
-include/gimp-1.3/libgimp/gimpmiscui.h
 include/gimp-1.3/libgimp/gimppainttools_pdb.h
 include/gimp-1.3/libgimp/gimppalettes_pdb.h
 include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
@@ -99,6 +97,12 @@ include/gimp-1.3/libgimpmath/gimpvector.h
 include/gimp-1.3/libgimpmodule/gimpmodule.h
 include/gimp-1.3/libgimpmodule/gimpmoduledb.h
 include/gimp-1.3/libgimpmodule/gimpmoduletypes.h
+include/gimp-1.3/libgimpthumb/gimpthumb-enums.h
+include/gimp-1.3/libgimpthumb/gimpthumb-error.h
+include/gimp-1.3/libgimpthumb/gimpthumb-types.h
+include/gimp-1.3/libgimpthumb/gimpthumb-utils.h
+include/gimp-1.3/libgimpthumb/gimpthumb.h
+include/gimp-1.3/libgimpthumb/gimpthumbnail.h
 include/gimp-1.3/libgimpwidgets/gimpbutton.h
 include/gimp-1.3/libgimpwidgets/gimpchainbutton.h
 include/gimp-1.3/libgimpwidgets/gimpcolorarea.h
@@ -140,6 +144,9 @@ lib/libgimpmath-1.3.so.%%SHLIBVER%%
 lib/libgimpmodule-1.3.a
 lib/libgimpmodule-1.3.so
 lib/libgimpmodule-1.3.so.%%SHLIBVER%%
+lib/libgimpthumb-1.3.a
+lib/libgimpthumb-1.3.so
+lib/libgimpthumb-1.3.so.%%SHLIBVER%%
 lib/libgimpui-1.3.a
 lib/libgimpui-1.3.so
 lib/libgimpui-1.3.so.%%SHLIBVER%%
@@ -147,6 +154,7 @@ lib/libgimpwidgets-1.3.a
 lib/libgimpwidgets-1.3.so
 lib/libgimpwidgets-1.3.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-1.3.pc
+libdata/pkgconfig/gimpthumb-1.3.pc
 libdata/pkgconfig/gimpui-1.3.pc
 libexec/gimp/1.3/environ/default.env
 %%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
@@ -178,6 +186,7 @@ libexec/gimp/1.3/plug-ins/bumpmap
 libexec/gimp/1.3/plug-ins/bz2
 libexec/gimp/1.3/plug-ins/c_astretch
 libexec/gimp/1.3/plug-ins/ccanalyze
+libexec/gimp/1.3/plug-ins/channel_mixer
 libexec/gimp/1.3/plug-ins/checkerboard
 %%PYTHON:%%libexec/gimp/1.3/plug-ins/clothify.py
 libexec/gimp/1.3/plug-ins/color_enhance
@@ -447,6 +456,18 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpmodule/libgimpmodule.html
 %%DOCSDIR%%/libgimpmodule/right.png
 %%DOCSDIR%%/libgimpmodule/up.png
+%%DOCSDIR%%/libgimpthumb/GimpThumbnail.html
+%%DOCSDIR%%/libgimpthumb/home.png
+%%DOCSDIR%%/libgimpthumb/index.html
+%%DOCSDIR%%/libgimpthumb/index.sgml
+%%DOCSDIR%%/libgimpthumb/left.png
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-enums.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.html
+%%DOCSDIR%%/libgimpthumb/right.png
+%%DOCSDIR%%/libgimpthumb/up.png
 %%DOCSDIR%%/libgimpwidgets/GimpButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpChainButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorArea.html
@@ -1049,6 +1070,8 @@ share/gimp/palettes/Plasma.gpl
 share/gimp/palettes/Reds.gpl
 share/gimp/palettes/Reds_And_Purples.gpl
 share/gimp/palettes/Royal.gpl
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
 share/gimp/palettes/Topographic.gpl
 share/gimp/palettes/Visibone.gpl
 share/gimp/palettes/Visibone_2.gpl
@@ -1641,6 +1664,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpwidgets
+@dirrm %%DOCSDIR%%/libgimpthumb
 @dirrm %%DOCSDIR%%/libgimpmodule
 @dirrm %%DOCSDIR%%/libgimpmath
 @dirrm %%DOCSDIR%%/libgimpcolor
@@ -1677,6 +1701,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm libexec/gimp/1.3
 @dirrm libexec/gimp
 @dirrm include/gimp-1.3/libgimpwidgets
+@dirrm include/gimp-1.3/libgimpthumb
 @dirrm include/gimp-1.3/libgimpmodule
 @dirrm include/gimp-1.3/libgimpmath
 @dirrm include/gimp-1.3/libgimpcolor
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index e7bf43e18972..529d73084ca2 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.3.23
-PORTREVISION=	1
+PORTVERSION=	2.0.pre1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+#MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/testing
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.pre/pre/}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program (unstable development version)
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 24a65f1470fa..5d706e75122b 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.3.23.tar.bz2) = 1f30a6979d62241915964db034c4f306
+MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
diff --git a/graphics/gimp-app/files/patch-app_core_gimpimage-contiguous-region.c b/graphics/gimp-app/files/patch-app_core_gimpimage-contiguous-region.c
new file mode 100644
index 000000000000..3a2dd2af0b86
--- /dev/null
+++ b/graphics/gimp-app/files/patch-app_core_gimpimage-contiguous-region.c
@@ -0,0 +1,11 @@
+--- app/core/gimpimage-contiguous-region.c.orig	Wed Jan  7 15:13:01 2004
++++ app/core/gimpimage-contiguous-region.c	Wed Jan  7 15:20:20 2004
+@@ -416,7 +416,7 @@
+   guchar *m;
+   guchar  s_color[MAX_CHANNELS];
+   guchar  diff;
+-  gint    col_bytes = bytes;;
++  gint    col_bytes = bytes;
+   Tile   *s_tile    = NULL;
+   Tile   *m_tile    = NULL;
+ 
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 14c93f02dfb2..db907126b195 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -45,8 +45,6 @@ include/gimp-1.3/libgimp/gimpmenu.h
 include/gimp-1.3/libgimp/gimpmessage_pdb.h
 include/gimp-1.3/libgimp/gimpmisc.h
 include/gimp-1.3/libgimp/gimpmisc_pdb.h
-include/gimp-1.3/libgimp/gimpmisctools_pdb.h
-include/gimp-1.3/libgimp/gimpmiscui.h
 include/gimp-1.3/libgimp/gimppainttools_pdb.h
 include/gimp-1.3/libgimp/gimppalettes_pdb.h
 include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
@@ -99,6 +97,12 @@ include/gimp-1.3/libgimpmath/gimpvector.h
 include/gimp-1.3/libgimpmodule/gimpmodule.h
 include/gimp-1.3/libgimpmodule/gimpmoduledb.h
 include/gimp-1.3/libgimpmodule/gimpmoduletypes.h
+include/gimp-1.3/libgimpthumb/gimpthumb-enums.h
+include/gimp-1.3/libgimpthumb/gimpthumb-error.h
+include/gimp-1.3/libgimpthumb/gimpthumb-types.h
+include/gimp-1.3/libgimpthumb/gimpthumb-utils.h
+include/gimp-1.3/libgimpthumb/gimpthumb.h
+include/gimp-1.3/libgimpthumb/gimpthumbnail.h
 include/gimp-1.3/libgimpwidgets/gimpbutton.h
 include/gimp-1.3/libgimpwidgets/gimpchainbutton.h
 include/gimp-1.3/libgimpwidgets/gimpcolorarea.h
@@ -140,6 +144,9 @@ lib/libgimpmath-1.3.so.%%SHLIBVER%%
 lib/libgimpmodule-1.3.a
 lib/libgimpmodule-1.3.so
 lib/libgimpmodule-1.3.so.%%SHLIBVER%%
+lib/libgimpthumb-1.3.a
+lib/libgimpthumb-1.3.so
+lib/libgimpthumb-1.3.so.%%SHLIBVER%%
 lib/libgimpui-1.3.a
 lib/libgimpui-1.3.so
 lib/libgimpui-1.3.so.%%SHLIBVER%%
@@ -147,6 +154,7 @@ lib/libgimpwidgets-1.3.a
 lib/libgimpwidgets-1.3.so
 lib/libgimpwidgets-1.3.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-1.3.pc
+libdata/pkgconfig/gimpthumb-1.3.pc
 libdata/pkgconfig/gimpui-1.3.pc
 libexec/gimp/1.3/environ/default.env
 %%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
@@ -178,6 +186,7 @@ libexec/gimp/1.3/plug-ins/bumpmap
 libexec/gimp/1.3/plug-ins/bz2
 libexec/gimp/1.3/plug-ins/c_astretch
 libexec/gimp/1.3/plug-ins/ccanalyze
+libexec/gimp/1.3/plug-ins/channel_mixer
 libexec/gimp/1.3/plug-ins/checkerboard
 %%PYTHON:%%libexec/gimp/1.3/plug-ins/clothify.py
 libexec/gimp/1.3/plug-ins/color_enhance
@@ -447,6 +456,18 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpmodule/libgimpmodule.html
 %%DOCSDIR%%/libgimpmodule/right.png
 %%DOCSDIR%%/libgimpmodule/up.png
+%%DOCSDIR%%/libgimpthumb/GimpThumbnail.html
+%%DOCSDIR%%/libgimpthumb/home.png
+%%DOCSDIR%%/libgimpthumb/index.html
+%%DOCSDIR%%/libgimpthumb/index.sgml
+%%DOCSDIR%%/libgimpthumb/left.png
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-enums.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.html
+%%DOCSDIR%%/libgimpthumb/right.png
+%%DOCSDIR%%/libgimpthumb/up.png
 %%DOCSDIR%%/libgimpwidgets/GimpButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpChainButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorArea.html
@@ -1049,6 +1070,8 @@ share/gimp/palettes/Plasma.gpl
 share/gimp/palettes/Reds.gpl
 share/gimp/palettes/Reds_And_Purples.gpl
 share/gimp/palettes/Royal.gpl
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
 share/gimp/palettes/Topographic.gpl
 share/gimp/palettes/Visibone.gpl
 share/gimp/palettes/Visibone_2.gpl
@@ -1641,6 +1664,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpwidgets
+@dirrm %%DOCSDIR%%/libgimpthumb
 @dirrm %%DOCSDIR%%/libgimpmodule
 @dirrm %%DOCSDIR%%/libgimpmath
 @dirrm %%DOCSDIR%%/libgimpcolor
@@ -1677,6 +1701,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm libexec/gimp/1.3
 @dirrm libexec/gimp
 @dirrm include/gimp-1.3/libgimpwidgets
+@dirrm include/gimp-1.3/libgimpthumb
 @dirrm include/gimp-1.3/libgimpmodule
 @dirrm include/gimp-1.3/libgimpmath
 @dirrm include/gimp-1.3/libgimpcolor
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index e7bf43e18972..529d73084ca2 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.3.23
-PORTREVISION=	1
+PORTVERSION=	2.0.pre1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+#MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/testing
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.pre/pre/}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program (unstable development version)
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 24a65f1470fa..5d706e75122b 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.3.23.tar.bz2) = 1f30a6979d62241915964db034c4f306
+MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
diff --git a/graphics/gimp-devel/files/patch-app_core_gimpimage-contiguous-region.c b/graphics/gimp-devel/files/patch-app_core_gimpimage-contiguous-region.c
new file mode 100644
index 000000000000..3a2dd2af0b86
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-app_core_gimpimage-contiguous-region.c
@@ -0,0 +1,11 @@
+--- app/core/gimpimage-contiguous-region.c.orig	Wed Jan  7 15:13:01 2004
++++ app/core/gimpimage-contiguous-region.c	Wed Jan  7 15:20:20 2004
+@@ -416,7 +416,7 @@
+   guchar *m;
+   guchar  s_color[MAX_CHANNELS];
+   guchar  diff;
+-  gint    col_bytes = bytes;;
++  gint    col_bytes = bytes;
+   Tile   *s_tile    = NULL;
+   Tile   *m_tile    = NULL;
+ 
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 14c93f02dfb2..db907126b195 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -45,8 +45,6 @@ include/gimp-1.3/libgimp/gimpmenu.h
 include/gimp-1.3/libgimp/gimpmessage_pdb.h
 include/gimp-1.3/libgimp/gimpmisc.h
 include/gimp-1.3/libgimp/gimpmisc_pdb.h
-include/gimp-1.3/libgimp/gimpmisctools_pdb.h
-include/gimp-1.3/libgimp/gimpmiscui.h
 include/gimp-1.3/libgimp/gimppainttools_pdb.h
 include/gimp-1.3/libgimp/gimppalettes_pdb.h
 include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
@@ -99,6 +97,12 @@ include/gimp-1.3/libgimpmath/gimpvector.h
 include/gimp-1.3/libgimpmodule/gimpmodule.h
 include/gimp-1.3/libgimpmodule/gimpmoduledb.h
 include/gimp-1.3/libgimpmodule/gimpmoduletypes.h
+include/gimp-1.3/libgimpthumb/gimpthumb-enums.h
+include/gimp-1.3/libgimpthumb/gimpthumb-error.h
+include/gimp-1.3/libgimpthumb/gimpthumb-types.h
+include/gimp-1.3/libgimpthumb/gimpthumb-utils.h
+include/gimp-1.3/libgimpthumb/gimpthumb.h
+include/gimp-1.3/libgimpthumb/gimpthumbnail.h
 include/gimp-1.3/libgimpwidgets/gimpbutton.h
 include/gimp-1.3/libgimpwidgets/gimpchainbutton.h
 include/gimp-1.3/libgimpwidgets/gimpcolorarea.h
@@ -140,6 +144,9 @@ lib/libgimpmath-1.3.so.%%SHLIBVER%%
 lib/libgimpmodule-1.3.a
 lib/libgimpmodule-1.3.so
 lib/libgimpmodule-1.3.so.%%SHLIBVER%%
+lib/libgimpthumb-1.3.a
+lib/libgimpthumb-1.3.so
+lib/libgimpthumb-1.3.so.%%SHLIBVER%%
 lib/libgimpui-1.3.a
 lib/libgimpui-1.3.so
 lib/libgimpui-1.3.so.%%SHLIBVER%%
@@ -147,6 +154,7 @@ lib/libgimpwidgets-1.3.a
 lib/libgimpwidgets-1.3.so
 lib/libgimpwidgets-1.3.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-1.3.pc
+libdata/pkgconfig/gimpthumb-1.3.pc
 libdata/pkgconfig/gimpui-1.3.pc
 libexec/gimp/1.3/environ/default.env
 %%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
@@ -178,6 +186,7 @@ libexec/gimp/1.3/plug-ins/bumpmap
 libexec/gimp/1.3/plug-ins/bz2
 libexec/gimp/1.3/plug-ins/c_astretch
 libexec/gimp/1.3/plug-ins/ccanalyze
+libexec/gimp/1.3/plug-ins/channel_mixer
 libexec/gimp/1.3/plug-ins/checkerboard
 %%PYTHON:%%libexec/gimp/1.3/plug-ins/clothify.py
 libexec/gimp/1.3/plug-ins/color_enhance
@@ -447,6 +456,18 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpmodule/libgimpmodule.html
 %%DOCSDIR%%/libgimpmodule/right.png
 %%DOCSDIR%%/libgimpmodule/up.png
+%%DOCSDIR%%/libgimpthumb/GimpThumbnail.html
+%%DOCSDIR%%/libgimpthumb/home.png
+%%DOCSDIR%%/libgimpthumb/index.html
+%%DOCSDIR%%/libgimpthumb/index.sgml
+%%DOCSDIR%%/libgimpthumb/left.png
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-enums.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.html
+%%DOCSDIR%%/libgimpthumb/right.png
+%%DOCSDIR%%/libgimpthumb/up.png
 %%DOCSDIR%%/libgimpwidgets/GimpButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpChainButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorArea.html
@@ -1049,6 +1070,8 @@ share/gimp/palettes/Plasma.gpl
 share/gimp/palettes/Reds.gpl
 share/gimp/palettes/Reds_And_Purples.gpl
 share/gimp/palettes/Royal.gpl
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
 share/gimp/palettes/Topographic.gpl
 share/gimp/palettes/Visibone.gpl
 share/gimp/palettes/Visibone_2.gpl
@@ -1641,6 +1664,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpwidgets
+@dirrm %%DOCSDIR%%/libgimpthumb
 @dirrm %%DOCSDIR%%/libgimpmodule
 @dirrm %%DOCSDIR%%/libgimpmath
 @dirrm %%DOCSDIR%%/libgimpcolor
@@ -1677,6 +1701,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm libexec/gimp/1.3
 @dirrm libexec/gimp
 @dirrm include/gimp-1.3/libgimpwidgets
+@dirrm include/gimp-1.3/libgimpthumb
 @dirrm include/gimp-1.3/libgimpmodule
 @dirrm include/gimp-1.3/libgimpmath
 @dirrm include/gimp-1.3/libgimpcolor
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index e7bf43e18972..529d73084ca2 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.3.23
-PORTREVISION=	1
+PORTVERSION=	2.0.pre1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+#MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/testing
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.pre/pre/}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program (unstable development version)
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 24a65f1470fa..5d706e75122b 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.3.23.tar.bz2) = 1f30a6979d62241915964db034c4f306
+MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
diff --git a/graphics/gimp/files/patch-app_core_gimpimage-contiguous-region.c b/graphics/gimp/files/patch-app_core_gimpimage-contiguous-region.c
new file mode 100644
index 000000000000..3a2dd2af0b86
--- /dev/null
+++ b/graphics/gimp/files/patch-app_core_gimpimage-contiguous-region.c
@@ -0,0 +1,11 @@
+--- app/core/gimpimage-contiguous-region.c.orig	Wed Jan  7 15:13:01 2004
++++ app/core/gimpimage-contiguous-region.c	Wed Jan  7 15:20:20 2004
+@@ -416,7 +416,7 @@
+   guchar *m;
+   guchar  s_color[MAX_CHANNELS];
+   guchar  diff;
+-  gint    col_bytes = bytes;;
++  gint    col_bytes = bytes;
+   Tile   *s_tile    = NULL;
+   Tile   *m_tile    = NULL;
+ 
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 14c93f02dfb2..db907126b195 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -45,8 +45,6 @@ include/gimp-1.3/libgimp/gimpmenu.h
 include/gimp-1.3/libgimp/gimpmessage_pdb.h
 include/gimp-1.3/libgimp/gimpmisc.h
 include/gimp-1.3/libgimp/gimpmisc_pdb.h
-include/gimp-1.3/libgimp/gimpmisctools_pdb.h
-include/gimp-1.3/libgimp/gimpmiscui.h
 include/gimp-1.3/libgimp/gimppainttools_pdb.h
 include/gimp-1.3/libgimp/gimppalettes_pdb.h
 include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
@@ -99,6 +97,12 @@ include/gimp-1.3/libgimpmath/gimpvector.h
 include/gimp-1.3/libgimpmodule/gimpmodule.h
 include/gimp-1.3/libgimpmodule/gimpmoduledb.h
 include/gimp-1.3/libgimpmodule/gimpmoduletypes.h
+include/gimp-1.3/libgimpthumb/gimpthumb-enums.h
+include/gimp-1.3/libgimpthumb/gimpthumb-error.h
+include/gimp-1.3/libgimpthumb/gimpthumb-types.h
+include/gimp-1.3/libgimpthumb/gimpthumb-utils.h
+include/gimp-1.3/libgimpthumb/gimpthumb.h
+include/gimp-1.3/libgimpthumb/gimpthumbnail.h
 include/gimp-1.3/libgimpwidgets/gimpbutton.h
 include/gimp-1.3/libgimpwidgets/gimpchainbutton.h
 include/gimp-1.3/libgimpwidgets/gimpcolorarea.h
@@ -140,6 +144,9 @@ lib/libgimpmath-1.3.so.%%SHLIBVER%%
 lib/libgimpmodule-1.3.a
 lib/libgimpmodule-1.3.so
 lib/libgimpmodule-1.3.so.%%SHLIBVER%%
+lib/libgimpthumb-1.3.a
+lib/libgimpthumb-1.3.so
+lib/libgimpthumb-1.3.so.%%SHLIBVER%%
 lib/libgimpui-1.3.a
 lib/libgimpui-1.3.so
 lib/libgimpui-1.3.so.%%SHLIBVER%%
@@ -147,6 +154,7 @@ lib/libgimpwidgets-1.3.a
 lib/libgimpwidgets-1.3.so
 lib/libgimpwidgets-1.3.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-1.3.pc
+libdata/pkgconfig/gimpthumb-1.3.pc
 libdata/pkgconfig/gimpui-1.3.pc
 libexec/gimp/1.3/environ/default.env
 %%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
@@ -178,6 +186,7 @@ libexec/gimp/1.3/plug-ins/bumpmap
 libexec/gimp/1.3/plug-ins/bz2
 libexec/gimp/1.3/plug-ins/c_astretch
 libexec/gimp/1.3/plug-ins/ccanalyze
+libexec/gimp/1.3/plug-ins/channel_mixer
 libexec/gimp/1.3/plug-ins/checkerboard
 %%PYTHON:%%libexec/gimp/1.3/plug-ins/clothify.py
 libexec/gimp/1.3/plug-ins/color_enhance
@@ -447,6 +456,18 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpmodule/libgimpmodule.html
 %%DOCSDIR%%/libgimpmodule/right.png
 %%DOCSDIR%%/libgimpmodule/up.png
+%%DOCSDIR%%/libgimpthumb/GimpThumbnail.html
+%%DOCSDIR%%/libgimpthumb/home.png
+%%DOCSDIR%%/libgimpthumb/index.html
+%%DOCSDIR%%/libgimpthumb/index.sgml
+%%DOCSDIR%%/libgimpthumb/left.png
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-enums.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.html
+%%DOCSDIR%%/libgimpthumb/right.png
+%%DOCSDIR%%/libgimpthumb/up.png
 %%DOCSDIR%%/libgimpwidgets/GimpButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpChainButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorArea.html
@@ -1049,6 +1070,8 @@ share/gimp/palettes/Plasma.gpl
 share/gimp/palettes/Reds.gpl
 share/gimp/palettes/Reds_And_Purples.gpl
 share/gimp/palettes/Royal.gpl
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
 share/gimp/palettes/Topographic.gpl
 share/gimp/palettes/Visibone.gpl
 share/gimp/palettes/Visibone_2.gpl
@@ -1641,6 +1664,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpwidgets
+@dirrm %%DOCSDIR%%/libgimpthumb
 @dirrm %%DOCSDIR%%/libgimpmodule
 @dirrm %%DOCSDIR%%/libgimpmath
 @dirrm %%DOCSDIR%%/libgimpcolor
@@ -1677,6 +1701,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm libexec/gimp/1.3
 @dirrm libexec/gimp
 @dirrm include/gimp-1.3/libgimpwidgets
+@dirrm include/gimp-1.3/libgimpthumb
 @dirrm include/gimp-1.3/libgimpmodule
 @dirrm include/gimp-1.3/libgimpmath
 @dirrm include/gimp-1.3/libgimpcolor
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index e7bf43e18972..529d73084ca2 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	1.3.23
-PORTREVISION=	1
+PORTVERSION=	2.0.pre1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+#MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/v${PORTVERSION}
+MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/testing
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.pre/pre/}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program (unstable development version)
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 24a65f1470fa..5d706e75122b 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.3.23.tar.bz2) = 1f30a6979d62241915964db034c4f306
+MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
diff --git a/graphics/gimpshop/files/patch-app_core_gimpimage-contiguous-region.c b/graphics/gimpshop/files/patch-app_core_gimpimage-contiguous-region.c
new file mode 100644
index 000000000000..3a2dd2af0b86
--- /dev/null
+++ b/graphics/gimpshop/files/patch-app_core_gimpimage-contiguous-region.c
@@ -0,0 +1,11 @@
+--- app/core/gimpimage-contiguous-region.c.orig	Wed Jan  7 15:13:01 2004
++++ app/core/gimpimage-contiguous-region.c	Wed Jan  7 15:20:20 2004
+@@ -416,7 +416,7 @@
+   guchar *m;
+   guchar  s_color[MAX_CHANNELS];
+   guchar  diff;
+-  gint    col_bytes = bytes;;
++  gint    col_bytes = bytes;
+   Tile   *s_tile    = NULL;
+   Tile   *m_tile    = NULL;
+ 
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 14c93f02dfb2..db907126b195 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -45,8 +45,6 @@ include/gimp-1.3/libgimp/gimpmenu.h
 include/gimp-1.3/libgimp/gimpmessage_pdb.h
 include/gimp-1.3/libgimp/gimpmisc.h
 include/gimp-1.3/libgimp/gimpmisc_pdb.h
-include/gimp-1.3/libgimp/gimpmisctools_pdb.h
-include/gimp-1.3/libgimp/gimpmiscui.h
 include/gimp-1.3/libgimp/gimppainttools_pdb.h
 include/gimp-1.3/libgimp/gimppalettes_pdb.h
 include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
@@ -99,6 +97,12 @@ include/gimp-1.3/libgimpmath/gimpvector.h
 include/gimp-1.3/libgimpmodule/gimpmodule.h
 include/gimp-1.3/libgimpmodule/gimpmoduledb.h
 include/gimp-1.3/libgimpmodule/gimpmoduletypes.h
+include/gimp-1.3/libgimpthumb/gimpthumb-enums.h
+include/gimp-1.3/libgimpthumb/gimpthumb-error.h
+include/gimp-1.3/libgimpthumb/gimpthumb-types.h
+include/gimp-1.3/libgimpthumb/gimpthumb-utils.h
+include/gimp-1.3/libgimpthumb/gimpthumb.h
+include/gimp-1.3/libgimpthumb/gimpthumbnail.h
 include/gimp-1.3/libgimpwidgets/gimpbutton.h
 include/gimp-1.3/libgimpwidgets/gimpchainbutton.h
 include/gimp-1.3/libgimpwidgets/gimpcolorarea.h
@@ -140,6 +144,9 @@ lib/libgimpmath-1.3.so.%%SHLIBVER%%
 lib/libgimpmodule-1.3.a
 lib/libgimpmodule-1.3.so
 lib/libgimpmodule-1.3.so.%%SHLIBVER%%
+lib/libgimpthumb-1.3.a
+lib/libgimpthumb-1.3.so
+lib/libgimpthumb-1.3.so.%%SHLIBVER%%
 lib/libgimpui-1.3.a
 lib/libgimpui-1.3.so
 lib/libgimpui-1.3.so.%%SHLIBVER%%
@@ -147,6 +154,7 @@ lib/libgimpwidgets-1.3.a
 lib/libgimpwidgets-1.3.so
 lib/libgimpwidgets-1.3.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-1.3.pc
+libdata/pkgconfig/gimpthumb-1.3.pc
 libdata/pkgconfig/gimpui-1.3.pc
 libexec/gimp/1.3/environ/default.env
 %%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
@@ -178,6 +186,7 @@ libexec/gimp/1.3/plug-ins/bumpmap
 libexec/gimp/1.3/plug-ins/bz2
 libexec/gimp/1.3/plug-ins/c_astretch
 libexec/gimp/1.3/plug-ins/ccanalyze
+libexec/gimp/1.3/plug-ins/channel_mixer
 libexec/gimp/1.3/plug-ins/checkerboard
 %%PYTHON:%%libexec/gimp/1.3/plug-ins/clothify.py
 libexec/gimp/1.3/plug-ins/color_enhance
@@ -447,6 +456,18 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpmodule/libgimpmodule.html
 %%DOCSDIR%%/libgimpmodule/right.png
 %%DOCSDIR%%/libgimpmodule/up.png
+%%DOCSDIR%%/libgimpthumb/GimpThumbnail.html
+%%DOCSDIR%%/libgimpthumb/home.png
+%%DOCSDIR%%/libgimpthumb/index.html
+%%DOCSDIR%%/libgimpthumb/index.sgml
+%%DOCSDIR%%/libgimpthumb/left.png
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-enums.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-error.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb-gimpthumb-utils.html
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.devhelp
+%%DOCSDIR%%/libgimpthumb/libgimpthumb.html
+%%DOCSDIR%%/libgimpthumb/right.png
+%%DOCSDIR%%/libgimpthumb/up.png
 %%DOCSDIR%%/libgimpwidgets/GimpButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpChainButton.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorArea.html
@@ -1049,6 +1070,8 @@ share/gimp/palettes/Plasma.gpl
 share/gimp/palettes/Reds.gpl
 share/gimp/palettes/Reds_And_Purples.gpl
 share/gimp/palettes/Royal.gpl
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
 share/gimp/palettes/Topographic.gpl
 share/gimp/palettes/Visibone.gpl
 share/gimp/palettes/Visibone_2.gpl
@@ -1641,6 +1664,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpwidgets
+@dirrm %%DOCSDIR%%/libgimpthumb
 @dirrm %%DOCSDIR%%/libgimpmodule
 @dirrm %%DOCSDIR%%/libgimpmath
 @dirrm %%DOCSDIR%%/libgimpcolor
@@ -1677,6 +1701,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm libexec/gimp/1.3
 @dirrm libexec/gimp
 @dirrm include/gimp-1.3/libgimpwidgets
+@dirrm include/gimp-1.3/libgimpthumb
 @dirrm include/gimp-1.3/libgimpmodule
 @dirrm include/gimp-1.3/libgimpmath
 @dirrm include/gimp-1.3/libgimpcolor