- Update to 2.0.pre4

- Switch back to gimp's own shlib versioning scheme [1]

Reviewed by:	marcus [1]

8 files changed, 17 insertions, 72 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index a66fc7e..3ae1b92 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.0.pre3
-PORTREVISION=	1
+PORTVERSION=	2.0.pre4
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -29,7 +28,7 @@ LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		wmf.2:${PORTSDIR}/graphics/libwmf
 
-SHLIBVER?=	2
+SHLIBVER?=	27
 
 NO_LATEST_LINK=	yes
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index c4fdc61..a528899 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.0pre3.tar.bz2) = f4d45d83cba87bc9d45399b0e6bce27c
-SIZE (gimp-2.0pre3.tar.bz2) = 12102800
+MD5 (gimp-2.0pre4.tar.bz2) = cbd15608c08110a392edd89ebdf8bcef
+SIZE (gimp-2.0pre4.tar.bz2) = 12807937
diff --git a/graphics/gimp-app/files/patch-app_core_gimpchannel.c b/graphics/gimp-app/files/patch-app_core_gimpchannel.c
deleted file mode 100644
index e3abf53..0000000
--- a/graphics/gimp-app/files/patch-app_core_gimpchannel.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/gimp-app/files/patch-app_plug-in_plug-in-shm.c b/graphics/gimp-app/files/patch-app_plug-in_plug-in-shm.c
deleted file mode 100644
index b6a6abe..0000000
--- a/graphics/gimp-app/files/patch-app_plug-in_plug-in-shm.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- app/plug-in/plug-in-shm.c.orig	Wed Feb 19 01:40:37 2003
-+++ app/plug-in/plug-in-shm.c	Wed Feb 19 01:40:49 2003
-@@ -17,6 +17,7 @@
-  */
- 
- #include "config.h"
-+#include <sys/types.h>
- 
- #ifdef HAVE_IPC_H
- #include <sys/ipc.h>
diff --git a/graphics/gimp-app/files/patch-app_tools_gimptexttool.c b/graphics/gimp-app/files/patch-app_tools_gimptexttool.c
deleted file mode 100644
index 7fbf416..0000000
--- a/graphics/gimp-app/files/patch-app_tools_gimptexttool.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/gimp-app/files/patch-app_vectors_gimpvectors.c b/graphics/gimp-app/files/patch-app_vectors_gimpvectors.c
deleted file mode 100644
index 49c8696..0000000
--- a/graphics/gimp-app/files/patch-app_vectors_gimpvectors.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure
index 879a7bd..9b96241 100644
--- a/graphics/gimp-app/files/patch-configure
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,17 +1,6 @@
---- configure.orig	Fri Feb 27 18:09:19 2004
-+++ configure	Fri Feb 27 18:10:20 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
- 
- 
- 
-@@ -31377,6 +31377,7 @@
+--- configure.orig	Sun Mar  7 02:08:10 2004
++++ configure	Sun Mar  7 02:48:14 2004
+@@ -31396,6 +31396,7 @@
  #include <gimp-print/gimp-print.h>
  #include <stdio.h>
  #include <stdlib.h>
@@ -19,7 +8,7 @@
  
  int
  main ()
-@@ -32842,8 +32843,8 @@
+@@ -32869,8 +32870,8 @@
  fi
  fi;
  
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 8923a94..3b42d44 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -557,6 +557,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-default-colors-12.png
 %%DOCSDIR%%/libgimpwidgets/stock-device-status-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-device-status-24.png
+%%DOCSDIR%%/libgimpwidgets/stock-display-filter-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-display-filter-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-duplicate-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-edit-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-error-64.png
@@ -1045,6 +1047,7 @@ share/gimp/gradients/Yellow_Contrast.ggr
 share/gimp/gradients/Yellow_Orange.ggr
 share/gimp/images/gimp_logo.png
 share/gimp/images/gimp_splash.png
+share/gimp/images/wilber-devel-icon.png
 share/gimp/images/wilber-icon.png
 share/gimp/images/wilber-tips.png
 share/gimp/images/wilber-wizard.png
@@ -1324,6 +1327,8 @@ share/gimp/themes/Default/images/stock-curve-smooth-16.png
 share/gimp/themes/Default/images/stock-default-colors-12.png
 share/gimp/themes/Default/images/stock-device-status-16.png
 share/gimp/themes/Default/images/stock-device-status-24.png
+share/gimp/themes/Default/images/stock-display-filter-16.png
+share/gimp/themes/Default/images/stock-display-filter-24.png
 share/gimp/themes/Default/images/stock-duplicate-16.png
 share/gimp/themes/Default/images/stock-edit-16.png
 share/gimp/themes/Default/images/stock-error-64.png
@@ -1562,6 +1567,10 @@ share/locale/el/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/el/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/el/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/el/LC_MESSAGES/gimp20.mo
+share/locale/en_CA/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/en_CA/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/en_CA/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/en_CA/LC_MESSAGES/gimp20.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/en_GB/LC_MESSAGES/gimp20-std-plug-ins.mo