Update gimp-devel (unstable development version of the GIMP) to 1.3.3 after

a repo-copy from ports/graphics/gimp1 and connect it to the build.

Prompted by:	Alexandr Kovalenko <never@nevermind.kiev.ua>

7 files changed, 34 insertions, 56 deletions

diff --git a/graphics/gimpshop/files/patch-Makefile.in b/graphics/gimpshop/files/patch-Makefile.in
new file mode 100644
index 0000000..4e49675
--- /dev/null
+++ b/graphics/gimpshop/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in	2002/05/17 18:44:19	1.1
++++ Makefile.in	2002/05/17 18:44:46
+@@ -185,7 +185,7 @@
+ 
+ bin_SCRIPTS = gimptool-1.3 @GIMPINSTALL@
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = gimp-1.3.pc gimpui-1.3.pc
+ 
+ EXTRA_SCRIPTS = gimpinstall-1.3
diff --git a/graphics/gimpshop/files/patch-ac b/graphics/gimpshop/files/patch-ac
deleted file mode 100644
index 22755b4..0000000
--- a/graphics/gimpshop/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sat May  6 01:10:00 2000
-+++ Makefile.in	Sat May  6 01:10:12 2000
-@@ -196,7 +196,7 @@
- 
- man_MANS = gimp.1 gimptool.1 gimprc.5
- 
--m4datadir = $(datadir)/aclocal
-+m4datadir = $(prefix)/share/aclocal
- m4data_DATA = gimp.m4
- 
- scriptdata = 
diff --git a/graphics/gimpshop/files/patch-ae b/graphics/gimpshop/files/patch-ae
index a9cd977..52f6bc2 100644
--- a/graphics/gimpshop/files/patch-ae
+++ b/graphics/gimpshop/files/patch-ae
@@ -1,11 +1,13 @@
---- plug-ins/common/plugindetails.c.orig	Fri Jan 14 17:26:07 2000
-+++ plug-ins/common/plugindetails.c	Fri Jan 14 17:26:21 2000
-@@ -27,7 +27,7 @@
+
+$FreeBSD$
+
+--- plug-ins/common/plugindetails.c.orig	Wed Jan 30 17:25:54 2002
++++ plug-ins/common/plugindetails.c	Fri May 17 20:45:33 2002
+@@ -27,6 +27,7 @@
  #include <stdio.h>
  #include <string.h>
  #include <time.h>
--
 +#include <sys/types.h>
- #include <gtk/gtk.h>
  
- #include "libgimp/gimp.h"
+ #ifdef __GNUC__
+ #warning GTK_DISABLE_DEPRECATED
diff --git a/graphics/gimpshop/files/patch-configure b/graphics/gimpshop/files/patch-configure
index 25dd31d..7394312 100644
--- a/graphics/gimpshop/files/patch-configure
+++ b/graphics/gimpshop/files/patch-configure
@@ -1,8 +1,8 @@
 
 $FreeBSD$
 
---- configure.orig	Sun Feb 10 08:21:30 2002
-+++ configure	Sun May 19 23:52:50 2002
+--- configure.orig	Sun Feb 10 22:25:19 2002
++++ configure	Fri May 17 20:53:47 2002
 @@ -746,7 +746,7 @@
  GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
  
@@ -11,8 +11,8 @@ $FreeBSD$
 +LT_CURRENT=2
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
- LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-@@ -5577,6 +5577,7 @@
+ 
+@@ -5310,6 +5310,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -20,7 +20,7 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -11957,8 +11958,8 @@
+@@ -11392,8 +11393,8 @@
  
  fi
  
@@ -31,7 +31,7 @@ $FreeBSD$
  gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
  
  localedir='${prefix}/${DATADIRNAME}/locale'
-@@ -13133,11 +13134,6 @@
+@@ -12526,11 +12527,6 @@
    *) # Relative path.
      srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimpshop/files/patch-gimptool-1.2.in b/graphics/gimpshop/files/patch-gimptool-1.3.in
index 052cac1..a79ae307 100644
--- a/graphics/gimpshop/files/patch-gimptool-1.2.in
+++ b/graphics/gimpshop/files/patch-gimptool-1.3.in
@@ -1,6 +1,9 @@
---- gimptool-1.2.in.orig	Wed Feb 20 14:04:01 2002
-+++ gimptool-1.2.in	Wed Feb 20 14:04:39 2002
-@@ -227,19 +227,19 @@
+
+$FreeBSD$
+
+--- gimptool-1.3.in.orig	Tue Jan 15 12:21:05 2002
++++ gimptool-1.3.in	Fri May 17 20:46:18 2002
+@@ -215,19 +215,19 @@
      | --uninstall-script | --uninstall-admin-script )
        case $1 in
          --*install-bin)
diff --git a/graphics/gimpshop/files/patch-libgimp::Makefile.in b/graphics/gimpshop/files/patch-libgimp::Makefile.in
deleted file mode 100644
index b9cdc78..0000000
--- a/graphics/gimpshop/files/patch-libgimp::Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- libgimp/Makefile.in.orig	Tue Feb 12 05:46:08 2002
-+++ libgimp/Makefile.in	Wed Feb 20 14:02:07 2002
-@@ -225,13 +225,13 @@
- gimpinclude_HEADERS =  	gimp.h				${PDB_WRAPPERS_H}		gimpchainbutton.h		gimpchannel.h			gimpcolorbutton.h		gimpcolordisplay.h		gimpcolorselector.h		gimpcolorspace.h	        gimpcompat.h			gimpdrawable.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimpgradientselect.h		gimphelpui.h			gimpimage.h			gimplayer.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimpparasite.h			gimpparasiteio.h		gimppatheditor.h		gimppixelrgn.h			gimppixmap.h			gimpproceduraldb.h		gimpquerybox.h			gimpselection.h			gimpsignal.h			gimpsizeentry.h			gimptile.h			gimptypes.h			gimpui.h			gimpunit.h			gimpunitmenu.h			gimputils.h			gimpvector.h			gimpwidgets.h			gimpintl.h
- 
- 
--libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	$(no_undefined) 	$(libgimp_export_symbols)
-+libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) 	$(libgimp_export_symbols)
- 
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
- 
- libgimp_la_DEPENDENCIES = $(gimp_def)
- 
--libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	$(no_undefined) 	$(libgimpui_export_symbols)
-+libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) 	$(libgimpui_export_symbols)
- 
- 
- libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)
diff --git a/graphics/gimpshop/files/patch-plug-ins::libgck::gck::Makefile.in b/graphics/gimpshop/files/patch-plug-ins::libgck::gck::Makefile.in
deleted file mode 100644
index 6764015..0000000
--- a/graphics/gimpshop/files/patch-plug-ins::libgck::gck::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig	Tue Feb 12 05:46:23 2002
-+++ plug-ins/libgck/gck/Makefile.in	Wed Feb 20 14:00:02 2002
-@@ -193,7 +193,7 @@
- gckinclude_HEADERS =  	gck.h
- 
- 
--libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
-+libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
- 
- 
- INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)