Upgrade to 1.1.2.

Agreed by:	asami

4 files changed, 155 insertions, 103 deletions

diff --git a/graphics/gimp-devel/files/patch-ac b/graphics/gimp-devel/files/patch-ac
index 109f237f4968..dc9c1c3a3fb4 100644
--- a/graphics/gimp-devel/files/patch-ac
+++ b/graphics/gimp-devel/files/patch-ac
@@ -1,6 +1,6 @@
---- plug-ins/gpc/Makefile.am.orig	Tue Sep 29 22:29:19 1998
-+++ plug-ins/gpc/Makefile.am	Tue Sep 29 22:30:55 1998
-@@ -1,11 +1,15 @@
+--- 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)
@@ -9,34 +9,32 @@
  pluginlib_LIBRARIES = libgpc.a
  
  libgpc_a_SOURCES = \
--	gpc.c gpc.h
+-	gpc.c		\
 +	gpc.c
 +
 +gimpinclude_HEADERS = \
-+	gpc.h
+ 	gpc.h
  
  INCLUDES = \
- 	$(X_CFLAGS)			\
---- plug-ins/gpc/Makefile.in.orig	Tue Sep 29 22:29:22 1998
-+++ plug-ins/gpc/Makefile.in	Tue Sep 29 22:31:20 1998
-@@ -116,11 +116,15 @@
- patterndata = @patterndata@
+--- plug-ins/gpc/Makefile.in.orig	Thu Feb  4 11:21:25 1999
++++ plug-ins/gpc/Makefile.in	Sat Feb 20 17:33:30 1999
+@@ -162,10 +162,14 @@
+ prefix = @prefix@
  
  pluginlibdir = $(libdir)
 +gimpincludedir = $(includedir)
  
  pluginlib_LIBRARIES = libgpc.a
  
- libgpc_a_SOURCES = \
--	gpc.c gpc.h
-+	gpc.c
+-libgpc_a_SOURCES =  	gpc.c			gpc.h
++libgpc_a_SOURCES =  	gpc.c
 +
-+gimpinclude_HEADERS = \
-+	gpc.h
++
++gimpinclude_HEADERS =  	gpc.h
  
- INCLUDES = \
- 	$(X_CFLAGS)			\
-@@ -162,6 +166,8 @@
+ 
+ INCLUDES =  	-I$(top_srcdir)				$(GTK_CFLAGS)				-I$(includedir)
+@@ -201,6 +205,8 @@
  MANS = $(man_MANS)
  
  NROFF = nroff
@@ -45,20 +43,18 @@
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-@@ -169,17 +175,18 @@
+@@ -208,6 +214,7 @@
  
  TAR = tar
- GZIP = --best
+ GZIP_ENV = --best
 +DEP_FILES =  .deps/gpc.P
  SOURCES = $(libgpc_a_SOURCES)
  OBJECTS = $(libgpc_a_OBJECTS)
  
--all: Makefile $(LIBRARIES) $(MANS)
-+all: Makefile $(LIBRARIES) $(MANS) $(HEADERS)
- 
+@@ -215,9 +222,9 @@
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
- $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ $(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
  
@@ -67,7 +63,7 @@
  	cd $(top_builddir) \
  	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
-@@ -216,9 +223,6 @@
+@@ -254,9 +261,6 @@
  	  rm -f $(DESTDIR)$(pluginlibdir)/$$p; \
  	done
  
@@ -77,7 +73,7 @@
  .s.o:
  	$(COMPILE) -c $<
  
-@@ -235,9 +239,6 @@
+@@ -273,9 +277,6 @@
  
  maintainer-clean-compile:
  
@@ -87,9 +83,9 @@
  .s.lo:
  	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
  
-@@ -298,6 +299,21 @@
+@@ -336,6 +337,21 @@
  	@$(NORMAL_UNINSTALL)
- 	$(MAKE) uninstall-man3
+ 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
  
 +install-gimpincludeHEADERS: $(gimpinclude_HEADERS)
 +	@$(NORMAL_INSTALL)
@@ -109,7 +105,7 @@
  tags: TAGS
  
  ID: $(HEADERS) $(SOURCES) $(LISP)
-@@ -328,6 +344,11 @@
+@@ -370,6 +386,11 @@
  subdir = plug-ins/gpc
  
  distdir: $(DISTFILES)
@@ -120,10 +116,14 @@
 +	  && $(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); \
- 	  test -f $(distdir)/$$file \
-@@ -335,6 +356,29 @@
- 	  || cp -p $$d/$$file $(distdir)/$$file; \
+ 	  if test -d $$d/$$file; then \
+@@ -380,10 +401,38 @@
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
  	done
+-gpc.o: gpc.c ../../libgimp/gimp.h ../../libgimp/gimpenums.h \
+-	../../libgimp/gimpfeatures.h ../../libgimp/parasite.h \
+-	../../libgimp/parasiteF.h ../../libgimp/parasiteP.h
  
 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 +
@@ -134,89 +134,113 @@
 +clean-depend:
 +
 +distclean-depend:
++	-rm -rf .deps
 +
 +maintainer-clean-depend:
-+	-rm -rf .deps
 +
 +%.o: %.c
 +	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).P -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).p -c $<
-+	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
-+	  < .deps/$(*F).p > .deps/$(*F).P
-+	@-rm -f .deps/$(*F).p
- info:
- dvi:
- check: all
-@@ -343,18 +387,19 @@
- install-exec: 
- 	@$(NORMAL_INSTALL)
- 
--install-data: install-pluginlibLIBRARIES install-man
-+install-data: install-pluginlibLIBRARIES install-man install-gimpincludeHEADERS
- 	@$(NORMAL_INSTALL)
- 
- install: install-exec install-data all
- 	@:
- 
--uninstall: uninstall-pluginlibLIBRARIES uninstall-man
-+uninstall: uninstall-pluginlibLIBRARIES uninstall-man uninstall-gimpincludeHEADERS
- 
++	$(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:
+@@ -395,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) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
  installdirs:
--	$(mkinstalldirs)  $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3
-+	$(mkinstalldirs)  $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \
-+		$(DATADIR)$(gimpincludedir)
+-	$(mkinstalldirs)  $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3
++	$(mkinstalldirs)  $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \
++		$(DESTDIR)$(gimpincludedir)
  
  
  mostlyclean-generic:
-@@ -372,22 +417,22 @@
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean:  mostlyclean-pluginlibLIBRARIES mostlyclean-compile \
+@@ -421,27 +473,27 @@
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pluginlibLIBRARIES mostlyclean-compile \
 -		mostlyclean-libtool mostlyclean-tags \
 +		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
  		mostlyclean-generic
  
- clean:  clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \
--		clean-generic mostlyclean
-+		clean-depend clean-generic mostlyclean
+ mostlyclean: mostlyclean-am
  
- distclean:  distclean-pluginlibLIBRARIES distclean-compile \
+ 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
+-		clean-am
 +		distclean-libtool distclean-tags distclean-depend \
-+		distclean-generic clean
- 	-rm -f config.status
++		distclean-generic clean-am
  	-rm -f libtool
  
- maintainer-clean:  maintainer-clean-pluginlibLIBRARIES \
+ distclean: distclean-am
+ 
+ maintainer-clean-am:  maintainer-clean-pluginlibLIBRARIES \
  		maintainer-clean-compile maintainer-clean-libtool \
 -		maintainer-clean-tags maintainer-clean-generic \
--		distclean
+-		distclean-am
 +		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean
++		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."
  
-@@ -397,10 +442,12 @@
+@@ -453,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 dvi installcheck \
--install-exec install-data install uninstall all installdirs \
--mostlyclean-generic distclean-generic clean-generic \
+-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 dvi \
-+installcheck install-exec install-data install uninstall all \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++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-devel/files/patch-ae b/graphics/gimp-devel/files/patch-ae
new file mode 100644
index 000000000000..bc633c2f961b
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-ae
@@ -0,0 +1,11 @@
+--- plug-ins/plugindetails/plugindetails.c.orig	Sat Feb 20 18:47:03 1999
++++ plug-ins/plugindetails/plugindetails.c	Sat Feb 20 18:47:11 1999
+@@ -25,7 +25,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
+-#include <regex.h>
++#include <gnuregex.h>
+ #include "gtk/gtk.h"
+ #include "libgimp/gimp.h"
+ 
diff --git a/graphics/gimp-devel/files/patch-af b/graphics/gimp-devel/files/patch-af
new file mode 100644
index 000000000000..72a6fdc08e3b
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-af
@@ -0,0 +1,20 @@
+--- 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)
+       case $1 in
+         --install-bin)
+-          install_cmd="@INSTALL_PROGRAM@"
++          install_cmd="@INSTALL_SCRIPT@"
+           install_dir="$HOME/@gimpdir@/plug-ins"
+           ;;
+         --install-bin-strip)
+@@ -206,7 +206,7 @@
+           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)
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index 9d364506b01c..190924fc41a0 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -1,36 +1,33 @@
---- configure.in.orig	Sun Sep 27 16:50:04 1998
-+++ configure.in	Tue Sep 29 22:28:31 1998
-@@ -358,7 +358,7 @@
- LIBS="$gimp_save_LIBS"
+--- configure.in.orig	Thu Feb  4 08:37:10 1999
++++ configure.in	Sun Feb 21 00:11:35 1999
+@@ -441,7 +441,7 @@
+ fi
  
  gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+ localedir=$datadir/locale
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
- gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure.orig	Mon Sep 28 06:00:09 1998
-+++ configure	Tue Sep 29 22:28:31 1998
-@@ -4379,7 +4379,7 @@
- LIBS="$gimp_save_LIBS"
+--- configure.orig	Thu Feb  4 08:38:47 1999
++++ configure	Sun Feb 21 00:11:46 1999
+@@ -7254,7 +7254,7 @@
+ fi
  
  gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+ localedir=$datadir/locale
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
- gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- Makefile.in.orig	Wed Sep 30 00:52:20 1998
-+++ Makefile.in	Wed Sep 30 00:52:41 1998
-@@ -440,9 +440,9 @@
+--- Makefile.in.orig	Sat Feb 20 23:45:16 1999
++++ Makefile.in	Sun Feb 21 00:12:00 1999
+@@ -530,7 +530,7 @@
+ install-exec: install-exec-recursive
  
- install-exec-am: install-binSCRIPTS
+ install-data-am: install-gimpdataSCRIPTS install-man \
+-		install-gimpdataDATA install-m4dataDATA
++		install-gimpdataDATA
+ install-data: install-data-recursive
  
--install-data-am: install-gimpdataSCRIPTS install-man install-gimpdataDATA install-m4dataDATA
-+install-data-am: install-gimpdataSCRIPTS install-man install-gimpdataDATA
- 
--uninstall-am: uninstall-binSCRIPTS uninstall-gimpdataSCRIPTS uninstall-man uninstall-gimpdataDATA uninstall-m4dataDATA
-+uninstall-am: uninstall-binSCRIPTS uninstall-gimpdataSCRIPTS uninstall-man uninstall-gimpdataDATA
- 
- install-exec: install-exec-recursive install-exec-am
- 	@$(NORMAL_INSTALL)
+ install-am: all-am