Upgrade to 1.1.29.

While I'm at it:
* Set USE_LIBINTL, rather than depending on gettext directly.
* Remove some silliness that deleted -export-dynamic from a Makefile and then
  readded it through the global LDFLAGS.

6 files changed, 64 insertions, 45 deletions

diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index 2d3c5409ae4..9bb267b3531 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.25 2000/11/28 18:06:32 mycroft Exp $
+# $NetBSD: Makefile,v 1.26 2000/11/28 19:32:06 mycroft Exp $
 
-DISTNAME=		gimp-1.1.24
+DISTNAME=		gimp-1.1.29
 CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.24/ \
-			ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v1.1.24/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/unstable/v1.1.24/
+MASTER_SITES=		ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.29/ \
+			ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v1.1.29/ \
+			ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/unstable/v1.1.29/
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		hubert@netbsd.org
+MAINTAINER=		hubertf@netbsd.org
 HOMEPAGE=		http://www.gimp.org/
 
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 DEPENDS+=		gtk+>=1.2.7:../../x11/gtk
 DEPENDS+=		mpeg-1.2.1:../../graphics/mpeg-lib
 DEPENDS+=		png>=1.0.6:../../graphics/png
@@ -20,6 +19,7 @@ DEPENDS+=		tiff-*:../../graphics/tiff
 USE_X11BASE=		YES
 USE_XPM=		YES
 USE_GMAKE=		YES
+USE_LIBINTL=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
@@ -28,19 +28,12 @@ EVAL_PREFIX+=		GTKDIR=gtk+
 CONFIGURE_ARGS+=	--with-gtk-prefix="${GTKDIR}" \
 			--disable-perl \
 			--disable-python
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" INTLLIBS="-lintl" \
-			GNOME_CONFIG=no
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" GNOME_CONFIG=no
 
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OBJECT_FMT} == ELF)
-LDFLAGS+=		-Wl,-E
-.endif
-
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
 	${LN} -fs ${PREFIX}/share/aclocal/gimp.m4 \
diff --git a/graphics/gimp-current/files/md5 b/graphics/gimp-current/files/md5
index 25255fcfd4b..2d63c544b32 100644
--- a/graphics/gimp-current/files/md5
+++ b/graphics/gimp-current/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/07/05 03:39:32 hubertf Exp $
+$NetBSD: md5,v 1.4 2000/11/28 19:32:07 mycroft Exp $
 
-MD5 (gimp-1.1.24.tar.bz2) = 18c0ea8a814a468767a939e9895df6b3
+MD5 (gimp-1.1.29.tar.bz2) = 6e07a2c013780cfb529ce2faaabd857c
diff --git a/graphics/gimp-current/files/patch-sum b/graphics/gimp-current/files/patch-sum
index 1d949f93bb1..86e5b8fcede 100644
--- a/graphics/gimp-current/files/patch-sum
+++ b/graphics/gimp-current/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.7 2000/07/05 03:39:32 hubertf Exp $
+$NetBSD: patch-sum,v 1.8 2000/11/28 19:32:07 mycroft Exp $
 
-MD5 (patch-aa) = 36d6d4645f6f613105d2b81cdf71b5f1
+MD5 (patch-aa) = 194524ab38fb8ab884ad39447ea3fbf9
 MD5 (patch-ab) = 37b67cc506600f5229527da58747f8d7
 MD5 (patch-ad) = 0790b37098de455e83ccbaa07c9e9825
-MD5 (patch-ae) = 2407c57a6e3c775282a2b762103f1061
+MD5 (patch-ae) = 75e7ed3ca8d3079b8ce527062f11de83
 MD5 (patch-af) = f9e9485bf2b4edd452ecae2217c79e0c
 MD5 (patch-ag) = 9b940193281094b0eede2be6ca6bdabb
 MD5 (patch-ah) = 2546231e793e4868e6f05a5c184c49a1
diff --git a/graphics/gimp-current/patches/patch-aa b/graphics/gimp-current/patches/patch-aa
index 7e2158adb9e..f6b651d3996 100644
--- a/graphics/gimp-current/patches/patch-aa
+++ b/graphics/gimp-current/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2000/07/05 03:39:32 hubertf Exp $
+$NetBSD: patch-aa,v 1.6 2000/11/28 19:32:07 mycroft Exp $
 
---- configure.orig	Thu Jun 22 22:49:05 2000
-+++ configure	Tue Jul  4 04:32:24 2000
+--- configure.orig	Tue Oct 31 04:10:14 2000
++++ configure	Tue Nov 28 18:20:15 2000
 @@ -668,7 +668,7 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
@@ -48,10 +48,10 @@ $NetBSD: patch-aa,v 1.5 2000/07/05 03:39:32 hubertf Exp $
  
  if test "$GNOME_CONFIG" = "no"; then
      HELPBROWSER=
-@@ -7150,7 +7151,7 @@
- 
- gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+@@ -7152,7 +7153,7 @@
  gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+ gimpsysconfdir=$sysconfdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+ 
 -localedir='${prefix}/${DATADIRNAME}/locale'
 +localedir='${prefix}/share/locale'
  
diff --git a/graphics/gimp-current/patches/patch-ae b/graphics/gimp-current/patches/patch-ae
index 093840aaf92..65337031388 100644
--- a/graphics/gimp-current/patches/patch-ae
+++ b/graphics/gimp-current/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.4 2000/07/05 03:39:32 hubertf Exp $
+$NetBSD: patch-ae,v 1.5 2000/11/28 19:32:07 mycroft Exp $
 
---- app/Makefile.in.orig	Fri Jun 23 00:47:43 2000
-+++ app/Makefile.in	Tue Jul  4 03:57:14 2000
-@@ -190,10 +190,10 @@
- gimp_SOURCES =  	about_dialog.c			about_dialog.h			airbrush.c			airbrush.h			app_procs.c			app_procs.h			appenv.h			apptypes.h			asupsample.c			asupsample.h			batch.c				batch.h				bezier_select.c			bezier_select.h			bezier_selectP.h		blend.c				blend.h				blob.c                  	blob.h                  	boundary.c			boundary.h			boundaryF.h			brightness_contrast.c		brightness_contrast.h		brush_edit.c			brush_edit.h			brush_header.h			brush_scale.c			brush_scale.h			brush_select.c			brush_select.h			brush_select_cmds.c		brushes_cmds.c			bucket_fill.c			bucket_fill.h			by_color_select.c		by_color_select.h		channel.c			channel.h			channel_pvt.h			channel_cmds.c			channels_dialog.c		channels_dialog.h		channel_ops.c			channel_ops.h			channel_ops_cmds.c		clone.c				clone.h				color_area.c			color_area.h			color_balance.c			color_balance.h			color_cmds.c			color_notebook.c		color_notebook.h		color_panel.c			color_panel.h			color_picker.c			color_picker.h			color_select.c			color_select.h			color_transfer.c		color_transfer.h		colormaps.c			colormaps.h			colormap_dialog.c		colormap_dialog.h		commands.c			commands.h			context_manager.c		context_manager.h		convert.c			convert.h			convert_cmds.c			convolve.c			convolve.h			crop.c				crop.h				cursorutil.c			cursorutil.h			curves.c			curves.h			datafiles.c			datafiles.h			desaturate.c			desaturate.h			devices.c			devices.h			dialog_types.h			dialog_handler.c		dialog_handler.h		disp_callbacks.c		disp_callbacks.h		display_cmds.c			docindex.c			docindex.h			dodgeburn.c			dodgeburn.h			draw_core.c			draw_core.h			drawable.c			drawable.h			drawable_pvt.h			drawable_cmds.c			edit_cmds.c			edit_selection.c		edit_selection.h		ellipse_select.c		ellipse_select.h		eraser.c			eraser.h			errorconsole.c			errorconsole.h			errors.c			errors.h			equalize.c			equalize.h			fileops.c			fileops.h			fileopsP.h			fileops_cmds.c			flip_tool.c			flip_tool.h			floating_sel.c			floating_sel.h			floating_sel_cmds.c		file_new_dialog.c		file_new_dialog.h		free_select.c			free_select.h			fsdither.h			fuzzy_select.c			fuzzy_select.h			gdisplay.c			gdisplay.h			gdisplayP.h			gdisplayF.h			gdisplay_color.c		gdisplay_color.h		gdisplay_color_ui.c		gdisplay_color_ui.h		gdisplay_ops.c			gdisplay_ops.h			general.c			general.h			gimage.c			gimage.h			gimage_mask.c			gimage_mask.h			gimpbrush.c			gimpbrush.h			gimpbrushgenerated.c		gimpbrushgenerated.h		gimpbrushlist.c			gimpbrushlist.h			gimpbrushlistF.h		gimpbrushlistP.h		gimpbrushpipe.c			gimpbrushpipe.h			gimpbrushpipeP.h		gimpcontext.c			gimpcontext.h			gimpcontextpreview.c		gimpcontextpreview.h		gimpdnd.c			gimpdnd.h			gimphelp.c			gimphelp.h			gimphistogram.c			gimphistogram.h			gimphistogramP.h		gimphistogramF.h		gimplist.c			gimplist.h			gimplistF.h			gimplistP.h			gimplut.c			gimplut.h			gimplutF.h			gimplutP.h			gimpparasite.c			gimpparasite.h			gimpprogress.c			gimpprogress.h			gimprc.c			gimprc.h			gimprc_cmds.c			gimpui.c			gimpui.h			gimpunit.c			global_edit.c			global_edit.h			gradient.c			gradientP.h			gradient_header.h		gradient_select.h		gradient_select.c		gradient_select_cmds.c		gradient.h			gradients_cmds.c		gtkwrapbox.c			gtkwrapbox.h			gtkhwrapbox.c			gtkhwrapbox.h			gtkvwrapbox.c			gtkvwrapbox.h			guides_cmds.c			gximage.c			gximage.h			help_cmds.c			histogramwidget.c		histogramwidget.h		histogram_tool.c		histogram_tool.h		hue_saturation.c		hue_saturation.h		image_cmds.c			image_map.c			image_map.h			image_new.c			image_new.h			image_render.c			image_render.h			indicator_area.c		indicator_area.h		info_dialog.c			info_dialog.h			info_window.c			info_window.h			ink.c                   	ink.h		        	interface.c			interface.h			internal_procs.c		internal_procs.h		invert.c			invert.h			iscissors.c			iscissors.h			layer.c				layer.h				layerF.h			layer_pvt.h			layer_cmds.c			layer_select.c			layer_select.h			layers_dialog.c			layers_dialog.h			layers_dialogP.h		lc_dialog.c			lc_dialog.h			lc_dialogP.h			levels.c			levels.h			lut_funcs.c			lut_funcs.h			magnify.c			magnify.h			main.c				marching_ants.h			measure.c			measure.h			menus.c				menus.h				message_cmds.c			misc_cmds.c			module_db.c			module_db.h			move.c				move.h				nav_window.c			nav_window.h			ops_buttons.c			ops_buttons.h			palette.c			palette_entries.h		palette.h			palette_cmds.c			palette_select.c		palette_select.h		paletteP.h			paint_core.c			paint_core.h			paint_core_kernels.h		paint_funcs.c			paint_funcs.h			paint_options.h			paintbrush.c			paintbrush.h			parasite_cmds.c			parasitelist.c			parasitelist.h			parasitelistF.h			parasitelistP.h			path.c				path.h				pathP.h				path_transform.h		paths_cmds.c			paths_dialog.c			paths_dialog.h			paths_dialogP.h			pattern_header.h		pattern_select.c		pattern_select.h		pattern_select_cmds.c		patterns.c			patterns.h			patterns_cmds.c			pencil.c			pencil.h			perspective_tool.c		perspective_tool.h		pixel_processor.c		pixel_processor.h		pixel_region.c			pixel_region.h			pixel_regionP.h			pixmaps.h			pixmaps2.h			plug_in.c			plug_in.h			plug_in_cmds.c			posterize.c			posterize.h			preferences_dialog.c		preferences_dialog.h		procedural_db.c			procedural_db.h			procedural_db_cmds.c		qmask.c				qmask.h				rect_select.c			rect_select.h			rect_selectP.h			regex.h				regex.c				resize.c			resize.h			rotate_tool.c			rotate_tool.h			scale.c				scale.h				scale_tool.c			scale_tool.h			scan_convert.c			scan_convert.h			scroll.c			scroll.h			selection.c			selection.h			selection_cmds.c		selection_options.h		session.h			session.c			shear_tool.c			shear_tool.h			smudge.c			smudge.h			temp_buf.c			temp_buf.h			text_tool.c			text_tool.h			text_tool_cmds.c		threshold.c			threshold.h			tile.c				tile.h				tile_pvt.h			tile_cache.c			tile_cache.h			tile_manager.c			tile_manager.h			tile_manager_pvt.h		tile_swap.c			tile_swap.h			tips_dialog.c			tips_dialog.h			tool_options.c			tool_options.h			tools.c				tools.h				toolsF.h			tools_cmds.c			transform_core.c		transform_core.h		transform_tool.c		transform_tool.h		undo.c				undo.h				undo_cmds.c			undo_history.c			undo_types.h			unitrc.h			unit_cmds.c			user_install.c			user_install.h			wilber.h			xcf.c				xcf.h
+--- app/Makefile.in.orig	Tue Oct 31 06:56:40 2000
++++ app/Makefile.in	Tue Nov 28 18:28:13 2000
+@@ -196,10 +196,10 @@
+ gimp_SOURCES =  	about_dialog.c			about_dialog.h			airbrush.c			airbrush.h			app_procs.c			app_procs.h			appenv.h			apptypes.h			asupsample.c			asupsample.h			authors.h			batch.c				batch.h				bezier_select.c			bezier_select.h			bezier_selectP.h		blend.c				blend.h				blob.c                  	blob.h                  	boundary.c			boundary.h			boundaryF.h			brightness_contrast.c		brightness_contrast.h		brush_edit.c			brush_edit.h			brush_header.h			brush_scale.c			brush_scale.h			brush_select.c			brush_select.h			brush_select_cmds.c		brushes_cmds.c			bucket_fill.c			bucket_fill.h			by_color_select.c		by_color_select.h		channel.c			channel.h			channel_pvt.h			channel_cmds.c			channels_dialog.c		channels_dialog.h		channel_ops.c			channel_ops.h			channel_ops_cmds.c		clone.c				clone.h				color_area.c			color_area.h			color_balance.c			color_balance.h			color_cmds.c			color_notebook.c		color_notebook.h		color_panel.c			color_panel.h			color_picker.c			color_picker.h			color_select.c			color_select.h			color_transfer.c		color_transfer.h		colormaps.c			colormaps.h			colormap_dialog.c		colormap_dialog.h		commands.c			commands.h			context_manager.c		context_manager.h		convert.c			convert.h			convert_cmds.c			convolve.c			convolve.h			crop.c				crop.h				cursorutil.c			cursorutil.h			curves.c			curves.h			datafiles.c			datafiles.h			desaturate.c			desaturate.h			devices.c			devices.h			dialog_types.h			dialog_handler.c		dialog_handler.h		disp_callbacks.c		disp_callbacks.h		display_cmds.c			docindex.c			docindex.h			dodgeburn.c			dodgeburn.h			draw_core.c			draw_core.h			drawable.c			drawable.h			drawable_pvt.h			drawable_cmds.c			edit_cmds.c			edit_selection.c		edit_selection.h		ellipse_select.c		ellipse_select.h		eraser.c			eraser.h			errorconsole.c			errorconsole.h			errors.c			errors.h			equalize.c			equalize.h			fileops.c			fileops.h			fileopsP.h			fileops_cmds.c			flip_tool.c			flip_tool.h			floating_sel.c			floating_sel.h			floating_sel_cmds.c		file_new_dialog.c		file_new_dialog.h		free_select.c			free_select.h			fsdither.h			fuzzy_select.c			fuzzy_select.h			gdisplay.c			gdisplay.h			gdisplayP.h			gdisplayF.h			gdisplay_color.c		gdisplay_color.h		gdisplay_color_ui.c		gdisplay_color_ui.h		gdisplay_ops.c			gdisplay_ops.h			general.c			general.h			gimage.c			gimage.h			gimage_mask.c			gimage_mask.h			gimpbrush.c			gimpbrush.h			gimpbrushgenerated.c		gimpbrushgenerated.h		gimpbrushlist.c			gimpbrushlist.h			gimpbrushlistF.h		gimpbrushlistP.h		gimpbrushpipe.c			gimpbrushpipe.h			gimpbrushpipeP.h		gimpcontext.c			gimpcontext.h			gimpcontextpreview.c		gimpcontextpreview.h		gimpdnd.c			gimpdnd.h			gimphelp.c			gimphelp.h			gimphistogram.c			gimphistogram.h			gimphistogramP.h		gimphistogramF.h		gimplist.c			gimplist.h			gimplistF.h			gimplistP.h			gimplut.c			gimplut.h			gimplutF.h			gimplutP.h			gimpparasite.c			gimpparasite.h			gimpprogress.c			gimpprogress.h			gimprc.c			gimprc.h			gimprc_cmds.c			gimpui.c			gimpui.h			gimpunit.c			global_edit.c			global_edit.h			gradient.c			gradientP.h			gradient_header.h		gradient_select.h		gradient_select.c		gradient_select_cmds.c		gradient.h			gradients_cmds.c		gtkwrapbox.c			gtkwrapbox.h			gtkhwrapbox.c			gtkhwrapbox.h			gtkvwrapbox.c			gtkvwrapbox.h			guides_cmds.c			gximage.c			gximage.h			help_cmds.c			histogramwidget.c		histogramwidget.h		histogram_tool.c		histogram_tool.h		hue_saturation.c		hue_saturation.h		image_cmds.c			image_map.c			image_map.h			image_new.c			image_new.h			image_render.c			image_render.h			indicator_area.c		indicator_area.h		info_dialog.c			info_dialog.h			info_window.c			info_window.h			ink.c                   	ink.h		        	interface.c			interface.h			internal_procs.c		internal_procs.h		invert.c			invert.h			iscissors.c			iscissors.h			layer.c				layer.h				layerF.h			layer_pvt.h			layer_cmds.c			layer_select.c			layer_select.h			layers_dialog.c			layers_dialog.h			layers_dialogP.h		lc_dialog.c			lc_dialog.h			lc_dialogP.h			levels.c			levels.h			lut_funcs.c			lut_funcs.h			magnify.c			magnify.h			main.c				marching_ants.h			measure.c			measure.h			menus.c				menus.h				message_cmds.c			misc_cmds.c			module_db.c			module_db.h			move.c				move.h				nav_window.c			nav_window.h			ops_buttons.c			ops_buttons.h			palette.c			palette_entries.h		palette.h			palette_cmds.c			palette_select.c		palette_select.h		paletteP.h			paint_core.c			paint_core.h			paint_core_kernels.h		paint_funcs.c			paint_funcs.h			paint_options.h			paintbrush.c			paintbrush.h			parasite_cmds.c			parasitelist.c			parasitelist.h			parasitelistF.h			parasitelistP.h			path.c				path.h				pathP.h				path_transform.h		paths_cmds.c			paths_dialog.c			paths_dialog.h			paths_dialogP.h			pattern_header.h		pattern_select.c		pattern_select.h		pattern_select_cmds.c		patterns.c			patterns.h			patterns_cmds.c			pencil.c			pencil.h			perspective_tool.c		perspective_tool.h		pixel_processor.c		pixel_processor.h		pixel_region.c			pixel_region.h			pixel_regionP.h			pixmaps.h			pixmaps2.h			plug_in.c			plug_in.h			plug_in_cmds.c			posterize.c			posterize.h			preferences_dialog.c		preferences_dialog.h		procedural_db.c			procedural_db.h			procedural_db_cmds.c		qmask.c				qmask.h				rect_select.c			rect_select.h			rect_selectP.h			regex.h				regex.c				resolution_calibrate.c		resolution_calibrate.h		resize.c			resize.h			rotate_tool.c			rotate_tool.h			scale.c				scale.h				scale_tool.c			scale_tool.h			scan_convert.c			scan_convert.h			scroll.c			scroll.h			selection.c			selection.h			selection_cmds.c		selection_options.h		session.h			session.c			shear_tool.c			shear_tool.h			smudge.c			smudge.h			temp_buf.c			temp_buf.h			text_tool.c			text_tool.h			text_tool_cmds.c		threshold.c			threshold.h			tile.c				tile.h				tile_pvt.h			tile_cache.c			tile_cache.h			tile_manager.c			tile_manager.h			tile_manager_pvt.h		tile_swap.c			tile_swap.h			tips_dialog.c			tips_dialog.h			tool_options.c			tool_options.h			tools.c				tools.h				toolsF.h			tools_cmds.c			transform_core.c		transform_core.h		transform_tool.c		transform_tool.h		undo.c				undo.h				undo_cmds.c			undo_history.c			undo_types.h			unitrc.h			unit_cmds.c			user_install.c			user_install.h			wilber.h			xcf.c				xcf.h
  
  
--EXTRA_DIST =  	colormap_dialog.i.c		colormap_dialog.i.h		colormap_dialog.p.h		colormap_dialog.t.h		makefile.cygwin			makefile.msc			gimp.rc				gimp.sym			wilber.ico
-+EXTRA_DIST =  	colormap_dialog.i.c		colormap_dialog.i.h		colormap_dialog.p.h		colormap_dialog.t.h		makefile.cygwin			makefile.msc			gimp.rc							wilber.ico
+-EXTRA_DIST =  	colormap_dialog.i.c		colormap_dialog.i.h		colormap_dialog.p.h		colormap_dialog.t.h		makefile.mingw			makefile.mingw.in		makefile.msc			gimp.rc				gimp.sym			wilber.ico
++EXTRA_DIST =  	colormap_dialog.i.c		colormap_dialog.i.h		colormap_dialog.p.h		colormap_dialog.t.h		makefile.mingw			makefile.mingw.in		makefile.msc			gimp.rc				wilber.ico
  
  
 -gimp_LDFLAGS = -export-dynamic -export-symbols $(srcdir)/gimp.sym
-+gimp_LDFLAGS = 
++gimp_LDFLAGS = -export-dynamic
  
- AM_CPPFLAGS =  	-DLIBDIR=\""$(gimpplugindir)"\"		-DLOCALEDIR=\""$(localedir)"\"		-DREGEX_MALLOC				@GIMP_THREAD_FLAGS@ 			@GIMP_MP_FLAGS@
+ AM_CPPFLAGS =  	-DLIBDIR=\""$(gimpplugindir)"\"		-DLOCALEDIR=\""$(localedir)"\"		-DREGEX_MALLOC				-DG_LOG_DOMAIN=\"Gimp\"			@GIMP_THREAD_FLAGS@ 			@GIMP_MP_FLAGS@
  
diff --git a/graphics/gimp-current/pkg/PLIST b/graphics/gimp-current/pkg/PLIST
index 47d600d4a6c..0186fc5a711 100644
--- a/graphics/gimp-current/pkg/PLIST
+++ b/graphics/gimp-current/pkg/PLIST
@@ -1,7 +1,14 @@
-@comment $NetBSD: PLIST,v 1.11 2000/11/27 22:14:56 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.12 2000/11/28 19:32:07 mycroft Exp $
+bin/escputil
 bin/gimp
 bin/gimp-config
+bin/gimp-remote
 bin/gimptool
+etc/gimp/1.1/gimprc
+etc/gimp/1.1/gimprc_user
+etc/gimp/1.1/gtkrc
+etc/gimp/1.1/ps-menurc
+etc/gimp/1.1/unitrc
 include/gck/gck.h
 include/libgimp/gimp.h
 include/libgimp/gimp_pdb.h
@@ -168,6 +175,7 @@ lib/gimp/1.1/plug-ins/gtm
 lib/gimp/1.1/plug-ins/guillotine
 lib/gimp/1.1/plug-ins/gz
 lib/gimp/1.1/plug-ins/header
+lib/gimp/1.1/plug-ins/helpbrowser
 lib/gimp/1.1/plug-ins/hot
 lib/gimp/1.1/plug-ins/hrz
 lib/gimp/1.1/plug-ins/ifscompose
@@ -254,14 +262,16 @@ lib/gimp/1.1/plug-ins/xwd
 lib/gimp/1.1/plug-ins/zealouscrop
 lib/libgck.a
 lib/libgck.la
-lib/libgck.so.24.0
+lib/libgck.so.29.0
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so.24.0
+lib/libgimp.so.29.0
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so.24.0
+lib/libgimpui.so.29.0
+man/man1/escputil.1
 man/man1/gimp.1
+man/man1/gimp-remote.1
 man/man1/gimptool.1
 man/man5/gimprc.5
 share/aclocal/gimp.m4
@@ -310,6 +320,7 @@ share/gimp/1.1/brushes/pixel.gbr
 share/gimp/1.1/brushes/thegimp.gbr
 share/gimp/1.1/brushes/vine.gih
 share/gimp/1.1/brushes/xcf.gbr
+share/gimp/1.1/devel-docs/html/libgimp/book1.html
 share/gimp/1.1/devel-docs/html/libgimp/gimpchainbutton.html
 share/gimp/1.1/devel-docs/html/libgimp/gimpcolorbutton.html
 share/gimp/1.1/devel-docs/html/libgimp/gimpdefinitions.html
@@ -360,6 +371,7 @@ share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpmodule.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimppalette.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpparasite.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
+share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimppatterns.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimppixelrgn.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpplugin.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpproceduraldb.html
@@ -377,6 +389,7 @@ share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimputils.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpvector.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpwidgets.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-gimpwire.html
+share/gimp/1.1/devel-docs/html/libgimp/libgimp-gserialize.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-parasite.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-parasitef.html
 share/gimp/1.1/devel-docs/html/libgimp/libgimp-parasiteio.html
@@ -435,8 +448,6 @@ share/gimp/1.1/gflare/GFlare_102
 share/gimp/1.1/gflare/Hidden_Planet
 share/gimp/1.1/gimp_logo.ppm
 share/gimp/1.1/gimp_splash.ppm
-share/gimp/1.1/gimprc
-share/gimp/1.1/gimprc_user
 share/gimp/1.1/gimpressionist/Brushes/arrow01.pgm
 share/gimp/1.1/gimpressionist/Brushes/ball.ppm
 share/gimp/1.1/gimpressionist/Brushes/blob.ppm
@@ -607,7 +618,6 @@ share/gimp/1.1/gradients/Wood_1
 share/gimp/1.1/gradients/Wood_2
 share/gimp/1.1/gradients/Yellow_Contrast
 share/gimp/1.1/gradients/Yellow_Orange
-share/gimp/1.1/gtkrc
 share/gimp/1.1/help/C/channels/channel_to_selection.html
 share/gimp/1.1/help/C/channels/channels.html
 share/gimp/1.1/help/C/channels/delete_channel.html
@@ -721,6 +731,7 @@ share/gimp/1.1/help/C/filters/animoptimize.html
 share/gimp/1.1/help/C/filters/apply_lens.html
 share/gimp/1.1/help/C/filters/autocrop.html
 share/gimp/1.1/help/C/filters/autostretch_hsv.html
+share/gimp/1.1/help/C/filters/avi.html
 share/gimp/1.1/help/C/filters/blinds.html
 share/gimp/1.1/help/C/filters/blur.html
 share/gimp/1.1/help/C/filters/bmp.html
@@ -738,6 +749,7 @@ share/gimp/1.1/help/C/filters/convmatrix.html
 share/gimp/1.1/help/C/filters/csource.html
 share/gimp/1.1/help/C/filters/cubism.html
 share/gimp/1.1/help/C/filters/curve_bend.html
+share/gimp/1.1/help/C/filters/dataurl.html
 share/gimp/1.1/help/C/filters/dbbrowser.html
 share/gimp/1.1/help/C/filters/decompose.html
 share/gimp/1.1/help/C/filters/deinterlace.html
@@ -801,7 +813,9 @@ share/gimp/1.1/help/C/filters/mapobject.html
 share/gimp/1.1/help/C/filters/max_rgb.html
 share/gimp/1.1/help/C/filters/maze.html
 share/gimp/1.1/help/C/filters/mblur.html
+share/gimp/1.1/help/C/filters/miff.html
 share/gimp/1.1/help/C/filters/mosaic.html
+share/gimp/1.1/help/C/filters/mpeg.html
 share/gimp/1.1/help/C/filters/newsprint.html
 share/gimp/1.1/help/C/filters/nlfilt.html
 share/gimp/1.1/help/C/filters/noisify.html
@@ -829,7 +843,6 @@ share/gimp/1.1/help/C/filters/repeat_last.html
 share/gimp/1.1/help/C/filters/reshow_last.html
 share/gimp/1.1/help/C/filters/ripple.html
 share/gimp/1.1/help/C/filters/rotate.html
-share/gimp/1.1/help/C/filters/rotators.html
 share/gimp/1.1/help/C/filters/sample_colorize.html
 share/gimp/1.1/help/C/filters/scatter_hsv.html
 share/gimp/1.1/help/C/filters/screenshot.html
@@ -1087,7 +1100,6 @@ share/gimp/1.1/patterns/wood2.pat
 share/gimp/1.1/patterns/wood3.pat
 share/gimp/1.1/patterns/wood4.pat
 share/gimp/1.1/patterns/wood5.pat
-share/gimp/1.1/ps-menurc
 share/gimp/1.1/scripts/3d-outline.scm
 share/gimp/1.1/scripts/3dTruchet.scm
 share/gimp/1.1/scripts/add-bevel.scm
@@ -1188,6 +1200,7 @@ share/gimp/1.1/scripts/xach-effect.scm
 share/gimp/1.1/tips/gimp_conseils.fr.txt
 share/gimp/1.1/tips/gimp_tips.cs.txt
 share/gimp/1.1/tips/gimp_tips.de.txt
+share/gimp/1.1/tips/gimp_tips.es.txt
 share/gimp/1.1/tips/gimp_tips.it.txt
 share/gimp/1.1/tips/gimp_tips.ja.txt
 share/gimp/1.1/tips/gimp_tips.ko.txt
@@ -1195,7 +1208,6 @@ share/gimp/1.1/tips/gimp_tips.pl.txt
 share/gimp/1.1/tips/gimp_tips.ru.txt
 share/gimp/1.1/tips/gimp_tips.txt
 share/gimp/1.1/tips/gimp_tips.uk.txt
-share/gimp/1.1/unitrc
 share/gimp/1.1/user_install
 share/locale/ca/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
@@ -1229,6 +1241,14 @@ share/locale/fr/LC_MESSAGES/gimp-libgimp.mo
 share/locale/fr/LC_MESSAGES/gimp-script-fu.mo
 share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/fr/LC_MESSAGES/gimp.mo
+share/locale/ga/LC_MESSAGES/gimp-libgimp.mo
+share/locale/ga/LC_MESSAGES/gimp-script-fu.mo
+share/locale/ga/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ga/LC_MESSAGES/gimp.mo
+share/locale/gl/LC_MESSAGES/gimp-libgimp.mo
+share/locale/gl/LC_MESSAGES/gimp-script-fu.mo
+share/locale/gl/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/gl/LC_MESSAGES/gimp.mo
 share/locale/hu/LC_MESSAGES/gimp-libgimp.mo
 share/locale/hu/LC_MESSAGES/gimp-script-fu.mo
 share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
@@ -1257,6 +1277,10 @@ share/locale/pl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pl/LC_MESSAGES/gimp-script-fu.mo
 share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
 share/locale/pl/LC_MESSAGES/gimp.mo
+share/locale/pt_BR/LC_MESSAGES/gimp-libgimp.mo
+share/locale/pt_BR/LC_MESSAGES/gimp-script-fu.mo
+share/locale/pt_BR/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/gimp.mo
 share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
 share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
@@ -1374,5 +1398,7 @@ share/locale/uk/LC_MESSAGES/gimp.mo
 @dirrm lib/gimp
 @dirrm include/libgimp
 @dirrm include/gck
+@dirrm etc/gimp/1.1
+@dirrm etc/gimp
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gimp.m4 ${LOCALBASE}/share/aclocal/gimp.m4
 @unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gimp.m4