8 files changed, 64 insertions, 50 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 7a3f8f057327..28672dfbed27 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.0.0
+# Version required:     1.0.1
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.46 1998/09/22 22:55:52 asami Exp $
+# $Id: Makefile,v 1.47 1998/09/23 00:51:58 vanilla Exp $
 #
 
-DISTNAME=	gimp-1.0.0
+DISTNAME=	gimp-1.0.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.0/v1.0.0/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.0/v1.0.0/ \
-		http://www.ameth.org/gimp/pub/gimp/v1.0/v1.0.0/
-DISTFILES=	gimp-1.0.0.tar.gz gimp-data-extras-1.0.0.tar.gz
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.0/v1.0.1/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.0/v1.0.1/ \
+		http://www.ameth.org/gimp/pub/gimp/v1.0/v1.0.1/
+DISTFILES=	gimp-1.0.1.tar.gz gimp-data-extras-1.0.0.tar.gz
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -27,7 +27,7 @@ LIB_DEPENDS+=	xdelta.0:${PORTSDIR}/misc/xdelta
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-
+CONFIGURE_ARGS=	--with-xdelta=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
@@ -43,5 +43,6 @@ post-install:
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 3084434c623d..1ccf374511ed 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-1.0.0.tar.gz) = b08fbdea508e6df7058b5e3bef5b1e12
+MD5 (gimp-1.0.1.tar.gz) = b2f1dabb3f2a40b7e647084b2fac8ec5
 MD5 (gimp-data-extras-1.0.0.tar.gz) = 62fbffda0fdc34e89f04fb70c8e17672
diff --git a/graphics/gimp-app/files/patch-aa b/graphics/gimp-app/files/patch-aa
index a6abcf19014d..db75e4e1092b 100644
--- a/graphics/gimp-app/files/patch-aa
+++ b/graphics/gimp-app/files/patch-aa
@@ -1,5 +1,5 @@
---- app/main.c.orig	Sat May 30 15:32:13 1998
-+++ app/main.c	Sun Jun  7 10:08:19 1998
+--- 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 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -8,13 +8,7 @@
  #include <locale.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -81,10 +82,15 @@
-   int i, j;
-   gchar *display_name, *display_env;
- 
-+#define ATEXIT(proc)   (atexit (proc))
-+
-   ATEXIT (g_mem_profile);
+@@ -94,6 +95,9 @@
  
    /* Initialize variables */
    prog_name = argv[0];
diff --git a/graphics/gimp-app/files/patch-ac b/graphics/gimp-app/files/patch-ac
index 29a131ca3e9f..109f237f4968 100644
--- a/graphics/gimp-app/files/patch-ac
+++ b/graphics/gimp-app/files/patch-ac
@@ -1,10 +1,9 @@
---- plug-ins/gpc/Makefile.am.orig	Wed May 27 23:47:43 1998
-+++ plug-ins/gpc/Makefile.am	Wed May 27 23:48:43 1998
+--- 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 @@
  ## Process this file with automake to produce Makefile.in
  
--pluginlibdir = $(gimpplugindir)/plug-ins
-+pluginlibdir = $(libdir)
+ pluginlibdir = $(libdir)
 +gimpincludedir = $(includedir)
  
  pluginlib_LIBRARIES = libgpc.a
@@ -18,14 +17,12 @@
  
  INCLUDES = \
  	$(X_CFLAGS)			\
---- plug-ins/gpc/Makefile.in.orig	Wed May 27 23:47:45 1998
-+++ plug-ins/gpc/Makefile.in	Wed May 27 23:48:52 1998
-@@ -115,12 +115,16 @@
- palettedata = @palettedata@
+--- 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@
  
--pluginlibdir = $(gimpplugindir)/plug-ins
-+pluginlibdir = $(libdir)
+ pluginlibdir = $(libdir)
 +gimpincludedir = $(includedir)
  
  pluginlib_LIBRARIES = libgpc.a
@@ -39,7 +36,7 @@
  
  INCLUDES = \
  	$(X_CFLAGS)			\
-@@ -163,6 +167,8 @@
+@@ -162,6 +166,8 @@
  MANS = $(man_MANS)
  
  NROFF = nroff
@@ -48,7 +45,7 @@
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-@@ -170,17 +176,18 @@
+@@ -169,17 +175,18 @@
  
  TAR = tar
  GZIP = --best
@@ -70,7 +67,7 @@
  	cd $(top_builddir) \
  	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
-@@ -217,9 +224,6 @@
+@@ -216,9 +223,6 @@
  	  rm -f $(DESTDIR)$(pluginlibdir)/$$p; \
  	done
  
@@ -80,7 +77,7 @@
  .s.o:
  	$(COMPILE) -c $<
  
-@@ -236,9 +240,6 @@
+@@ -235,9 +239,6 @@
  
  maintainer-clean-compile:
  
@@ -90,7 +87,7 @@
  .s.lo:
  	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
  
-@@ -299,6 +300,21 @@
+@@ -298,6 +299,21 @@
  	@$(NORMAL_UNINSTALL)
  	$(MAKE) uninstall-man3
  
@@ -112,7 +109,7 @@
  tags: TAGS
  
  ID: $(HEADERS) $(SOURCES) $(LISP)
-@@ -329,6 +345,11 @@
+@@ -328,6 +344,11 @@
  subdir = plug-ins/gpc
  
  distdir: $(DISTFILES)
@@ -124,7 +121,7 @@
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  test -f $(distdir)/$$file \
-@@ -336,6 +357,29 @@
+@@ -335,6 +356,29 @@
  	  || cp -p $$d/$$file $(distdir)/$$file; \
  	done
  
@@ -154,7 +151,7 @@
  info:
  dvi:
  check: all
-@@ -344,18 +388,19 @@
+@@ -343,18 +387,19 @@
  install-exec: 
  	@$(NORMAL_INSTALL)
  
@@ -177,7 +174,7 @@
  
  
  mostlyclean-generic:
-@@ -373,22 +418,22 @@
+@@ -372,22 +417,22 @@
  	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
  	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
  mostlyclean:  mostlyclean-pluginlibLIBRARIES mostlyclean-compile \
@@ -206,7 +203,7 @@
  	@echo "This command is intended for maintainers to use;"
  	@echo "it deletes files that may require special tools to rebuild."
  
-@@ -398,10 +443,12 @@
+@@ -397,10 +442,12 @@
  mostlyclean-compile distclean-compile clean-compile \
  maintainer-clean-compile mostlyclean-libtool distclean-libtool \
  clean-libtool maintainer-clean-libtool install-man3 uninstall-man3 \
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index b5a2a29dcd04..9d364506b01c 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.in.orig	Wed May 27 23:32:15 1998
-+++ configure.in	Wed May 27 23:32:30 1998
-@@ -306,7 +306,7 @@
+--- 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"
  
  gimpdatadir=$datadir/gimp
@@ -9,9 +9,9 @@
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
  gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure.orig	Wed May 27 23:32:17 1998
-+++ configure	Wed May 27 23:32:38 1998
-@@ -4146,7 +4146,7 @@
+--- 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"
  
  gimpdatadir=$datadir/gimp
@@ -20,3 +20,17 @@
  
  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 @@
+ 
+ install-exec-am: install-binSCRIPTS
+ 
+-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)
diff --git a/graphics/gimp-app/files/patch-am b/graphics/gimp-app/files/patch-am
index e11f7845ba1b..368e279354da 100644
--- a/graphics/gimp-app/files/patch-am
+++ b/graphics/gimp-app/files/patch-am
@@ -1,5 +1,5 @@
---- libgimp/gimp.c.orig	Sun Apr 12 22:40:51 1998
-+++ libgimp/gimp.c	Sun May 17 11:00:26 1998
+--- 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"
  
@@ -8,7 +8,7 @@
  #include <signal.h>
  #include <stdarg.h>
  #include <stdio.h>
-@@ -84,6 +85,8 @@
+@@ -95,6 +96,8 @@
      }
  
    progname = argv[0];
diff --git a/graphics/gimp-app/pkg-message b/graphics/gimp-app/pkg-message
new file mode 100644
index 000000000000..1f18d33acf95
--- /dev/null
+++ b/graphics/gimp-app/pkg-message
@@ -0,0 +1,7 @@
+*********************************************************
+*							*
+*	If you want to use autoconf with gimp,		*
+*	Please copy gimp.m4 to /usr/local/share/aclocal	*
+*	by yourself, thanks.				*
+*							*
+*********************************************************
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 923254e6f3e4..02208713cf77 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -13,6 +13,7 @@ include/gck/gckui.h
 include/gck/gckvector.h
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
+include/libgimp/gimpfeatures.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpui.h
 lib/libgck.a
@@ -22,11 +23,11 @@ lib/libgck.so.1
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
-lib/libgimp.so.1
+lib/libgimp.so.1.1
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
-lib/libgimpui.so.1
+lib/libgimpui.so.1.1
 lib/libgpc.a
 lib/libmegawidget.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
@@ -74,9 +75,9 @@ libexec/gimp/1.0/plug-ins/fractaltrace
 libexec/gimp/1.0/plug-ins/gauss_iir
 libexec/gimp/1.0/plug-ins/gauss_rle
 libexec/gimp/1.0/plug-ins/gbr
+libexec/gimp/1.0/plug-ins/gee
 libexec/gimp/1.0/plug-ins/gfig
 libexec/gimp/1.0/plug-ins/gfli
-libexec/gimp/1.0/plug-ins/gee
 libexec/gimp/1.0/plug-ins/gicon
 libexec/gimp/1.0/plug-ins/gif
 libexec/gimp/1.0/plug-ins/glasstile