Merge the gimp1 and gimp1-i18n ports, and update to GIMP 1.1.17.

PR:		ports/16837, ports/16913
Reviewed by:	maintainers

5 files changed, 37 insertions, 43 deletions

diff --git a/graphics/gimp/files/patch-aa b/graphics/gimp/files/patch-aa
index 16de4cd974f..33a7ddbd83b 100644
--- a/graphics/gimp/files/patch-aa
+++ b/graphics/gimp/files/patch-aa
@@ -1,21 +1,20 @@
---- app/main.c.orig	Wed Oct  6 13:55:38 1999
-+++ app/main.c	Tue Oct 12 13:23:44 1999
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- #include "config.h"
--
+--- app/main.c.orig	Thu Feb 10 14:41:02 2000
++++ app/main.c	Sat Feb 19 13:51:36 2000
+@@ -22,6 +22,7 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <sys/types.h>
 +#include <floatingpoint.h>
- #include <locale.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -117,6 +117,9 @@
  
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+@@ -129,6 +130,9 @@
    /* Initialize variables */
+ 
    prog_name = argv[0];
 +
 +  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
    /* Initialize i18n support */
- 
+   INIT_LOCALE ("gimp");
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index 4a00a2ad60f..2e37f7c44cf 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
-+++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
-@@ -151,8 +151,8 @@
+--- plug-ins/common/url.c.orig	Tue Feb  1 16:09:01 2000
++++ plug-ins/common/url.c	Sat Feb 19 13:51:36 2000
+@@ -158,8 +158,8 @@
      }
    else if (pid == 0)
      {
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index 80d4d82eb59..95af0d629b7 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.orig	Wed Oct  6 14:00:22 1999
-+++ configure	Tue Oct 12 13:37:31 1999
-@@ -3471,7 +3471,11 @@
+--- configure.orig	Fri Feb 11 10:32:12 2000
++++ configure	Sat Feb 19 13:51:36 2000
+@@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -13,7 +13,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7108,7 +7112,7 @@
+@@ -7017,7 +7021,7 @@
  fi
  
  gimpdatadir=$datadir/gimp
@@ -22,7 +22,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8513,10 +8517,6 @@
+@@ -8561,10 +8565,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimp/files/patch-ak b/graphics/gimp/files/patch-ak
index 0d660de2f20..90837d0254f 100644
--- a/graphics/gimp/files/patch-ak
+++ b/graphics/gimp/files/patch-ak
@@ -1,17 +1,11 @@
---- libgimp/Makefile.in.orig	Tue Mar  9 02:58:39 1999
-+++ libgimp/Makefile.in	Tue May 18 09:42:40 1999
-@@ -188,11 +188,11 @@
- gimpinclude_HEADERS =  	color_selector.h		gimp.h				gimpchainbutton.h		gimpenums.h			gimpenv.h			gimpfeatures.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpintl.h			gserialize.h			parasite.h			parasiteF.h			parasiteP.h
+--- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
++++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
+@@ -211,7 +211,7 @@
  
- 
--libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
--libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
  
- libgimpui_la_LIBADD = $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp/files/patch-am b/graphics/gimp/files/patch-am
index 368e279354d..530b1aaa081 100644
--- a/graphics/gimp/files/patch-am
+++ b/graphics/gimp/files/patch-am
@@ -1,19 +1,20 @@
---- libgimp/gimp.c.orig	Tue Sep 29 22:35:20 1998
-+++ libgimp/gimp.c	Tue Sep 29 22:36:00 1998
-@@ -19,6 +19,7 @@
- #include "config.h"
- 
- #include <errno.h>
+--- libgimp/gimp.c.orig	Mon Dec  6 14:44:39 1999
++++ libgimp/gimp.c	Sat Feb 19 13:51:36 2000
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
 +#include <floatingpoint.h>
- #include <signal.h>
- #include <stdarg.h>
- #include <stdio.h>
-@@ -95,6 +96,8 @@
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+@@ -186,6 +187,9 @@
      }
  
    progname = argv[0];
 +
++  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
-   signal (SIGHUP, gimp_signal);
-   signal (SIGINT, gimp_signal);
+ #ifndef G_OS_WIN32
+   /* No use catching these on Win32, the user won't get any meaningful