Update to 1.2.0. Changes: many bugfixes, new plugins, etc.

3 files changed, 8 insertions, 66 deletions

diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index b3763fc417b..02b980d9a8a 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,38 +1,13 @@
-$NetBSD: patch-aa,v 1.5 1999/04/05 23:28:29 tron Exp $
+$NetBSD: patch-aa,v 1.6 2000/12/26 18:25:33 hubertf Exp $
 
---- configure.orig	Thu Apr  1 04:56:41 1999
-+++ configure	Tue Apr  6 01:09:43 1999
-@@ -644,7 +644,7 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+--- modules/Makefile.in.orig	Tue Dec 26 14:20:44 2000
++++ modules/Makefile.in
+@@ -180,7 +180,7 @@
+ CPPFLAGS =  	-DMODULE_COMPILATION
  
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+-INCLUDES =          -I$(top_srcdir)		        -I$(top_srcdir)/intl	        $(GTK_CFLAGS)		        -I$(includedir)
++INCLUDES =          -I$(top_srcdir)		        -I$(top_srcdir)/intl	        $(GTK_CFLAGS)		        -I$(includedir) $(INTLDEPS)
  
-@@ -1540,6 +1540,7 @@
- fi
  
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1836,6 +1837,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3118,7 +3120,7 @@
- fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  TIFF='tiff'; LIBTIFF_LIB='-ltiff'
-+  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
- else
-   echo "$ac_t""no" 1>&6
- echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
+ EXTRA_DIST =  	makefile.mingw			makefile.mingw.in		makefile.msc			module.def			gimpmodregister.c		gimpmodregister.h
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
deleted file mode 100644
index 1fbb48e146c..00000000000
--- a/graphics/gimp/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:40:47 agc Exp $
-
---- plug-ins/mail/mail.c.orig	Mon Nov 24 23:04:27 1997
-+++ plug-ins/mail/mail.c	Tue Apr 14 00:43:26 1998
-@@ -88,9 +88,9 @@
-    * As always: The utility of this plugin is left as an exercise for the reader
-    *
-  */
--#ifndef MAILER
--#define MAILER "/usr/lib/sendmail"
--#endif
-+
-+#include <paths.h>
-+#define MAILER _PATH_SENDMAIL
- 
- #ifndef UUENCODE
- #define UUENCODE "uuencode"
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
deleted file mode 100644
index c2f7a34d9a3..00000000000
--- a/graphics/gimp/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.8 1999/05/05 21:01:49 tv Exp $
-
---- docs/Makefile.in.orig	Wed May  5 16:11:26 1999
-+++ docs/Makefile.in	Wed May  5 16:12:09 1999
-@@ -463,9 +463,8 @@
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
- 
--pdb_dump.texi: $(srcdir)/pdb_self_doc.el $(srcdir)/pdb_dump
--	cd $(srcdir) && \
--	@EMACS@ --batch -l pdb_self_doc.el -f make-docs-noargs
-+pdb_dump.texi: $(srcdir)/pdb_self_doc $(srcdir)/pdb_dump
-+	$(srcdir)/pdb_self_doc <$(srcdir)/pdb_dump >pdb_dump.texi
- 
- $(srcdir)/pdb_dump: $(top_srcdir)/app/*.c
- 	$(top_builddir)/app/gimp --no-interface --batch '(gimp-procedural-db-dump "pdb_dump.tmp")' '(gimp-quit 0)'