aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/gimp-app-devel/Makefile4
-rw-r--r--graphics/gimp-app-devel/distinfo2
-rw-r--r--graphics/gimp-app-devel/files/patch-app_core_gimpimage-contiguous-region.c11
-rw-r--r--graphics/gimp-app-devel/files/patch-gimptool-2.0.in (renamed from graphics/gimp-devel/files/patch-gimptool-1.3.in)4
-rw-r--r--graphics/gimp-app-devel/pkg-plist55
-rw-r--r--graphics/gimp-app/Makefile4
-rw-r--r--graphics/gimp-app/distinfo2
-rw-r--r--graphics/gimp-app/files/patch-app_core_gimpimage-contiguous-region.c11
-rw-r--r--graphics/gimp-app/files/patch-gimptool-2.0.in29
-rw-r--r--graphics/gimp-app/pkg-plist55
-rw-r--r--graphics/gimp-devel/Makefile4
-rw-r--r--graphics/gimp-devel/distinfo2
-rw-r--r--graphics/gimp-devel/files/patch-app_core_gimpimage-contiguous-region.c11
-rw-r--r--graphics/gimp-devel/files/patch-gimptool-2.0.in (renamed from graphics/gimp-app-devel/files/patch-gimptool-1.3.in)4
-rw-r--r--graphics/gimp-devel/pkg-plist55
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gimp/distinfo2
-rw-r--r--graphics/gimp/files/patch-app_core_gimpimage-contiguous-region.c11
-rw-r--r--graphics/gimp/files/patch-gimptool-2.0.in (renamed from graphics/gimp-app/files/patch-gimptool-1.3.in)6
-rw-r--r--graphics/gimp/pkg-plist55
-rw-r--r--graphics/gimpshop/Makefile4
-rw-r--r--graphics/gimpshop/distinfo2
-rw-r--r--graphics/gimpshop/files/patch-app_core_gimpimage-contiguous-region.c11
-rw-r--r--graphics/gimpshop/files/patch-gimptool-1.3.in29
-rw-r--r--graphics/gimpshop/files/patch-gimptool-2.0.in (renamed from graphics/gimp/files/patch-gimptool-1.3.in)4
-rw-r--r--graphics/gimpshop/pkg-plist55
26 files changed, 198 insertions, 238 deletions
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index c24efacd50b3..6077f19ee374 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 2.0.pre1
+PORTVERSION= 2.0.pre2
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -50,7 +50,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GIMP_DISTFILE= ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-MAN1= gimp-1.3.1 gimptool-1.3.1 gimp-remote-1.3.1
+MAN1= gimp-1.3.1 gimptool-2.0.1 gimp-remote-1.3.1
MAN5= gimprc-1.3.5
.if defined(WITH_PYTHON)
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 5d706e75122b..952287d4dc20 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
+MD5 (gimp-2.0pre2.tar.bz2) = 97898e176c5753269fc869cbe9590517
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
deleted file mode 100644
index 3a2dd2af0b86..000000000000
--- a/graphics/gimp-app-devel/files/patch-app_core_gimpimage-contiguous-region.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-gimptool-1.3.in b/graphics/gimp-app-devel/files/patch-gimptool-2.0.in
index a79ae307827d..bb5c013c578e 100644
--- a/graphics/gimp-devel/files/patch-gimptool-1.3.in
+++ b/graphics/gimp-app-devel/files/patch-gimptool-2.0.in
@@ -1,8 +1,8 @@
$FreeBSD$
---- gimptool-1.3.in.orig Tue Jan 15 12:21:05 2002
-+++ gimptool-1.3.in Fri May 17 20:46:18 2002
+--- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002
++++ gimptool-2.0.in Fri May 17 20:46:18 2002
@@ -215,19 +215,19 @@
| --uninstall-script | --uninstall-admin-script )
case $1 in
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index db907126b195..deba9c10f661 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,6 +1,6 @@
bin/gimp-1.3
bin/gimp-remote-1.3
-bin/gimptool-1.3
+bin/gimptool-2.0
etc/gimp/1.3/gimprc
etc/gimp/1.3/gtkrc
etc/gimp/1.3/ps-menurc
@@ -31,8 +31,8 @@ include/gimp-1.3/libgimp/gimpfonts_pdb.h
include/gimp-1.3/libgimp/gimpfontselect.h
include/gimp-1.3/libgimp/gimpfontselect_pdb.h
include/gimp-1.3/libgimp/gimpgimprc_pdb.h
-include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientmenu.h
+include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientselect.h
include/gimp-1.3/libgimp/gimpgradientselect_pdb.h
include/gimp-1.3/libgimp/gimpguides_pdb.h
@@ -43,22 +43,23 @@ include/gimp-1.3/libgimp/gimplayer.h
include/gimp-1.3/libgimp/gimplayer_pdb.h
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/gimppainttools_pdb.h
+include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimppalettes_pdb.h
include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
-include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimpparasite_pdb.h
include/gimp-1.3/libgimp/gimppaths_pdb.h
-include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternmenu.h
+include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternselect.h
include/gimp-1.3/libgimp/gimppatternselect_pdb.h
+include/gimp-1.3/libgimp/gimppixelfetcher.h
include/gimp-1.3/libgimp/gimppixelrgn.h
include/gimp-1.3/libgimp/gimpplugin_pdb.h
include/gimp-1.3/libgimp/gimpproceduraldb.h
include/gimp-1.3/libgimp/gimpproceduraldb_pdb.h
+include/gimp-1.3/libgimp/gimpregioniterator.h
include/gimp-1.3/libgimp/gimpselection.h
include/gimp-1.3/libgimp/gimpselection_pdb.h
include/gimp-1.3/libgimp/gimpselectiontools_pdb.h
@@ -153,9 +154,9 @@ lib/libgimpui-1.3.so.%%SHLIBVER%%
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
+libdata/pkgconfig/gimp-2.0.pc
+libdata/pkgconfig/gimpthumb-2.0.pc
+libdata/pkgconfig/gimpui-2.0.pc
libexec/gimp/1.3/environ/default.env
%%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
libexec/gimp/1.3/modules/libcdisplay_colorblind.so
@@ -370,11 +371,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpfileops.html
%%DOCSDIR%%/libgimp/libgimp-gimpfloatingsel.html
%%DOCSDIR%%/libgimp/libgimp-gimpfontmenu.html
-%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpfonts.html
+%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpgimprc.html
-%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpguides.html
%%DOCSDIR%%/libgimp/libgimp-gimphelp.html
@@ -383,12 +384,14 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpmenu.html
%%DOCSDIR%%/libgimp/libgimp-gimpmessage.html
%%DOCSDIR%%/libgimp/libgimp-gimppalette.html
-%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternselect.html
+%%DOCSDIR%%/libgimp/libgimp-gimppixelfetcher.html
%%DOCSDIR%%/libgimp/libgimp-gimppixelrgn.html
%%DOCSDIR%%/libgimp/libgimp-gimpplugin.html
%%DOCSDIR%%/libgimp/libgimp-gimpproceduraldb.html
+%%DOCSDIR%%/libgimp/libgimp-gimpregioniterator.html
%%DOCSDIR%%/libgimp/libgimp-gimpselection.html
%%DOCSDIR%%/libgimp/libgimp-gimptexttool.html
%%DOCSDIR%%/libgimp/libgimp-gimptile.html
@@ -426,8 +429,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpcolor/left.png
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpBilinear.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpCMYK.html
+%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpHSV.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpRGB.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor.devhelp
@@ -508,11 +511,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-round-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-square-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-16.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-48.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-alpha-16.png
@@ -535,6 +535,9 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-48.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-close-12.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-black-18.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-gray-18.png
@@ -603,11 +606,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-landscape-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-to-imagesize-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-letter-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-line-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-linked-12.png
@@ -621,16 +624,16 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-navigation-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-as-new-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-into-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-22.png
+%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
%%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
%%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-reset-16.png
%%DOCSDIR%%/libgimpwidgets/stock-reshow-filter-16.png
%%DOCSDIR%%/libgimpwidgets/stock-resize-16.png
@@ -1070,8 +1073,6 @@ 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
@@ -1081,6 +1082,8 @@ share/gimp/palettes/Web.gpl
share/gimp/patterns/3dgreen.pat
share/gimp/patterns/Craters.pat
share/gimp/patterns/Moonfoot.pat
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
share/gimp/patterns/amethyst.pat
share/gimp/patterns/bark.pat
share/gimp/patterns/blue.pat
@@ -1266,11 +1269,8 @@ share/gimp/themes/Default/images/stock-anchor-16.png
share/gimp/themes/Default/images/stock-cap-butt-16.png
share/gimp/themes/Default/images/stock-cap-round-16.png
share/gimp/themes/Default/images/stock-cap-square-16.png
-share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-channel-16.png
share/gimp/themes/Default/images/stock-channel-24.png
-share/gimp/themes/Default/images/stock-channels-16.png
-share/gimp/themes/Default/images/stock-channels-24.png
share/gimp/themes/Default/images/stock-channel-32.png
share/gimp/themes/Default/images/stock-channel-48.png
share/gimp/themes/Default/images/stock-channel-alpha-16.png
@@ -1293,6 +1293,9 @@ share/gimp/themes/Default/images/stock-channel-red-16.png
share/gimp/themes/Default/images/stock-channel-red-24.png
share/gimp/themes/Default/images/stock-channel-red-32.png
share/gimp/themes/Default/images/stock-channel-red-48.png
+share/gimp/themes/Default/images/stock-channels-16.png
+share/gimp/themes/Default/images/stock-channels-24.png
+share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-close-12.png
share/gimp/themes/Default/images/stock-color-picker-black-18.png
share/gimp/themes/Default/images/stock-color-picker-gray-18.png
@@ -1363,7 +1366,6 @@ share/gimp/themes/Default/images/stock-layer-16.png
share/gimp/themes/Default/images/stock-layer-24.png
share/gimp/themes/Default/images/stock-layer-32.png
share/gimp/themes/Default/images/stock-layer-48.png
-share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-layer-to-imagesize-16.png
share/gimp/themes/Default/images/stock-layers-16.png
share/gimp/themes/Default/images/stock-layers-24.png
@@ -1371,6 +1373,7 @@ share/gimp/themes/Default/images/stock-letter-spacing-22.png
share/gimp/themes/Default/images/stock-line-spacing-22.png
share/gimp/themes/Default/images/stock-linked-12.png
share/gimp/themes/Default/images/stock-linked-20.png
+share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-menu-left-12.png
share/gimp/themes/Default/images/stock-menu-right-12.png
share/gimp/themes/Default/images/stock-merge-down-16.png
@@ -1379,9 +1382,9 @@ share/gimp/themes/Default/images/stock-move-to-screen-24.png
share/gimp/themes/Default/images/stock-navigation-16.png
share/gimp/themes/Default/images/stock-paste-as-new-16.png
share/gimp/themes/Default/images/stock-paste-into-16.png
-share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-path-16.png
share/gimp/themes/Default/images/stock-path-22.png
+share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-paths-16.png
share/gimp/themes/Default/images/stock-paths-22.png
share/gimp/themes/Default/images/stock-plugin-16.png
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index c24efacd50b3..6077f19ee374 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 2.0.pre1
+PORTVERSION= 2.0.pre2
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -50,7 +50,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GIMP_DISTFILE= ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-MAN1= gimp-1.3.1 gimptool-1.3.1 gimp-remote-1.3.1
+MAN1= gimp-1.3.1 gimptool-2.0.1 gimp-remote-1.3.1
MAN5= gimprc-1.3.5
.if defined(WITH_PYTHON)
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 5d706e75122b..952287d4dc20 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
+MD5 (gimp-2.0pre2.tar.bz2) = 97898e176c5753269fc869cbe9590517
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
deleted file mode 100644
index 3a2dd2af0b86..000000000000
--- a/graphics/gimp-app/files/patch-app_core_gimpimage-contiguous-region.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-gimptool-2.0.in b/graphics/gimp-app/files/patch-gimptool-2.0.in
new file mode 100644
index 000000000000..776632d73c8b
--- /dev/null
+++ b/graphics/gimp-app/files/patch-gimptool-2.0.in
@@ -0,0 +1,29 @@
+
+$FreeBSD: /tmp/pcvs/ports/graphics/gimp-app/files/Attic/patch-gimptool-2.0.in,v 1.1 2004-01-20 08:26:58 bland Exp $
+
+--- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002
++++ gimptool-2.0.in Fri May 17 20:46:18 2002
+@@ -215,19 +215,19 @@
+ | --uninstall-script | --uninstall-admin-script )
+ case $1 in
+ --*install-bin)
+- install_cmd="@INSTALL_PROGRAM@"
++ install_cmd="@INSTALL_SCRIPT@"
+ install_dir="$HOME/@gimpdir@/plug-ins"
+ ;;
+ --install-bin-strip)
+- install_cmd="@INSTALL_PROGRAM@ -s"
++ install_cmd="@INSTALL_SCRIPT@ -s"
+ install_dir="$HOME/@gimpdir@/plug-ins"
+ ;;
+ --*install-admin-bin)
+- install_cmd="@INSTALL_PROGRAM@"
++ install_cmd="@INSTALL_SCRIPT@"
+ install_dir="$gimpplugindir/plug-ins"
+ ;;
+ --install-admin-bin-strip)
+- install_cmd="@INSTALL_PROGRAM@ -s"
++ install_cmd="@INSTALL_SCRIPT@ -s"
+ install_dir="$gimpplugindir/plug-ins"
+ ;;
+ --*install-script)
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index db907126b195..deba9c10f661 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,6 +1,6 @@
bin/gimp-1.3
bin/gimp-remote-1.3
-bin/gimptool-1.3
+bin/gimptool-2.0
etc/gimp/1.3/gimprc
etc/gimp/1.3/gtkrc
etc/gimp/1.3/ps-menurc
@@ -31,8 +31,8 @@ include/gimp-1.3/libgimp/gimpfonts_pdb.h
include/gimp-1.3/libgimp/gimpfontselect.h
include/gimp-1.3/libgimp/gimpfontselect_pdb.h
include/gimp-1.3/libgimp/gimpgimprc_pdb.h
-include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientmenu.h
+include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientselect.h
include/gimp-1.3/libgimp/gimpgradientselect_pdb.h
include/gimp-1.3/libgimp/gimpguides_pdb.h
@@ -43,22 +43,23 @@ include/gimp-1.3/libgimp/gimplayer.h
include/gimp-1.3/libgimp/gimplayer_pdb.h
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/gimppainttools_pdb.h
+include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimppalettes_pdb.h
include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
-include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimpparasite_pdb.h
include/gimp-1.3/libgimp/gimppaths_pdb.h
-include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternmenu.h
+include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternselect.h
include/gimp-1.3/libgimp/gimppatternselect_pdb.h
+include/gimp-1.3/libgimp/gimppixelfetcher.h
include/gimp-1.3/libgimp/gimppixelrgn.h
include/gimp-1.3/libgimp/gimpplugin_pdb.h
include/gimp-1.3/libgimp/gimpproceduraldb.h
include/gimp-1.3/libgimp/gimpproceduraldb_pdb.h
+include/gimp-1.3/libgimp/gimpregioniterator.h
include/gimp-1.3/libgimp/gimpselection.h
include/gimp-1.3/libgimp/gimpselection_pdb.h
include/gimp-1.3/libgimp/gimpselectiontools_pdb.h
@@ -153,9 +154,9 @@ lib/libgimpui-1.3.so.%%SHLIBVER%%
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
+libdata/pkgconfig/gimp-2.0.pc
+libdata/pkgconfig/gimpthumb-2.0.pc
+libdata/pkgconfig/gimpui-2.0.pc
libexec/gimp/1.3/environ/default.env
%%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
libexec/gimp/1.3/modules/libcdisplay_colorblind.so
@@ -370,11 +371,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpfileops.html
%%DOCSDIR%%/libgimp/libgimp-gimpfloatingsel.html
%%DOCSDIR%%/libgimp/libgimp-gimpfontmenu.html
-%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpfonts.html
+%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpgimprc.html
-%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpguides.html
%%DOCSDIR%%/libgimp/libgimp-gimphelp.html
@@ -383,12 +384,14 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpmenu.html
%%DOCSDIR%%/libgimp/libgimp-gimpmessage.html
%%DOCSDIR%%/libgimp/libgimp-gimppalette.html
-%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternselect.html
+%%DOCSDIR%%/libgimp/libgimp-gimppixelfetcher.html
%%DOCSDIR%%/libgimp/libgimp-gimppixelrgn.html
%%DOCSDIR%%/libgimp/libgimp-gimpplugin.html
%%DOCSDIR%%/libgimp/libgimp-gimpproceduraldb.html
+%%DOCSDIR%%/libgimp/libgimp-gimpregioniterator.html
%%DOCSDIR%%/libgimp/libgimp-gimpselection.html
%%DOCSDIR%%/libgimp/libgimp-gimptexttool.html
%%DOCSDIR%%/libgimp/libgimp-gimptile.html
@@ -426,8 +429,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpcolor/left.png
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpBilinear.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpCMYK.html
+%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpHSV.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpRGB.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor.devhelp
@@ -508,11 +511,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-round-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-square-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-16.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-48.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-alpha-16.png
@@ -535,6 +535,9 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-48.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-close-12.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-black-18.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-gray-18.png
@@ -603,11 +606,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-landscape-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-to-imagesize-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-letter-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-line-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-linked-12.png
@@ -621,16 +624,16 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-navigation-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-as-new-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-into-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-22.png
+%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
%%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
%%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-reset-16.png
%%DOCSDIR%%/libgimpwidgets/stock-reshow-filter-16.png
%%DOCSDIR%%/libgimpwidgets/stock-resize-16.png
@@ -1070,8 +1073,6 @@ 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
@@ -1081,6 +1082,8 @@ share/gimp/palettes/Web.gpl
share/gimp/patterns/3dgreen.pat
share/gimp/patterns/Craters.pat
share/gimp/patterns/Moonfoot.pat
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
share/gimp/patterns/amethyst.pat
share/gimp/patterns/bark.pat
share/gimp/patterns/blue.pat
@@ -1266,11 +1269,8 @@ share/gimp/themes/Default/images/stock-anchor-16.png
share/gimp/themes/Default/images/stock-cap-butt-16.png
share/gimp/themes/Default/images/stock-cap-round-16.png
share/gimp/themes/Default/images/stock-cap-square-16.png
-share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-channel-16.png
share/gimp/themes/Default/images/stock-channel-24.png
-share/gimp/themes/Default/images/stock-channels-16.png
-share/gimp/themes/Default/images/stock-channels-24.png
share/gimp/themes/Default/images/stock-channel-32.png
share/gimp/themes/Default/images/stock-channel-48.png
share/gimp/themes/Default/images/stock-channel-alpha-16.png
@@ -1293,6 +1293,9 @@ share/gimp/themes/Default/images/stock-channel-red-16.png
share/gimp/themes/Default/images/stock-channel-red-24.png
share/gimp/themes/Default/images/stock-channel-red-32.png
share/gimp/themes/Default/images/stock-channel-red-48.png
+share/gimp/themes/Default/images/stock-channels-16.png
+share/gimp/themes/Default/images/stock-channels-24.png
+share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-close-12.png
share/gimp/themes/Default/images/stock-color-picker-black-18.png
share/gimp/themes/Default/images/stock-color-picker-gray-18.png
@@ -1363,7 +1366,6 @@ share/gimp/themes/Default/images/stock-layer-16.png
share/gimp/themes/Default/images/stock-layer-24.png
share/gimp/themes/Default/images/stock-layer-32.png
share/gimp/themes/Default/images/stock-layer-48.png
-share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-layer-to-imagesize-16.png
share/gimp/themes/Default/images/stock-layers-16.png
share/gimp/themes/Default/images/stock-layers-24.png
@@ -1371,6 +1373,7 @@ share/gimp/themes/Default/images/stock-letter-spacing-22.png
share/gimp/themes/Default/images/stock-line-spacing-22.png
share/gimp/themes/Default/images/stock-linked-12.png
share/gimp/themes/Default/images/stock-linked-20.png
+share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-menu-left-12.png
share/gimp/themes/Default/images/stock-menu-right-12.png
share/gimp/themes/Default/images/stock-merge-down-16.png
@@ -1379,9 +1382,9 @@ share/gimp/themes/Default/images/stock-move-to-screen-24.png
share/gimp/themes/Default/images/stock-navigation-16.png
share/gimp/themes/Default/images/stock-paste-as-new-16.png
share/gimp/themes/Default/images/stock-paste-into-16.png
-share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-path-16.png
share/gimp/themes/Default/images/stock-path-22.png
+share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-paths-16.png
share/gimp/themes/Default/images/stock-paths-22.png
share/gimp/themes/Default/images/stock-plugin-16.png
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index c24efacd50b3..6077f19ee374 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 2.0.pre1
+PORTVERSION= 2.0.pre2
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -50,7 +50,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GIMP_DISTFILE= ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-MAN1= gimp-1.3.1 gimptool-1.3.1 gimp-remote-1.3.1
+MAN1= gimp-1.3.1 gimptool-2.0.1 gimp-remote-1.3.1
MAN5= gimprc-1.3.5
.if defined(WITH_PYTHON)
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 5d706e75122b..952287d4dc20 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
+MD5 (gimp-2.0pre2.tar.bz2) = 97898e176c5753269fc869cbe9590517
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
deleted file mode 100644
index 3a2dd2af0b86..000000000000
--- a/graphics/gimp-devel/files/patch-app_core_gimpimage-contiguous-region.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-gimptool-1.3.in b/graphics/gimp-devel/files/patch-gimptool-2.0.in
index a79ae307827d..bb5c013c578e 100644
--- a/graphics/gimp-app-devel/files/patch-gimptool-1.3.in
+++ b/graphics/gimp-devel/files/patch-gimptool-2.0.in
@@ -1,8 +1,8 @@
$FreeBSD$
---- gimptool-1.3.in.orig Tue Jan 15 12:21:05 2002
-+++ gimptool-1.3.in Fri May 17 20:46:18 2002
+--- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002
++++ gimptool-2.0.in Fri May 17 20:46:18 2002
@@ -215,19 +215,19 @@
| --uninstall-script | --uninstall-admin-script )
case $1 in
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index db907126b195..deba9c10f661 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -1,6 +1,6 @@
bin/gimp-1.3
bin/gimp-remote-1.3
-bin/gimptool-1.3
+bin/gimptool-2.0
etc/gimp/1.3/gimprc
etc/gimp/1.3/gtkrc
etc/gimp/1.3/ps-menurc
@@ -31,8 +31,8 @@ include/gimp-1.3/libgimp/gimpfonts_pdb.h
include/gimp-1.3/libgimp/gimpfontselect.h
include/gimp-1.3/libgimp/gimpfontselect_pdb.h
include/gimp-1.3/libgimp/gimpgimprc_pdb.h
-include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientmenu.h
+include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientselect.h
include/gimp-1.3/libgimp/gimpgradientselect_pdb.h
include/gimp-1.3/libgimp/gimpguides_pdb.h
@@ -43,22 +43,23 @@ include/gimp-1.3/libgimp/gimplayer.h
include/gimp-1.3/libgimp/gimplayer_pdb.h
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/gimppainttools_pdb.h
+include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimppalettes_pdb.h
include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
-include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimpparasite_pdb.h
include/gimp-1.3/libgimp/gimppaths_pdb.h
-include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternmenu.h
+include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternselect.h
include/gimp-1.3/libgimp/gimppatternselect_pdb.h
+include/gimp-1.3/libgimp/gimppixelfetcher.h
include/gimp-1.3/libgimp/gimppixelrgn.h
include/gimp-1.3/libgimp/gimpplugin_pdb.h
include/gimp-1.3/libgimp/gimpproceduraldb.h
include/gimp-1.3/libgimp/gimpproceduraldb_pdb.h
+include/gimp-1.3/libgimp/gimpregioniterator.h
include/gimp-1.3/libgimp/gimpselection.h
include/gimp-1.3/libgimp/gimpselection_pdb.h
include/gimp-1.3/libgimp/gimpselectiontools_pdb.h
@@ -153,9 +154,9 @@ lib/libgimpui-1.3.so.%%SHLIBVER%%
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
+libdata/pkgconfig/gimp-2.0.pc
+libdata/pkgconfig/gimpthumb-2.0.pc
+libdata/pkgconfig/gimpui-2.0.pc
libexec/gimp/1.3/environ/default.env
%%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
libexec/gimp/1.3/modules/libcdisplay_colorblind.so
@@ -370,11 +371,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpfileops.html
%%DOCSDIR%%/libgimp/libgimp-gimpfloatingsel.html
%%DOCSDIR%%/libgimp/libgimp-gimpfontmenu.html
-%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpfonts.html
+%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpgimprc.html
-%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpguides.html
%%DOCSDIR%%/libgimp/libgimp-gimphelp.html
@@ -383,12 +384,14 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpmenu.html
%%DOCSDIR%%/libgimp/libgimp-gimpmessage.html
%%DOCSDIR%%/libgimp/libgimp-gimppalette.html
-%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternselect.html
+%%DOCSDIR%%/libgimp/libgimp-gimppixelfetcher.html
%%DOCSDIR%%/libgimp/libgimp-gimppixelrgn.html
%%DOCSDIR%%/libgimp/libgimp-gimpplugin.html
%%DOCSDIR%%/libgimp/libgimp-gimpproceduraldb.html
+%%DOCSDIR%%/libgimp/libgimp-gimpregioniterator.html
%%DOCSDIR%%/libgimp/libgimp-gimpselection.html
%%DOCSDIR%%/libgimp/libgimp-gimptexttool.html
%%DOCSDIR%%/libgimp/libgimp-gimptile.html
@@ -426,8 +429,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpcolor/left.png
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpBilinear.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpCMYK.html
+%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpHSV.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpRGB.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor.devhelp
@@ -508,11 +511,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-round-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-square-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-16.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-48.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-alpha-16.png
@@ -535,6 +535,9 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-48.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-close-12.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-black-18.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-gray-18.png
@@ -603,11 +606,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-landscape-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-to-imagesize-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-letter-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-line-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-linked-12.png
@@ -621,16 +624,16 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-navigation-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-as-new-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-into-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-22.png
+%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
%%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
%%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-reset-16.png
%%DOCSDIR%%/libgimpwidgets/stock-reshow-filter-16.png
%%DOCSDIR%%/libgimpwidgets/stock-resize-16.png
@@ -1070,8 +1073,6 @@ 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
@@ -1081,6 +1082,8 @@ share/gimp/palettes/Web.gpl
share/gimp/patterns/3dgreen.pat
share/gimp/patterns/Craters.pat
share/gimp/patterns/Moonfoot.pat
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
share/gimp/patterns/amethyst.pat
share/gimp/patterns/bark.pat
share/gimp/patterns/blue.pat
@@ -1266,11 +1269,8 @@ share/gimp/themes/Default/images/stock-anchor-16.png
share/gimp/themes/Default/images/stock-cap-butt-16.png
share/gimp/themes/Default/images/stock-cap-round-16.png
share/gimp/themes/Default/images/stock-cap-square-16.png
-share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-channel-16.png
share/gimp/themes/Default/images/stock-channel-24.png
-share/gimp/themes/Default/images/stock-channels-16.png
-share/gimp/themes/Default/images/stock-channels-24.png
share/gimp/themes/Default/images/stock-channel-32.png
share/gimp/themes/Default/images/stock-channel-48.png
share/gimp/themes/Default/images/stock-channel-alpha-16.png
@@ -1293,6 +1293,9 @@ share/gimp/themes/Default/images/stock-channel-red-16.png
share/gimp/themes/Default/images/stock-channel-red-24.png
share/gimp/themes/Default/images/stock-channel-red-32.png
share/gimp/themes/Default/images/stock-channel-red-48.png
+share/gimp/themes/Default/images/stock-channels-16.png
+share/gimp/themes/Default/images/stock-channels-24.png
+share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-close-12.png
share/gimp/themes/Default/images/stock-color-picker-black-18.png
share/gimp/themes/Default/images/stock-color-picker-gray-18.png
@@ -1363,7 +1366,6 @@ share/gimp/themes/Default/images/stock-layer-16.png
share/gimp/themes/Default/images/stock-layer-24.png
share/gimp/themes/Default/images/stock-layer-32.png
share/gimp/themes/Default/images/stock-layer-48.png
-share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-layer-to-imagesize-16.png
share/gimp/themes/Default/images/stock-layers-16.png
share/gimp/themes/Default/images/stock-layers-24.png
@@ -1371,6 +1373,7 @@ share/gimp/themes/Default/images/stock-letter-spacing-22.png
share/gimp/themes/Default/images/stock-line-spacing-22.png
share/gimp/themes/Default/images/stock-linked-12.png
share/gimp/themes/Default/images/stock-linked-20.png
+share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-menu-left-12.png
share/gimp/themes/Default/images/stock-menu-right-12.png
share/gimp/themes/Default/images/stock-merge-down-16.png
@@ -1379,9 +1382,9 @@ share/gimp/themes/Default/images/stock-move-to-screen-24.png
share/gimp/themes/Default/images/stock-navigation-16.png
share/gimp/themes/Default/images/stock-paste-as-new-16.png
share/gimp/themes/Default/images/stock-paste-into-16.png
-share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-path-16.png
share/gimp/themes/Default/images/stock-path-22.png
+share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-paths-16.png
share/gimp/themes/Default/images/stock-paths-22.png
share/gimp/themes/Default/images/stock-plugin-16.png
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index c24efacd50b3..6077f19ee374 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 2.0.pre1
+PORTVERSION= 2.0.pre2
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -50,7 +50,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GIMP_DISTFILE= ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-MAN1= gimp-1.3.1 gimptool-1.3.1 gimp-remote-1.3.1
+MAN1= gimp-1.3.1 gimptool-2.0.1 gimp-remote-1.3.1
MAN5= gimprc-1.3.5
.if defined(WITH_PYTHON)
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 5d706e75122b..952287d4dc20 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
+MD5 (gimp-2.0pre2.tar.bz2) = 97898e176c5753269fc869cbe9590517
diff --git a/graphics/gimp/files/patch-app_core_gimpimage-contiguous-region.c b/graphics/gimp/files/patch-app_core_gimpimage-contiguous-region.c
deleted file mode 100644
index 3a2dd2af0b86..000000000000
--- a/graphics/gimp/files/patch-app_core_gimpimage-contiguous-region.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-gimptool-1.3.in b/graphics/gimp/files/patch-gimptool-2.0.in
index a79ae307827d..699c69f349f2 100644
--- a/graphics/gimp-app/files/patch-gimptool-1.3.in
+++ b/graphics/gimp/files/patch-gimptool-2.0.in
@@ -1,8 +1,8 @@
-$FreeBSD$
+$FreeBSD: /tmp/pcvs/ports/graphics/gimp/files/Attic/patch-gimptool-2.0.in,v 1.1 2004-01-20 08:26:58 bland Exp $
---- gimptool-1.3.in.orig Tue Jan 15 12:21:05 2002
-+++ gimptool-1.3.in Fri May 17 20:46:18 2002
+--- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002
++++ gimptool-2.0.in Fri May 17 20:46:18 2002
@@ -215,19 +215,19 @@
| --uninstall-script | --uninstall-admin-script )
case $1 in
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index db907126b195..deba9c10f661 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1,6 +1,6 @@
bin/gimp-1.3
bin/gimp-remote-1.3
-bin/gimptool-1.3
+bin/gimptool-2.0
etc/gimp/1.3/gimprc
etc/gimp/1.3/gtkrc
etc/gimp/1.3/ps-menurc
@@ -31,8 +31,8 @@ include/gimp-1.3/libgimp/gimpfonts_pdb.h
include/gimp-1.3/libgimp/gimpfontselect.h
include/gimp-1.3/libgimp/gimpfontselect_pdb.h
include/gimp-1.3/libgimp/gimpgimprc_pdb.h
-include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientmenu.h
+include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientselect.h
include/gimp-1.3/libgimp/gimpgradientselect_pdb.h
include/gimp-1.3/libgimp/gimpguides_pdb.h
@@ -43,22 +43,23 @@ include/gimp-1.3/libgimp/gimplayer.h
include/gimp-1.3/libgimp/gimplayer_pdb.h
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/gimppainttools_pdb.h
+include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimppalettes_pdb.h
include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
-include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimpparasite_pdb.h
include/gimp-1.3/libgimp/gimppaths_pdb.h
-include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternmenu.h
+include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternselect.h
include/gimp-1.3/libgimp/gimppatternselect_pdb.h
+include/gimp-1.3/libgimp/gimppixelfetcher.h
include/gimp-1.3/libgimp/gimppixelrgn.h
include/gimp-1.3/libgimp/gimpplugin_pdb.h
include/gimp-1.3/libgimp/gimpproceduraldb.h
include/gimp-1.3/libgimp/gimpproceduraldb_pdb.h
+include/gimp-1.3/libgimp/gimpregioniterator.h
include/gimp-1.3/libgimp/gimpselection.h
include/gimp-1.3/libgimp/gimpselection_pdb.h
include/gimp-1.3/libgimp/gimpselectiontools_pdb.h
@@ -153,9 +154,9 @@ lib/libgimpui-1.3.so.%%SHLIBVER%%
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
+libdata/pkgconfig/gimp-2.0.pc
+libdata/pkgconfig/gimpthumb-2.0.pc
+libdata/pkgconfig/gimpui-2.0.pc
libexec/gimp/1.3/environ/default.env
%%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
libexec/gimp/1.3/modules/libcdisplay_colorblind.so
@@ -370,11 +371,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpfileops.html
%%DOCSDIR%%/libgimp/libgimp-gimpfloatingsel.html
%%DOCSDIR%%/libgimp/libgimp-gimpfontmenu.html
-%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpfonts.html
+%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpgimprc.html
-%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpguides.html
%%DOCSDIR%%/libgimp/libgimp-gimphelp.html
@@ -383,12 +384,14 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpmenu.html
%%DOCSDIR%%/libgimp/libgimp-gimpmessage.html
%%DOCSDIR%%/libgimp/libgimp-gimppalette.html
-%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternselect.html
+%%DOCSDIR%%/libgimp/libgimp-gimppixelfetcher.html
%%DOCSDIR%%/libgimp/libgimp-gimppixelrgn.html
%%DOCSDIR%%/libgimp/libgimp-gimpplugin.html
%%DOCSDIR%%/libgimp/libgimp-gimpproceduraldb.html
+%%DOCSDIR%%/libgimp/libgimp-gimpregioniterator.html
%%DOCSDIR%%/libgimp/libgimp-gimpselection.html
%%DOCSDIR%%/libgimp/libgimp-gimptexttool.html
%%DOCSDIR%%/libgimp/libgimp-gimptile.html
@@ -426,8 +429,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpcolor/left.png
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpBilinear.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpCMYK.html
+%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpHSV.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpRGB.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor.devhelp
@@ -508,11 +511,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-round-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-square-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-16.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-48.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-alpha-16.png
@@ -535,6 +535,9 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-48.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-close-12.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-black-18.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-gray-18.png
@@ -603,11 +606,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-landscape-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-to-imagesize-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-letter-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-line-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-linked-12.png
@@ -621,16 +624,16 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-navigation-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-as-new-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-into-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-22.png
+%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
%%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
%%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-reset-16.png
%%DOCSDIR%%/libgimpwidgets/stock-reshow-filter-16.png
%%DOCSDIR%%/libgimpwidgets/stock-resize-16.png
@@ -1070,8 +1073,6 @@ 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
@@ -1081,6 +1082,8 @@ share/gimp/palettes/Web.gpl
share/gimp/patterns/3dgreen.pat
share/gimp/patterns/Craters.pat
share/gimp/patterns/Moonfoot.pat
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
share/gimp/patterns/amethyst.pat
share/gimp/patterns/bark.pat
share/gimp/patterns/blue.pat
@@ -1266,11 +1269,8 @@ share/gimp/themes/Default/images/stock-anchor-16.png
share/gimp/themes/Default/images/stock-cap-butt-16.png
share/gimp/themes/Default/images/stock-cap-round-16.png
share/gimp/themes/Default/images/stock-cap-square-16.png
-share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-channel-16.png
share/gimp/themes/Default/images/stock-channel-24.png
-share/gimp/themes/Default/images/stock-channels-16.png
-share/gimp/themes/Default/images/stock-channels-24.png
share/gimp/themes/Default/images/stock-channel-32.png
share/gimp/themes/Default/images/stock-channel-48.png
share/gimp/themes/Default/images/stock-channel-alpha-16.png
@@ -1293,6 +1293,9 @@ share/gimp/themes/Default/images/stock-channel-red-16.png
share/gimp/themes/Default/images/stock-channel-red-24.png
share/gimp/themes/Default/images/stock-channel-red-32.png
share/gimp/themes/Default/images/stock-channel-red-48.png
+share/gimp/themes/Default/images/stock-channels-16.png
+share/gimp/themes/Default/images/stock-channels-24.png
+share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-close-12.png
share/gimp/themes/Default/images/stock-color-picker-black-18.png
share/gimp/themes/Default/images/stock-color-picker-gray-18.png
@@ -1363,7 +1366,6 @@ share/gimp/themes/Default/images/stock-layer-16.png
share/gimp/themes/Default/images/stock-layer-24.png
share/gimp/themes/Default/images/stock-layer-32.png
share/gimp/themes/Default/images/stock-layer-48.png
-share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-layer-to-imagesize-16.png
share/gimp/themes/Default/images/stock-layers-16.png
share/gimp/themes/Default/images/stock-layers-24.png
@@ -1371,6 +1373,7 @@ share/gimp/themes/Default/images/stock-letter-spacing-22.png
share/gimp/themes/Default/images/stock-line-spacing-22.png
share/gimp/themes/Default/images/stock-linked-12.png
share/gimp/themes/Default/images/stock-linked-20.png
+share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-menu-left-12.png
share/gimp/themes/Default/images/stock-menu-right-12.png
share/gimp/themes/Default/images/stock-merge-down-16.png
@@ -1379,9 +1382,9 @@ share/gimp/themes/Default/images/stock-move-to-screen-24.png
share/gimp/themes/Default/images/stock-navigation-16.png
share/gimp/themes/Default/images/stock-paste-as-new-16.png
share/gimp/themes/Default/images/stock-paste-into-16.png
-share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-path-16.png
share/gimp/themes/Default/images/stock-path-22.png
+share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-paths-16.png
share/gimp/themes/Default/images/stock-paths-22.png
share/gimp/themes/Default/images/stock-plugin-16.png
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index c24efacd50b3..6077f19ee374 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 2.0.pre1
+PORTVERSION= 2.0.pre2
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -50,7 +50,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GIMP_DISTFILE= ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-MAN1= gimp-1.3.1 gimptool-1.3.1 gimp-remote-1.3.1
+MAN1= gimp-1.3.1 gimptool-2.0.1 gimp-remote-1.3.1
MAN5= gimprc-1.3.5
.if defined(WITH_PYTHON)
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 5d706e75122b..952287d4dc20 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-2.0pre1.tar.bz2) = 7862920def4ee411f6417c9372753a6d
+MD5 (gimp-2.0pre2.tar.bz2) = 97898e176c5753269fc869cbe9590517
diff --git a/graphics/gimpshop/files/patch-app_core_gimpimage-contiguous-region.c b/graphics/gimpshop/files/patch-app_core_gimpimage-contiguous-region.c
deleted file mode 100644
index 3a2dd2af0b86..000000000000
--- a/graphics/gimpshop/files/patch-app_core_gimpimage-contiguous-region.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/patch-gimptool-1.3.in b/graphics/gimpshop/files/patch-gimptool-1.3.in
deleted file mode 100644
index a79ae307827d..000000000000
--- a/graphics/gimpshop/files/patch-gimptool-1.3.in
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- gimptool-1.3.in.orig Tue Jan 15 12:21:05 2002
-+++ gimptool-1.3.in Fri May 17 20:46:18 2002
-@@ -215,19 +215,19 @@
- | --uninstall-script | --uninstall-admin-script )
- case $1 in
- --*install-bin)
-- install_cmd="@INSTALL_PROGRAM@"
-+ install_cmd="@INSTALL_SCRIPT@"
- install_dir="$HOME/@gimpdir@/plug-ins"
- ;;
- --install-bin-strip)
-- install_cmd="@INSTALL_PROGRAM@ -s"
-+ install_cmd="@INSTALL_SCRIPT@ -s"
- install_dir="$HOME/@gimpdir@/plug-ins"
- ;;
- --*install-admin-bin)
-- install_cmd="@INSTALL_PROGRAM@"
-+ install_cmd="@INSTALL_SCRIPT@"
- install_dir="$gimpplugindir/plug-ins"
- ;;
- --install-admin-bin-strip)
-- install_cmd="@INSTALL_PROGRAM@ -s"
-+ install_cmd="@INSTALL_SCRIPT@ -s"
- install_dir="$gimpplugindir/plug-ins"
- ;;
- --*install-script)
diff --git a/graphics/gimp/files/patch-gimptool-1.3.in b/graphics/gimpshop/files/patch-gimptool-2.0.in
index a79ae307827d..bb5c013c578e 100644
--- a/graphics/gimp/files/patch-gimptool-1.3.in
+++ b/graphics/gimpshop/files/patch-gimptool-2.0.in
@@ -1,8 +1,8 @@
$FreeBSD$
---- gimptool-1.3.in.orig Tue Jan 15 12:21:05 2002
-+++ gimptool-1.3.in Fri May 17 20:46:18 2002
+--- gimptool-2.0.in.orig Tue Jan 15 12:21:05 2002
++++ gimptool-2.0.in Fri May 17 20:46:18 2002
@@ -215,19 +215,19 @@
| --uninstall-script | --uninstall-admin-script )
case $1 in
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index db907126b195..deba9c10f661 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1,6 +1,6 @@
bin/gimp-1.3
bin/gimp-remote-1.3
-bin/gimptool-1.3
+bin/gimptool-2.0
etc/gimp/1.3/gimprc
etc/gimp/1.3/gtkrc
etc/gimp/1.3/ps-menurc
@@ -31,8 +31,8 @@ include/gimp-1.3/libgimp/gimpfonts_pdb.h
include/gimp-1.3/libgimp/gimpfontselect.h
include/gimp-1.3/libgimp/gimpfontselect_pdb.h
include/gimp-1.3/libgimp/gimpgimprc_pdb.h
-include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientmenu.h
+include/gimp-1.3/libgimp/gimpgradients_pdb.h
include/gimp-1.3/libgimp/gimpgradientselect.h
include/gimp-1.3/libgimp/gimpgradientselect_pdb.h
include/gimp-1.3/libgimp/gimpguides_pdb.h
@@ -43,22 +43,23 @@ include/gimp-1.3/libgimp/gimplayer.h
include/gimp-1.3/libgimp/gimplayer_pdb.h
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/gimppainttools_pdb.h
+include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimppalettes_pdb.h
include/gimp-1.3/libgimp/gimppaletteselect_pdb.h
-include/gimp-1.3/libgimp/gimppalette_pdb.h
include/gimp-1.3/libgimp/gimpparasite_pdb.h
include/gimp-1.3/libgimp/gimppaths_pdb.h
-include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternmenu.h
+include/gimp-1.3/libgimp/gimppatterns_pdb.h
include/gimp-1.3/libgimp/gimppatternselect.h
include/gimp-1.3/libgimp/gimppatternselect_pdb.h
+include/gimp-1.3/libgimp/gimppixelfetcher.h
include/gimp-1.3/libgimp/gimppixelrgn.h
include/gimp-1.3/libgimp/gimpplugin_pdb.h
include/gimp-1.3/libgimp/gimpproceduraldb.h
include/gimp-1.3/libgimp/gimpproceduraldb_pdb.h
+include/gimp-1.3/libgimp/gimpregioniterator.h
include/gimp-1.3/libgimp/gimpselection.h
include/gimp-1.3/libgimp/gimpselection_pdb.h
include/gimp-1.3/libgimp/gimpselectiontools_pdb.h
@@ -153,9 +154,9 @@ lib/libgimpui-1.3.so.%%SHLIBVER%%
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
+libdata/pkgconfig/gimp-2.0.pc
+libdata/pkgconfig/gimpthumb-2.0.pc
+libdata/pkgconfig/gimpui-2.0.pc
libexec/gimp/1.3/environ/default.env
%%PYTHON:%%libexec/gimp/1.3/environ/pygimp.env
libexec/gimp/1.3/modules/libcdisplay_colorblind.so
@@ -370,11 +371,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpfileops.html
%%DOCSDIR%%/libgimp/libgimp-gimpfloatingsel.html
%%DOCSDIR%%/libgimp/libgimp-gimpfontmenu.html
-%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpfonts.html
+%%DOCSDIR%%/libgimp/libgimp-gimpfontselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpgimprc.html
-%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimpgradients.html
%%DOCSDIR%%/libgimp/libgimp-gimpgradientselect.html
%%DOCSDIR%%/libgimp/libgimp-gimpguides.html
%%DOCSDIR%%/libgimp/libgimp-gimphelp.html
@@ -383,12 +384,14 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimp/libgimp-gimpmenu.html
%%DOCSDIR%%/libgimp/libgimp-gimpmessage.html
%%DOCSDIR%%/libgimp/libgimp-gimppalette.html
-%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternmenu.html
+%%DOCSDIR%%/libgimp/libgimp-gimppatterns.html
%%DOCSDIR%%/libgimp/libgimp-gimppatternselect.html
+%%DOCSDIR%%/libgimp/libgimp-gimppixelfetcher.html
%%DOCSDIR%%/libgimp/libgimp-gimppixelrgn.html
%%DOCSDIR%%/libgimp/libgimp-gimpplugin.html
%%DOCSDIR%%/libgimp/libgimp-gimpproceduraldb.html
+%%DOCSDIR%%/libgimp/libgimp-gimpregioniterator.html
%%DOCSDIR%%/libgimp/libgimp-gimpselection.html
%%DOCSDIR%%/libgimp/libgimp-gimptexttool.html
%%DOCSDIR%%/libgimp/libgimp-gimptile.html
@@ -426,8 +429,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpcolor/left.png
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpBilinear.html
-%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpCMYK.html
+%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpColorSpace.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpHSV.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor-GimpRGB.html
%%DOCSDIR%%/libgimpcolor/libgimpcolor.devhelp
@@ -508,11 +511,8 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-round-16.png
%%DOCSDIR%%/libgimpwidgets/stock-cap-square-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-16.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-48.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-alpha-16.png
@@ -535,6 +535,9 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-24.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-32.png
%%DOCSDIR%%/libgimpwidgets/stock-channel-red-48.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-channels-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-char-picker-22.png
%%DOCSDIR%%/libgimpwidgets/stock-close-12.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-black-18.png
%%DOCSDIR%%/libgimpwidgets/stock-color-picker-gray-18.png
@@ -603,11 +606,11 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-landscape-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-layer-to-imagesize-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-16.png
%%DOCSDIR%%/libgimpwidgets/stock-layers-24.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
-%%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
%%DOCSDIR%%/libgimpwidgets/stock-letter-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-line-spacing-22.png
%%DOCSDIR%%/libgimpwidgets/stock-linked-12.png
@@ -621,16 +624,16 @@ share/aclocal/gimp-2.0.m4
%%DOCSDIR%%/libgimpwidgets/stock-navigation-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-as-new-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paste-into-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-16.png
%%DOCSDIR%%/libgimpwidgets/stock-path-22.png
+%%DOCSDIR%%/libgimpwidgets/stock-path-stroke-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-16.png
%%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
%%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
%%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
-%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
%%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-question-64.png
%%DOCSDIR%%/libgimpwidgets/stock-reset-16.png
%%DOCSDIR%%/libgimpwidgets/stock-reshow-filter-16.png
%%DOCSDIR%%/libgimpwidgets/stock-resize-16.png
@@ -1070,8 +1073,6 @@ 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
@@ -1081,6 +1082,8 @@ share/gimp/palettes/Web.gpl
share/gimp/patterns/3dgreen.pat
share/gimp/patterns/Craters.pat
share/gimp/patterns/Moonfoot.pat
+share/gimp/patterns/Stripes1px.pat
+share/gimp/patterns/Stripes2px.pat
share/gimp/patterns/amethyst.pat
share/gimp/patterns/bark.pat
share/gimp/patterns/blue.pat
@@ -1266,11 +1269,8 @@ share/gimp/themes/Default/images/stock-anchor-16.png
share/gimp/themes/Default/images/stock-cap-butt-16.png
share/gimp/themes/Default/images/stock-cap-round-16.png
share/gimp/themes/Default/images/stock-cap-square-16.png
-share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-channel-16.png
share/gimp/themes/Default/images/stock-channel-24.png
-share/gimp/themes/Default/images/stock-channels-16.png
-share/gimp/themes/Default/images/stock-channels-24.png
share/gimp/themes/Default/images/stock-channel-32.png
share/gimp/themes/Default/images/stock-channel-48.png
share/gimp/themes/Default/images/stock-channel-alpha-16.png
@@ -1293,6 +1293,9 @@ share/gimp/themes/Default/images/stock-channel-red-16.png
share/gimp/themes/Default/images/stock-channel-red-24.png
share/gimp/themes/Default/images/stock-channel-red-32.png
share/gimp/themes/Default/images/stock-channel-red-48.png
+share/gimp/themes/Default/images/stock-channels-16.png
+share/gimp/themes/Default/images/stock-channels-24.png
+share/gimp/themes/Default/images/stock-char-picker-22.png
share/gimp/themes/Default/images/stock-close-12.png
share/gimp/themes/Default/images/stock-color-picker-black-18.png
share/gimp/themes/Default/images/stock-color-picker-gray-18.png
@@ -1363,7 +1366,6 @@ share/gimp/themes/Default/images/stock-layer-16.png
share/gimp/themes/Default/images/stock-layer-24.png
share/gimp/themes/Default/images/stock-layer-32.png
share/gimp/themes/Default/images/stock-layer-48.png
-share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-layer-to-imagesize-16.png
share/gimp/themes/Default/images/stock-layers-16.png
share/gimp/themes/Default/images/stock-layers-24.png
@@ -1371,6 +1373,7 @@ share/gimp/themes/Default/images/stock-letter-spacing-22.png
share/gimp/themes/Default/images/stock-line-spacing-22.png
share/gimp/themes/Default/images/stock-linked-12.png
share/gimp/themes/Default/images/stock-linked-20.png
+share/gimp/themes/Default/images/stock-list-16.png
share/gimp/themes/Default/images/stock-menu-left-12.png
share/gimp/themes/Default/images/stock-menu-right-12.png
share/gimp/themes/Default/images/stock-merge-down-16.png
@@ -1379,9 +1382,9 @@ share/gimp/themes/Default/images/stock-move-to-screen-24.png
share/gimp/themes/Default/images/stock-navigation-16.png
share/gimp/themes/Default/images/stock-paste-as-new-16.png
share/gimp/themes/Default/images/stock-paste-into-16.png
-share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-path-16.png
share/gimp/themes/Default/images/stock-path-22.png
+share/gimp/themes/Default/images/stock-path-stroke-16.png
share/gimp/themes/Default/images/stock-paths-16.png
share/gimp/themes/Default/images/stock-paths-22.png
share/gimp/themes/Default/images/stock-plugin-16.png