Upgrade to 1.1.10

PR:		ports/14294
Submitted by:	Brian Handy <handy@physics.montana.edu>

6 files changed, 33 insertions, 277 deletions

diff --git a/graphics/gimp/files/patch-aa b/graphics/gimp/files/patch-aa
index db75e4e1092b..16de4cd974ff 100644
--- a/graphics/gimp/files/patch-aa
+++ b/graphics/gimp/files/patch-aa
@@ -1,14 +1,15 @@
---- app/main.c.orig	Mon Sep 21 17:15:18 1998
-+++ app/main.c	Tue Sep 29 22:24:17 1998
-@@ -16,6 +16,7 @@
+--- 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"
+-
 +#include <floatingpoint.h>
  #include <locale.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -94,6 +95,9 @@
+@@ -117,6 +117,9 @@
  
    /* Initialize variables */
    prog_name = argv[0];
@@ -16,5 +17,5 @@
 +  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
-   /* Initialize Gtk toolkit */
-   gtk_set_locale ();
+   /* Initialize i18n support */
+ 
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index f176e017d798..cc3600f85cac 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -1,5 +1,5 @@
---- plug-ins/url/url.c.orig	Sat May 30 15:32:36 1998
-+++ plug-ins/url/url.c	Sun Jun  7 10:09:34 1998
+--- plug-ins/common/url.c.orig	Sat May 30 15:32:36 1998
++++ plug-ins/common/url.c	Sun Jun  7 10:09:34 1998
 @@ -146,8 +146,8 @@
      }
    else if (pid == 0)
diff --git a/graphics/gimp/files/patch-ac b/graphics/gimp/files/patch-ac
deleted file mode 100644
index de1f74a33182..000000000000
--- a/graphics/gimp/files/patch-ac
+++ /dev/null
@@ -1,242 +0,0 @@
---- plug-ins/gpc/Makefile.am.orig	Wed Nov 18 06:14:51 1998
-+++ plug-ins/gpc/Makefile.am	Sat Feb 20 17:31:16 1999
-@@ -1,11 +1,14 @@
- ## Process this file with automake to produce Makefile.in
- 
- pluginlibdir = $(libdir)
-+gimpincludedir = $(includedir)
- 
- pluginlib_LIBRARIES = libgpc.a
- 
- libgpc_a_SOURCES = \
--	gpc.c		\
-+	gpc.c
-+
-+gimpinclude_HEADERS = \
- 	gpc.h
- 
- INCLUDES = \
---- plug-ins/gpc/Makefile.in.orig	Tue Mar  9 02:58:46 1999
-+++ plug-ins/gpc/Makefile.in	Mon May 10 10:17:48 1999
-@@ -162,10 +162,14 @@
- prefix = @prefix@
- 
- pluginlibdir = $(libdir)
-+gimpincludedir = $(includedir)
- 
- pluginlib_LIBRARIES = libgpc.a
- 
--libgpc_a_SOURCES =  	gpc.c			gpc.h
-+libgpc_a_SOURCES =  	gpc.c
-+
-+
-+gimpinclude_HEADERS =  	gpc.h
- 
- 
- INCLUDES =  	-I$(top_srcdir)				$(GTK_CFLAGS)				-I$(includedir)
-@@ -201,6 +205,8 @@
- MANS = $(man_MANS)
- 
- NROFF = nroff
-+HEADERS =  $(gimpinclude_HEADERS)
-+
- DIST_COMMON =  Makefile.am Makefile.in
- 
- 
-@@ -208,6 +214,7 @@
- 
- TAR = tar
- GZIP_ENV = --best
-+DEP_FILES =  .deps/gpc.P
- SOURCES = $(libgpc_a_SOURCES)
- OBJECTS = $(libgpc_a_OBJECTS)
- 
-@@ -215,9 +222,9 @@
- .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .s
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gpc/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gpc/Makefile
- 
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -254,9 +261,6 @@
- 	  rm -f $(DESTDIR)$(pluginlibdir)/$$p; \
- 	done
- 
--.c.o:
--	$(COMPILE) -c $<
--
- .s.o:
- 	$(COMPILE) -c $<
- 
-@@ -273,9 +277,6 @@
- 
- maintainer-clean-compile:
- 
--.c.lo:
--	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
--
- .s.lo:
- 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
- 
-@@ -336,6 +337,21 @@
- 	@$(NORMAL_UNINSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
- 
-+install-gimpincludeHEADERS: $(gimpinclude_HEADERS)
-+	@$(NORMAL_INSTALL)
-+	$(mkinstalldirs) $(DESTDIR)$(gimpincludedir)
-+	@list='$(gimpinclude_HEADERS)'; for p in $$list; do \
-+	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p"; \
-+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gimpincludedir)/$$p; \
-+	done
-+
-+uninstall-gimpincludeHEADERS:
-+	@$(NORMAL_UNINSTALL)
-+	list='$(gimpinclude_HEADERS)'; for p in $$list; do \
-+	  rm -f $(DESTDIR)$(gimpincludedir)/$$p; \
-+	done
-+
- tags: TAGS
- 
- ID: $(HEADERS) $(SOURCES) $(LISP)
-@@ -370,6 +386,11 @@
- subdir = plug-ins/gpc
- 
- distdir: $(DISTFILES)
-+	here=`cd $(top_builddir) && pwd`; \
-+	top_distdir=`cd $(top_distdir) && pwd`; \
-+	distdir=`cd $(distdir) && pwd`; \
-+	cd $(top_srcdir) \
-+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu plug-ins/gpc/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -381,6 +402,37 @@
- 	  fi; \
- 	done
- 
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-+
-+-include $(DEP_FILES)
-+
-+mostlyclean-depend:
-+
-+clean-depend:
-+
-+distclean-depend:
-+	-rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-+	  < .deps/$(*F).pp > .deps/$(*F).P; \
-+	tr ' ' '\012' < .deps/$(*F).pp \
-+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+	    >> .deps/$(*F).P; \
-+	rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
-@@ -392,20 +444,23 @@
- install-exec-am:
- install-exec: install-exec-am
- 
--install-data-am: install-pluginlibLIBRARIES install-man
-+install-data-am: install-pluginlibLIBRARIES install-man \
-+		install-gimpincludeHEADERS
- install-data: install-data-am
- 
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
- install: install-am
--uninstall-am: uninstall-pluginlibLIBRARIES uninstall-man
-+uninstall-am: uninstall-pluginlibLIBRARIES uninstall-man \
-+		uninstall-gimpincludeHEADERS
- uninstall: uninstall-am
--all-am: Makefile $(LIBRARIES) $(MANS)
-+all-am: Makefile $(LIBRARIES) $(MANS) $(HEADERS)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
--	$(mkinstalldirs)  $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3
-+	$(mkinstalldirs)  $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \
-+		$(DESTDIR)$(gimpincludedir)
- 
- 
- mostlyclean-generic:
-@@ -418,27 +473,27 @@
- 
- maintainer-clean-generic:
- mostlyclean-am:  mostlyclean-pluginlibLIBRARIES mostlyclean-compile \
--		mostlyclean-libtool mostlyclean-tags \
-+		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
- 		mostlyclean-generic
- 
- mostlyclean: mostlyclean-am
- 
- clean-am:  clean-pluginlibLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-generic mostlyclean-am
-+		clean-tags clean-depend clean-generic mostlyclean-am
- 
- clean: clean-am
- 
- distclean-am:  distclean-pluginlibLIBRARIES distclean-compile \
--		distclean-libtool distclean-tags distclean-generic \
--		clean-am
-+		distclean-libtool distclean-tags distclean-depend \
-+		distclean-generic clean-am
- 	-rm -f libtool
- 
- distclean: distclean-am
- 
- maintainer-clean-am:  maintainer-clean-pluginlibLIBRARIES \
- 		maintainer-clean-compile maintainer-clean-libtool \
--		maintainer-clean-tags maintainer-clean-generic \
--		distclean-am
-+		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
-@@ -450,13 +505,15 @@
- mostlyclean-compile distclean-compile clean-compile \
- maintainer-clean-compile mostlyclean-libtool distclean-libtool \
- clean-libtool maintainer-clean-libtool install-man3 uninstall-man3 \
--install-man uninstall-man tags mostlyclean-tags distclean-tags \
--clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
--check-am installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
-+install-man uninstall-man uninstall-gimpincludeHEADERS \
-+install-gimpincludeHEADERS tags mostlyclean-tags distclean-tags \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-+install-exec install-data-am install-data install-am install \
-+uninstall-am uninstall all-redirect all-am all installdirs \
-+mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
- 
- .PHONY: files
diff --git a/graphics/gimp/files/patch-ae b/graphics/gimp/files/patch-ae
index ca2fa369a359..a7416000f0e6 100644
--- a/graphics/gimp/files/patch-ae
+++ b/graphics/gimp/files/patch-ae
@@ -1,5 +1,5 @@
---- plug-ins/plugindetails/plugindetails.c.orig	Sat Mar 27 07:53:38 1999
-+++ plug-ins/plugindetails/plugindetails.c	Sat May 22 21:24:31 1999
+--- plug-ins/common/plugindetails.c.orig	Sat Mar 27 07:53:38 1999
++++ plug-ins/common/plugindetails.c	Sat May 22 21:24:31 1999
 @@ -25,6 +25,7 @@
  #include <stdio.h>
  #include <string.h>
diff --git a/graphics/gimp/files/patch-af b/graphics/gimp/files/patch-af
index 72a6fdc08e3b..87ce6b507805 100644
--- a/graphics/gimp/files/patch-af
+++ b/graphics/gimp/files/patch-af
@@ -1,20 +1,16 @@
---- gimptool.in.orig	Sat Feb 20 19:48:58 1999
-+++ gimptool.in	Sat Feb 20 19:49:37 1999
-@@ -198,7 +198,7 @@
-     | --install-script | --install-admin-script)
+--- gimptool.in.orig	Wed Aug 25 18:49:22 1999
++++ gimptool.in	Tue Oct 12 13:31:37 1999
+@@ -209,11 +209,11 @@
+     | --uninstall-script | --uninstall-admin-script )
        case $1 in
-         --install-bin)
+         --*install-bin)
 -          install_cmd="@INSTALL_PROGRAM@"
 +          install_cmd="@INSTALL_SCRIPT@"
            install_dir="$HOME/@gimpdir@/plug-ins"
            ;;
          --install-bin-strip)
-@@ -206,7 +206,7 @@
+-          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="$plug_in_dir/plug-ins"
-           ;;
-         --install-admin-bin-strip)
+         --*install-admin-bin)
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index f178ae078a0d..80d4d82eb59c 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.orig	Tue May  4 06:06:39 1999
-+++ configure	Sat May 22 21:39:37 1999
-@@ -3538,7 +3538,10 @@
+--- configure.orig	Wed Oct  6 14:00:22 1999
++++ configure	Tue Oct 12 13:37:31 1999
+@@ -3471,7 +3471,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,10 +9,11 @@
 +		   INTLDEPS='-lintl'
 +		   INTLLIBS=$INTLDEPS
 +		   LIBS=`echo $LIBS | sed -e 's/-lintl//'`
++
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7165,7 +7168,7 @@
+@@ -7108,7 +7112,7 @@
  fi
  
  gimpdatadir=$datadir/gimp
@@ -21,14 +22,14 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8746,10 +8749,6 @@
-       *) # Relative path.
-         ac_sub_cache_file="$ac_dots$cache_file" ;;
-       esac
+@@ -8513,10 +8517,6 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
+ 
 -  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
+-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-  esac
  
-       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
-       # The eval makes quoting arguments work.
+   echo creating "$ac_file"
+   rm -f "$ac_file"