Updated to 1.2.4.

Changes:

- DESCR has 80 columns
- better COMMENT
- sync buildlink2.mk with reality
- style nits

1.2.4:
======
- numerous bugfixes, too many to mention.  see ChangeLog for details
- print plug-in now depends on libgimpprint

10 files changed, 93 insertions, 72 deletions

diff --git a/graphics/gimp-base/DESCR b/graphics/gimp-base/DESCR
index 5c8e77cb124..645aecb16b7 100644
--- a/graphics/gimp-base/DESCR
+++ b/graphics/gimp-base/DESCR
@@ -1,4 +1,4 @@
 Powerful image manipulation program similar to "Adobe Photoshop"[tm].
-It supports layers, arbitrary image sizes and working on several images
-at the same time. It comes with a lot of useful plug-ins. Missing is CMYK
-support and more then 8 bits per channel.
+It supports layers, arbitrary image sizes and working on several images at the
+same time. It comes with a lot of useful plug-ins. Missing is CMYK support and
+more then 8 bits per channel.
diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index e9422ad973b..4a9deacc0fd 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,34 +1,34 @@
-# $NetBSD: Makefile,v 1.14 2003/05/05 16:32:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/23 18:04:32 salo Exp $
+#
 
-DISTNAME=		gimp-1.2.3
-PKGNAME=		gimp-base-1.2.3
-PKGREVISION=		5
+DISTNAME=		gimp-1.2.4
+PKGNAME=		gimp-base-1.2.4
 CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.3/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.3/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.2/v1.2.3/
+MASTER_SITES=		ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.4/ \
+			ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.4/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.2/v1.2.4/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		hubertf@netbsd.org
 HOMEPAGE=		http://www.gimp.org/
-COMMENT=		Image manipulation program similar to Photoshop[tm]
+COMMENT=		GNU Image Manipulation Program (base)
 
-CONFLICTS+=		gimp<=1.2.3
+BUILD_USES_MSGFMT=	YES
 
-BUILD_USES_MSGFMT=	yes
+CONFLICTS+=		gimp<=1.2.3
 
-USE_BUILDLINK2=		yes
-USE_PKGINSTALL=		yes
-USE_PKGLOCALEDIR=	yes
-USE_X11=		yes
-USE_GMAKE=		yes
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11=		YES
+USE_GMAKE=		YES
 
-USE_LIBTOOL=		yes
+USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/bsd.prefs.mk"
 
-GNU_CONFIGURE=		yes
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-python
@@ -70,6 +70,7 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/mpeg-lib/buildlink2.mk"
+.include "../../print/gimp-print-lib/buildlink2.mk"
 .if defined(GIMP_WITH_HELPBROWSER) && ${GIMP_WITH_HELPBROWSER} != "no"
 PLIST_SUBST+=	HELPBROWSER=""
 .include "../../x11/gnome-libs/buildlink2.mk"
diff --git a/graphics/gimp-base/PLIST b/graphics/gimp-base/PLIST
index 8557993bc40..374dc8a3110 100644
--- a/graphics/gimp-base/PLIST
+++ b/graphics/gimp-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/21 23:29:25 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/05/23 18:04:32 salo Exp $
 bin/gimp
 bin/gimp-1.2
 bin/gimp-config
@@ -252,19 +252,19 @@ lib/gimp/1.2/plug-ins/xwd
 lib/gimp/1.2/plug-ins/zealouscrop
 lib/libgck-1.2.so
 lib/libgck-1.2.so.0
-lib/libgck-1.2.so.0.3
+lib/libgck-1.2.so.0.4
 lib/libgck.a
 lib/libgck.la
 lib/libgck.so
 lib/libgimp-1.2.so
 lib/libgimp-1.2.so.0
-lib/libgimp-1.2.so.0.3
+lib/libgimp-1.2.so.0.4
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
 lib/libgimpui-1.2.so
 lib/libgimpui-1.2.so.0
-lib/libgimpui-1.2.so.0.3
+lib/libgimpui-1.2.so.0.4
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
@@ -1292,6 +1292,7 @@ share/gimp/1.2/scripts/pupi-button.scm
 share/gimp/1.2/scripts/rendermap.scm
 share/gimp/1.2/scripts/ripply-anim.scm
 share/gimp/1.2/scripts/round-corners.scm
+share/gimp/1.2/scripts/script-fu-util.scm
 share/gimp/1.2/scripts/sel-to-anim-img.scm
 share/gimp/1.2/scripts/select_to_brush.scm
 share/gimp/1.2/scripts/select_to_image.scm
@@ -1333,6 +1334,8 @@ share/gimp/1.2/tips/gimp_tips.ko.txt
 share/gimp/1.2/tips/gimp_tips.lt.txt
 share/gimp/1.2/tips/gimp_tips.pl.txt
 share/gimp/1.2/tips/gimp_tips.ru.txt
+share/gimp/1.2/tips/gimp_tips.sk.txt
+share/gimp/1.2/tips/gimp_tips.sl.txt
 share/gimp/1.2/tips/gimp_tips.tr.txt
 share/gimp/1.2/tips/gimp_tips.txt
 share/gimp/1.2/tips/gimp_tips.uk.txt
@@ -1423,6 +1426,10 @@ ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gimp-libgimp.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gimp-script-fu.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gimp.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gimp-libgimp.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gimp-script-fu.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gimp-std-plugins.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gimp.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
@@ -1439,6 +1446,10 @@ ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gimp-libgimp.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gimp-script-fu.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gimp-std-plugins.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gimp.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gimp-libgimp.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gimp-script-fu.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gimp-std-plugins.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gimp.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gimp-libgimp.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gimp-script-fu.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gimp-std-plugins.mo
diff --git a/graphics/gimp-base/buildlink2.mk b/graphics/gimp-base/buildlink2.mk
index f95da35dc8a..f72c991e7a7 100644
--- a/graphics/gimp-base/buildlink2.mk
+++ b/graphics/gimp-base/buildlink2.mk
@@ -1,20 +1,30 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/05/02 11:55:17 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/05/23 18:04:32 salo Exp $
+#
+# This Makefile fragment is included by packages that use gimp-base.
+#
+# This file was created automatically using createbuildlink 2.6.
+#
 
 .if !defined(GIMP_BASE_BUILDLINK2_MK)
 GIMP_BASE_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		gimp-base
-BUILDLINK_DEPENDS.gimp-base?=	gimp-base>=1.2.3nb5
-BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp-base
-DEPENDS+=		${BUILDLINK_DEPENDS.gimp-base}:../../graphics/gimp-base
+BUILDLINK_PACKAGES+=			gimp-base
+BUILDLINK_DEPENDS.gimp-base?=		gimp-base>=1.2.4
+BUILDLINK_PKGSRCDIR.gimp-base?=		../../graphics/gimp-base
 
-EVAL_PREFIX+=		BUILDLINK_PREFIX.gimp-base=gimp-base
-BUILDLINK_PREFIX.gimp-base_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.gimp-base=	include/libgimp/*
-BUILDLINK_FILES.gimp-base+=	lib/libgimp.*
-BUILDLINK_FILES.gimp-base+=	lib/libgimpui.*
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gimp-base=gimp-base
+BUILDLINK_PREFIX.gimp-base_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.gimp-base+=	include/gck/*
+BUILDLINK_FILES.gimp-base+=	include/libgimp/*
+BUILDLINK_FILES.gimp-base+=	lib/libgck*
+BUILDLINK_FILES.gimp-base+=	lib/libgimp*
 
-.include "../../devel/glib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/mpeg-lib/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gimp-base-buildlink
diff --git a/graphics/gimp-base/distinfo b/graphics/gimp-base/distinfo
index ced1ae26b0e..560b9979da1 100644
--- a/graphics/gimp-base/distinfo
+++ b/graphics/gimp-base/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/12/28 22:47:58 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2003/05/23 18:04:32 salo Exp $
 
-SHA1 (gimp-1.2.3.tar.bz2) = 3cb2686fcdc7995888b76d175e1c7bc33b2b4707
-Size (gimp-1.2.3.tar.bz2) = 10795020 bytes
-SHA1 (gimp-data-extras-1.2.0.tar.bz2) = 93e966544a4f507e2b9045e0cc0745bd0ae1ee81
-Size (gimp-data-extras-1.2.0.tar.bz2) = 4432926 bytes
+SHA1 (gimp-1.2.4.tar.bz2) = e746f6cfde1a943eec9b6d09768da5a38f97b7c4
+Size (gimp-1.2.4.tar.bz2) = 10875154 bytes
 SHA1 (patch-aa) = 2d2f7ce110822522314aebfd86c06ebcbdbabb9d
-SHA1 (patch-ab) = fd8dcdaffc70e4fc905f98d1af82b2ee13e3eed1
+SHA1 (patch-ab) = 41ca54a3f632ecd1dd2b47da6b6333b5db61c10e
 SHA1 (patch-ac) = 9949ba730b031132a183cabf69025e36500c70f0
 SHA1 (patch-ad) = 29c68f53be2d527661dcbaa38b2bf92626cb139c
diff --git a/graphics/gimp-base/patches/patch-ab b/graphics/gimp-base/patches/patch-ab
index 64effe895e6..5438cf67022 100644
--- a/graphics/gimp-base/patches/patch-ab
+++ b/graphics/gimp-base/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/02/15 20:52:36 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2003/05/23 18:04:32 salo Exp $
 
---- plug-ins/Makefile.in.orig	Fri Feb 15 14:01:45 2002
-+++ plug-ins/Makefile.in	Fri Feb 15 14:03:20 2002
-@@ -187,7 +187,7 @@
+--- plug-ins/Makefile.in.orig	2003-05-20 01:07:31.000000000 +0200
++++ plug-ins/Makefile.in	2003-05-23 17:14:38.000000000 +0200
+@@ -186,7 +186,7 @@
  @OS_WIN32_TRUE@TWAIN = twain
  @OS_WIN32_TRUE@WINSNAP = winsnap
  
--SUBDIRS =  	libgck				dbbrowser			script-fu			$(GIMP_PERL)			FractalExplorer			Lighting			MapObject			bmp				faxg3				fits				flame				fp				gap				gdyntext			gfig			        gflare				gfli				gimpressionist			$(HELPBROWSER)			ifscompose			imagemap			maze				mosaic				pagecurl			print				rcm				sgi				sel2path			$(TWAIN)			$(WEBBROWSER)			$(WINSNAP)			xjt				common
-+SUBDIRS =  	libgck				dbbrowser			script-fu			$(GIMP_PERL)			FractalExplorer			Lighting			MapObject			bmp				faxg3				fits				flame				fp				gap				gdyntext			gfig			        gflare				gfli				gimpressionist			$(HELPBROWSER)			ifscompose			imagemap			maze				mosaic				pagecurl					rcm				sgi				sel2path			$(TWAIN)			$(WEBBROWSER)			$(WINSNAP)			xjt				common
+-SUBDIRS =  	libgck				dbbrowser			script-fu			$(GIMP_PERL)			FractalExplorer			Lighting			MapObject			bmp				faxg3				fits				flame				fp				gap				gdyntext			gfig			        gflare				gfli				gimpressionist			$(HELPBROWSER)			ifscompose			imagemap			maze				mosaic				pagecurl			$(PRINT)			rcm				sgi				sel2path			$(TWAIN)			$(WEBBROWSER)			$(WINSNAP)			$(XJT)				common
++SUBDIRS =  	libgck				dbbrowser			script-fu			$(GIMP_PERL)			FractalExplorer			Lighting			MapObject			bmp				faxg3				fits				flame				fp				gap				gdyntext			gfig			        gflare				gfli				gimpressionist			$(HELPBROWSER)			ifscompose			imagemap			maze				mosaic				pagecurl			rcm				sgi				sel2path			$(TWAIN)			$(WEBBROWSER)			$(WINSNAP)			$(XJT)				common
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
diff --git a/graphics/gimp-data/DESCR b/graphics/gimp-data/DESCR
index 5c8e77cb124..645aecb16b7 100644
--- a/graphics/gimp-data/DESCR
+++ b/graphics/gimp-data/DESCR
@@ -1,4 +1,4 @@
 Powerful image manipulation program similar to "Adobe Photoshop"[tm].
-It supports layers, arbitrary image sizes and working on several images
-at the same time. It comes with a lot of useful plug-ins. Missing is CMYK
-support and more then 8 bits per channel.
+It supports layers, arbitrary image sizes and working on several images at the
+same time. It comes with a lot of useful plug-ins. Missing is CMYK support and
+more then 8 bits per channel.
diff --git a/graphics/gimp-data/Makefile b/graphics/gimp-data/Makefile
index 74a5c45e90f..8dc1a389071 100644
--- a/graphics/gimp-data/Makefile
+++ b/graphics/gimp-data/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.4 2003/05/02 11:55:18 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/23 18:04:33 salo Exp $
+#
 
 DISTNAME=	gimp-data-extras-1.2.0
 PKGNAME=	gimp-data-1.2
 PKGREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.3/ \
-		ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.3/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.2/v1.2.3/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.4/ \
+		ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.4/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.2/v1.2.4/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.gimp.org/
-COMMENT=	extra brushes and patterns for the GIMP
+COMMENT=	GNU Image Manipulation Program (extra brushes and patterns)
 
-CONFLICTS+=		gimp<=1.2.3
+CONFLICTS+=	gimp<=1.2.3
 
-USE_BUILDLINK2=		yes
-USE_X11=		yes
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
 
 .include "../../graphics/gimp-base/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/DESCR b/graphics/gimp/DESCR
index 5c8e77cb124..645aecb16b7 100644
--- a/graphics/gimp/DESCR
+++ b/graphics/gimp/DESCR
@@ -1,4 +1,4 @@
 Powerful image manipulation program similar to "Adobe Photoshop"[tm].
-It supports layers, arbitrary image sizes and working on several images
-at the same time. It comes with a lot of useful plug-ins. Missing is CMYK
-support and more then 8 bits per channel.
+It supports layers, arbitrary image sizes and working on several images at the
+same time. It comes with a lot of useful plug-ins. Missing is CMYK support and
+more then 8 bits per channel.
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 810d8fd363f..d06eb5cc358 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.84 2003/05/05 16:32:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.85 2003/05/23 18:04:31 salo Exp $
+#
 
-DISTNAME=		gimp-1.2.3
-PKGREVISION=		3
-CATEGORIES=		graphics
-DISTFILES=		# nothing
+DISTNAME=	gimp-1.2.4
+CATEGORIES=	graphics
+DISTFILES=	# nothing
 
-MAINTAINER=		hubertf@netbsd.org
-HOMEPAGE=		http://www.gimp.org/
-COMMENT=		Image manipulation program similar to Photoshop[tm]
+MAINTAINER=	hubertf@netbsd.org
+HOMEPAGE=	http://www.gimp.org/
+COMMENT=	GNU Image Manipulation Program
 
-NO_BUILD=	yes
+NO_BUILD=	YES
 
-DEPENDS+=	gimp-base>=1.2.3nb1:../../graphics/gimp-base
+DEPENDS+=	gimp-base>=1.2.4:../../graphics/gimp-base
 DEPENDS+=	gimp-data>=1.2:../../graphics/gimp-data
 DEPENDS+=	gimp-print>=4.2.0:../../print/gimp-print
 DEPENDS+=	gimp-print-escputil>=4.2.0:../../print/gimp-print-escputil