From will@shadow.blackdawn.com Sun Nov  7 17:13:40 1999
Return-Path: <will@shadow.blackdawn.com>
Received: from neptune.psn.net (neptune.psn.net [207.211.58.16])
	by hub.freebsd.org (Postfix) with ESMTP id EC6EE14C15
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Nov 1999 17:13:32 -0800 (PST)
	(envelope-from will@shadow.blackdawn.com)
Received: from 5042-243.008.popsite.net ([209.224.140.243] helo=shadow.blackdawn.com)
	by neptune.psn.net with esmtp (PSN Internet Service 2.12 #3)
	for FreeBSD-gnats-submit@FreeBSD.ORG
	id 11kdNC-0001R4-00; Sun, 7 Nov 1999 18:13:31 -0700
Received: (from will@localhost)
	by shadow.blackdawn.com (8.9.3/8.9.3) id UAA69050;
	Sun, 7 Nov 1999 20:13:24 -0500 (EST)
	(envelope-from will)
Message-Id: <199911080113.UAA69050@shadow.blackdawn.com>
Date: Sun, 7 Nov 1999 20:13:24 -0500 (EST)
From: Will Andrews <andrews@technologist.com>
Sender: will@shadow.blackdawn.com
Reply-To: Will Andrews <andrews@technologist.com>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: update port graphics/gimp1 to v1.1.11
X-Send-Pr-Version: 3.2

>Number:         14779
>Category:       ports
>Synopsis:       update port graphics/gimp1 to v1.1.11
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov  7 17:20:00 PST 1999
>Closed-Date:    Thu Nov 11 18:55:35 PST 1999
>Last-Modified:  Thu Nov 11 18:55:56 PST 1999
>Originator:     Will Andrews
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
none
>Environment:

FreeBSD shadow.blackdawn.com 3.3-STABLE FreeBSD 3.3-STABLE #0: Mon Oct  4 19:40:23 EDT 1999     root@shadow.blackdawn.com:/usr/src/sys/compile/SHADOW  i386

>Description:

This is the update for the graphics/gimp1 port to v1.1.11, which is
currently the only distfile they're passing out on the GIMP FTP sites.
Thus, it's vital to commit this ASAP.

The ${VERSION} stuff is optional (up to the committer), but I suggest
that it be used since it will reduce the size of GIMP diffs by 3 lines
in the future, and may be used for other purposes.. ;)

There were relatively few changes to the port, thankfully. The PLIST
was pretty much the only real work I had to do. :-)

Boy, GIMP sure looks nice now!

>How-To-Repeat:

Apply the diff to the current port.

>Fix:

diff -urN gimp1/Makefile gimp1.new/Makefile
--- gimp1/Makefile	Sun Oct 24 15:42:33 1999
+++ gimp1.new/Makefile	Sun Nov  7 20:04:35 1999
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.1.10
+# Version required:     1.1.11
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD: ports/graphics/gimp1/Makefile,v 1.59 1999/10/23 07:59:39 vanilla Exp $
 #
 
-DISTNAME=	gimp-1.1.10
+DISTNAME=	gimp-${VERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.10/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.10/ \
-		http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.10/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \
+		http://www.ameth.org/gimp/pub/gimp/unstable/v${VERSION}/
 
 MAINTAINER=	erich@FreeBSD.org
 
@@ -22,6 +22,7 @@
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+VERSION=	1.1.11
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff -urN gimp1/files/md5 gimp1.new/files/md5
--- gimp1/files/md5	Sun Oct 24 15:42:33 1999
+++ gimp1.new/files/md5	Sun Nov  7 19:18:08 1999
@@ -1 +1 @@
-MD5 (gimp-1.1.10.tar.bz2) = a5bf11f5bd1050d9d0ed1fc941f4302c
+MD5 (gimp-1.1.11.tar.bz2) = c22832463f6a6333c1cab549dba8bcbc
diff -urN gimp1/patches/patch-ab gimp1.new/patches/patch-ab
--- gimp1/patches/patch-ab	Sun Oct 24 15:42:33 1999
+++ gimp1.new/patches/patch-ab	Sun Nov  7 19:27:07 1999
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c.orig	Sat May 30 15:32:36 1998
-+++ plug-ins/common/url.c	Sun Jun  7 10:09:34 1998
-@@ -146,8 +146,8 @@
+--- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
++++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
+@@ -151,8 +151,8 @@
      }
    else if (pid == 0)
      {
@@ -8,6 +8,6 @@
 -      g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
 +      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
 +      g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+       g_free (tmpname);
        _exit(127);
      }
-   else
diff -urN gimp1/pkg/PLIST gimp1.new/pkg/PLIST
--- gimp1/pkg/PLIST	Sun Oct 24 15:42:36 1999
+++ gimp1.new/pkg/PLIST	Sun Nov  7 19:58:20 1999
@@ -9,6 +9,8 @@
 include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gckvector.h
+include/libgimp/gimpcolorbutton.h
+include/libgimp/gimpcompat.h
 include/libgimp/color_display.h
 include/libgimp/color_selector.h
 include/libgimp/gimp.h
@@ -36,21 +38,22 @@
 include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.so
-lib/libgck.so.10
+lib/libgck.so.11
 lib/libgimp.a
 lib/libgimp.so
-lib/libgimp.so.10
+lib/libgimp.so.11
 lib/libgimpui.a
 lib/libgimpui.so
-lib/libgimpui.so.10
+lib/libgimpui.so.11
 lib/libgpc.a
 lib/libmegawidget.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-libexec/gimp/1.1/modules/libcdisplay_gamma.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.so
+libexec/gimp/1.1/modules/libcdisplay_gamma.a
+libexec/gimp/1.1/modules/libcolorsel_gtk.a
+libexec/gimp/1.1/modules/libcolorsel_triangle.a
+libexec/gimp/1.1/modules/libcolorsel_water.a
+libexec/gimp/1.1/plug-ins/helpbrowser
 libexec/gimp/1.1/plug-ins/AlienMap
 libexec/gimp/1.1/plug-ins/AlienMap2
 libexec/gimp/1.1/plug-ins/CEL
@@ -1039,6 +1042,7 @@
 share/gimp/tips/gimp_tips.it.txt
 share/gimp/tips/gimp_conseils.fr.txt
 share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.ko.txt
 share/gimp/unitrc
 share/gimp/user_install
 share/locale/de/LC_MESSAGES/gimp.mo

>Release-Note:
>Audit-Trail:

From: "Chris D. Faulhaber" <jedgar@fxp.org>
To: Will Andrews <andrews@technologist.com>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/14779: update port graphics/gimp1 to v1.1.11
Date: Sun, 7 Nov 1999 22:11:19 -0500 (EST)

 On Sun, 7 Nov 1999, Will Andrews wrote:
 
 > This is the update for the graphics/gimp1 port to v1.1.11, which is
 > currently the only distfile they're passing out on the GIMP FTP sites.
 > Thus, it's vital to commit this ASAP.
 > 
 
 Not exactly true.  v1.1.10 is now in /pub/gimp/unstable/old/v1.1.10 .  It
 might not be a bad idea to add
 ftp://ftp.gimp.org/pub/gimp/unstable/old/${VERSION} to the MASTER_SITES so
 it is fetchable when they bring out a new version.
 
 -----
 Chris D. Faulhaber <jedgar@fxp.org>  |  All the true gurus I've met never
 System/Network Administrator,        |  claimed they were one, and always
 Reality Check Information, Inc.      |  pointed to someone better.
 
 
 
 
State-Changed-From-To: open->closed 
State-Changed-By: jim 
State-Changed-When: Thu Nov 11 18:55:35 PST 1999 
State-Changed-Why:  
Update committed, thanks! 
>Unformatted:
