1. Upgrade to 1.0.0.

2. Portlint.
PR:	ports/6878
Submitted by:	Brett Taylor <brett@peloton.physics.montana.edu>

5 files changed, 146 insertions, 159 deletions

diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index ea01d9bf4c35..f8f7da300475 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,32 +1,24 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.28
+# Version required:     1.0.0
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.32 1998/05/21 21:28:51 mph Exp $
+# $Id: Makefile,v 1.33 1998/05/27 18:36:01 vanilla Exp $
 #
 
-MAJOR=	0
-MINOR=	99
-MICRO=	31
-
-VERSION=	${MAJOR}.${MINOR}.${MICRO}
-MM_VERSION=	${MAJOR}.${MINOR}
-
-DISTNAME=	gimp-${VERSION}
-DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-extras-${MM_VERSION}a.tar.gz
-
+DISTNAME=	gimp-1.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
-	ftp://ftp.cs.umn.edu/pub/gimp/gimp/v${MAJOR}.${MINOR}/v${VERSION}/
+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
 
 MAINTAINER=	erich@FreeBSD.org
 
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg\\.9\\.:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	gtk\\.1\\.3:${PORTSDIR}/x11/gtk
+LIB_DEPENDS+=	gtk\\.1\\.4:${PORTSDIR}/x11/gtk
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png\\.2\\.:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
@@ -46,8 +38,8 @@ MAN3=		gpc.3
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
-	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
+	${MKDIR} ${PREFIX}/share/gimp/;
+	cd ${WRKDIR}/gimp-data-extras-1.0.0; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 37675518c4f7..3084434c623d 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-0.99.31.tar.gz) = f648ae8180c91eaf5188619bb986723e
-MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
+MD5 (gimp-1.0.0.tar.gz) = b08fbdea508e6df7058b5e3bef5b1e12
+MD5 (gimp-data-extras-1.0.0.tar.gz) = 62fbffda0fdc34e89f04fb70c8e17672
diff --git a/graphics/gimpshop/files/patch-aa b/graphics/gimpshop/files/patch-aa
index d88851a1fcc3..a6abcf19014d 100644
--- a/graphics/gimpshop/files/patch-aa
+++ b/graphics/gimpshop/files/patch-aa
@@ -1,5 +1,5 @@
---- app/main.c.orig	Mon Apr 20 18:19:27 1998
-+++ app/main.c	Sun May 17 10:33:39 1998
+--- app/main.c.orig	Sat May 30 15:32:13 1998
++++ app/main.c	Sun Jun  7 10:08:19 1998
 @@ -16,6 +16,7 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
@@ -8,7 +8,7 @@
  #include <locale.h>
  #include <stdio.h>
  #include <stdlib.h>
-@@ -80,10 +81,15 @@
+@@ -81,10 +82,15 @@
    int i, j;
    gchar *display_name, *display_env;
  
diff --git a/graphics/gimpshop/files/patch-ab b/graphics/gimpshop/files/patch-ab
index 3c90bafc4593..f176e017d798 100644
--- a/graphics/gimpshop/files/patch-ab
+++ b/graphics/gimpshop/files/patch-ab
@@ -1,20 +1,13 @@
-
-*****
-***** patches for plug-ins
-*****
-
---- /a/gimp-0.99.6/plug-ins/url/url.c	Mon Mar 10 04:57:12 1997
-+++ plug-ins/url/url.c	Wed Mar 12 21:56:39 1997
+--- 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
 @@ -146,8 +146,8 @@
      }
    else if (pid == 0)
      {
 -      execlp ("wget", "wget", filename, "-O", tmpname, NULL);
--      g_warning ("url: exec failed: wget: %s\n", g_strerror(errno));
+-      g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
 +      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
-+      g_warning ("url: exec failed: fetch: %s\n", g_strerror(errno));
++      g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
        _exit(127);
      }
    else
-
-
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 8dd716d230c0..bca0392e491b 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -29,129 +29,129 @@ lib/libgimpui.so
 lib/libgimpui.so.1.0
 lib/libgpc.a
 lib/libmegawidget.a
-libexec/gimp/0.99/plug-ins/AlienMap
-libexec/gimp/0.99/plug-ins/CEL
-libexec/gimp/0.99/plug-ins/CML_explorer
-libexec/gimp/0.99/plug-ins/MapObject
-libexec/gimp/0.99/plug-ins/aa
-libexec/gimp/0.99/plug-ins/align_layers
-libexec/gimp/0.99/plug-ins/animationplay
-libexec/gimp/0.99/plug-ins/animoptimize
-libexec/gimp/0.99/plug-ins/apply_lens
-libexec/gimp/0.99/plug-ins/autocrop
-libexec/gimp/0.99/plug-ins/autostretch_hsv
-libexec/gimp/0.99/plug-ins/blinds
-libexec/gimp/0.99/plug-ins/blur
-libexec/gimp/0.99/plug-ins/bmp
-libexec/gimp/0.99/plug-ins/bumpmap
-libexec/gimp/0.99/plug-ins/bz2
-libexec/gimp/0.99/plug-ins/c_astretch
-libexec/gimp/0.99/plug-ins/checkerboard
-libexec/gimp/0.99/plug-ins/colorify
-libexec/gimp/0.99/plug-ins/compose
-libexec/gimp/0.99/plug-ins/convmatrix
-libexec/gimp/0.99/plug-ins/cubism
-libexec/gimp/0.99/plug-ins/dbbrowser
-libexec/gimp/0.99/plug-ins/decompose
-libexec/gimp/0.99/plug-ins/deinterlace
-libexec/gimp/0.99/plug-ins/depthmerge
-libexec/gimp/0.99/plug-ins/despeckle
-libexec/gimp/0.99/plug-ins/destripe
-libexec/gimp/0.99/plug-ins/diffraction
-libexec/gimp/0.99/plug-ins/displace
-libexec/gimp/0.99/plug-ins/edge
-libexec/gimp/0.99/plug-ins/emboss
-libexec/gimp/0.99/plug-ins/engrave
-libexec/gimp/0.99/plug-ins/exchange
-libexec/gimp/0.99/plug-ins/faxg3
-libexec/gimp/0.99/plug-ins/film
-libexec/gimp/0.99/plug-ins/fits
-libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/flarefx
-libexec/gimp/0.99/plug-ins/fractaltrace
-libexec/gimp/0.99/plug-ins/gauss_iir
-libexec/gimp/0.99/plug-ins/gauss_rle
-libexec/gimp/0.99/plug-ins/gbr
-libexec/gimp/0.99/plug-ins/gfig
-libexec/gimp/0.99/plug-ins/gfli
-libexec/gimp/0.99/plug-ins/gee
-libexec/gimp/0.99/plug-ins/gicon
-libexec/gimp/0.99/plug-ins/gif
-libexec/gimp/0.99/plug-ins/glasstile
-libexec/gimp/0.99/plug-ins/gqbist
-libexec/gimp/0.99/plug-ins/gradmap
-libexec/gimp/0.99/plug-ins/grid
-libexec/gimp/0.99/plug-ins/gtm
-libexec/gimp/0.99/plug-ins/gz
-libexec/gimp/0.99/plug-ins/header
-libexec/gimp/0.99/plug-ins/hot
-libexec/gimp/0.99/plug-ins/hrz
-libexec/gimp/0.99/plug-ins/ifscompose
-libexec/gimp/0.99/plug-ins/illusion
-libexec/gimp/0.99/plug-ins/iwarp
-libexec/gimp/0.99/plug-ins/jpeg
-libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/mail
-libexec/gimp/0.99/plug-ins/max_rgb
-libexec/gimp/0.99/plug-ins/maze
-libexec/gimp/0.99/plug-ins/mblur
-libexec/gimp/0.99/plug-ins/mosaic
-libexec/gimp/0.99/plug-ins/mpeg
-libexec/gimp/0.99/plug-ins/nlfilt
-libexec/gimp/0.99/plug-ins/noisify
-libexec/gimp/0.99/plug-ins/normalize
-libexec/gimp/0.99/plug-ins/nova
-libexec/gimp/0.99/plug-ins/oilify
-libexec/gimp/0.99/plug-ins/pagecurl
-libexec/gimp/0.99/plug-ins/palette
-libexec/gimp/0.99/plug-ins/papertile
-libexec/gimp/0.99/plug-ins/pat
-libexec/gimp/0.99/plug-ins/pcx
-libexec/gimp/0.99/plug-ins/pix
-libexec/gimp/0.99/plug-ins/pixelize
-libexec/gimp/0.99/plug-ins/plasma
-libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/pnm
-libexec/gimp/0.99/plug-ins/polar
-libexec/gimp/0.99/plug-ins/print
-libexec/gimp/0.99/plug-ins/ps
-libexec/gimp/0.99/plug-ins/psd
-libexec/gimp/0.99/plug-ins/randomize
-libexec/gimp/0.99/plug-ins/ripple
-libexec/gimp/0.99/plug-ins/rotate
-libexec/gimp/0.99/plug-ins/rotators
-libexec/gimp/0.99/plug-ins/scatter_hsv
-libexec/gimp/0.99/plug-ins/screenshot
-libexec/gimp/0.99/plug-ins/script-fu
-libexec/gimp/0.99/plug-ins/semiflatten
-libexec/gimp/0.99/plug-ins/sgi
-libexec/gimp/0.99/plug-ins/sharpen
-libexec/gimp/0.99/plug-ins/shift
-libexec/gimp/0.99/plug-ins/sinus
-libexec/gimp/0.99/plug-ins/smooth_palette
-libexec/gimp/0.99/plug-ins/snoise
-libexec/gimp/0.99/plug-ins/snp
-libexec/gimp/0.99/plug-ins/sobel
-libexec/gimp/0.99/plug-ins/sparkle
-libexec/gimp/0.99/plug-ins/spread
-libexec/gimp/0.99/plug-ins/struc
-libexec/gimp/0.99/plug-ins/sunras
-libexec/gimp/0.99/plug-ins/tga
-libexec/gimp/0.99/plug-ins/threshold_alpha
-libexec/gimp/0.99/plug-ins/tiff
-libexec/gimp/0.99/plug-ins/tile
-libexec/gimp/0.99/plug-ins/tileit
-libexec/gimp/0.99/plug-ins/tiler
-libexec/gimp/0.99/plug-ins/url
-libexec/gimp/0.99/plug-ins/video
-libexec/gimp/0.99/plug-ins/vinvert
-libexec/gimp/0.99/plug-ins/vpropagate
-libexec/gimp/0.99/plug-ins/waves
-libexec/gimp/0.99/plug-ins/webbrowser
-libexec/gimp/0.99/plug-ins/whirlpinch
-libexec/gimp/0.99/plug-ins/xpm
-libexec/gimp/0.99/plug-ins/xwd
-libexec/gimp/0.99/plug-ins/zealouscrop
+libexec/gimp/1.0/plug-ins/AlienMap
+libexec/gimp/1.0/plug-ins/CEL
+libexec/gimp/1.0/plug-ins/CML_explorer
+libexec/gimp/1.0/plug-ins/MapObject
+libexec/gimp/1.0/plug-ins/aa
+libexec/gimp/1.0/plug-ins/align_layers
+libexec/gimp/1.0/plug-ins/animationplay
+libexec/gimp/1.0/plug-ins/animoptimize
+libexec/gimp/1.0/plug-ins/apply_lens
+libexec/gimp/1.0/plug-ins/autocrop
+libexec/gimp/1.0/plug-ins/autostretch_hsv
+libexec/gimp/1.0/plug-ins/blinds
+libexec/gimp/1.0/plug-ins/blur
+libexec/gimp/1.0/plug-ins/bmp
+libexec/gimp/1.0/plug-ins/bumpmap
+libexec/gimp/1.0/plug-ins/bz2
+libexec/gimp/1.0/plug-ins/c_astretch
+libexec/gimp/1.0/plug-ins/checkerboard
+libexec/gimp/1.0/plug-ins/colorify
+libexec/gimp/1.0/plug-ins/compose
+libexec/gimp/1.0/plug-ins/convmatrix
+libexec/gimp/1.0/plug-ins/cubism
+libexec/gimp/1.0/plug-ins/dbbrowser
+libexec/gimp/1.0/plug-ins/decompose
+libexec/gimp/1.0/plug-ins/deinterlace
+libexec/gimp/1.0/plug-ins/depthmerge
+libexec/gimp/1.0/plug-ins/despeckle
+libexec/gimp/1.0/plug-ins/destripe
+libexec/gimp/1.0/plug-ins/diffraction
+libexec/gimp/1.0/plug-ins/displace
+libexec/gimp/1.0/plug-ins/edge
+libexec/gimp/1.0/plug-ins/emboss
+libexec/gimp/1.0/plug-ins/engrave
+libexec/gimp/1.0/plug-ins/exchange
+libexec/gimp/1.0/plug-ins/faxg3
+libexec/gimp/1.0/plug-ins/film
+libexec/gimp/1.0/plug-ins/fits
+libexec/gimp/1.0/plug-ins/flame
+libexec/gimp/1.0/plug-ins/flarefx
+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/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
+libexec/gimp/1.0/plug-ins/gqbist
+libexec/gimp/1.0/plug-ins/gradmap
+libexec/gimp/1.0/plug-ins/grid
+libexec/gimp/1.0/plug-ins/gtm
+libexec/gimp/1.0/plug-ins/gz
+libexec/gimp/1.0/plug-ins/header
+libexec/gimp/1.0/plug-ins/hot
+libexec/gimp/1.0/plug-ins/hrz
+libexec/gimp/1.0/plug-ins/ifscompose
+libexec/gimp/1.0/plug-ins/illusion
+libexec/gimp/1.0/plug-ins/iwarp
+libexec/gimp/1.0/plug-ins/jpeg
+libexec/gimp/1.0/plug-ins/laplace
+libexec/gimp/1.0/plug-ins/mail
+libexec/gimp/1.0/plug-ins/max_rgb
+libexec/gimp/1.0/plug-ins/maze
+libexec/gimp/1.0/plug-ins/mblur
+libexec/gimp/1.0/plug-ins/mosaic
+libexec/gimp/1.0/plug-ins/mpeg
+libexec/gimp/1.0/plug-ins/nlfilt
+libexec/gimp/1.0/plug-ins/noisify
+libexec/gimp/1.0/plug-ins/normalize
+libexec/gimp/1.0/plug-ins/nova
+libexec/gimp/1.0/plug-ins/oilify
+libexec/gimp/1.0/plug-ins/pagecurl
+libexec/gimp/1.0/plug-ins/palette
+libexec/gimp/1.0/plug-ins/papertile
+libexec/gimp/1.0/plug-ins/pat
+libexec/gimp/1.0/plug-ins/pcx
+libexec/gimp/1.0/plug-ins/pix
+libexec/gimp/1.0/plug-ins/pixelize
+libexec/gimp/1.0/plug-ins/plasma
+libexec/gimp/1.0/plug-ins/png
+libexec/gimp/1.0/plug-ins/pnm
+libexec/gimp/1.0/plug-ins/polar
+libexec/gimp/1.0/plug-ins/print
+libexec/gimp/1.0/plug-ins/ps
+libexec/gimp/1.0/plug-ins/psd
+libexec/gimp/1.0/plug-ins/randomize
+libexec/gimp/1.0/plug-ins/ripple
+libexec/gimp/1.0/plug-ins/rotate
+libexec/gimp/1.0/plug-ins/rotators
+libexec/gimp/1.0/plug-ins/scatter_hsv
+libexec/gimp/1.0/plug-ins/screenshot
+libexec/gimp/1.0/plug-ins/script-fu
+libexec/gimp/1.0/plug-ins/semiflatten
+libexec/gimp/1.0/plug-ins/sgi
+libexec/gimp/1.0/plug-ins/sharpen
+libexec/gimp/1.0/plug-ins/shift
+libexec/gimp/1.0/plug-ins/sinus
+libexec/gimp/1.0/plug-ins/smooth_palette
+libexec/gimp/1.0/plug-ins/snoise
+libexec/gimp/1.0/plug-ins/snp
+libexec/gimp/1.0/plug-ins/sobel
+libexec/gimp/1.0/plug-ins/sparkle
+libexec/gimp/1.0/plug-ins/spread
+libexec/gimp/1.0/plug-ins/struc
+libexec/gimp/1.0/plug-ins/sunras
+libexec/gimp/1.0/plug-ins/tga
+libexec/gimp/1.0/plug-ins/threshold_alpha
+libexec/gimp/1.0/plug-ins/tiff
+libexec/gimp/1.0/plug-ins/tile
+libexec/gimp/1.0/plug-ins/tileit
+libexec/gimp/1.0/plug-ins/tiler
+libexec/gimp/1.0/plug-ins/url
+libexec/gimp/1.0/plug-ins/video
+libexec/gimp/1.0/plug-ins/vinvert
+libexec/gimp/1.0/plug-ins/vpropagate
+libexec/gimp/1.0/plug-ins/waves
+libexec/gimp/1.0/plug-ins/webbrowser
+libexec/gimp/1.0/plug-ins/whirlpinch
+libexec/gimp/1.0/plug-ins/xpm
+libexec/gimp/1.0/plug-ins/xwd
+libexec/gimp/1.0/plug-ins/zealouscrop
 man/man1/gimp.1.gz
 man/man1/gimptool.1.gz
 man/man3/gpc.3.gz
@@ -570,6 +570,7 @@ share/gimp/scripts/distress_selection.scm
 share/gimp/scripts/drop-shadow.scm
 share/gimp/scripts/egg.scm
 share/gimp/scripts/erase-rows.scm
+share/gimp/scripts/fade-outline.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
 share/gimp/scripts/frosty-logo.scm
@@ -626,12 +627,13 @@ share/gimp/user_install
 share/gimp/gimprc
 share/gimp/gimprc_user
 share/gimp/gtkrc
+share/gimp/gtkrc.forest2
 share/gimp/gimp_logo.ppm
 share/gimp/gimp_splash.ppm
 share/gimp/gimp_tips.txt
 share/gimp/ps-menurc
-@dirrm libexec/gimp/0.99/plug-ins
-@dirrm libexec/gimp/0.99
+@dirrm libexec/gimp/1.0/plug-ins
+@dirrm libexec/gimp/1.0
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck