Update to 2.0pre3.

8 files changed, 87 insertions, 35 deletions

diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index e5b004c5344..ddeb34efa38 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.0.pre2
-PORTREVISION=	2
+PORTVERSION=	2.0.pre3
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -21,7 +20,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.pre/pre/}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program (unstable development version)
 
-BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool
 LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		exif.10:${PORTSDIR}/graphics/libexif \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -39,14 +37,15 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gtk20 libartlgpl2 librsvg2
+USE_GNOME=	gnomehack intltool gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${PREFIX}/share/doc/gimp \
-		--disable-gtk-doc
+		--disable-gtk-doc \
+		--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 952287d4dc2..c4fdc611b15 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1,2 @@
-MD5 (gimp-2.0pre2.tar.bz2) = 97898e176c5753269fc869cbe9590517
+MD5 (gimp-2.0pre3.tar.bz2) = f4d45d83cba87bc9d45399b0e6bce27c
+SIZE (gimp-2.0pre3.tar.bz2) = 12102800
diff --git a/graphics/gimpshop/files/patch-app_core_gimpchannel.c b/graphics/gimpshop/files/patch-app_core_gimpchannel.c
new file mode 100644
index 00000000000..e3abf5386ab
--- /dev/null
+++ b/graphics/gimpshop/files/patch-app_core_gimpchannel.c
@@ -0,0 +1,11 @@
+--- app/core/gimpchannel.c.orig	Thu Feb  5 01:46:50 2004
++++ app/core/gimpchannel.c	Thu Feb  5 01:46:59 2004
+@@ -640,7 +640,7 @@
+   else if (GIMP_IS_PAINT_INFO (stroke_desc))
+     {
+       GimpImage        *gimage     = gimp_item_get_image (item);
+-      GimpPaintInfo    *paint_info = GIMP_PAINT_INFO (stroke_desc);;
++      GimpPaintInfo    *paint_info = GIMP_PAINT_INFO (stroke_desc);
+       GimpPaintOptions *paint_options;
+       GimpPaintCore    *core;
+ 
diff --git a/graphics/gimpshop/files/patch-app_tools_gimptexttool.c b/graphics/gimpshop/files/patch-app_tools_gimptexttool.c
new file mode 100644
index 00000000000..7fbf416afd3
--- /dev/null
+++ b/graphics/gimpshop/files/patch-app_tools_gimptexttool.c
@@ -0,0 +1,11 @@
+--- app/tools/gimptexttool.c.orig	Thu Feb  5 01:52:53 2004
++++ app/tools/gimptexttool.c	Thu Feb  5 01:53:00 2004
+@@ -218,7 +218,7 @@
+ 			     GdkModifierType  state,
+ 			     GimpDisplay     *gdisp)
+ {
+-  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);;
++  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
+   GimpDrawable *drawable;
+   GimpText     *text  = NULL;
+   gint          off_x = 0;
diff --git a/graphics/gimpshop/files/patch-app_vectors_gimpvectors.c b/graphics/gimpshop/files/patch-app_vectors_gimpvectors.c
new file mode 100644
index 00000000000..49c869645a8
--- /dev/null
+++ b/graphics/gimpshop/files/patch-app_vectors_gimpvectors.c
@@ -0,0 +1,20 @@
+--- app/vectors/gimpvectors.c.orig	Thu Feb  5 01:49:20 2004
++++ app/vectors/gimpvectors.c	Thu Feb  5 01:50:25 2004
+@@ -545,7 +545,7 @@
+                      GimpObject   *stroke_desc,
+                      gboolean      use_default_values)
+ {
+-  GimpVectors *vectors = GIMP_VECTORS (item);;
++  GimpVectors *vectors = GIMP_VECTORS (item);
+   gboolean     retval  = FALSE;
+ 
+   if (! vectors->strokes)
+@@ -564,7 +564,7 @@
+   else if (GIMP_IS_PAINT_INFO (stroke_desc))
+     {
+       GimpImage        *gimage     = gimp_item_get_image (item);
+-      GimpPaintInfo    *paint_info = GIMP_PAINT_INFO (stroke_desc);;
++      GimpPaintInfo    *paint_info = GIMP_PAINT_INFO (stroke_desc);
+       GimpPaintOptions *paint_options;
+       GimpPaintCore    *core;
+ 
diff --git a/graphics/gimpshop/files/patch-configure b/graphics/gimpshop/files/patch-configure
index f05feba3bfe..a94cd64b435 100644
--- a/graphics/gimpshop/files/patch-configure
+++ b/graphics/gimpshop/files/patch-configure
@@ -1,22 +1,24 @@
---- configure.orig	Thu Oct 10 18:44:32 2002
-+++ configure	Fri Oct 11 12:52:28 2002
-@@ -1462,7 +1462,7 @@
- 
- 
- LT_RELEASE=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
--LT_CURRENT=`expr $GIMP_MICRO_VERSION - $GIMP_INTERFACE_AGE`
-+LT_CURRENT=2
- LT_REVISION=$GIMP_INTERFACE_AGE
- LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
- LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-@@ -17657,8 +17658,8 @@
+--- configure.orig	Tue Feb  3 20:25:57 2004
++++ configure	Thu Feb  5 02:13:22 2004
+@@ -1995,8 +1995,8 @@
+ 
+ 
+ 
+-LT_VERSION_INFO="26:0:0"
+-LT_CURRENT_MINUS_AGE=26
++LT_VERSION_INFO="2:0:0"
++LT_CURRENT_MINUS_AGE=2
+ 
+ 
+ 
+@@ -32842,8 +32842,8 @@
  fi
  fi;
  
--gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
--gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
-+gimpdatadir=$datadir/$PACKAGE
-+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
- gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+-gimpdatadir="$datadir/$PACKAGE/1.3"
+-gimpplugindir="$libdir/$PACKAGE/1.3"
++gimpdatadir="$datadir/$PACKAGE"
++gimpplugindir="$libexecdir/$PACKAGE/1.3"
+ gimpsysconfdir="$sysconfdir/$PACKAGE/1.3"
  
  localedir='${prefix}/${DATADIRNAME}/locale'
diff --git a/graphics/gimpshop/files/patch-data_misc_gimp.desktop.in.in b/graphics/gimpshop/files/patch-data_misc_gimp.desktop.in.in
deleted file mode 100644
index 03a3e522d44..00000000000
--- a/graphics/gimpshop/files/patch-data_misc_gimp.desktop.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/misc/gimp.desktop.in.in.orig	Wed Jan 21 12:24:16 2004
-+++ data/misc/gimp.desktop.in.in	Wed Jan 21 12:27:36 2004
-@@ -3,7 +3,7 @@
- _Name=The GIMP (unstable)
- _Comment=Create and edit images or photographs
- TryExec=gimp-1.3
--Exec=gimp-remote-1.3 --new %U
-+Exec=gimp-1.3
- Icon=@gimpdatadir@/images/wilber-icon.png
- Terminal=false
- Type=Application
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 4f6f187c78f..e96c9c8958b 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -279,11 +279,12 @@ libexec/gimp/1.3/plug-ins/plugindetails
 libexec/gimp/1.3/plug-ins/png
 libexec/gimp/1.3/plug-ins/pnm
 libexec/gimp/1.3/plug-ins/polar
+libexec/gimp/1.3/plug-ins/postscript
 %%PRINT%%libexec/gimp/1.3/plug-ins/print
-libexec/gimp/1.3/plug-ins/ps
 libexec/gimp/1.3/plug-ins/psd
 libexec/gimp/1.3/plug-ins/psd_save
 libexec/gimp/1.3/plug-ins/psp
+%%PYTHON:%%libexec/gimp/1.3/plug-ins/py-slice.py
 libexec/gimp/1.3/plug-ins/randomize
 libexec/gimp/1.3/plug-ins/rcm
 libexec/gimp/1.3/plug-ins/ripple
@@ -531,6 +532,10 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-channel-green-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-green-32.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-green-48.png
+%%DOCSDIR%%/libgimpwidgets/stock-channel-indexed-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-channel-indexed-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-channel-indexed-32.png
+%%DOCSDIR%%/libgimpwidgets/stock-channel-indexed-48.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-red-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-red-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-red-32.png
@@ -608,6 +613,10 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-layer-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-layer-32.png
 %%DOCSDIR%%/libgimpwidgets/stock-layer-48.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-mask-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-mask-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-mask-32.png
+%%DOCSDIR%%/libgimpwidgets/stock-layer-mask-48.png
 %%DOCSDIR%%/libgimpwidgets/stock-layer-to-imagesize-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-layers-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-layers-24.png
@@ -644,6 +653,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-selection-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-add-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-all-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-selection-border-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-grow-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-intersect-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-selection-none-16.png
@@ -1289,6 +1299,10 @@ share/gimp/themes/Default/images/stock-channel-green-16.png
 share/gimp/themes/Default/images/stock-channel-green-24.png
 share/gimp/themes/Default/images/stock-channel-green-32.png
 share/gimp/themes/Default/images/stock-channel-green-48.png
+share/gimp/themes/Default/images/stock-channel-indexed-16.png
+share/gimp/themes/Default/images/stock-channel-indexed-24.png
+share/gimp/themes/Default/images/stock-channel-indexed-32.png
+share/gimp/themes/Default/images/stock-channel-indexed-48.png
 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
@@ -1366,6 +1380,10 @@ 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-layer-mask-16.png
+share/gimp/themes/Default/images/stock-layer-mask-24.png
+share/gimp/themes/Default/images/stock-layer-mask-32.png
+share/gimp/themes/Default/images/stock-layer-mask-48.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
@@ -1402,6 +1420,7 @@ share/gimp/themes/Default/images/stock-scale-16.png
 share/gimp/themes/Default/images/stock-selection-16.png
 share/gimp/themes/Default/images/stock-selection-add-16.png
 share/gimp/themes/Default/images/stock-selection-all-16.png
+share/gimp/themes/Default/images/stock-selection-border-16.png
 share/gimp/themes/Default/images/stock-selection-grow-16.png
 share/gimp/themes/Default/images/stock-selection-intersect-16.png
 share/gimp/themes/Default/images/stock-selection-none-16.png