aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/gimp-app-devel/Makefile10
-rw-r--r--graphics/gimp-app-devel/distinfo2
-rw-r--r--graphics/gimp-app-devel/files/patch-ak17
-rw-r--r--graphics/gimp-app-devel/files/patch-gimptool-1.2.in (renamed from graphics/gimp-app-devel/files/patch-af)6
-rw-r--r--graphics/gimp-app-devel/files/patch-libgimp::Makefile.in19
-rw-r--r--graphics/gimp-app-devel/files/patch-plug-ins::libgck::gck::Makefile.in (renamed from graphics/gimp-app/files/patch-ao)10
-rw-r--r--graphics/gimp-app-devel/pkg-plist234
-rw-r--r--graphics/gimp-app/Makefile10
-rw-r--r--graphics/gimp-app/distinfo2
-rw-r--r--graphics/gimp-app/files/patch-ak17
-rw-r--r--graphics/gimp-app/files/patch-gimptool-1.2.in (renamed from graphics/gimp-devel/files/patch-af)6
-rw-r--r--graphics/gimp-app/files/patch-libgimp::Makefile.in19
-rw-r--r--graphics/gimp-app/files/patch-plug-ins::libgck::gck::Makefile.in (renamed from graphics/gimp-devel/files/patch-ao)10
-rw-r--r--graphics/gimp-app/pkg-plist234
-rw-r--r--graphics/gimp-devel/Makefile10
-rw-r--r--graphics/gimp-devel/distinfo2
-rw-r--r--graphics/gimp-devel/files/patch-ak17
-rw-r--r--graphics/gimp-devel/files/patch-gimptool-1.2.in (renamed from graphics/gimp/files/patch-af)6
-rw-r--r--graphics/gimp-devel/files/patch-libgimp::Makefile.in19
-rw-r--r--graphics/gimp-devel/files/patch-plug-ins::libgck::gck::Makefile.in (renamed from graphics/gimp-app-devel/files/patch-ao)10
-rw-r--r--graphics/gimp-devel/pkg-plist234
-rw-r--r--graphics/gimp/Makefile10
-rw-r--r--graphics/gimp/distinfo2
-rw-r--r--graphics/gimp/files/patch-ak17
-rw-r--r--graphics/gimp/files/patch-gimptool-1.2.in (renamed from graphics/gimp-app/files/patch-af)6
-rw-r--r--graphics/gimp/files/patch-libgimp::Makefile.in19
-rw-r--r--graphics/gimp/files/patch-plug-ins::libgck::gck::Makefile.in (renamed from graphics/gimp/files/patch-ao)10
-rw-r--r--graphics/gimp/pkg-plist234
-rw-r--r--graphics/gimp1/Makefile10
-rw-r--r--graphics/gimp1/distinfo2
-rw-r--r--graphics/gimp1/files/patch-af26
-rw-r--r--graphics/gimp1/files/patch-ak17
-rw-r--r--graphics/gimp1/files/patch-ao11
-rw-r--r--graphics/gimp1/files/patch-gimptool-1.2.in26
-rw-r--r--graphics/gimp1/files/patch-libgimp::Makefile.in19
-rw-r--r--graphics/gimp1/files/patch-plug-ins::libgck::gck::Makefile.in11
-rw-r--r--graphics/gimp1/pkg-plist234
-rw-r--r--graphics/gimpshop/Makefile10
-rw-r--r--graphics/gimpshop/distinfo2
-rw-r--r--graphics/gimpshop/files/patch-af26
-rw-r--r--graphics/gimpshop/files/patch-ak17
-rw-r--r--graphics/gimpshop/files/patch-ao11
-rw-r--r--graphics/gimpshop/files/patch-gimptool-1.2.in26
-rw-r--r--graphics/gimpshop/files/patch-libgimp::Makefile.in19
-rw-r--r--graphics/gimpshop/files/patch-plug-ins::libgck::gck::Makefile.in11
-rw-r--r--graphics/gimpshop/pkg-plist234
46 files changed, 1408 insertions, 496 deletions
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index f4e2048be79e..ca69390ee316 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gimp
-PORTVERSION= 1.2.2
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTVERSION= 1.2.3
+PORTREVISION= 0
+#PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
@@ -24,7 +24,8 @@ LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+#SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+SHLIBVER?= 2
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -34,6 +35,7 @@ USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+LIBTOOLFILES= aclocal.m4
PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ARGS= --disable-perl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 7ae55b0c96c8..cb85cd7f3134 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.2.tar.bz2) = 680c01b0fc35cd68c540eb9d236f5e1a
+MD5 (gimp-1.2.3.tar.bz2) = b19235f19f524f772a4aef597a69b1da
diff --git a/graphics/gimp-app-devel/files/patch-ak b/graphics/gimp-app-devel/files/patch-ak
deleted file mode 100644
index ead5311df6ff..000000000000
--- a/graphics/gimp-app-devel/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgimp/Makefile.in.orig Sat Mar 4 11:10:43 2000
-+++ libgimp/Makefile.in Sun Apr 2 22:40:29 2000
-@@ -209,11 +209,11 @@
- gimpinclude_HEADERS = color_display.h color_selector.h gimp.h gimpchainbutton.h gimpcolorbutton.h gimpcolorspace.h gimpcompat.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimphelpui.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimppatheditor.h gimppixmap.h gimpquerybox.h gimpsizeentry.h gimpui.h gimpunit.h gimpunitmenu.h gimpvector.h gimpwidgets.h gimpintl.h parasite.h parasiteF.h parasiteP.h parasiteio.h
-
-
--libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
-
--libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- libgimpui_la_LIBADD = $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp-app-devel/files/patch-af b/graphics/gimp-app-devel/files/patch-gimptool-1.2.in
index 83f0d440beea..052cac1df256 100644
--- a/graphics/gimp-app-devel/files/patch-af
+++ b/graphics/gimp-app-devel/files/patch-gimptool-1.2.in
@@ -1,6 +1,6 @@
---- gimptool.in.orig Thu Apr 27 02:07:40 2000
-+++ gimptool.in Thu Mar 15 05:55:24 2001
-@@ -234,19 +234,19 @@
+--- gimptool-1.2.in.orig Wed Feb 20 14:04:01 2002
++++ gimptool-1.2.in Wed Feb 20 14:04:39 2002
+@@ -227,19 +227,19 @@
| --uninstall-script | --uninstall-admin-script )
case $1 in
--*install-bin)
diff --git a/graphics/gimp-app-devel/files/patch-libgimp::Makefile.in b/graphics/gimp-app-devel/files/patch-libgimp::Makefile.in
new file mode 100644
index 000000000000..b9cdc7868203
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-libgimp::Makefile.in
@@ -0,0 +1,19 @@
+--- libgimp/Makefile.in.orig Tue Feb 12 05:46:08 2002
++++ libgimp/Makefile.in Wed Feb 20 14:02:07 2002
+@@ -225,13 +225,13 @@
+ gimpinclude_HEADERS = gimp.h ${PDB_WRAPPERS_H} gimpchainbutton.h gimpchannel.h gimpcolorbutton.h gimpcolordisplay.h gimpcolorselector.h gimpcolorspace.h gimpcompat.h gimpdrawable.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimpgradientselect.h gimphelpui.h gimpimage.h gimplayer.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpparasite.h gimpparasiteio.h gimppatheditor.h gimppixelrgn.h gimppixmap.h gimpproceduraldb.h gimpquerybox.h gimpselection.h gimpsignal.h gimpsizeentry.h gimptile.h gimptypes.h gimpui.h gimpunit.h gimpunitmenu.h gimputils.h gimpvector.h gimpwidgets.h gimpintl.h
+
+
+-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimp_export_symbols)
++libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
+
+-libgimp_la_LIBADD = $(GLIB_LIBS) -lm
++libgimp_la_LIBADD = $(GTK_LIBS) -lm
+
+ libgimp_la_DEPENDENCIES = $(gimp_def)
+
+-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimpui_export_symbols)
++libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
+
+
+ libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)
diff --git a/graphics/gimp-app/files/patch-ao b/graphics/gimp-app-devel/files/patch-plug-ins::libgck::gck::Makefile.in
index e5f1d5a3677c..6764015563eb 100644
--- a/graphics/gimp-app/files/patch-ao
+++ b/graphics/gimp-app-devel/files/patch-plug-ins::libgck::gck::Makefile.in
@@ -1,11 +1,11 @@
---- plug-ins/libgck/gck/Makefile.in.orig Sun Apr 2 22:41:29 2000
-+++ plug-ins/libgck/gck/Makefile.in Sun Apr 2 22:41:37 2000
-@@ -191,7 +191,7 @@
+--- plug-ins/libgck/gck/Makefile.in.orig Tue Feb 12 05:46:23 2002
++++ plug-ins/libgck/gck/Makefile.in Wed Feb 20 14:00:02 2002
+@@ -193,7 +193,7 @@
gckinclude_HEADERS = gck.h
--libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
++libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 70fdc67a43b0..389cbc14e136 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -88,16 +88,25 @@ include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
+lib/libgck.la
lib/libgck.so
lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
+lib/libgimp.la
lib/libgimp.so
lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
+lib/libgimpui.la
lib/libgimpui.so
lib/libgimpui.so.%%SHLIBVER%%
+libexec/gimp/1.2/modules/libcolorsel_gtk.a
+libexec/gimp/1.2/modules/libcolorsel_gtk.la
libexec/gimp/1.2/modules/libcolorsel_gtk.so
+libexec/gimp/1.2/modules/libcolorsel_triangle.a
+libexec/gimp/1.2/modules/libcolorsel_triangle.la
libexec/gimp/1.2/modules/libcolorsel_triangle.so
+libexec/gimp/1.2/modules/libcolorsel_water.a
+libexec/gimp/1.2/modules/libcolorsel_water.la
libexec/gimp/1.2/modules/libcolorsel_water.so
libexec/gimp/1.2/plug-ins/AlienMap
libexec/gimp/1.2/plug-ins/AlienMap2
@@ -623,6 +632,7 @@ share/gimp/help/C/dialogs/color_selectors/built_in.html
share/gimp/help/C/dialogs/color_selectors/gtk.html
share/gimp/help/C/dialogs/color_selectors/triangle.html
share/gimp/help/C/dialogs/color_selectors/watercolor.html
+share/gimp/help/C/dialogs/confirm_save.html
share/gimp/help/C/dialogs/convert_to_indexed.html
share/gimp/help/C/dialogs/copy_named.html
share/gimp/help/C/dialogs/cut_named.html
@@ -630,6 +640,7 @@ share/gimp/help/C/dialogs/device_status.html
share/gimp/help/C/dialogs/document_index.html
share/gimp/help/C/dialogs/edit_qmask_attributes.html
share/gimp/help/C/dialogs/error_console.html
+share/gimp/help/C/dialogs/export_file.html
share/gimp/help/C/dialogs/feather_selection.html
share/gimp/help/C/dialogs/file_new.html
share/gimp/help/C/dialogs/file_open.html
@@ -707,38 +718,72 @@ share/gimp/help/C/file_formats.html
share/gimp/help/C/filters/alienmap.html
share/gimp/help/C/filters/alienmap2.html
share/gimp/help/C/filters/align_layers.html
+share/gimp/help/C/filters/animate_cells.html
+share/gimp/help/C/filters/animationplay.html
+share/gimp/help/C/filters/animoptimize.html
+share/gimp/help/C/filters/apply_lens.html
share/gimp/help/C/filters/applycanvas.html
share/gimp/help/C/filters/autocrop.html
share/gimp/help/C/filters/autostretch_hsv.html
+share/gimp/help/C/filters/blended2.html
share/gimp/help/C/filters/blinds.html
share/gimp/help/C/filters/blur.html
-share/gimp/help/C/filters/bz2.html
+share/gimp/help/C/filters/blowinout.html
+share/gimp/help/C/filters/border.html
share/gimp/help/C/filters/borderaverage.html
+share/gimp/help/C/filters/bumpmap.html
share/gimp/help/C/filters/burst.html
+share/gimp/help/C/filters/bz2.html
share/gimp/help/C/filters/c_astretch.html
share/gimp/help/C/filters/centerguide.html
share/gimp/help/C/filters/checkerboard.html
+share/gimp/help/C/filters/cml_explorer.html
share/gimp/help/C/filters/color_enhance.html
share/gimp/help/C/filters/colorify.html
share/gimp/help/C/filters/colortoalpha.html
+share/gimp/help/C/filters/convmatrix.html
share/gimp/help/C/filters/compose.html
share/gimp/help/C/filters/cubism.html
+share/gimp/help/C/filters/curve_bend.html
share/gimp/help/C/filters/decompose.html
+share/gimp/help/C/filters/deinterlace.html
+share/gimp/help/C/filters/depthmerge.html
+share/gimp/help/C/filters/despeckle.html
+share/gimp/help/C/filters/destripe.html
+share/gimp/help/C/filters/diffraction.html
+share/gimp/help/C/filters/displace.html
share/gimp/help/C/filters/ditherize.html
share/gimp/help/C/filters/dust.html
+share/gimp/help/C/filters/edge.html
+share/gimp/help/C/filters/emboss.html
+share/gimp/help/C/filters/engrave.html
share/gimp/help/C/filters/exchange.html
share/gimp/help/C/filters/fade-alpha.html
+share/gimp/help/C/filters/film.html
+share/gimp/help/C/filters/fire.html
share/gimp/help/C/filters/fit-text.html
share/gimp/help/C/filters/fits.html
share/gimp/help/C/filters/flame.html
+share/gimp/help/C/filters/flarefx.html
+share/gimp/help/C/filters/fractalexplorer.html
+share/gimp/help/C/filters/fractaltrace.html
share/gimp/help/C/filters/fp.html
share/gimp/help/C/filters/frame_filter.html
share/gimp/help/C/filters/gap_filter.html
+share/gimp/help/C/filters/gap_frontends.html
+share/gimp/help/C/filters/gap_navigator_dialog.html
+share/gimp/help/C/filters/gap_plugins.html
share/gimp/help/C/filters/gauss_iir.html
share/gimp/help/C/filters/gauss_rle.html
share/gimp/help/C/filters/gee_zoom.html
+share/gimp/help/C/filters/gdyntext.html
share/gimp/help/C/filters/gfig.html
+share/gimp/help/C/filters/gflare.html
share/gimp/help/C/filters/gih.html
+share/gimp/help/C/filters/gimpressionist.html
+share/gimp/help/C/filters/glasstile.html
+share/gimp/help/C/filters/glowing_steel.html
+share/gimp/help/C/filters/gouge.html
share/gimp/help/C/filters/gradmap.html
share/gimp/help/C/filters/grid.html
share/gimp/help/C/filters/gqbist.html
@@ -750,24 +795,45 @@ share/gimp/help/C/filters/guillotine.html
share/gimp/help/C/filters/gz.html
share/gimp/help/C/filters/hot.html
share/gimp/help/C/filters/hrz.html
+share/gimp/help/C/filters/ifscompose.html
+share/gimp/help/C/filters/illusion.html
+share/gimp/help/C/filters/image_tile.html
+share/gimp/help/C/filters/imagemap.html
+share/gimp/help/C/filters/iwarp.html
share/gimp/help/C/filters/index.html
share/gimp/help/C/filters/jigsaw.html
share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/laplace.html
share/gimp/help/C/filters/layerfuncs.html
+share/gimp/help/C/filters/lic.html
+share/gimp/help/C/filters/lighting.html
+share/gimp/help/C/filters/logulator.html
share/gimp/help/C/filters/mail.html
+share/gimp/help/C/filters/map_to_gradient.html
share/gimp/help/C/filters/mapcolor.html
+share/gimp/help/C/filters/mapobject.html
share/gimp/help/C/filters/max_rgb.html
share/gimp/help/C/filters/maze.html
share/gimp/help/C/filters/mblur.html
share/gimp/help/C/filters/miff.html
+share/gimp/help/C/filters/mirrorsplit.html
share/gimp/help/C/filters/mosaic.html
+share/gimp/help/C/filters/newsprint.html
+share/gimp/help/C/filters/nlfilt.html
+share/gimp/help/C/filters/nova.html
share/gimp/help/C/filters/noisify.html
share/gimp/help/C/filters/none.html
share/gimp/help/C/filters/normalize.html
share/gimp/help/C/filters/oilify.html
+share/gimp/help/C/filters/pagecurl.html
+share/gimp/help/C/filters/papertile.html
share/gimp/help/C/filters/pat.html
+share/gimp/help/C/filters/perlotine.html
+share/gimp/help/C/filters/pixelmap.html
share/gimp/help/C/filters/pixelize.html
share/gimp/help/C/filters/plasma.html
+share/gimp/help/C/filters/polar.html
+share/gimp/help/C/filters/prep4gif.html
share/gimp/help/C/filters/png.html
share/gimp/help/C/filters/pnm.html
share/gimp/help/C/filters/print.html
@@ -779,21 +845,27 @@ share/gimp/help/C/filters/rcm.html
share/gimp/help/C/filters/repdup.html
share/gimp/help/C/filters/repeat_last.html
share/gimp/help/C/filters/reshow_last.html
+share/gimp/help/C/filters/resynth.html
share/gimp/help/C/filters/ripple.html
share/gimp/help/C/filters/rotate.html
share/gimp/help/C/filters/roundsel.html
share/gimp/help/C/filters/sample_colorize.html
share/gimp/help/C/filters/scatter_hsv.html
+share/gimp/help/C/filters/scratches.html
share/gimp/help/C/filters/sel2path.html
share/gimp/help/C/filters/sel_gauss.html
+share/gimp/help/C/filters/semiflatten.html
share/gimp/help/C/filters/sharpen.html
share/gimp/help/C/filters/shift.html
share/gimp/help/C/filters/sgi.html
-share/gimp/help/C/filters/semiflatten.html
+share/gimp/help/C/filters/sinus.html
share/gimp/help/C/filters/smooth_palette.html
share/gimp/help/C/filters/snoise.html
+share/gimp/help/C/filters/sobel.html
+share/gimp/help/C/filters/sparkle.html
share/gimp/help/C/filters/spread.html
share/gimp/help/C/filters/stampify.html
+share/gimp/help/C/filters/struc.html
share/gimp/help/C/filters/sunras.html
share/gimp/help/C/filters/terral_text.html
share/gimp/help/C/filters/tex-to-float.html
@@ -801,10 +873,25 @@ share/gimp/help/C/filters/tga.html
share/gimp/help/C/filters/threshold_alpha.html
share/gimp/help/C/filters/tiff.html
share/gimp/help/C/filters/tile.html
+share/gimp/help/C/filters/tileit.html
+share/gimp/help/C/filters/tiler.html
share/gimp/help/C/filters/tileable_blur.html
+share/gimp/help/C/filters/translogo.html
+share/gimp/help/C/filters/unsharp.html
share/gimp/help/C/filters/url.html
+share/gimp/help/C/filters/video.html
share/gimp/help/C/filters/vinvert.html
+share/gimp/help/C/filters/vpropagate.html
+share/gimp/help/C/filters/warp-sharp.html
+share/gimp/help/C/filters/warp.html
+share/gimp/help/C/filters/waves.html
+share/gimp/help/C/filters/webify.html
+share/gimp/help/C/filters/whirlpinch.html
+share/gimp/help/C/filters/wind.html
+share/gimp/help/C/filters/windify.html
share/gimp/help/C/filters/wmf.html
+share/gimp/help/C/filters/xachlego.html
+share/gimp/help/C/filters/xachshadow.html
share/gimp/help/C/filters/xachvision.html
share/gimp/help/C/filters/xwd.html
share/gimp/help/C/filters/zealouscrop.html
@@ -876,15 +963,97 @@ share/gimp/help/C/image/view/toggle_rulers.html
share/gimp/help/C/image/view/toggle_selection.html
share/gimp/help/C/image/view/toggle_statusbar.html
share/gimp/help/C/image/view/zoom.html
+share/gimp/help/C/images/add_point.png
+share/gimp/help/C/images/anchor_layer.png
+share/gimp/help/C/images/channel_to_selection.png
+share/gimp/help/C/images/delete_channel.png
+share/gimp/help/C/images/delete_directory.png
+share/gimp/help/C/images/delete_layer.png
+share/gimp/help/C/images/delete_path.png
+share/gimp/help/C/images/dotted_square.png
+share/gimp/help/C/images/duplicate_channel.png
+share/gimp/help/C/images/duplicate_layer.png
+share/gimp/help/C/images/duplicate_path.png
+share/gimp/help/C/images/edit_point.png
+share/gimp/help/C/images/eye.png
+share/gimp/help/C/images/examples/border-selection-01.png
+share/gimp/help/C/images/example/border-selection-02.png
+share/gimp/help/C/images/glossary/modes-addition.png
+share/gimp/help/C/images/glossary/modes-color.png
+share/gimp/help/C/images/glossary/modes-darken.png
+share/gimp/help/C/images/glossary/modes-difference.png
+share/gimp/help/C/images/glossary/modes-dissolve.png
+share/gimp/help/C/images/glossary/modes-divide.png
+share/gimp/help/C/images/glossary/modes-hue.png
+share/gimp/help/C/images/glossary/modes-lighten.png
+share/gimp/help/C/images/glossary/modes-multiply.png
+share/gimp/help/C/images/glossary/modes-normal.png
+share/gimp/help/C/images/glossary/modes-normal2.png
+share/gimp/help/C/images/glossary/modes-overlay.png
+share/gimp/help/C/images/glossary/modes-saturation.png
+share/gimp/help/C/images/glossary/modes-screen.png
+share/gimp/help/C/images/glossary/modes-subtract.png
+share/gimp/help/C/images/glossary/modes-value.png
+share/gimp/help/C/images/geezoom.png
share/gimp/help/C/images/image_menu.png
share/gimp/help/C/images/image_window.png
share/gimp/help/C/images/layers_dialog.png
+share/gimp/help/C/images/layers_example.png
share/gimp/help/C/images/layers_menu.png
+share/gimp/help/C/images/layers_overview.png
+share/gimp/help/C/images/lower_channel.png
+share/gimp/help/C/images/lower_directory.png
+share/gimp/help/C/images/lower_layer.png
+share/gimp/help/C/images/new_channel.png
+share/gimp/help/C/images/new_directory.png
+share/gimp/help/C/images/new_path.png
+share/gimp/help/C/images/new_point.png
+share/gimp/help/C/images/path_to_selection.png
+share/gimp/help/C/images/preview_box.png
share/gimp/help/C/images/print_color.png
share/gimp/help/C/images/print_main.png
share/gimp/help/C/images/print_setup.png
+share/gimp/help/C/images/raise_channel.png
+share/gimp/help/C/images/raise_directory.png
+share/gimp/help/C/images/raise_layer.png
+share/gimp/help/C/images/red_square.png
+share/gimp/help/C/images/remove_point.png
+share/gimp/help/C/images/selection_to_path.png
+share/gimp/help/C/images/stroke_path.png
share/gimp/help/C/images/tool_options.png
share/gimp/help/C/images/toolbox.png
+share/gimp/help/C/images/tools/tool-opt-increment.png
+share/gimp/help/C/images/tools/tool-opt-nonincrement.png
+share/gimp/help/C/images/tools/tool_airbrush.png
+share/gimp/help/C/images/tools/tool_apartheid.png
+share/gimp/help/C/images/tools/tool_bezier.png
+share/gimp/help/C/images/tools/tool_blend.png
+share/gimp/help/C/images/tools/tool_burndodge.png
+share/gimp/help/C/images/tools/tool_convolver.png
+share/gimp/help/C/images/tools/tool_crop.png
+share/gimp/help/C/images/tools/tool_dodgeburn.png
+share/gimp/help/C/images/tools/tool_ellipse_sel.png
+share/gimp/help/C/images/tools/tool_eraser.png
+share/gimp/help/C/images/tools/tool_fill.png
+share/gimp/help/C/images/tools/tool_flip.png
+share/gimp/help/C/images/tools/tool_free_sel.png
+share/gimp/help/C/images/tools/tool_fuzzy_sel.png
+share/gimp/help/C/images/tools/tool_gradient.png
+share/gimp/help/C/images/tools/tool_ink.png
+share/gimp/help/C/images/tools/tool_measure.png
+share/gimp/help/C/images/tools/tool_move.png
+share/gimp/help/C/images/tools/tool_paintbrush.png
+share/gimp/help/C/images/tools/tool_pencil.png
+share/gimp/help/C/images/tools/tool_picker.png
+share/gimp/help/C/images/tools/tool_rect_sel.png
+share/gimp/help/C/images/tools/tool_scissors.png
+share/gimp/help/C/images/tools/tool_smudge.png
+share/gimp/help/C/images/tools/tool_smuge.png
+share/gimp/help/C/images/tools/tool_text.png
+share/gimp/help/C/images/tools/tool_transform.png
+share/gimp/help/C/images/tools/tool_zoom.png
+share/gimp/help/C/images/triangle.png
+share/gimp/help/C/images/wilber.png
share/gimp/help/C/index.html
share/gimp/help/C/introduction.html
share/gimp/help/C/keyboard_shortcuts.html
@@ -947,6 +1116,9 @@ share/gimp/help/C/toolbox/help/context_help.html
@unexec rm -f %D/share/gimp/help/C/toolbox/help/dialogs
@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/toolbox/help/filters
@unexec rm -f %D/share/gimp/help/C/toolbox/help/filters
+share/gimp/help/C/stylesheet-images/note.gif
+share/gimp/help/C/stylesheet-images/tip.gif
+share/gimp/help/C/stylesheet-images/warning.gif
share/gimp/help/C/toolbox/index.html
share/gimp/help/C/toolbox/toolbox.html
share/gimp/help/C/tools/airbrush.html
@@ -986,42 +1158,6 @@ share/gimp/help/C/tools/threshold.html
share/gimp/help/C/tools/transform.html
share/gimp/help/C/using_gimp.html
share/gimp/help/C/why_gimp.html
-share/gimp/help/images/add_point.png
-share/gimp/help/images/anchor_layer.png
-share/gimp/help/images/channel_to_selection.png
-share/gimp/help/images/delete_channel.png
-share/gimp/help/images/delete_directory.png
-share/gimp/help/images/delete_layer.png
-share/gimp/help/images/delete_path.png
-share/gimp/help/images/dotted_square.png
-share/gimp/help/images/duplicate_channel.png
-share/gimp/help/images/duplicate_layer.png
-share/gimp/help/images/duplicate_path.png
-share/gimp/help/images/edit_point.png
-share/gimp/help/images/eek.png
-share/gimp/help/images/geezoom.png
-share/gimp/help/images/layers_example.png
-share/gimp/help/images/layers_overview.png
-share/gimp/help/images/lower_channel.png
-share/gimp/help/images/lower_directory.png
-share/gimp/help/images/lower_layer.png
-share/gimp/help/images/new_channel.png
-share/gimp/help/images/new_directory.png
-share/gimp/help/images/new_path.png
-share/gimp/help/images/new_point.png
-share/gimp/help/images/note.png
-share/gimp/help/images/path_to_selection.png
-share/gimp/help/images/preview_box.png
-share/gimp/help/images/raise_channel.png
-share/gimp/help/images/raise_directory.png
-share/gimp/help/images/raise_layer.png
-share/gimp/help/images/red_square.png
-share/gimp/help/images/remove_point.png
-share/gimp/help/images/selection_to_path.png
-share/gimp/help/images/stroke_path.png
-share/gimp/help/images/tip.png
-share/gimp/help/images/warning.png
-share/gimp/help/images/wilber.png
share/gimp/palettes/Bears
share/gimp/palettes/Bgold
share/gimp/palettes/Blues
@@ -1216,16 +1352,21 @@ share/gimp/scripts/web-browser.scm
share/gimp/scripts/xach-effect.scm
share/gimp/tips/gimp_conseils.fr.txt
share/gimp/tips/gimp_tips.cs.txt
+share/gimp/tips/gimp_tips.da.txt
share/gimp/tips/gimp_tips.de.txt
share/gimp/tips/gimp_tips.es.txt
+share/gimp/tips/gimp_tips.hu.txt
share/gimp/tips/gimp_tips.it.txt
share/gimp/tips/gimp_tips.ja.txt
share/gimp/tips/gimp_tips.ko.txt
+share/gimp/tips/gimp_tips.lt.txt
share/gimp/tips/gimp_tips.pl.txt
share/gimp/tips/gimp_tips.ru.txt
share/gimp/tips/gimp_tips.txt
share/gimp/tips/gimp_tips.tr.txt
share/gimp/tips/gimp_tips.uk.txt
+share/gimp/tips/gimp_tips.zh_CN.txt
+share/gimp/tips/gimp_tips.zh_TW.txt
share/gimp/user_install
share/locale/ca/LC_MESSAGES/gimp-libgimp.mo
share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
@@ -1331,10 +1472,14 @@ share/locale/uk/LC_MESSAGES/gimp-libgimp.mo
share/locale/uk/LC_MESSAGES/gimp-script-fu.mo
share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo
share/locale/uk/LC_MESSAGES/gimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-libgimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-script-fu.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-std-plugins.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm etc/gimp/1.2
@dirrm etc/gimp
@dirrm include/gck
@@ -1363,6 +1508,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/dialogs/color_selectors
@dirrm share/gimp/help/C/dialogs/preferences
@dirrm share/gimp/help/C/dialogs
+@dirrm share/gimp/help/C/stylesheet-images
@dirrm share/gimp/help/C/tools
@dirrm share/gimp/help/C/layers/stack
@dirrm share/gimp/help/C/layers
@@ -1370,6 +1516,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/paths
@dirrm share/gimp/help/C/toolbox/help
@dirrm share/gimp/help/C/toolbox
+@dirrm share/gimp/help/C/images/examples
+@dirrm share/gimp/help/C/images/glossary
+@dirrm share/gimp/help/C/images/tools
@dirrm share/gimp/help/C/images
@dirrm share/gimp/help/C/image/edit
@dirrm share/gimp/help/C/image/select
@@ -1385,7 +1534,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/filters
@dirrm share/gimp/help/C/file
@dirrm share/gimp/help/C
-@dirrm share/gimp/help/images
@dirrm share/gimp/help
@dirrm share/gimp/palettes
@dirrm share/gimp/patterns
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index f4e2048be79e..ca69390ee316 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gimp
-PORTVERSION= 1.2.2
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTVERSION= 1.2.3
+PORTREVISION= 0
+#PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
@@ -24,7 +24,8 @@ LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+#SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+SHLIBVER?= 2
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -34,6 +35,7 @@ USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+LIBTOOLFILES= aclocal.m4
PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ARGS= --disable-perl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 7ae55b0c96c8..cb85cd7f3134 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.2.tar.bz2) = 680c01b0fc35cd68c540eb9d236f5e1a
+MD5 (gimp-1.2.3.tar.bz2) = b19235f19f524f772a4aef597a69b1da
diff --git a/graphics/gimp-app/files/patch-ak b/graphics/gimp-app/files/patch-ak
deleted file mode 100644
index ead5311df6ff..000000000000
--- a/graphics/gimp-app/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgimp/Makefile.in.orig Sat Mar 4 11:10:43 2000
-+++ libgimp/Makefile.in Sun Apr 2 22:40:29 2000
-@@ -209,11 +209,11 @@
- gimpinclude_HEADERS = color_display.h color_selector.h gimp.h gimpchainbutton.h gimpcolorbutton.h gimpcolorspace.h gimpcompat.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimphelpui.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimppatheditor.h gimppixmap.h gimpquerybox.h gimpsizeentry.h gimpui.h gimpunit.h gimpunitmenu.h gimpvector.h gimpwidgets.h gimpintl.h parasite.h parasiteF.h parasiteP.h parasiteio.h
-
-
--libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
-
--libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- libgimpui_la_LIBADD = $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp-devel/files/patch-af b/graphics/gimp-app/files/patch-gimptool-1.2.in
index 83f0d440beea..052cac1df256 100644
--- a/graphics/gimp-devel/files/patch-af
+++ b/graphics/gimp-app/files/patch-gimptool-1.2.in
@@ -1,6 +1,6 @@
---- gimptool.in.orig Thu Apr 27 02:07:40 2000
-+++ gimptool.in Thu Mar 15 05:55:24 2001
-@@ -234,19 +234,19 @@
+--- gimptool-1.2.in.orig Wed Feb 20 14:04:01 2002
++++ gimptool-1.2.in Wed Feb 20 14:04:39 2002
+@@ -227,19 +227,19 @@
| --uninstall-script | --uninstall-admin-script )
case $1 in
--*install-bin)
diff --git a/graphics/gimp-app/files/patch-libgimp::Makefile.in b/graphics/gimp-app/files/patch-libgimp::Makefile.in
new file mode 100644
index 000000000000..b9cdc7868203
--- /dev/null
+++ b/graphics/gimp-app/files/patch-libgimp::Makefile.in
@@ -0,0 +1,19 @@
+--- libgimp/Makefile.in.orig Tue Feb 12 05:46:08 2002
++++ libgimp/Makefile.in Wed Feb 20 14:02:07 2002
+@@ -225,13 +225,13 @@
+ gimpinclude_HEADERS = gimp.h ${PDB_WRAPPERS_H} gimpchainbutton.h gimpchannel.h gimpcolorbutton.h gimpcolordisplay.h gimpcolorselector.h gimpcolorspace.h gimpcompat.h gimpdrawable.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimpgradientselect.h gimphelpui.h gimpimage.h gimplayer.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpparasite.h gimpparasiteio.h gimppatheditor.h gimppixelrgn.h gimppixmap.h gimpproceduraldb.h gimpquerybox.h gimpselection.h gimpsignal.h gimpsizeentry.h gimptile.h gimptypes.h gimpui.h gimpunit.h gimpunitmenu.h gimputils.h gimpvector.h gimpwidgets.h gimpintl.h
+
+
+-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimp_export_symbols)
++libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
+
+-libgimp_la_LIBADD = $(GLIB_LIBS) -lm
++libgimp_la_LIBADD = $(GTK_LIBS) -lm
+
+ libgimp_la_DEPENDENCIES = $(gimp_def)
+
+-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimpui_export_symbols)
++libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
+
+
+ libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)
diff --git a/graphics/gimp-devel/files/patch-ao b/graphics/gimp-app/files/patch-plug-ins::libgck::gck::Makefile.in
index e5f1d5a3677c..6764015563eb 100644
--- a/graphics/gimp-devel/files/patch-ao
+++ b/graphics/gimp-app/files/patch-plug-ins::libgck::gck::Makefile.in
@@ -1,11 +1,11 @@
---- plug-ins/libgck/gck/Makefile.in.orig Sun Apr 2 22:41:29 2000
-+++ plug-ins/libgck/gck/Makefile.in Sun Apr 2 22:41:37 2000
-@@ -191,7 +191,7 @@
+--- plug-ins/libgck/gck/Makefile.in.orig Tue Feb 12 05:46:23 2002
++++ plug-ins/libgck/gck/Makefile.in Wed Feb 20 14:00:02 2002
+@@ -193,7 +193,7 @@
gckinclude_HEADERS = gck.h
--libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
++libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 70fdc67a43b0..389cbc14e136 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -88,16 +88,25 @@ include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
+lib/libgck.la
lib/libgck.so
lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
+lib/libgimp.la
lib/libgimp.so
lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
+lib/libgimpui.la
lib/libgimpui.so
lib/libgimpui.so.%%SHLIBVER%%
+libexec/gimp/1.2/modules/libcolorsel_gtk.a
+libexec/gimp/1.2/modules/libcolorsel_gtk.la
libexec/gimp/1.2/modules/libcolorsel_gtk.so
+libexec/gimp/1.2/modules/libcolorsel_triangle.a
+libexec/gimp/1.2/modules/libcolorsel_triangle.la
libexec/gimp/1.2/modules/libcolorsel_triangle.so
+libexec/gimp/1.2/modules/libcolorsel_water.a
+libexec/gimp/1.2/modules/libcolorsel_water.la
libexec/gimp/1.2/modules/libcolorsel_water.so
libexec/gimp/1.2/plug-ins/AlienMap
libexec/gimp/1.2/plug-ins/AlienMap2
@@ -623,6 +632,7 @@ share/gimp/help/C/dialogs/color_selectors/built_in.html
share/gimp/help/C/dialogs/color_selectors/gtk.html
share/gimp/help/C/dialogs/color_selectors/triangle.html
share/gimp/help/C/dialogs/color_selectors/watercolor.html
+share/gimp/help/C/dialogs/confirm_save.html
share/gimp/help/C/dialogs/convert_to_indexed.html
share/gimp/help/C/dialogs/copy_named.html
share/gimp/help/C/dialogs/cut_named.html
@@ -630,6 +640,7 @@ share/gimp/help/C/dialogs/device_status.html
share/gimp/help/C/dialogs/document_index.html
share/gimp/help/C/dialogs/edit_qmask_attributes.html
share/gimp/help/C/dialogs/error_console.html
+share/gimp/help/C/dialogs/export_file.html
share/gimp/help/C/dialogs/feather_selection.html
share/gimp/help/C/dialogs/file_new.html
share/gimp/help/C/dialogs/file_open.html
@@ -707,38 +718,72 @@ share/gimp/help/C/file_formats.html
share/gimp/help/C/filters/alienmap.html
share/gimp/help/C/filters/alienmap2.html
share/gimp/help/C/filters/align_layers.html
+share/gimp/help/C/filters/animate_cells.html
+share/gimp/help/C/filters/animationplay.html
+share/gimp/help/C/filters/animoptimize.html
+share/gimp/help/C/filters/apply_lens.html
share/gimp/help/C/filters/applycanvas.html
share/gimp/help/C/filters/autocrop.html
share/gimp/help/C/filters/autostretch_hsv.html
+share/gimp/help/C/filters/blended2.html
share/gimp/help/C/filters/blinds.html
share/gimp/help/C/filters/blur.html
-share/gimp/help/C/filters/bz2.html
+share/gimp/help/C/filters/blowinout.html
+share/gimp/help/C/filters/border.html
share/gimp/help/C/filters/borderaverage.html
+share/gimp/help/C/filters/bumpmap.html
share/gimp/help/C/filters/burst.html
+share/gimp/help/C/filters/bz2.html
share/gimp/help/C/filters/c_astretch.html
share/gimp/help/C/filters/centerguide.html
share/gimp/help/C/filters/checkerboard.html
+share/gimp/help/C/filters/cml_explorer.html
share/gimp/help/C/filters/color_enhance.html
share/gimp/help/C/filters/colorify.html
share/gimp/help/C/filters/colortoalpha.html
+share/gimp/help/C/filters/convmatrix.html
share/gimp/help/C/filters/compose.html
share/gimp/help/C/filters/cubism.html
+share/gimp/help/C/filters/curve_bend.html
share/gimp/help/C/filters/decompose.html
+share/gimp/help/C/filters/deinterlace.html
+share/gimp/help/C/filters/depthmerge.html
+share/gimp/help/C/filters/despeckle.html
+share/gimp/help/C/filters/destripe.html
+share/gimp/help/C/filters/diffraction.html
+share/gimp/help/C/filters/displace.html
share/gimp/help/C/filters/ditherize.html
share/gimp/help/C/filters/dust.html
+share/gimp/help/C/filters/edge.html
+share/gimp/help/C/filters/emboss.html
+share/gimp/help/C/filters/engrave.html
share/gimp/help/C/filters/exchange.html
share/gimp/help/C/filters/fade-alpha.html
+share/gimp/help/C/filters/film.html
+share/gimp/help/C/filters/fire.html
share/gimp/help/C/filters/fit-text.html
share/gimp/help/C/filters/fits.html
share/gimp/help/C/filters/flame.html
+share/gimp/help/C/filters/flarefx.html
+share/gimp/help/C/filters/fractalexplorer.html
+share/gimp/help/C/filters/fractaltrace.html
share/gimp/help/C/filters/fp.html
share/gimp/help/C/filters/frame_filter.html
share/gimp/help/C/filters/gap_filter.html
+share/gimp/help/C/filters/gap_frontends.html
+share/gimp/help/C/filters/gap_navigator_dialog.html
+share/gimp/help/C/filters/gap_plugins.html
share/gimp/help/C/filters/gauss_iir.html
share/gimp/help/C/filters/gauss_rle.html
share/gimp/help/C/filters/gee_zoom.html
+share/gimp/help/C/filters/gdyntext.html
share/gimp/help/C/filters/gfig.html
+share/gimp/help/C/filters/gflare.html
share/gimp/help/C/filters/gih.html
+share/gimp/help/C/filters/gimpressionist.html
+share/gimp/help/C/filters/glasstile.html
+share/gimp/help/C/filters/glowing_steel.html
+share/gimp/help/C/filters/gouge.html
share/gimp/help/C/filters/gradmap.html
share/gimp/help/C/filters/grid.html
share/gimp/help/C/filters/gqbist.html
@@ -750,24 +795,45 @@ share/gimp/help/C/filters/guillotine.html
share/gimp/help/C/filters/gz.html
share/gimp/help/C/filters/hot.html
share/gimp/help/C/filters/hrz.html
+share/gimp/help/C/filters/ifscompose.html
+share/gimp/help/C/filters/illusion.html
+share/gimp/help/C/filters/image_tile.html
+share/gimp/help/C/filters/imagemap.html
+share/gimp/help/C/filters/iwarp.html
share/gimp/help/C/filters/index.html
share/gimp/help/C/filters/jigsaw.html
share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/laplace.html
share/gimp/help/C/filters/layerfuncs.html
+share/gimp/help/C/filters/lic.html
+share/gimp/help/C/filters/lighting.html
+share/gimp/help/C/filters/logulator.html
share/gimp/help/C/filters/mail.html
+share/gimp/help/C/filters/map_to_gradient.html
share/gimp/help/C/filters/mapcolor.html
+share/gimp/help/C/filters/mapobject.html
share/gimp/help/C/filters/max_rgb.html
share/gimp/help/C/filters/maze.html
share/gimp/help/C/filters/mblur.html
share/gimp/help/C/filters/miff.html
+share/gimp/help/C/filters/mirrorsplit.html
share/gimp/help/C/filters/mosaic.html
+share/gimp/help/C/filters/newsprint.html
+share/gimp/help/C/filters/nlfilt.html
+share/gimp/help/C/filters/nova.html
share/gimp/help/C/filters/noisify.html
share/gimp/help/C/filters/none.html
share/gimp/help/C/filters/normalize.html
share/gimp/help/C/filters/oilify.html
+share/gimp/help/C/filters/pagecurl.html
+share/gimp/help/C/filters/papertile.html
share/gimp/help/C/filters/pat.html
+share/gimp/help/C/filters/perlotine.html
+share/gimp/help/C/filters/pixelmap.html
share/gimp/help/C/filters/pixelize.html
share/gimp/help/C/filters/plasma.html
+share/gimp/help/C/filters/polar.html
+share/gimp/help/C/filters/prep4gif.html
share/gimp/help/C/filters/png.html
share/gimp/help/C/filters/pnm.html
share/gimp/help/C/filters/print.html
@@ -779,21 +845,27 @@ share/gimp/help/C/filters/rcm.html
share/gimp/help/C/filters/repdup.html
share/gimp/help/C/filters/repeat_last.html
share/gimp/help/C/filters/reshow_last.html
+share/gimp/help/C/filters/resynth.html
share/gimp/help/C/filters/ripple.html
share/gimp/help/C/filters/rotate.html
share/gimp/help/C/filters/roundsel.html
share/gimp/help/C/filters/sample_colorize.html
share/gimp/help/C/filters/scatter_hsv.html
+share/gimp/help/C/filters/scratches.html
share/gimp/help/C/filters/sel2path.html
share/gimp/help/C/filters/sel_gauss.html
+share/gimp/help/C/filters/semiflatten.html
share/gimp/help/C/filters/sharpen.html
share/gimp/help/C/filters/shift.html
share/gimp/help/C/filters/sgi.html
-share/gimp/help/C/filters/semiflatten.html
+share/gimp/help/C/filters/sinus.html
share/gimp/help/C/filters/smooth_palette.html
share/gimp/help/C/filters/snoise.html
+share/gimp/help/C/filters/sobel.html
+share/gimp/help/C/filters/sparkle.html
share/gimp/help/C/filters/spread.html
share/gimp/help/C/filters/stampify.html
+share/gimp/help/C/filters/struc.html
share/gimp/help/C/filters/sunras.html
share/gimp/help/C/filters/terral_text.html
share/gimp/help/C/filters/tex-to-float.html
@@ -801,10 +873,25 @@ share/gimp/help/C/filters/tga.html
share/gimp/help/C/filters/threshold_alpha.html
share/gimp/help/C/filters/tiff.html
share/gimp/help/C/filters/tile.html
+share/gimp/help/C/filters/tileit.html
+share/gimp/help/C/filters/tiler.html
share/gimp/help/C/filters/tileable_blur.html
+share/gimp/help/C/filters/translogo.html
+share/gimp/help/C/filters/unsharp.html
share/gimp/help/C/filters/url.html
+share/gimp/help/C/filters/video.html
share/gimp/help/C/filters/vinvert.html
+share/gimp/help/C/filters/vpropagate.html
+share/gimp/help/C/filters/warp-sharp.html
+share/gimp/help/C/filters/warp.html
+share/gimp/help/C/filters/waves.html
+share/gimp/help/C/filters/webify.html
+share/gimp/help/C/filters/whirlpinch.html
+share/gimp/help/C/filters/wind.html
+share/gimp/help/C/filters/windify.html
share/gimp/help/C/filters/wmf.html
+share/gimp/help/C/filters/xachlego.html
+share/gimp/help/C/filters/xachshadow.html
share/gimp/help/C/filters/xachvision.html
share/gimp/help/C/filters/xwd.html
share/gimp/help/C/filters/zealouscrop.html
@@ -876,15 +963,97 @@ share/gimp/help/C/image/view/toggle_rulers.html
share/gimp/help/C/image/view/toggle_selection.html
share/gimp/help/C/image/view/toggle_statusbar.html
share/gimp/help/C/image/view/zoom.html
+share/gimp/help/C/images/add_point.png
+share/gimp/help/C/images/anchor_layer.png
+share/gimp/help/C/images/channel_to_selection.png
+share/gimp/help/C/images/delete_channel.png
+share/gimp/help/C/images/delete_directory.png
+share/gimp/help/C/images/delete_layer.png
+share/gimp/help/C/images/delete_path.png
+share/gimp/help/C/images/dotted_square.png
+share/gimp/help/C/images/duplicate_channel.png
+share/gimp/help/C/images/duplicate_layer.png
+share/gimp/help/C/images/duplicate_path.png
+share/gimp/help/C/images/edit_point.png
+share/gimp/help/C/images/eye.png
+share/gimp/help/C/images/examples/border-selection-01.png
+share/gimp/help/C/images/example/border-selection-02.png
+share/gimp/help/C/images/glossary/modes-addition.png
+share/gimp/help/C/images/glossary/modes-color.png
+share/gimp/help/C/images/glossary/modes-darken.png
+share/gimp/help/C/images/glossary/modes-difference.png
+share/gimp/help/C/images/glossary/modes-dissolve.png
+share/gimp/help/C/images/glossary/modes-divide.png
+share/gimp/help/C/images/glossary/modes-hue.png
+share/gimp/help/C/images/glossary/modes-lighten.png
+share/gimp/help/C/images/glossary/modes-multiply.png
+share/gimp/help/C/images/glossary/modes-normal.png
+share/gimp/help/C/images/glossary/modes-normal2.png
+share/gimp/help/C/images/glossary/modes-overlay.png
+share/gimp/help/C/images/glossary/modes-saturation.png
+share/gimp/help/C/images/glossary/modes-screen.png
+share/gimp/help/C/images/glossary/modes-subtract.png
+share/gimp/help/C/images/glossary/modes-value.png
+share/gimp/help/C/images/geezoom.png
share/gimp/help/C/images/image_menu.png
share/gimp/help/C/images/image_window.png
share/gimp/help/C/images/layers_dialog.png
+share/gimp/help/C/images/layers_example.png
share/gimp/help/C/images/layers_menu.png
+share/gimp/help/C/images/layers_overview.png
+share/gimp/help/C/images/lower_channel.png
+share/gimp/help/C/images/lower_directory.png
+share/gimp/help/C/images/lower_layer.png
+share/gimp/help/C/images/new_channel.png
+share/gimp/help/C/images/new_directory.png
+share/gimp/help/C/images/new_path.png
+share/gimp/help/C/images/new_point.png
+share/gimp/help/C/images/path_to_selection.png
+share/gimp/help/C/images/preview_box.png
share/gimp/help/C/images/print_color.png
share/gimp/help/C/images/print_main.png
share/gimp/help/C/images/print_setup.png
+share/gimp/help/C/images/raise_channel.png
+share/gimp/help/C/images/raise_directory.png
+share/gimp/help/C/images/raise_layer.png
+share/gimp/help/C/images/red_square.png
+share/gimp/help/C/images/remove_point.png
+share/gimp/help/C/images/selection_to_path.png
+share/gimp/help/C/images/stroke_path.png
share/gimp/help/C/images/tool_options.png
share/gimp/help/C/images/toolbox.png
+share/gimp/help/C/images/tools/tool-opt-increment.png
+share/gimp/help/C/images/tools/tool-opt-nonincrement.png
+share/gimp/help/C/images/tools/tool_airbrush.png
+share/gimp/help/C/images/tools/tool_apartheid.png
+share/gimp/help/C/images/tools/tool_bezier.png
+share/gimp/help/C/images/tools/tool_blend.png
+share/gimp/help/C/images/tools/tool_burndodge.png
+share/gimp/help/C/images/tools/tool_convolver.png
+share/gimp/help/C/images/tools/tool_crop.png
+share/gimp/help/C/images/tools/tool_dodgeburn.png
+share/gimp/help/C/images/tools/tool_ellipse_sel.png
+share/gimp/help/C/images/tools/tool_eraser.png
+share/gimp/help/C/images/tools/tool_fill.png
+share/gimp/help/C/images/tools/tool_flip.png
+share/gimp/help/C/images/tools/tool_free_sel.png
+share/gimp/help/C/images/tools/tool_fuzzy_sel.png
+share/gimp/help/C/images/tools/tool_gradient.png
+share/gimp/help/C/images/tools/tool_ink.png
+share/gimp/help/C/images/tools/tool_measure.png
+share/gimp/help/C/images/tools/tool_move.png
+share/gimp/help/C/images/tools/tool_paintbrush.png
+share/gimp/help/C/images/tools/tool_pencil.png
+share/gimp/help/C/images/tools/tool_picker.png
+share/gimp/help/C/images/tools/tool_rect_sel.png
+share/gimp/help/C/images/tools/tool_scissors.png
+share/gimp/help/C/images/tools/tool_smudge.png
+share/gimp/help/C/images/tools/tool_smuge.png
+share/gimp/help/C/images/tools/tool_text.png
+share/gimp/help/C/images/tools/tool_transform.png
+share/gimp/help/C/images/tools/tool_zoom.png
+share/gimp/help/C/images/triangle.png
+share/gimp/help/C/images/wilber.png
share/gimp/help/C/index.html
share/gimp/help/C/introduction.html
share/gimp/help/C/keyboard_shortcuts.html
@@ -947,6 +1116,9 @@ share/gimp/help/C/toolbox/help/context_help.html
@unexec rm -f %D/share/gimp/help/C/toolbox/help/dialogs
@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/toolbox/help/filters
@unexec rm -f %D/share/gimp/help/C/toolbox/help/filters
+share/gimp/help/C/stylesheet-images/note.gif
+share/gimp/help/C/stylesheet-images/tip.gif
+share/gimp/help/C/stylesheet-images/warning.gif
share/gimp/help/C/toolbox/index.html
share/gimp/help/C/toolbox/toolbox.html
share/gimp/help/C/tools/airbrush.html
@@ -986,42 +1158,6 @@ share/gimp/help/C/tools/threshold.html
share/gimp/help/C/tools/transform.html
share/gimp/help/C/using_gimp.html
share/gimp/help/C/why_gimp.html
-share/gimp/help/images/add_point.png
-share/gimp/help/images/anchor_layer.png
-share/gimp/help/images/channel_to_selection.png
-share/gimp/help/images/delete_channel.png
-share/gimp/help/images/delete_directory.png
-share/gimp/help/images/delete_layer.png
-share/gimp/help/images/delete_path.png
-share/gimp/help/images/dotted_square.png
-share/gimp/help/images/duplicate_channel.png
-share/gimp/help/images/duplicate_layer.png
-share/gimp/help/images/duplicate_path.png
-share/gimp/help/images/edit_point.png
-share/gimp/help/images/eek.png
-share/gimp/help/images/geezoom.png
-share/gimp/help/images/layers_example.png
-share/gimp/help/images/layers_overview.png
-share/gimp/help/images/lower_channel.png
-share/gimp/help/images/lower_directory.png
-share/gimp/help/images/lower_layer.png
-share/gimp/help/images/new_channel.png
-share/gimp/help/images/new_directory.png
-share/gimp/help/images/new_path.png
-share/gimp/help/images/new_point.png
-share/gimp/help/images/note.png
-share/gimp/help/images/path_to_selection.png
-share/gimp/help/images/preview_box.png
-share/gimp/help/images/raise_channel.png
-share/gimp/help/images/raise_directory.png
-share/gimp/help/images/raise_layer.png
-share/gimp/help/images/red_square.png
-share/gimp/help/images/remove_point.png
-share/gimp/help/images/selection_to_path.png
-share/gimp/help/images/stroke_path.png
-share/gimp/help/images/tip.png
-share/gimp/help/images/warning.png
-share/gimp/help/images/wilber.png
share/gimp/palettes/Bears
share/gimp/palettes/Bgold
share/gimp/palettes/Blues
@@ -1216,16 +1352,21 @@ share/gimp/scripts/web-browser.scm
share/gimp/scripts/xach-effect.scm
share/gimp/tips/gimp_conseils.fr.txt
share/gimp/tips/gimp_tips.cs.txt
+share/gimp/tips/gimp_tips.da.txt
share/gimp/tips/gimp_tips.de.txt
share/gimp/tips/gimp_tips.es.txt
+share/gimp/tips/gimp_tips.hu.txt
share/gimp/tips/gimp_tips.it.txt
share/gimp/tips/gimp_tips.ja.txt
share/gimp/tips/gimp_tips.ko.txt
+share/gimp/tips/gimp_tips.lt.txt
share/gimp/tips/gimp_tips.pl.txt
share/gimp/tips/gimp_tips.ru.txt
share/gimp/tips/gimp_tips.txt
share/gimp/tips/gimp_tips.tr.txt
share/gimp/tips/gimp_tips.uk.txt
+share/gimp/tips/gimp_tips.zh_CN.txt
+share/gimp/tips/gimp_tips.zh_TW.txt
share/gimp/user_install
share/locale/ca/LC_MESSAGES/gimp-libgimp.mo
share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
@@ -1331,10 +1472,14 @@ share/locale/uk/LC_MESSAGES/gimp-libgimp.mo
share/locale/uk/LC_MESSAGES/gimp-script-fu.mo
share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo
share/locale/uk/LC_MESSAGES/gimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-libgimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-script-fu.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-std-plugins.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm etc/gimp/1.2
@dirrm etc/gimp
@dirrm include/gck
@@ -1363,6 +1508,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/dialogs/color_selectors
@dirrm share/gimp/help/C/dialogs/preferences
@dirrm share/gimp/help/C/dialogs
+@dirrm share/gimp/help/C/stylesheet-images
@dirrm share/gimp/help/C/tools
@dirrm share/gimp/help/C/layers/stack
@dirrm share/gimp/help/C/layers
@@ -1370,6 +1516,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/paths
@dirrm share/gimp/help/C/toolbox/help
@dirrm share/gimp/help/C/toolbox
+@dirrm share/gimp/help/C/images/examples
+@dirrm share/gimp/help/C/images/glossary
+@dirrm share/gimp/help/C/images/tools
@dirrm share/gimp/help/C/images
@dirrm share/gimp/help/C/image/edit
@dirrm share/gimp/help/C/image/select
@@ -1385,7 +1534,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/filters
@dirrm share/gimp/help/C/file
@dirrm share/gimp/help/C
-@dirrm share/gimp/help/images
@dirrm share/gimp/help
@dirrm share/gimp/palettes
@dirrm share/gimp/patterns
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index f4e2048be79e..ca69390ee316 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gimp
-PORTVERSION= 1.2.2
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTVERSION= 1.2.3
+PORTREVISION= 0
+#PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
@@ -24,7 +24,8 @@ LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+#SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+SHLIBVER?= 2
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -34,6 +35,7 @@ USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+LIBTOOLFILES= aclocal.m4
PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ARGS= --disable-perl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 7ae55b0c96c8..cb85cd7f3134 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.2.tar.bz2) = 680c01b0fc35cd68c540eb9d236f5e1a
+MD5 (gimp-1.2.3.tar.bz2) = b19235f19f524f772a4aef597a69b1da
diff --git a/graphics/gimp-devel/files/patch-ak b/graphics/gimp-devel/files/patch-ak
deleted file mode 100644
index ead5311df6ff..000000000000
--- a/graphics/gimp-devel/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgimp/Makefile.in.orig Sat Mar 4 11:10:43 2000
-+++ libgimp/Makefile.in Sun Apr 2 22:40:29 2000
-@@ -209,11 +209,11 @@
- gimpinclude_HEADERS = color_display.h color_selector.h gimp.h gimpchainbutton.h gimpcolorbutton.h gimpcolorspace.h gimpcompat.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimphelpui.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimppatheditor.h gimppixmap.h gimpquerybox.h gimpsizeentry.h gimpui.h gimpunit.h gimpunitmenu.h gimpvector.h gimpwidgets.h gimpintl.h parasite.h parasiteF.h parasiteP.h parasiteio.h
-
-
--libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
-
--libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- libgimpui_la_LIBADD = $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp/files/patch-af b/graphics/gimp-devel/files/patch-gimptool-1.2.in
index 83f0d440beea..052cac1df256 100644
--- a/graphics/gimp/files/patch-af
+++ b/graphics/gimp-devel/files/patch-gimptool-1.2.in
@@ -1,6 +1,6 @@
---- gimptool.in.orig Thu Apr 27 02:07:40 2000
-+++ gimptool.in Thu Mar 15 05:55:24 2001
-@@ -234,19 +234,19 @@
+--- gimptool-1.2.in.orig Wed Feb 20 14:04:01 2002
++++ gimptool-1.2.in Wed Feb 20 14:04:39 2002
+@@ -227,19 +227,19 @@
| --uninstall-script | --uninstall-admin-script )
case $1 in
--*install-bin)
diff --git a/graphics/gimp-devel/files/patch-libgimp::Makefile.in b/graphics/gimp-devel/files/patch-libgimp::Makefile.in
new file mode 100644
index 000000000000..b9cdc7868203
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-libgimp::Makefile.in
@@ -0,0 +1,19 @@
+--- libgimp/Makefile.in.orig Tue Feb 12 05:46:08 2002
++++ libgimp/Makefile.in Wed Feb 20 14:02:07 2002
+@@ -225,13 +225,13 @@
+ gimpinclude_HEADERS = gimp.h ${PDB_WRAPPERS_H} gimpchainbutton.h gimpchannel.h gimpcolorbutton.h gimpcolordisplay.h gimpcolorselector.h gimpcolorspace.h gimpcompat.h gimpdrawable.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimpgradientselect.h gimphelpui.h gimpimage.h gimplayer.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpparasite.h gimpparasiteio.h gimppatheditor.h gimppixelrgn.h gimppixmap.h gimpproceduraldb.h gimpquerybox.h gimpselection.h gimpsignal.h gimpsizeentry.h gimptile.h gimptypes.h gimpui.h gimpunit.h gimpunitmenu.h gimputils.h gimpvector.h gimpwidgets.h gimpintl.h
+
+
+-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimp_export_symbols)
++libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
+
+-libgimp_la_LIBADD = $(GLIB_LIBS) -lm
++libgimp_la_LIBADD = $(GTK_LIBS) -lm
+
+ libgimp_la_DEPENDENCIES = $(gimp_def)
+
+-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimpui_export_symbols)
++libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
+
+
+ libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)
diff --git a/graphics/gimp-app-devel/files/patch-ao b/graphics/gimp-devel/files/patch-plug-ins::libgck::gck::Makefile.in
index e5f1d5a3677c..6764015563eb 100644
--- a/graphics/gimp-app-devel/files/patch-ao
+++ b/graphics/gimp-devel/files/patch-plug-ins::libgck::gck::Makefile.in
@@ -1,11 +1,11 @@
---- plug-ins/libgck/gck/Makefile.in.orig Sun Apr 2 22:41:29 2000
-+++ plug-ins/libgck/gck/Makefile.in Sun Apr 2 22:41:37 2000
-@@ -191,7 +191,7 @@
+--- plug-ins/libgck/gck/Makefile.in.orig Tue Feb 12 05:46:23 2002
++++ plug-ins/libgck/gck/Makefile.in Wed Feb 20 14:00:02 2002
+@@ -193,7 +193,7 @@
gckinclude_HEADERS = gck.h
--libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
++libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 70fdc67a43b0..389cbc14e136 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -88,16 +88,25 @@ include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
+lib/libgck.la
lib/libgck.so
lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
+lib/libgimp.la
lib/libgimp.so
lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
+lib/libgimpui.la
lib/libgimpui.so
lib/libgimpui.so.%%SHLIBVER%%
+libexec/gimp/1.2/modules/libcolorsel_gtk.a
+libexec/gimp/1.2/modules/libcolorsel_gtk.la
libexec/gimp/1.2/modules/libcolorsel_gtk.so
+libexec/gimp/1.2/modules/libcolorsel_triangle.a
+libexec/gimp/1.2/modules/libcolorsel_triangle.la
libexec/gimp/1.2/modules/libcolorsel_triangle.so
+libexec/gimp/1.2/modules/libcolorsel_water.a
+libexec/gimp/1.2/modules/libcolorsel_water.la
libexec/gimp/1.2/modules/libcolorsel_water.so
libexec/gimp/1.2/plug-ins/AlienMap
libexec/gimp/1.2/plug-ins/AlienMap2
@@ -623,6 +632,7 @@ share/gimp/help/C/dialogs/color_selectors/built_in.html
share/gimp/help/C/dialogs/color_selectors/gtk.html
share/gimp/help/C/dialogs/color_selectors/triangle.html
share/gimp/help/C/dialogs/color_selectors/watercolor.html
+share/gimp/help/C/dialogs/confirm_save.html
share/gimp/help/C/dialogs/convert_to_indexed.html
share/gimp/help/C/dialogs/copy_named.html
share/gimp/help/C/dialogs/cut_named.html
@@ -630,6 +640,7 @@ share/gimp/help/C/dialogs/device_status.html
share/gimp/help/C/dialogs/document_index.html
share/gimp/help/C/dialogs/edit_qmask_attributes.html
share/gimp/help/C/dialogs/error_console.html
+share/gimp/help/C/dialogs/export_file.html
share/gimp/help/C/dialogs/feather_selection.html
share/gimp/help/C/dialogs/file_new.html
share/gimp/help/C/dialogs/file_open.html
@@ -707,38 +718,72 @@ share/gimp/help/C/file_formats.html
share/gimp/help/C/filters/alienmap.html
share/gimp/help/C/filters/alienmap2.html
share/gimp/help/C/filters/align_layers.html
+share/gimp/help/C/filters/animate_cells.html
+share/gimp/help/C/filters/animationplay.html
+share/gimp/help/C/filters/animoptimize.html
+share/gimp/help/C/filters/apply_lens.html
share/gimp/help/C/filters/applycanvas.html
share/gimp/help/C/filters/autocrop.html
share/gimp/help/C/filters/autostretch_hsv.html
+share/gimp/help/C/filters/blended2.html
share/gimp/help/C/filters/blinds.html
share/gimp/help/C/filters/blur.html
-share/gimp/help/C/filters/bz2.html
+share/gimp/help/C/filters/blowinout.html
+share/gimp/help/C/filters/border.html
share/gimp/help/C/filters/borderaverage.html
+share/gimp/help/C/filters/bumpmap.html
share/gimp/help/C/filters/burst.html
+share/gimp/help/C/filters/bz2.html
share/gimp/help/C/filters/c_astretch.html
share/gimp/help/C/filters/centerguide.html
share/gimp/help/C/filters/checkerboard.html
+share/gimp/help/C/filters/cml_explorer.html
share/gimp/help/C/filters/color_enhance.html
share/gimp/help/C/filters/colorify.html
share/gimp/help/C/filters/colortoalpha.html
+share/gimp/help/C/filters/convmatrix.html
share/gimp/help/C/filters/compose.html
share/gimp/help/C/filters/cubism.html
+share/gimp/help/C/filters/curve_bend.html
share/gimp/help/C/filters/decompose.html
+share/gimp/help/C/filters/deinterlace.html
+share/gimp/help/C/filters/depthmerge.html
+share/gimp/help/C/filters/despeckle.html
+share/gimp/help/C/filters/destripe.html
+share/gimp/help/C/filters/diffraction.html
+share/gimp/help/C/filters/displace.html
share/gimp/help/C/filters/ditherize.html
share/gimp/help/C/filters/dust.html
+share/gimp/help/C/filters/edge.html
+share/gimp/help/C/filters/emboss.html
+share/gimp/help/C/filters/engrave.html
share/gimp/help/C/filters/exchange.html
share/gimp/help/C/filters/fade-alpha.html
+share/gimp/help/C/filters/film.html
+share/gimp/help/C/filters/fire.html
share/gimp/help/C/filters/fit-text.html
share/gimp/help/C/filters/fits.html
share/gimp/help/C/filters/flame.html
+share/gimp/help/C/filters/flarefx.html
+share/gimp/help/C/filters/fractalexplorer.html
+share/gimp/help/C/filters/fractaltrace.html
share/gimp/help/C/filters/fp.html
share/gimp/help/C/filters/frame_filter.html
share/gimp/help/C/filters/gap_filter.html
+share/gimp/help/C/filters/gap_frontends.html
+share/gimp/help/C/filters/gap_navigator_dialog.html
+share/gimp/help/C/filters/gap_plugins.html
share/gimp/help/C/filters/gauss_iir.html
share/gimp/help/C/filters/gauss_rle.html
share/gimp/help/C/filters/gee_zoom.html
+share/gimp/help/C/filters/gdyntext.html
share/gimp/help/C/filters/gfig.html
+share/gimp/help/C/filters/gflare.html
share/gimp/help/C/filters/gih.html
+share/gimp/help/C/filters/gimpressionist.html
+share/gimp/help/C/filters/glasstile.html
+share/gimp/help/C/filters/glowing_steel.html
+share/gimp/help/C/filters/gouge.html
share/gimp/help/C/filters/gradmap.html
share/gimp/help/C/filters/grid.html
share/gimp/help/C/filters/gqbist.html
@@ -750,24 +795,45 @@ share/gimp/help/C/filters/guillotine.html
share/gimp/help/C/filters/gz.html
share/gimp/help/C/filters/hot.html
share/gimp/help/C/filters/hrz.html
+share/gimp/help/C/filters/ifscompose.html
+share/gimp/help/C/filters/illusion.html
+share/gimp/help/C/filters/image_tile.html
+share/gimp/help/C/filters/imagemap.html
+share/gimp/help/C/filters/iwarp.html
share/gimp/help/C/filters/index.html
share/gimp/help/C/filters/jigsaw.html
share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/laplace.html
share/gimp/help/C/filters/layerfuncs.html
+share/gimp/help/C/filters/lic.html
+share/gimp/help/C/filters/lighting.html
+share/gimp/help/C/filters/logulator.html
share/gimp/help/C/filters/mail.html
+share/gimp/help/C/filters/map_to_gradient.html
share/gimp/help/C/filters/mapcolor.html
+share/gimp/help/C/filters/mapobject.html
share/gimp/help/C/filters/max_rgb.html
share/gimp/help/C/filters/maze.html
share/gimp/help/C/filters/mblur.html
share/gimp/help/C/filters/miff.html
+share/gimp/help/C/filters/mirrorsplit.html
share/gimp/help/C/filters/mosaic.html
+share/gimp/help/C/filters/newsprint.html
+share/gimp/help/C/filters/nlfilt.html
+share/gimp/help/C/filters/nova.html
share/gimp/help/C/filters/noisify.html
share/gimp/help/C/filters/none.html
share/gimp/help/C/filters/normalize.html
share/gimp/help/C/filters/oilify.html
+share/gimp/help/C/filters/pagecurl.html
+share/gimp/help/C/filters/papertile.html
share/gimp/help/C/filters/pat.html
+share/gimp/help/C/filters/perlotine.html
+share/gimp/help/C/filters/pixelmap.html
share/gimp/help/C/filters/pixelize.html
share/gimp/help/C/filters/plasma.html
+share/gimp/help/C/filters/polar.html
+share/gimp/help/C/filters/prep4gif.html
share/gimp/help/C/filters/png.html
share/gimp/help/C/filters/pnm.html
share/gimp/help/C/filters/print.html
@@ -779,21 +845,27 @@ share/gimp/help/C/filters/rcm.html
share/gimp/help/C/filters/repdup.html
share/gimp/help/C/filters/repeat_last.html
share/gimp/help/C/filters/reshow_last.html
+share/gimp/help/C/filters/resynth.html
share/gimp/help/C/filters/ripple.html
share/gimp/help/C/filters/rotate.html
share/gimp/help/C/filters/roundsel.html
share/gimp/help/C/filters/sample_colorize.html
share/gimp/help/C/filters/scatter_hsv.html
+share/gimp/help/C/filters/scratches.html
share/gimp/help/C/filters/sel2path.html
share/gimp/help/C/filters/sel_gauss.html
+share/gimp/help/C/filters/semiflatten.html
share/gimp/help/C/filters/sharpen.html
share/gimp/help/C/filters/shift.html
share/gimp/help/C/filters/sgi.html
-share/gimp/help/C/filters/semiflatten.html
+share/gimp/help/C/filters/sinus.html
share/gimp/help/C/filters/smooth_palette.html
share/gimp/help/C/filters/snoise.html
+share/gimp/help/C/filters/sobel.html
+share/gimp/help/C/filters/sparkle.html
share/gimp/help/C/filters/spread.html
share/gimp/help/C/filters/stampify.html
+share/gimp/help/C/filters/struc.html
share/gimp/help/C/filters/sunras.html
share/gimp/help/C/filters/terral_text.html
share/gimp/help/C/filters/tex-to-float.html
@@ -801,10 +873,25 @@ share/gimp/help/C/filters/tga.html
share/gimp/help/C/filters/threshold_alpha.html
share/gimp/help/C/filters/tiff.html
share/gimp/help/C/filters/tile.html
+share/gimp/help/C/filters/tileit.html
+share/gimp/help/C/filters/tiler.html
share/gimp/help/C/filters/tileable_blur.html
+share/gimp/help/C/filters/translogo.html
+share/gimp/help/C/filters/unsharp.html
share/gimp/help/C/filters/url.html
+share/gimp/help/C/filters/video.html
share/gimp/help/C/filters/vinvert.html
+share/gimp/help/C/filters/vpropagate.html
+share/gimp/help/C/filters/warp-sharp.html
+share/gimp/help/C/filters/warp.html
+share/gimp/help/C/filters/waves.html
+share/gimp/help/C/filters/webify.html
+share/gimp/help/C/filters/whirlpinch.html
+share/gimp/help/C/filters/wind.html
+share/gimp/help/C/filters/windify.html
share/gimp/help/C/filters/wmf.html
+share/gimp/help/C/filters/xachlego.html
+share/gimp/help/C/filters/xachshadow.html
share/gimp/help/C/filters/xachvision.html
share/gimp/help/C/filters/xwd.html
share/gimp/help/C/filters/zealouscrop.html
@@ -876,15 +963,97 @@ share/gimp/help/C/image/view/toggle_rulers.html
share/gimp/help/C/image/view/toggle_selection.html
share/gimp/help/C/image/view/toggle_statusbar.html
share/gimp/help/C/image/view/zoom.html
+share/gimp/help/C/images/add_point.png
+share/gimp/help/C/images/anchor_layer.png
+share/gimp/help/C/images/channel_to_selection.png
+share/gimp/help/C/images/delete_channel.png
+share/gimp/help/C/images/delete_directory.png
+share/gimp/help/C/images/delete_layer.png
+share/gimp/help/C/images/delete_path.png
+share/gimp/help/C/images/dotted_square.png
+share/gimp/help/C/images/duplicate_channel.png
+share/gimp/help/C/images/duplicate_layer.png
+share/gimp/help/C/images/duplicate_path.png
+share/gimp/help/C/images/edit_point.png
+share/gimp/help/C/images/eye.png
+share/gimp/help/C/images/examples/border-selection-01.png
+share/gimp/help/C/images/example/border-selection-02.png
+share/gimp/help/C/images/glossary/modes-addition.png
+share/gimp/help/C/images/glossary/modes-color.png
+share/gimp/help/C/images/glossary/modes-darken.png
+share/gimp/help/C/images/glossary/modes-difference.png
+share/gimp/help/C/images/glossary/modes-dissolve.png
+share/gimp/help/C/images/glossary/modes-divide.png
+share/gimp/help/C/images/glossary/modes-hue.png
+share/gimp/help/C/images/glossary/modes-lighten.png
+share/gimp/help/C/images/glossary/modes-multiply.png
+share/gimp/help/C/images/glossary/modes-normal.png
+share/gimp/help/C/images/glossary/modes-normal2.png
+share/gimp/help/C/images/glossary/modes-overlay.png
+share/gimp/help/C/images/glossary/modes-saturation.png
+share/gimp/help/C/images/glossary/modes-screen.png
+share/gimp/help/C/images/glossary/modes-subtract.png
+share/gimp/help/C/images/glossary/modes-value.png
+share/gimp/help/C/images/geezoom.png
share/gimp/help/C/images/image_menu.png
share/gimp/help/C/images/image_window.png
share/gimp/help/C/images/layers_dialog.png
+share/gimp/help/C/images/layers_example.png
share/gimp/help/C/images/layers_menu.png
+share/gimp/help/C/images/layers_overview.png
+share/gimp/help/C/images/lower_channel.png
+share/gimp/help/C/images/lower_directory.png
+share/gimp/help/C/images/lower_layer.png
+share/gimp/help/C/images/new_channel.png
+share/gimp/help/C/images/new_directory.png
+share/gimp/help/C/images/new_path.png
+share/gimp/help/C/images/new_point.png
+share/gimp/help/C/images/path_to_selection.png
+share/gimp/help/C/images/preview_box.png
share/gimp/help/C/images/print_color.png
share/gimp/help/C/images/print_main.png
share/gimp/help/C/images/print_setup.png
+share/gimp/help/C/images/raise_channel.png
+share/gimp/help/C/images/raise_directory.png
+share/gimp/help/C/images/raise_layer.png
+share/gimp/help/C/images/red_square.png
+share/gimp/help/C/images/remove_point.png
+share/gimp/help/C/images/selection_to_path.png
+share/gimp/help/C/images/stroke_path.png
share/gimp/help/C/images/tool_options.png
share/gimp/help/C/images/toolbox.png
+share/gimp/help/C/images/tools/tool-opt-increment.png
+share/gimp/help/C/images/tools/tool-opt-nonincrement.png
+share/gimp/help/C/images/tools/tool_airbrush.png
+share/gimp/help/C/images/tools/tool_apartheid.png
+share/gimp/help/C/images/tools/tool_bezier.png
+share/gimp/help/C/images/tools/tool_blend.png
+share/gimp/help/C/images/tools/tool_burndodge.png
+share/gimp/help/C/images/tools/tool_convolver.png
+share/gimp/help/C/images/tools/tool_crop.png
+share/gimp/help/C/images/tools/tool_dodgeburn.png
+share/gimp/help/C/images/tools/tool_ellipse_sel.png
+share/gimp/help/C/images/tools/tool_eraser.png
+share/gimp/help/C/images/tools/tool_fill.png
+share/gimp/help/C/images/tools/tool_flip.png
+share/gimp/help/C/images/tools/tool_free_sel.png
+share/gimp/help/C/images/tools/tool_fuzzy_sel.png
+share/gimp/help/C/images/tools/tool_gradient.png
+share/gimp/help/C/images/tools/tool_ink.png
+share/gimp/help/C/images/tools/tool_measure.png
+share/gimp/help/C/images/tools/tool_move.png
+share/gimp/help/C/images/tools/tool_paintbrush.png
+share/gimp/help/C/images/tools/tool_pencil.png
+share/gimp/help/C/images/tools/tool_picker.png
+share/gimp/help/C/images/tools/tool_rect_sel.png
+share/gimp/help/C/images/tools/tool_scissors.png
+share/gimp/help/C/images/tools/tool_smudge.png
+share/gimp/help/C/images/tools/tool_smuge.png
+share/gimp/help/C/images/tools/tool_text.png
+share/gimp/help/C/images/tools/tool_transform.png
+share/gimp/help/C/images/tools/tool_zoom.png
+share/gimp/help/C/images/triangle.png
+share/gimp/help/C/images/wilber.png
share/gimp/help/C/index.html
share/gimp/help/C/introduction.html
share/gimp/help/C/keyboard_shortcuts.html
@@ -947,6 +1116,9 @@ share/gimp/help/C/toolbox/help/context_help.html
@unexec rm -f %D/share/gimp/help/C/toolbox/help/dialogs
@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/toolbox/help/filters
@unexec rm -f %D/share/gimp/help/C/toolbox/help/filters
+share/gimp/help/C/stylesheet-images/note.gif
+share/gimp/help/C/stylesheet-images/tip.gif
+share/gimp/help/C/stylesheet-images/warning.gif
share/gimp/help/C/toolbox/index.html
share/gimp/help/C/toolbox/toolbox.html
share/gimp/help/C/tools/airbrush.html
@@ -986,42 +1158,6 @@ share/gimp/help/C/tools/threshold.html
share/gimp/help/C/tools/transform.html
share/gimp/help/C/using_gimp.html
share/gimp/help/C/why_gimp.html
-share/gimp/help/images/add_point.png
-share/gimp/help/images/anchor_layer.png
-share/gimp/help/images/channel_to_selection.png
-share/gimp/help/images/delete_channel.png
-share/gimp/help/images/delete_directory.png
-share/gimp/help/images/delete_layer.png
-share/gimp/help/images/delete_path.png
-share/gimp/help/images/dotted_square.png
-share/gimp/help/images/duplicate_channel.png
-share/gimp/help/images/duplicate_layer.png
-share/gimp/help/images/duplicate_path.png
-share/gimp/help/images/edit_point.png
-share/gimp/help/images/eek.png
-share/gimp/help/images/geezoom.png
-share/gimp/help/images/layers_example.png
-share/gimp/help/images/layers_overview.png
-share/gimp/help/images/lower_channel.png
-share/gimp/help/images/lower_directory.png
-share/gimp/help/images/lower_layer.png
-share/gimp/help/images/new_channel.png
-share/gimp/help/images/new_directory.png
-share/gimp/help/images/new_path.png
-share/gimp/help/images/new_point.png
-share/gimp/help/images/note.png
-share/gimp/help/images/path_to_selection.png
-share/gimp/help/images/preview_box.png
-share/gimp/help/images/raise_channel.png
-share/gimp/help/images/raise_directory.png
-share/gimp/help/images/raise_layer.png
-share/gimp/help/images/red_square.png
-share/gimp/help/images/remove_point.png
-share/gimp/help/images/selection_to_path.png
-share/gimp/help/images/stroke_path.png
-share/gimp/help/images/tip.png
-share/gimp/help/images/warning.png
-share/gimp/help/images/wilber.png
share/gimp/palettes/Bears
share/gimp/palettes/Bgold
share/gimp/palettes/Blues
@@ -1216,16 +1352,21 @@ share/gimp/scripts/web-browser.scm
share/gimp/scripts/xach-effect.scm
share/gimp/tips/gimp_conseils.fr.txt
share/gimp/tips/gimp_tips.cs.txt
+share/gimp/tips/gimp_tips.da.txt
share/gimp/tips/gimp_tips.de.txt
share/gimp/tips/gimp_tips.es.txt
+share/gimp/tips/gimp_tips.hu.txt
share/gimp/tips/gimp_tips.it.txt
share/gimp/tips/gimp_tips.ja.txt
share/gimp/tips/gimp_tips.ko.txt
+share/gimp/tips/gimp_tips.lt.txt
share/gimp/tips/gimp_tips.pl.txt
share/gimp/tips/gimp_tips.ru.txt
share/gimp/tips/gimp_tips.txt
share/gimp/tips/gimp_tips.tr.txt
share/gimp/tips/gimp_tips.uk.txt
+share/gimp/tips/gimp_tips.zh_CN.txt
+share/gimp/tips/gimp_tips.zh_TW.txt
share/gimp/user_install
share/locale/ca/LC_MESSAGES/gimp-libgimp.mo
share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
@@ -1331,10 +1472,14 @@ share/locale/uk/LC_MESSAGES/gimp-libgimp.mo
share/locale/uk/LC_MESSAGES/gimp-script-fu.mo
share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo
share/locale/uk/LC_MESSAGES/gimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-libgimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-script-fu.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-std-plugins.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm etc/gimp/1.2
@dirrm etc/gimp
@dirrm include/gck
@@ -1363,6 +1508,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/dialogs/color_selectors
@dirrm share/gimp/help/C/dialogs/preferences
@dirrm share/gimp/help/C/dialogs
+@dirrm share/gimp/help/C/stylesheet-images
@dirrm share/gimp/help/C/tools
@dirrm share/gimp/help/C/layers/stack
@dirrm share/gimp/help/C/layers
@@ -1370,6 +1516,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/paths
@dirrm share/gimp/help/C/toolbox/help
@dirrm share/gimp/help/C/toolbox
+@dirrm share/gimp/help/C/images/examples
+@dirrm share/gimp/help/C/images/glossary
+@dirrm share/gimp/help/C/images/tools
@dirrm share/gimp/help/C/images
@dirrm share/gimp/help/C/image/edit
@dirrm share/gimp/help/C/image/select
@@ -1385,7 +1534,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/filters
@dirrm share/gimp/help/C/file
@dirrm share/gimp/help/C
-@dirrm share/gimp/help/images
@dirrm share/gimp/help
@dirrm share/gimp/palettes
@dirrm share/gimp/patterns
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index f4e2048be79e..ca69390ee316 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gimp
-PORTVERSION= 1.2.2
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTVERSION= 1.2.3
+PORTREVISION= 0
+#PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
@@ -24,7 +24,8 @@ LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+#SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+SHLIBVER?= 2
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -34,6 +35,7 @@ USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+LIBTOOLFILES= aclocal.m4
PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ARGS= --disable-perl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 7ae55b0c96c8..cb85cd7f3134 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.2.tar.bz2) = 680c01b0fc35cd68c540eb9d236f5e1a
+MD5 (gimp-1.2.3.tar.bz2) = b19235f19f524f772a4aef597a69b1da
diff --git a/graphics/gimp/files/patch-ak b/graphics/gimp/files/patch-ak
deleted file mode 100644
index ead5311df6ff..000000000000
--- a/graphics/gimp/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgimp/Makefile.in.orig Sat Mar 4 11:10:43 2000
-+++ libgimp/Makefile.in Sun Apr 2 22:40:29 2000
-@@ -209,11 +209,11 @@
- gimpinclude_HEADERS = color_display.h color_selector.h gimp.h gimpchainbutton.h gimpcolorbutton.h gimpcolorspace.h gimpcompat.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimphelpui.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimppatheditor.h gimppixmap.h gimpquerybox.h gimpsizeentry.h gimpui.h gimpunit.h gimpunitmenu.h gimpvector.h gimpwidgets.h gimpintl.h parasite.h parasiteF.h parasiteP.h parasiteio.h
-
-
--libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
-
--libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- libgimpui_la_LIBADD = $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp-app/files/patch-af b/graphics/gimp/files/patch-gimptool-1.2.in
index 83f0d440beea..052cac1df256 100644
--- a/graphics/gimp-app/files/patch-af
+++ b/graphics/gimp/files/patch-gimptool-1.2.in
@@ -1,6 +1,6 @@
---- gimptool.in.orig Thu Apr 27 02:07:40 2000
-+++ gimptool.in Thu Mar 15 05:55:24 2001
-@@ -234,19 +234,19 @@
+--- gimptool-1.2.in.orig Wed Feb 20 14:04:01 2002
++++ gimptool-1.2.in Wed Feb 20 14:04:39 2002
+@@ -227,19 +227,19 @@
| --uninstall-script | --uninstall-admin-script )
case $1 in
--*install-bin)
diff --git a/graphics/gimp/files/patch-libgimp::Makefile.in b/graphics/gimp/files/patch-libgimp::Makefile.in
new file mode 100644
index 000000000000..b9cdc7868203
--- /dev/null
+++ b/graphics/gimp/files/patch-libgimp::Makefile.in
@@ -0,0 +1,19 @@
+--- libgimp/Makefile.in.orig Tue Feb 12 05:46:08 2002
++++ libgimp/Makefile.in Wed Feb 20 14:02:07 2002
+@@ -225,13 +225,13 @@
+ gimpinclude_HEADERS = gimp.h ${PDB_WRAPPERS_H} gimpchainbutton.h gimpchannel.h gimpcolorbutton.h gimpcolordisplay.h gimpcolorselector.h gimpcolorspace.h gimpcompat.h gimpdrawable.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimpgradientselect.h gimphelpui.h gimpimage.h gimplayer.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpparasite.h gimpparasiteio.h gimppatheditor.h gimppixelrgn.h gimppixmap.h gimpproceduraldb.h gimpquerybox.h gimpselection.h gimpsignal.h gimpsizeentry.h gimptile.h gimptypes.h gimpui.h gimpunit.h gimpunitmenu.h gimputils.h gimpvector.h gimpwidgets.h gimpintl.h
+
+
+-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimp_export_symbols)
++libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
+
+-libgimp_la_LIBADD = $(GLIB_LIBS) -lm
++libgimp_la_LIBADD = $(GTK_LIBS) -lm
+
+ libgimp_la_DEPENDENCIES = $(gimp_def)
+
+-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimpui_export_symbols)
++libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
+
+
+ libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)
diff --git a/graphics/gimp/files/patch-ao b/graphics/gimp/files/patch-plug-ins::libgck::gck::Makefile.in
index e5f1d5a3677c..6764015563eb 100644
--- a/graphics/gimp/files/patch-ao
+++ b/graphics/gimp/files/patch-plug-ins::libgck::gck::Makefile.in
@@ -1,11 +1,11 @@
---- plug-ins/libgck/gck/Makefile.in.orig Sun Apr 2 22:41:29 2000
-+++ plug-ins/libgck/gck/Makefile.in Sun Apr 2 22:41:37 2000
-@@ -191,7 +191,7 @@
+--- plug-ins/libgck/gck/Makefile.in.orig Tue Feb 12 05:46:23 2002
++++ plug-ins/libgck/gck/Makefile.in Wed Feb 20 14:00:02 2002
+@@ -193,7 +193,7 @@
gckinclude_HEADERS = gck.h
--libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
++libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 70fdc67a43b0..389cbc14e136 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -88,16 +88,25 @@ include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
+lib/libgck.la
lib/libgck.so
lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
+lib/libgimp.la
lib/libgimp.so
lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
+lib/libgimpui.la
lib/libgimpui.so
lib/libgimpui.so.%%SHLIBVER%%
+libexec/gimp/1.2/modules/libcolorsel_gtk.a
+libexec/gimp/1.2/modules/libcolorsel_gtk.la
libexec/gimp/1.2/modules/libcolorsel_gtk.so
+libexec/gimp/1.2/modules/libcolorsel_triangle.a
+libexec/gimp/1.2/modules/libcolorsel_triangle.la
libexec/gimp/1.2/modules/libcolorsel_triangle.so
+libexec/gimp/1.2/modules/libcolorsel_water.a
+libexec/gimp/1.2/modules/libcolorsel_water.la
libexec/gimp/1.2/modules/libcolorsel_water.so
libexec/gimp/1.2/plug-ins/AlienMap
libexec/gimp/1.2/plug-ins/AlienMap2
@@ -623,6 +632,7 @@ share/gimp/help/C/dialogs/color_selectors/built_in.html
share/gimp/help/C/dialogs/color_selectors/gtk.html
share/gimp/help/C/dialogs/color_selectors/triangle.html
share/gimp/help/C/dialogs/color_selectors/watercolor.html
+share/gimp/help/C/dialogs/confirm_save.html
share/gimp/help/C/dialogs/convert_to_indexed.html
share/gimp/help/C/dialogs/copy_named.html
share/gimp/help/C/dialogs/cut_named.html
@@ -630,6 +640,7 @@ share/gimp/help/C/dialogs/device_status.html
share/gimp/help/C/dialogs/document_index.html
share/gimp/help/C/dialogs/edit_qmask_attributes.html
share/gimp/help/C/dialogs/error_console.html
+share/gimp/help/C/dialogs/export_file.html
share/gimp/help/C/dialogs/feather_selection.html
share/gimp/help/C/dialogs/file_new.html
share/gimp/help/C/dialogs/file_open.html
@@ -707,38 +718,72 @@ share/gimp/help/C/file_formats.html
share/gimp/help/C/filters/alienmap.html
share/gimp/help/C/filters/alienmap2.html
share/gimp/help/C/filters/align_layers.html
+share/gimp/help/C/filters/animate_cells.html
+share/gimp/help/C/filters/animationplay.html
+share/gimp/help/C/filters/animoptimize.html
+share/gimp/help/C/filters/apply_lens.html
share/gimp/help/C/filters/applycanvas.html
share/gimp/help/C/filters/autocrop.html
share/gimp/help/C/filters/autostretch_hsv.html
+share/gimp/help/C/filters/blended2.html
share/gimp/help/C/filters/blinds.html
share/gimp/help/C/filters/blur.html
-share/gimp/help/C/filters/bz2.html
+share/gimp/help/C/filters/blowinout.html
+share/gimp/help/C/filters/border.html
share/gimp/help/C/filters/borderaverage.html
+share/gimp/help/C/filters/bumpmap.html
share/gimp/help/C/filters/burst.html
+share/gimp/help/C/filters/bz2.html
share/gimp/help/C/filters/c_astretch.html
share/gimp/help/C/filters/centerguide.html
share/gimp/help/C/filters/checkerboard.html
+share/gimp/help/C/filters/cml_explorer.html
share/gimp/help/C/filters/color_enhance.html
share/gimp/help/C/filters/colorify.html
share/gimp/help/C/filters/colortoalpha.html
+share/gimp/help/C/filters/convmatrix.html
share/gimp/help/C/filters/compose.html
share/gimp/help/C/filters/cubism.html
+share/gimp/help/C/filters/curve_bend.html
share/gimp/help/C/filters/decompose.html
+share/gimp/help/C/filters/deinterlace.html
+share/gimp/help/C/filters/depthmerge.html
+share/gimp/help/C/filters/despeckle.html
+share/gimp/help/C/filters/destripe.html
+share/gimp/help/C/filters/diffraction.html
+share/gimp/help/C/filters/displace.html
share/gimp/help/C/filters/ditherize.html
share/gimp/help/C/filters/dust.html
+share/gimp/help/C/filters/edge.html
+share/gimp/help/C/filters/emboss.html
+share/gimp/help/C/filters/engrave.html
share/gimp/help/C/filters/exchange.html
share/gimp/help/C/filters/fade-alpha.html
+share/gimp/help/C/filters/film.html
+share/gimp/help/C/filters/fire.html
share/gimp/help/C/filters/fit-text.html
share/gimp/help/C/filters/fits.html
share/gimp/help/C/filters/flame.html
+share/gimp/help/C/filters/flarefx.html
+share/gimp/help/C/filters/fractalexplorer.html
+share/gimp/help/C/filters/fractaltrace.html
share/gimp/help/C/filters/fp.html
share/gimp/help/C/filters/frame_filter.html
share/gimp/help/C/filters/gap_filter.html
+share/gimp/help/C/filters/gap_frontends.html
+share/gimp/help/C/filters/gap_navigator_dialog.html
+share/gimp/help/C/filters/gap_plugins.html
share/gimp/help/C/filters/gauss_iir.html
share/gimp/help/C/filters/gauss_rle.html
share/gimp/help/C/filters/gee_zoom.html
+share/gimp/help/C/filters/gdyntext.html
share/gimp/help/C/filters/gfig.html
+share/gimp/help/C/filters/gflare.html
share/gimp/help/C/filters/gih.html
+share/gimp/help/C/filters/gimpressionist.html
+share/gimp/help/C/filters/glasstile.html
+share/gimp/help/C/filters/glowing_steel.html
+share/gimp/help/C/filters/gouge.html
share/gimp/help/C/filters/gradmap.html
share/gimp/help/C/filters/grid.html
share/gimp/help/C/filters/gqbist.html
@@ -750,24 +795,45 @@ share/gimp/help/C/filters/guillotine.html
share/gimp/help/C/filters/gz.html
share/gimp/help/C/filters/hot.html
share/gimp/help/C/filters/hrz.html
+share/gimp/help/C/filters/ifscompose.html
+share/gimp/help/C/filters/illusion.html
+share/gimp/help/C/filters/image_tile.html
+share/gimp/help/C/filters/imagemap.html
+share/gimp/help/C/filters/iwarp.html
share/gimp/help/C/filters/index.html
share/gimp/help/C/filters/jigsaw.html
share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/laplace.html
share/gimp/help/C/filters/layerfuncs.html
+share/gimp/help/C/filters/lic.html
+share/gimp/help/C/filters/lighting.html
+share/gimp/help/C/filters/logulator.html
share/gimp/help/C/filters/mail.html
+share/gimp/help/C/filters/map_to_gradient.html
share/gimp/help/C/filters/mapcolor.html
+share/gimp/help/C/filters/mapobject.html
share/gimp/help/C/filters/max_rgb.html
share/gimp/help/C/filters/maze.html
share/gimp/help/C/filters/mblur.html
share/gimp/help/C/filters/miff.html
+share/gimp/help/C/filters/mirrorsplit.html
share/gimp/help/C/filters/mosaic.html
+share/gimp/help/C/filters/newsprint.html
+share/gimp/help/C/filters/nlfilt.html
+share/gimp/help/C/filters/nova.html
share/gimp/help/C/filters/noisify.html
share/gimp/help/C/filters/none.html
share/gimp/help/C/filters/normalize.html
share/gimp/help/C/filters/oilify.html
+share/gimp/help/C/filters/pagecurl.html
+share/gimp/help/C/filters/papertile.html
share/gimp/help/C/filters/pat.html
+share/gimp/help/C/filters/perlotine.html
+share/gimp/help/C/filters/pixelmap.html
share/gimp/help/C/filters/pixelize.html
share/gimp/help/C/filters/plasma.html
+share/gimp/help/C/filters/polar.html
+share/gimp/help/C/filters/prep4gif.html
share/gimp/help/C/filters/png.html
share/gimp/help/C/filters/pnm.html
share/gimp/help/C/filters/print.html
@@ -779,21 +845,27 @@ share/gimp/help/C/filters/rcm.html
share/gimp/help/C/filters/repdup.html
share/gimp/help/C/filters/repeat_last.html
share/gimp/help/C/filters/reshow_last.html
+share/gimp/help/C/filters/resynth.html
share/gimp/help/C/filters/ripple.html
share/gimp/help/C/filters/rotate.html
share/gimp/help/C/filters/roundsel.html
share/gimp/help/C/filters/sample_colorize.html
share/gimp/help/C/filters/scatter_hsv.html
+share/gimp/help/C/filters/scratches.html
share/gimp/help/C/filters/sel2path.html
share/gimp/help/C/filters/sel_gauss.html
+share/gimp/help/C/filters/semiflatten.html
share/gimp/help/C/filters/sharpen.html
share/gimp/help/C/filters/shift.html
share/gimp/help/C/filters/sgi.html
-share/gimp/help/C/filters/semiflatten.html
+share/gimp/help/C/filters/sinus.html
share/gimp/help/C/filters/smooth_palette.html
share/gimp/help/C/filters/snoise.html
+share/gimp/help/C/filters/sobel.html
+share/gimp/help/C/filters/sparkle.html
share/gimp/help/C/filters/spread.html
share/gimp/help/C/filters/stampify.html
+share/gimp/help/C/filters/struc.html
share/gimp/help/C/filters/sunras.html
share/gimp/help/C/filters/terral_text.html
share/gimp/help/C/filters/tex-to-float.html
@@ -801,10 +873,25 @@ share/gimp/help/C/filters/tga.html
share/gimp/help/C/filters/threshold_alpha.html
share/gimp/help/C/filters/tiff.html
share/gimp/help/C/filters/tile.html
+share/gimp/help/C/filters/tileit.html
+share/gimp/help/C/filters/tiler.html
share/gimp/help/C/filters/tileable_blur.html
+share/gimp/help/C/filters/translogo.html
+share/gimp/help/C/filters/unsharp.html
share/gimp/help/C/filters/url.html
+share/gimp/help/C/filters/video.html
share/gimp/help/C/filters/vinvert.html
+share/gimp/help/C/filters/vpropagate.html
+share/gimp/help/C/filters/warp-sharp.html
+share/gimp/help/C/filters/warp.html
+share/gimp/help/C/filters/waves.html
+share/gimp/help/C/filters/webify.html
+share/gimp/help/C/filters/whirlpinch.html
+share/gimp/help/C/filters/wind.html
+share/gimp/help/C/filters/windify.html
share/gimp/help/C/filters/wmf.html
+share/gimp/help/C/filters/xachlego.html
+share/gimp/help/C/filters/xachshadow.html
share/gimp/help/C/filters/xachvision.html
share/gimp/help/C/filters/xwd.html
share/gimp/help/C/filters/zealouscrop.html
@@ -876,15 +963,97 @@ share/gimp/help/C/image/view/toggle_rulers.html
share/gimp/help/C/image/view/toggle_selection.html
share/gimp/help/C/image/view/toggle_statusbar.html
share/gimp/help/C/image/view/zoom.html
+share/gimp/help/C/images/add_point.png
+share/gimp/help/C/images/anchor_layer.png
+share/gimp/help/C/images/channel_to_selection.png
+share/gimp/help/C/images/delete_channel.png
+share/gimp/help/C/images/delete_directory.png
+share/gimp/help/C/images/delete_layer.png
+share/gimp/help/C/images/delete_path.png
+share/gimp/help/C/images/dotted_square.png
+share/gimp/help/C/images/duplicate_channel.png
+share/gimp/help/C/images/duplicate_layer.png
+share/gimp/help/C/images/duplicate_path.png
+share/gimp/help/C/images/edit_point.png
+share/gimp/help/C/images/eye.png
+share/gimp/help/C/images/examples/border-selection-01.png
+share/gimp/help/C/images/example/border-selection-02.png
+share/gimp/help/C/images/glossary/modes-addition.png
+share/gimp/help/C/images/glossary/modes-color.png
+share/gimp/help/C/images/glossary/modes-darken.png
+share/gimp/help/C/images/glossary/modes-difference.png
+share/gimp/help/C/images/glossary/modes-dissolve.png
+share/gimp/help/C/images/glossary/modes-divide.png
+share/gimp/help/C/images/glossary/modes-hue.png
+share/gimp/help/C/images/glossary/modes-lighten.png
+share/gimp/help/C/images/glossary/modes-multiply.png
+share/gimp/help/C/images/glossary/modes-normal.png
+share/gimp/help/C/images/glossary/modes-normal2.png
+share/gimp/help/C/images/glossary/modes-overlay.png
+share/gimp/help/C/images/glossary/modes-saturation.png
+share/gimp/help/C/images/glossary/modes-screen.png
+share/gimp/help/C/images/glossary/modes-subtract.png
+share/gimp/help/C/images/glossary/modes-value.png
+share/gimp/help/C/images/geezoom.png
share/gimp/help/C/images/image_menu.png
share/gimp/help/C/images/image_window.png
share/gimp/help/C/images/layers_dialog.png
+share/gimp/help/C/images/layers_example.png
share/gimp/help/C/images/layers_menu.png
+share/gimp/help/C/images/layers_overview.png
+share/gimp/help/C/images/lower_channel.png
+share/gimp/help/C/images/lower_directory.png
+share/gimp/help/C/images/lower_layer.png
+share/gimp/help/C/images/new_channel.png
+share/gimp/help/C/images/new_directory.png
+share/gimp/help/C/images/new_path.png
+share/gimp/help/C/images/new_point.png
+share/gimp/help/C/images/path_to_selection.png
+share/gimp/help/C/images/preview_box.png
share/gimp/help/C/images/print_color.png
share/gimp/help/C/images/print_main.png
share/gimp/help/C/images/print_setup.png
+share/gimp/help/C/images/raise_channel.png
+share/gimp/help/C/images/raise_directory.png
+share/gimp/help/C/images/raise_layer.png
+share/gimp/help/C/images/red_square.png
+share/gimp/help/C/images/remove_point.png
+share/gimp/help/C/images/selection_to_path.png
+share/gimp/help/C/images/stroke_path.png
share/gimp/help/C/images/tool_options.png
share/gimp/help/C/images/toolbox.png
+share/gimp/help/C/images/tools/tool-opt-increment.png
+share/gimp/help/C/images/tools/tool-opt-nonincrement.png
+share/gimp/help/C/images/tools/tool_airbrush.png
+share/gimp/help/C/images/tools/tool_apartheid.png
+share/gimp/help/C/images/tools/tool_bezier.png
+share/gimp/help/C/images/tools/tool_blend.png
+share/gimp/help/C/images/tools/tool_burndodge.png
+share/gimp/help/C/images/tools/tool_convolver.png
+share/gimp/help/C/images/tools/tool_crop.png
+share/gimp/help/C/images/tools/tool_dodgeburn.png
+share/gimp/help/C/images/tools/tool_ellipse_sel.png
+share/gimp/help/C/images/tools/tool_eraser.png
+share/gimp/help/C/images/tools/tool_fill.png
+share/gimp/help/C/images/tools/tool_flip.png
+share/gimp/help/C/images/tools/tool_free_sel.png
+share/gimp/help/C/images/tools/tool_fuzzy_sel.png
+share/gimp/help/C/images/tools/tool_gradient.png
+share/gimp/help/C/images/tools/tool_ink.png
+share/gimp/help/C/images/tools/tool_measure.png
+share/gimp/help/C/images/tools/tool_move.png
+share/gimp/help/C/images/tools/tool_paintbrush.png
+share/gimp/help/C/images/tools/tool_pencil.png
+share/gimp/help/C/images/tools/tool_picker.png
+share/gimp/help/C/images/tools/tool_rect_sel.png
+share/gimp/help/C/images/tools/tool_scissors.png
+share/gimp/help/C/images/tools/tool_smudge.png
+share/gimp/help/C/images/tools/tool_smuge.png
+share/gimp/help/C/images/tools/tool_text.png
+share/gimp/help/C/images/tools/tool_transform.png
+share/gimp/help/C/images/tools/tool_zoom.png
+share/gimp/help/C/images/triangle.png
+share/gimp/help/C/images/wilber.png
share/gimp/help/C/index.html
share/gimp/help/C/introduction.html
share/gimp/help/C/keyboard_shortcuts.html
@@ -947,6 +1116,9 @@ share/gimp/help/C/toolbox/help/context_help.html
@unexec rm -f %D/share/gimp/help/C/toolbox/help/dialogs
@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/toolbox/help/filters
@unexec rm -f %D/share/gimp/help/C/toolbox/help/filters
+share/gimp/help/C/stylesheet-images/note.gif
+share/gimp/help/C/stylesheet-images/tip.gif
+share/gimp/help/C/stylesheet-images/warning.gif
share/gimp/help/C/toolbox/index.html
share/gimp/help/C/toolbox/toolbox.html
share/gimp/help/C/tools/airbrush.html
@@ -986,42 +1158,6 @@ share/gimp/help/C/tools/threshold.html
share/gimp/help/C/tools/transform.html
share/gimp/help/C/using_gimp.html
share/gimp/help/C/why_gimp.html
-share/gimp/help/images/add_point.png
-share/gimp/help/images/anchor_layer.png
-share/gimp/help/images/channel_to_selection.png
-share/gimp/help/images/delete_channel.png
-share/gimp/help/images/delete_directory.png
-share/gimp/help/images/delete_layer.png
-share/gimp/help/images/delete_path.png
-share/gimp/help/images/dotted_square.png
-share/gimp/help/images/duplicate_channel.png
-share/gimp/help/images/duplicate_layer.png
-share/gimp/help/images/duplicate_path.png
-share/gimp/help/images/edit_point.png
-share/gimp/help/images/eek.png
-share/gimp/help/images/geezoom.png
-share/gimp/help/images/layers_example.png
-share/gimp/help/images/layers_overview.png
-share/gimp/help/images/lower_channel.png
-share/gimp/help/images/lower_directory.png
-share/gimp/help/images/lower_layer.png
-share/gimp/help/images/new_channel.png
-share/gimp/help/images/new_directory.png
-share/gimp/help/images/new_path.png
-share/gimp/help/images/new_point.png
-share/gimp/help/images/note.png
-share/gimp/help/images/path_to_selection.png
-share/gimp/help/images/preview_box.png
-share/gimp/help/images/raise_channel.png
-share/gimp/help/images/raise_directory.png
-share/gimp/help/images/raise_layer.png
-share/gimp/help/images/red_square.png
-share/gimp/help/images/remove_point.png
-share/gimp/help/images/selection_to_path.png
-share/gimp/help/images/stroke_path.png
-share/gimp/help/images/tip.png
-share/gimp/help/images/warning.png
-share/gimp/help/images/wilber.png
share/gimp/palettes/Bears
share/gimp/palettes/Bgold
share/gimp/palettes/Blues
@@ -1216,16 +1352,21 @@ share/gimp/scripts/web-browser.scm
share/gimp/scripts/xach-effect.scm
share/gimp/tips/gimp_conseils.fr.txt
share/gimp/tips/gimp_tips.cs.txt
+share/gimp/tips/gimp_tips.da.txt
share/gimp/tips/gimp_tips.de.txt
share/gimp/tips/gimp_tips.es.txt
+share/gimp/tips/gimp_tips.hu.txt
share/gimp/tips/gimp_tips.it.txt
share/gimp/tips/gimp_tips.ja.txt
share/gimp/tips/gimp_tips.ko.txt
+share/gimp/tips/gimp_tips.lt.txt
share/gimp/tips/gimp_tips.pl.txt
share/gimp/tips/gimp_tips.ru.txt
share/gimp/tips/gimp_tips.txt
share/gimp/tips/gimp_tips.tr.txt
share/gimp/tips/gimp_tips.uk.txt
+share/gimp/tips/gimp_tips.zh_CN.txt
+share/gimp/tips/gimp_tips.zh_TW.txt
share/gimp/user_install
share/locale/ca/LC_MESSAGES/gimp-libgimp.mo
share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
@@ -1331,10 +1472,14 @@ share/locale/uk/LC_MESSAGES/gimp-libgimp.mo
share/locale/uk/LC_MESSAGES/gimp-script-fu.mo
share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo
share/locale/uk/LC_MESSAGES/gimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-libgimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-script-fu.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-std-plugins.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm etc/gimp/1.2
@dirrm etc/gimp
@dirrm include/gck
@@ -1363,6 +1508,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/dialogs/color_selectors
@dirrm share/gimp/help/C/dialogs/preferences
@dirrm share/gimp/help/C/dialogs
+@dirrm share/gimp/help/C/stylesheet-images
@dirrm share/gimp/help/C/tools
@dirrm share/gimp/help/C/layers/stack
@dirrm share/gimp/help/C/layers
@@ -1370,6 +1516,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/paths
@dirrm share/gimp/help/C/toolbox/help
@dirrm share/gimp/help/C/toolbox
+@dirrm share/gimp/help/C/images/examples
+@dirrm share/gimp/help/C/images/glossary
+@dirrm share/gimp/help/C/images/tools
@dirrm share/gimp/help/C/images
@dirrm share/gimp/help/C/image/edit
@dirrm share/gimp/help/C/image/select
@@ -1385,7 +1534,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/filters
@dirrm share/gimp/help/C/file
@dirrm share/gimp/help/C
-@dirrm share/gimp/help/images
@dirrm share/gimp/help
@dirrm share/gimp/palettes
@dirrm share/gimp/patterns
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index f4e2048be79e..ca69390ee316 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gimp
-PORTVERSION= 1.2.2
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTVERSION= 1.2.3
+PORTREVISION= 0
+#PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
@@ -24,7 +24,8 @@ LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+#SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+SHLIBVER?= 2
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -34,6 +35,7 @@ USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+LIBTOOLFILES= aclocal.m4
PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ARGS= --disable-perl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 7ae55b0c96c8..cb85cd7f3134 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.2.tar.bz2) = 680c01b0fc35cd68c540eb9d236f5e1a
+MD5 (gimp-1.2.3.tar.bz2) = b19235f19f524f772a4aef597a69b1da
diff --git a/graphics/gimp1/files/patch-af b/graphics/gimp1/files/patch-af
deleted file mode 100644
index 83f0d440beea..000000000000
--- a/graphics/gimp1/files/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
---- gimptool.in.orig Thu Apr 27 02:07:40 2000
-+++ gimptool.in Thu Mar 15 05:55:24 2001
-@@ -234,19 +234,19 @@
- | --uninstall-script | --uninstall-admin-script )
- case $1 in
- --*install-bin)
-- install_cmd="@INSTALL_PROGRAM@"
-+ install_cmd="@INSTALL_SCRIPT@"
- install_dir="$HOME/@gimpdir@/plug-ins"
- ;;
- --install-bin-strip)
-- install_cmd="@INSTALL_PROGRAM@ -s"
-+ install_cmd="@INSTALL_SCRIPT@ -s"
- install_dir="$HOME/@gimpdir@/plug-ins"
- ;;
- --*install-admin-bin)
-- install_cmd="@INSTALL_PROGRAM@"
-+ install_cmd="@INSTALL_SCRIPT@"
- install_dir="$gimpplugindir/plug-ins"
- ;;
- --install-admin-bin-strip)
-- install_cmd="@INSTALL_PROGRAM@ -s"
-+ install_cmd="@INSTALL_SCRIPT@ -s"
- install_dir="$gimpplugindir/plug-ins"
- ;;
- --*install-script)
diff --git a/graphics/gimp1/files/patch-ak b/graphics/gimp1/files/patch-ak
deleted file mode 100644
index ead5311df6ff..000000000000
--- a/graphics/gimp1/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgimp/Makefile.in.orig Sat Mar 4 11:10:43 2000
-+++ libgimp/Makefile.in Sun Apr 2 22:40:29 2000
-@@ -209,11 +209,11 @@
- gimpinclude_HEADERS = color_display.h color_selector.h gimp.h gimpchainbutton.h gimpcolorbutton.h gimpcolorspace.h gimpcompat.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimphelpui.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimppatheditor.h gimppixmap.h gimpquerybox.h gimpsizeentry.h gimpui.h gimpunit.h gimpunitmenu.h gimpvector.h gimpwidgets.h gimpintl.h parasite.h parasiteF.h parasiteP.h parasiteio.h
-
-
--libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
-
--libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- libgimpui_la_LIBADD = $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp1/files/patch-ao b/graphics/gimp1/files/patch-ao
deleted file mode 100644
index e5f1d5a3677c..000000000000
--- a/graphics/gimp1/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig Sun Apr 2 22:41:29 2000
-+++ plug-ins/libgck/gck/Makefile.in Sun Apr 2 22:41:37 2000
-@@ -191,7 +191,7 @@
- gckinclude_HEADERS = gck.h
-
-
--libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-
- INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)
diff --git a/graphics/gimp1/files/patch-gimptool-1.2.in b/graphics/gimp1/files/patch-gimptool-1.2.in
new file mode 100644
index 000000000000..052cac1df256
--- /dev/null
+++ b/graphics/gimp1/files/patch-gimptool-1.2.in
@@ -0,0 +1,26 @@
+--- gimptool-1.2.in.orig Wed Feb 20 14:04:01 2002
++++ gimptool-1.2.in Wed Feb 20 14:04:39 2002
+@@ -227,19 +227,19 @@
+ | --uninstall-script | --uninstall-admin-script )
+ case $1 in
+ --*install-bin)
+- install_cmd="@INSTALL_PROGRAM@"
++ install_cmd="@INSTALL_SCRIPT@"
+ install_dir="$HOME/@gimpdir@/plug-ins"
+ ;;
+ --install-bin-strip)
+- install_cmd="@INSTALL_PROGRAM@ -s"
++ install_cmd="@INSTALL_SCRIPT@ -s"
+ install_dir="$HOME/@gimpdir@/plug-ins"
+ ;;
+ --*install-admin-bin)
+- install_cmd="@INSTALL_PROGRAM@"
++ install_cmd="@INSTALL_SCRIPT@"
+ install_dir="$gimpplugindir/plug-ins"
+ ;;
+ --install-admin-bin-strip)
+- install_cmd="@INSTALL_PROGRAM@ -s"
++ install_cmd="@INSTALL_SCRIPT@ -s"
+ install_dir="$gimpplugindir/plug-ins"
+ ;;
+ --*install-script)
diff --git a/graphics/gimp1/files/patch-libgimp::Makefile.in b/graphics/gimp1/files/patch-libgimp::Makefile.in
new file mode 100644
index 000000000000..b9cdc7868203
--- /dev/null
+++ b/graphics/gimp1/files/patch-libgimp::Makefile.in
@@ -0,0 +1,19 @@
+--- libgimp/Makefile.in.orig Tue Feb 12 05:46:08 2002
++++ libgimp/Makefile.in Wed Feb 20 14:02:07 2002
+@@ -225,13 +225,13 @@
+ gimpinclude_HEADERS = gimp.h ${PDB_WRAPPERS_H} gimpchainbutton.h gimpchannel.h gimpcolorbutton.h gimpcolordisplay.h gimpcolorselector.h gimpcolorspace.h gimpcompat.h gimpdrawable.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimpgradientselect.h gimphelpui.h gimpimage.h gimplayer.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpparasite.h gimpparasiteio.h gimppatheditor.h gimppixelrgn.h gimppixmap.h gimpproceduraldb.h gimpquerybox.h gimpselection.h gimpsignal.h gimpsizeentry.h gimptile.h gimptypes.h gimpui.h gimpunit.h gimpunitmenu.h gimputils.h gimpvector.h gimpwidgets.h gimpintl.h
+
+
+-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimp_export_symbols)
++libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
+
+-libgimp_la_LIBADD = $(GLIB_LIBS) -lm
++libgimp_la_LIBADD = $(GTK_LIBS) -lm
+
+ libgimp_la_DEPENDENCIES = $(gimp_def)
+
+-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimpui_export_symbols)
++libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
+
+
+ libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)
diff --git a/graphics/gimp1/files/patch-plug-ins::libgck::gck::Makefile.in b/graphics/gimp1/files/patch-plug-ins::libgck::gck::Makefile.in
new file mode 100644
index 000000000000..6764015563eb
--- /dev/null
+++ b/graphics/gimp1/files/patch-plug-ins::libgck::gck::Makefile.in
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig Tue Feb 12 05:46:23 2002
++++ plug-ins/libgck/gck/Makefile.in Wed Feb 20 14:00:02 2002
+@@ -193,7 +193,7 @@
+ gckinclude_HEADERS = gck.h
+
+
+-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
++libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
+
+
+ INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 70fdc67a43b0..389cbc14e136 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -88,16 +88,25 @@ include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
+lib/libgck.la
lib/libgck.so
lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
+lib/libgimp.la
lib/libgimp.so
lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
+lib/libgimpui.la
lib/libgimpui.so
lib/libgimpui.so.%%SHLIBVER%%
+libexec/gimp/1.2/modules/libcolorsel_gtk.a
+libexec/gimp/1.2/modules/libcolorsel_gtk.la
libexec/gimp/1.2/modules/libcolorsel_gtk.so
+libexec/gimp/1.2/modules/libcolorsel_triangle.a
+libexec/gimp/1.2/modules/libcolorsel_triangle.la
libexec/gimp/1.2/modules/libcolorsel_triangle.so
+libexec/gimp/1.2/modules/libcolorsel_water.a
+libexec/gimp/1.2/modules/libcolorsel_water.la
libexec/gimp/1.2/modules/libcolorsel_water.so
libexec/gimp/1.2/plug-ins/AlienMap
libexec/gimp/1.2/plug-ins/AlienMap2
@@ -623,6 +632,7 @@ share/gimp/help/C/dialogs/color_selectors/built_in.html
share/gimp/help/C/dialogs/color_selectors/gtk.html
share/gimp/help/C/dialogs/color_selectors/triangle.html
share/gimp/help/C/dialogs/color_selectors/watercolor.html
+share/gimp/help/C/dialogs/confirm_save.html
share/gimp/help/C/dialogs/convert_to_indexed.html
share/gimp/help/C/dialogs/copy_named.html
share/gimp/help/C/dialogs/cut_named.html
@@ -630,6 +640,7 @@ share/gimp/help/C/dialogs/device_status.html
share/gimp/help/C/dialogs/document_index.html
share/gimp/help/C/dialogs/edit_qmask_attributes.html
share/gimp/help/C/dialogs/error_console.html
+share/gimp/help/C/dialogs/export_file.html
share/gimp/help/C/dialogs/feather_selection.html
share/gimp/help/C/dialogs/file_new.html
share/gimp/help/C/dialogs/file_open.html
@@ -707,38 +718,72 @@ share/gimp/help/C/file_formats.html
share/gimp/help/C/filters/alienmap.html
share/gimp/help/C/filters/alienmap2.html
share/gimp/help/C/filters/align_layers.html
+share/gimp/help/C/filters/animate_cells.html
+share/gimp/help/C/filters/animationplay.html
+share/gimp/help/C/filters/animoptimize.html
+share/gimp/help/C/filters/apply_lens.html
share/gimp/help/C/filters/applycanvas.html
share/gimp/help/C/filters/autocrop.html
share/gimp/help/C/filters/autostretch_hsv.html
+share/gimp/help/C/filters/blended2.html
share/gimp/help/C/filters/blinds.html
share/gimp/help/C/filters/blur.html
-share/gimp/help/C/filters/bz2.html
+share/gimp/help/C/filters/blowinout.html
+share/gimp/help/C/filters/border.html
share/gimp/help/C/filters/borderaverage.html
+share/gimp/help/C/filters/bumpmap.html
share/gimp/help/C/filters/burst.html
+share/gimp/help/C/filters/bz2.html
share/gimp/help/C/filters/c_astretch.html
share/gimp/help/C/filters/centerguide.html
share/gimp/help/C/filters/checkerboard.html
+share/gimp/help/C/filters/cml_explorer.html
share/gimp/help/C/filters/color_enhance.html
share/gimp/help/C/filters/colorify.html
share/gimp/help/C/filters/colortoalpha.html
+share/gimp/help/C/filters/convmatrix.html
share/gimp/help/C/filters/compose.html
share/gimp/help/C/filters/cubism.html
+share/gimp/help/C/filters/curve_bend.html
share/gimp/help/C/filters/decompose.html
+share/gimp/help/C/filters/deinterlace.html
+share/gimp/help/C/filters/depthmerge.html
+share/gimp/help/C/filters/despeckle.html
+share/gimp/help/C/filters/destripe.html
+share/gimp/help/C/filters/diffraction.html
+share/gimp/help/C/filters/displace.html
share/gimp/help/C/filters/ditherize.html
share/gimp/help/C/filters/dust.html
+share/gimp/help/C/filters/edge.html
+share/gimp/help/C/filters/emboss.html
+share/gimp/help/C/filters/engrave.html
share/gimp/help/C/filters/exchange.html
share/gimp/help/C/filters/fade-alpha.html
+share/gimp/help/C/filters/film.html
+share/gimp/help/C/filters/fire.html
share/gimp/help/C/filters/fit-text.html
share/gimp/help/C/filters/fits.html
share/gimp/help/C/filters/flame.html
+share/gimp/help/C/filters/flarefx.html
+share/gimp/help/C/filters/fractalexplorer.html
+share/gimp/help/C/filters/fractaltrace.html
share/gimp/help/C/filters/fp.html
share/gimp/help/C/filters/frame_filter.html
share/gimp/help/C/filters/gap_filter.html
+share/gimp/help/C/filters/gap_frontends.html
+share/gimp/help/C/filters/gap_navigator_dialog.html
+share/gimp/help/C/filters/gap_plugins.html
share/gimp/help/C/filters/gauss_iir.html
share/gimp/help/C/filters/gauss_rle.html
share/gimp/help/C/filters/gee_zoom.html
+share/gimp/help/C/filters/gdyntext.html
share/gimp/help/C/filters/gfig.html
+share/gimp/help/C/filters/gflare.html
share/gimp/help/C/filters/gih.html
+share/gimp/help/C/filters/gimpressionist.html
+share/gimp/help/C/filters/glasstile.html
+share/gimp/help/C/filters/glowing_steel.html
+share/gimp/help/C/filters/gouge.html
share/gimp/help/C/filters/gradmap.html
share/gimp/help/C/filters/grid.html
share/gimp/help/C/filters/gqbist.html
@@ -750,24 +795,45 @@ share/gimp/help/C/filters/guillotine.html
share/gimp/help/C/filters/gz.html
share/gimp/help/C/filters/hot.html
share/gimp/help/C/filters/hrz.html
+share/gimp/help/C/filters/ifscompose.html
+share/gimp/help/C/filters/illusion.html
+share/gimp/help/C/filters/image_tile.html
+share/gimp/help/C/filters/imagemap.html
+share/gimp/help/C/filters/iwarp.html
share/gimp/help/C/filters/index.html
share/gimp/help/C/filters/jigsaw.html
share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/laplace.html
share/gimp/help/C/filters/layerfuncs.html
+share/gimp/help/C/filters/lic.html
+share/gimp/help/C/filters/lighting.html
+share/gimp/help/C/filters/logulator.html
share/gimp/help/C/filters/mail.html
+share/gimp/help/C/filters/map_to_gradient.html
share/gimp/help/C/filters/mapcolor.html
+share/gimp/help/C/filters/mapobject.html
share/gimp/help/C/filters/max_rgb.html
share/gimp/help/C/filters/maze.html
share/gimp/help/C/filters/mblur.html
share/gimp/help/C/filters/miff.html
+share/gimp/help/C/filters/mirrorsplit.html
share/gimp/help/C/filters/mosaic.html
+share/gimp/help/C/filters/newsprint.html
+share/gimp/help/C/filters/nlfilt.html
+share/gimp/help/C/filters/nova.html
share/gimp/help/C/filters/noisify.html
share/gimp/help/C/filters/none.html
share/gimp/help/C/filters/normalize.html
share/gimp/help/C/filters/oilify.html
+share/gimp/help/C/filters/pagecurl.html
+share/gimp/help/C/filters/papertile.html
share/gimp/help/C/filters/pat.html
+share/gimp/help/C/filters/perlotine.html
+share/gimp/help/C/filters/pixelmap.html
share/gimp/help/C/filters/pixelize.html
share/gimp/help/C/filters/plasma.html
+share/gimp/help/C/filters/polar.html
+share/gimp/help/C/filters/prep4gif.html
share/gimp/help/C/filters/png.html
share/gimp/help/C/filters/pnm.html
share/gimp/help/C/filters/print.html
@@ -779,21 +845,27 @@ share/gimp/help/C/filters/rcm.html
share/gimp/help/C/filters/repdup.html
share/gimp/help/C/filters/repeat_last.html
share/gimp/help/C/filters/reshow_last.html
+share/gimp/help/C/filters/resynth.html
share/gimp/help/C/filters/ripple.html
share/gimp/help/C/filters/rotate.html
share/gimp/help/C/filters/roundsel.html
share/gimp/help/C/filters/sample_colorize.html
share/gimp/help/C/filters/scatter_hsv.html
+share/gimp/help/C/filters/scratches.html
share/gimp/help/C/filters/sel2path.html
share/gimp/help/C/filters/sel_gauss.html
+share/gimp/help/C/filters/semiflatten.html
share/gimp/help/C/filters/sharpen.html
share/gimp/help/C/filters/shift.html
share/gimp/help/C/filters/sgi.html
-share/gimp/help/C/filters/semiflatten.html
+share/gimp/help/C/filters/sinus.html
share/gimp/help/C/filters/smooth_palette.html
share/gimp/help/C/filters/snoise.html
+share/gimp/help/C/filters/sobel.html
+share/gimp/help/C/filters/sparkle.html
share/gimp/help/C/filters/spread.html
share/gimp/help/C/filters/stampify.html
+share/gimp/help/C/filters/struc.html
share/gimp/help/C/filters/sunras.html
share/gimp/help/C/filters/terral_text.html
share/gimp/help/C/filters/tex-to-float.html
@@ -801,10 +873,25 @@ share/gimp/help/C/filters/tga.html
share/gimp/help/C/filters/threshold_alpha.html
share/gimp/help/C/filters/tiff.html
share/gimp/help/C/filters/tile.html
+share/gimp/help/C/filters/tileit.html
+share/gimp/help/C/filters/tiler.html
share/gimp/help/C/filters/tileable_blur.html
+share/gimp/help/C/filters/translogo.html
+share/gimp/help/C/filters/unsharp.html
share/gimp/help/C/filters/url.html
+share/gimp/help/C/filters/video.html
share/gimp/help/C/filters/vinvert.html
+share/gimp/help/C/filters/vpropagate.html
+share/gimp/help/C/filters/warp-sharp.html
+share/gimp/help/C/filters/warp.html
+share/gimp/help/C/filters/waves.html
+share/gimp/help/C/filters/webify.html
+share/gimp/help/C/filters/whirlpinch.html
+share/gimp/help/C/filters/wind.html
+share/gimp/help/C/filters/windify.html
share/gimp/help/C/filters/wmf.html
+share/gimp/help/C/filters/xachlego.html
+share/gimp/help/C/filters/xachshadow.html
share/gimp/help/C/filters/xachvision.html
share/gimp/help/C/filters/xwd.html
share/gimp/help/C/filters/zealouscrop.html
@@ -876,15 +963,97 @@ share/gimp/help/C/image/view/toggle_rulers.html
share/gimp/help/C/image/view/toggle_selection.html
share/gimp/help/C/image/view/toggle_statusbar.html
share/gimp/help/C/image/view/zoom.html
+share/gimp/help/C/images/add_point.png
+share/gimp/help/C/images/anchor_layer.png
+share/gimp/help/C/images/channel_to_selection.png
+share/gimp/help/C/images/delete_channel.png
+share/gimp/help/C/images/delete_directory.png
+share/gimp/help/C/images/delete_layer.png
+share/gimp/help/C/images/delete_path.png
+share/gimp/help/C/images/dotted_square.png
+share/gimp/help/C/images/duplicate_channel.png
+share/gimp/help/C/images/duplicate_layer.png
+share/gimp/help/C/images/duplicate_path.png
+share/gimp/help/C/images/edit_point.png
+share/gimp/help/C/images/eye.png
+share/gimp/help/C/images/examples/border-selection-01.png
+share/gimp/help/C/images/example/border-selection-02.png
+share/gimp/help/C/images/glossary/modes-addition.png
+share/gimp/help/C/images/glossary/modes-color.png
+share/gimp/help/C/images/glossary/modes-darken.png
+share/gimp/help/C/images/glossary/modes-difference.png
+share/gimp/help/C/images/glossary/modes-dissolve.png
+share/gimp/help/C/images/glossary/modes-divide.png
+share/gimp/help/C/images/glossary/modes-hue.png
+share/gimp/help/C/images/glossary/modes-lighten.png
+share/gimp/help/C/images/glossary/modes-multiply.png
+share/gimp/help/C/images/glossary/modes-normal.png
+share/gimp/help/C/images/glossary/modes-normal2.png
+share/gimp/help/C/images/glossary/modes-overlay.png
+share/gimp/help/C/images/glossary/modes-saturation.png
+share/gimp/help/C/images/glossary/modes-screen.png
+share/gimp/help/C/images/glossary/modes-subtract.png
+share/gimp/help/C/images/glossary/modes-value.png
+share/gimp/help/C/images/geezoom.png
share/gimp/help/C/images/image_menu.png
share/gimp/help/C/images/image_window.png
share/gimp/help/C/images/layers_dialog.png
+share/gimp/help/C/images/layers_example.png
share/gimp/help/C/images/layers_menu.png
+share/gimp/help/C/images/layers_overview.png
+share/gimp/help/C/images/lower_channel.png
+share/gimp/help/C/images/lower_directory.png
+share/gimp/help/C/images/lower_layer.png
+share/gimp/help/C/images/new_channel.png
+share/gimp/help/C/images/new_directory.png
+share/gimp/help/C/images/new_path.png
+share/gimp/help/C/images/new_point.png
+share/gimp/help/C/images/path_to_selection.png
+share/gimp/help/C/images/preview_box.png
share/gimp/help/C/images/print_color.png
share/gimp/help/C/images/print_main.png
share/gimp/help/C/images/print_setup.png
+share/gimp/help/C/images/raise_channel.png
+share/gimp/help/C/images/raise_directory.png
+share/gimp/help/C/images/raise_layer.png
+share/gimp/help/C/images/red_square.png
+share/gimp/help/C/images/remove_point.png
+share/gimp/help/C/images/selection_to_path.png
+share/gimp/help/C/images/stroke_path.png
share/gimp/help/C/images/tool_options.png
share/gimp/help/C/images/toolbox.png
+share/gimp/help/C/images/tools/tool-opt-increment.png
+share/gimp/help/C/images/tools/tool-opt-nonincrement.png
+share/gimp/help/C/images/tools/tool_airbrush.png
+share/gimp/help/C/images/tools/tool_apartheid.png
+share/gimp/help/C/images/tools/tool_bezier.png
+share/gimp/help/C/images/tools/tool_blend.png
+share/gimp/help/C/images/tools/tool_burndodge.png
+share/gimp/help/C/images/tools/tool_convolver.png
+share/gimp/help/C/images/tools/tool_crop.png
+share/gimp/help/C/images/tools/tool_dodgeburn.png
+share/gimp/help/C/images/tools/tool_ellipse_sel.png
+share/gimp/help/C/images/tools/tool_eraser.png
+share/gimp/help/C/images/tools/tool_fill.png
+share/gimp/help/C/images/tools/tool_flip.png
+share/gimp/help/C/images/tools/tool_free_sel.png
+share/gimp/help/C/images/tools/tool_fuzzy_sel.png
+share/gimp/help/C/images/tools/tool_gradient.png
+share/gimp/help/C/images/tools/tool_ink.png
+share/gimp/help/C/images/tools/tool_measure.png
+share/gimp/help/C/images/tools/tool_move.png
+share/gimp/help/C/images/tools/tool_paintbrush.png
+share/gimp/help/C/images/tools/tool_pencil.png
+share/gimp/help/C/images/tools/tool_picker.png
+share/gimp/help/C/images/tools/tool_rect_sel.png
+share/gimp/help/C/images/tools/tool_scissors.png
+share/gimp/help/C/images/tools/tool_smudge.png
+share/gimp/help/C/images/tools/tool_smuge.png
+share/gimp/help/C/images/tools/tool_text.png
+share/gimp/help/C/images/tools/tool_transform.png
+share/gimp/help/C/images/tools/tool_zoom.png
+share/gimp/help/C/images/triangle.png
+share/gimp/help/C/images/wilber.png
share/gimp/help/C/index.html
share/gimp/help/C/introduction.html
share/gimp/help/C/keyboard_shortcuts.html
@@ -947,6 +1116,9 @@ share/gimp/help/C/toolbox/help/context_help.html
@unexec rm -f %D/share/gimp/help/C/toolbox/help/dialogs
@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/toolbox/help/filters
@unexec rm -f %D/share/gimp/help/C/toolbox/help/filters
+share/gimp/help/C/stylesheet-images/note.gif
+share/gimp/help/C/stylesheet-images/tip.gif
+share/gimp/help/C/stylesheet-images/warning.gif
share/gimp/help/C/toolbox/index.html
share/gimp/help/C/toolbox/toolbox.html
share/gimp/help/C/tools/airbrush.html
@@ -986,42 +1158,6 @@ share/gimp/help/C/tools/threshold.html
share/gimp/help/C/tools/transform.html
share/gimp/help/C/using_gimp.html
share/gimp/help/C/why_gimp.html
-share/gimp/help/images/add_point.png
-share/gimp/help/images/anchor_layer.png
-share/gimp/help/images/channel_to_selection.png
-share/gimp/help/images/delete_channel.png
-share/gimp/help/images/delete_directory.png
-share/gimp/help/images/delete_layer.png
-share/gimp/help/images/delete_path.png
-share/gimp/help/images/dotted_square.png
-share/gimp/help/images/duplicate_channel.png
-share/gimp/help/images/duplicate_layer.png
-share/gimp/help/images/duplicate_path.png
-share/gimp/help/images/edit_point.png
-share/gimp/help/images/eek.png
-share/gimp/help/images/geezoom.png
-share/gimp/help/images/layers_example.png
-share/gimp/help/images/layers_overview.png
-share/gimp/help/images/lower_channel.png
-share/gimp/help/images/lower_directory.png
-share/gimp/help/images/lower_layer.png
-share/gimp/help/images/new_channel.png
-share/gimp/help/images/new_directory.png
-share/gimp/help/images/new_path.png
-share/gimp/help/images/new_point.png
-share/gimp/help/images/note.png
-share/gimp/help/images/path_to_selection.png
-share/gimp/help/images/preview_box.png
-share/gimp/help/images/raise_channel.png
-share/gimp/help/images/raise_directory.png
-share/gimp/help/images/raise_layer.png
-share/gimp/help/images/red_square.png
-share/gimp/help/images/remove_point.png
-share/gimp/help/images/selection_to_path.png
-share/gimp/help/images/stroke_path.png
-share/gimp/help/images/tip.png
-share/gimp/help/images/warning.png
-share/gimp/help/images/wilber.png
share/gimp/palettes/Bears
share/gimp/palettes/Bgold
share/gimp/palettes/Blues
@@ -1216,16 +1352,21 @@ share/gimp/scripts/web-browser.scm
share/gimp/scripts/xach-effect.scm
share/gimp/tips/gimp_conseils.fr.txt
share/gimp/tips/gimp_tips.cs.txt
+share/gimp/tips/gimp_tips.da.txt
share/gimp/tips/gimp_tips.de.txt
share/gimp/tips/gimp_tips.es.txt
+share/gimp/tips/gimp_tips.hu.txt
share/gimp/tips/gimp_tips.it.txt
share/gimp/tips/gimp_tips.ja.txt
share/gimp/tips/gimp_tips.ko.txt
+share/gimp/tips/gimp_tips.lt.txt
share/gimp/tips/gimp_tips.pl.txt
share/gimp/tips/gimp_tips.ru.txt
share/gimp/tips/gimp_tips.txt
share/gimp/tips/gimp_tips.tr.txt
share/gimp/tips/gimp_tips.uk.txt
+share/gimp/tips/gimp_tips.zh_CN.txt
+share/gimp/tips/gimp_tips.zh_TW.txt
share/gimp/user_install
share/locale/ca/LC_MESSAGES/gimp-libgimp.mo
share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
@@ -1331,10 +1472,14 @@ share/locale/uk/LC_MESSAGES/gimp-libgimp.mo
share/locale/uk/LC_MESSAGES/gimp-script-fu.mo
share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo
share/locale/uk/LC_MESSAGES/gimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-libgimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-script-fu.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-std-plugins.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm etc/gimp/1.2
@dirrm etc/gimp
@dirrm include/gck
@@ -1363,6 +1508,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/dialogs/color_selectors
@dirrm share/gimp/help/C/dialogs/preferences
@dirrm share/gimp/help/C/dialogs
+@dirrm share/gimp/help/C/stylesheet-images
@dirrm share/gimp/help/C/tools
@dirrm share/gimp/help/C/layers/stack
@dirrm share/gimp/help/C/layers
@@ -1370,6 +1516,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/paths
@dirrm share/gimp/help/C/toolbox/help
@dirrm share/gimp/help/C/toolbox
+@dirrm share/gimp/help/C/images/examples
+@dirrm share/gimp/help/C/images/glossary
+@dirrm share/gimp/help/C/images/tools
@dirrm share/gimp/help/C/images
@dirrm share/gimp/help/C/image/edit
@dirrm share/gimp/help/C/image/select
@@ -1385,7 +1534,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/filters
@dirrm share/gimp/help/C/file
@dirrm share/gimp/help/C
-@dirrm share/gimp/help/images
@dirrm share/gimp/help
@dirrm share/gimp/palettes
@dirrm share/gimp/patterns
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index f4e2048be79e..ca69390ee316 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= gimp
-PORTVERSION= 1.2.2
-PORTREVISION= 1
-PORTEPOCH= 1
+PORTVERSION= 1.2.3
+PORTREVISION= 0
+#PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
@@ -24,7 +24,8 @@ LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
-SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+#SHLIBVER?= ${PORTVERSION:S/1.2.//g}
+SHLIBVER?= 2
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -34,6 +35,7 @@ USE_GTK= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
+LIBTOOLFILES= aclocal.m4
PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ARGS= --disable-perl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 7ae55b0c96c8..cb85cd7f3134 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.2.2.tar.bz2) = 680c01b0fc35cd68c540eb9d236f5e1a
+MD5 (gimp-1.2.3.tar.bz2) = b19235f19f524f772a4aef597a69b1da
diff --git a/graphics/gimpshop/files/patch-af b/graphics/gimpshop/files/patch-af
deleted file mode 100644
index 83f0d440beea..000000000000
--- a/graphics/gimpshop/files/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
---- gimptool.in.orig Thu Apr 27 02:07:40 2000
-+++ gimptool.in Thu Mar 15 05:55:24 2001
-@@ -234,19 +234,19 @@
- | --uninstall-script | --uninstall-admin-script )
- case $1 in
- --*install-bin)
-- install_cmd="@INSTALL_PROGRAM@"
-+ install_cmd="@INSTALL_SCRIPT@"
- install_dir="$HOME/@gimpdir@/plug-ins"
- ;;
- --install-bin-strip)
-- install_cmd="@INSTALL_PROGRAM@ -s"
-+ install_cmd="@INSTALL_SCRIPT@ -s"
- install_dir="$HOME/@gimpdir@/plug-ins"
- ;;
- --*install-admin-bin)
-- install_cmd="@INSTALL_PROGRAM@"
-+ install_cmd="@INSTALL_SCRIPT@"
- install_dir="$gimpplugindir/plug-ins"
- ;;
- --install-admin-bin-strip)
-- install_cmd="@INSTALL_PROGRAM@ -s"
-+ install_cmd="@INSTALL_SCRIPT@ -s"
- install_dir="$gimpplugindir/plug-ins"
- ;;
- --*install-script)
diff --git a/graphics/gimpshop/files/patch-ak b/graphics/gimpshop/files/patch-ak
deleted file mode 100644
index ead5311df6ff..000000000000
--- a/graphics/gimpshop/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
---- libgimp/Makefile.in.orig Sat Mar 4 11:10:43 2000
-+++ libgimp/Makefile.in Sun Apr 2 22:40:29 2000
-@@ -209,11 +209,11 @@
- gimpinclude_HEADERS = color_display.h color_selector.h gimp.h gimpchainbutton.h gimpcolorbutton.h gimpcolorspace.h gimpcompat.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimphelpui.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimppatheditor.h gimppixmap.h gimpquerybox.h gimpsizeentry.h gimpui.h gimpunit.h gimpunitmenu.h gimpvector.h gimpwidgets.h gimpintl.h parasite.h parasiteF.h parasiteP.h parasiteio.h
-
-
--libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
-
--libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
- libgimpui_la_LIBADD = $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimpshop/files/patch-ao b/graphics/gimpshop/files/patch-ao
deleted file mode 100644
index e5f1d5a3677c..000000000000
--- a/graphics/gimpshop/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig Sun Apr 2 22:41:29 2000
-+++ plug-ins/libgck/gck/Makefile.in Sun Apr 2 22:41:37 2000
-@@ -191,7 +191,7 @@
- gckinclude_HEADERS = gck.h
-
-
--libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-
-
- INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)
diff --git a/graphics/gimpshop/files/patch-gimptool-1.2.in b/graphics/gimpshop/files/patch-gimptool-1.2.in
new file mode 100644
index 000000000000..052cac1df256
--- /dev/null
+++ b/graphics/gimpshop/files/patch-gimptool-1.2.in
@@ -0,0 +1,26 @@
+--- gimptool-1.2.in.orig Wed Feb 20 14:04:01 2002
++++ gimptool-1.2.in Wed Feb 20 14:04:39 2002
+@@ -227,19 +227,19 @@
+ | --uninstall-script | --uninstall-admin-script )
+ case $1 in
+ --*install-bin)
+- install_cmd="@INSTALL_PROGRAM@"
++ install_cmd="@INSTALL_SCRIPT@"
+ install_dir="$HOME/@gimpdir@/plug-ins"
+ ;;
+ --install-bin-strip)
+- install_cmd="@INSTALL_PROGRAM@ -s"
++ install_cmd="@INSTALL_SCRIPT@ -s"
+ install_dir="$HOME/@gimpdir@/plug-ins"
+ ;;
+ --*install-admin-bin)
+- install_cmd="@INSTALL_PROGRAM@"
++ install_cmd="@INSTALL_SCRIPT@"
+ install_dir="$gimpplugindir/plug-ins"
+ ;;
+ --install-admin-bin-strip)
+- install_cmd="@INSTALL_PROGRAM@ -s"
++ install_cmd="@INSTALL_SCRIPT@ -s"
+ install_dir="$gimpplugindir/plug-ins"
+ ;;
+ --*install-script)
diff --git a/graphics/gimpshop/files/patch-libgimp::Makefile.in b/graphics/gimpshop/files/patch-libgimp::Makefile.in
new file mode 100644
index 000000000000..b9cdc7868203
--- /dev/null
+++ b/graphics/gimpshop/files/patch-libgimp::Makefile.in
@@ -0,0 +1,19 @@
+--- libgimp/Makefile.in.orig Tue Feb 12 05:46:08 2002
++++ libgimp/Makefile.in Wed Feb 20 14:02:07 2002
+@@ -225,13 +225,13 @@
+ gimpinclude_HEADERS = gimp.h ${PDB_WRAPPERS_H} gimpchainbutton.h gimpchannel.h gimpcolorbutton.h gimpcolordisplay.h gimpcolorselector.h gimpcolorspace.h gimpcompat.h gimpdrawable.h gimpdialog.h gimpenums.h gimpenv.h gimpexport.h gimpfeatures.h gimpfileselection.h gimpgradientselect.h gimphelpui.h gimpimage.h gimplayer.h gimplimits.h gimpmath.h gimpmatrix.h gimpmenu.h gimpmodule.h gimpparasite.h gimpparasiteio.h gimppatheditor.h gimppixelrgn.h gimppixmap.h gimpproceduraldb.h gimpquerybox.h gimpselection.h gimpsignal.h gimpsizeentry.h gimptile.h gimptypes.h gimpui.h gimpunit.h gimpunitmenu.h gimputils.h gimpvector.h gimpwidgets.h gimpintl.h
+
+
+-libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimp_export_symbols)
++libgimp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimp_export_symbols)
+
+-libgimp_la_LIBADD = $(GLIB_LIBS) -lm
++libgimp_la_LIBADD = $(GTK_LIBS) -lm
+
+ libgimp_la_DEPENDENCIES = $(gimp_def)
+
+-libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined) $(libgimpui_export_symbols)
++libgimpui_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined) $(libgimpui_export_symbols)
+
+
+ libgimpui_la_LIBADD = $(GTK_LIBS) $(conditional_libgimp_la)
diff --git a/graphics/gimpshop/files/patch-plug-ins::libgck::gck::Makefile.in b/graphics/gimpshop/files/patch-plug-ins::libgck::gck::Makefile.in
new file mode 100644
index 000000000000..6764015563eb
--- /dev/null
+++ b/graphics/gimpshop/files/patch-plug-ins::libgck::gck::Makefile.in
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig Tue Feb 12 05:46:23 2002
++++ plug-ins/libgck/gck/Makefile.in Wed Feb 20 14:00:02 2002
+@@ -193,7 +193,7 @@
+ gckinclude_HEADERS = gck.h
+
+
+-libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) $(no_undefined)
++libgck_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(no_undefined)
+
+
+ INCLUDES = -I.. -I$(srcdir)/.. -I$(top_srcdir) $(GTK_CFLAGS) -I$(includedir)
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 70fdc67a43b0..389cbc14e136 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -88,16 +88,25 @@ include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
+lib/libgck.la
lib/libgck.so
lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
+lib/libgimp.la
lib/libgimp.so
lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
+lib/libgimpui.la
lib/libgimpui.so
lib/libgimpui.so.%%SHLIBVER%%
+libexec/gimp/1.2/modules/libcolorsel_gtk.a
+libexec/gimp/1.2/modules/libcolorsel_gtk.la
libexec/gimp/1.2/modules/libcolorsel_gtk.so
+libexec/gimp/1.2/modules/libcolorsel_triangle.a
+libexec/gimp/1.2/modules/libcolorsel_triangle.la
libexec/gimp/1.2/modules/libcolorsel_triangle.so
+libexec/gimp/1.2/modules/libcolorsel_water.a
+libexec/gimp/1.2/modules/libcolorsel_water.la
libexec/gimp/1.2/modules/libcolorsel_water.so
libexec/gimp/1.2/plug-ins/AlienMap
libexec/gimp/1.2/plug-ins/AlienMap2
@@ -623,6 +632,7 @@ share/gimp/help/C/dialogs/color_selectors/built_in.html
share/gimp/help/C/dialogs/color_selectors/gtk.html
share/gimp/help/C/dialogs/color_selectors/triangle.html
share/gimp/help/C/dialogs/color_selectors/watercolor.html
+share/gimp/help/C/dialogs/confirm_save.html
share/gimp/help/C/dialogs/convert_to_indexed.html
share/gimp/help/C/dialogs/copy_named.html
share/gimp/help/C/dialogs/cut_named.html
@@ -630,6 +640,7 @@ share/gimp/help/C/dialogs/device_status.html
share/gimp/help/C/dialogs/document_index.html
share/gimp/help/C/dialogs/edit_qmask_attributes.html
share/gimp/help/C/dialogs/error_console.html
+share/gimp/help/C/dialogs/export_file.html
share/gimp/help/C/dialogs/feather_selection.html
share/gimp/help/C/dialogs/file_new.html
share/gimp/help/C/dialogs/file_open.html
@@ -707,38 +718,72 @@ share/gimp/help/C/file_formats.html
share/gimp/help/C/filters/alienmap.html
share/gimp/help/C/filters/alienmap2.html
share/gimp/help/C/filters/align_layers.html
+share/gimp/help/C/filters/animate_cells.html
+share/gimp/help/C/filters/animationplay.html
+share/gimp/help/C/filters/animoptimize.html
+share/gimp/help/C/filters/apply_lens.html
share/gimp/help/C/filters/applycanvas.html
share/gimp/help/C/filters/autocrop.html
share/gimp/help/C/filters/autostretch_hsv.html
+share/gimp/help/C/filters/blended2.html
share/gimp/help/C/filters/blinds.html
share/gimp/help/C/filters/blur.html
-share/gimp/help/C/filters/bz2.html
+share/gimp/help/C/filters/blowinout.html
+share/gimp/help/C/filters/border.html
share/gimp/help/C/filters/borderaverage.html
+share/gimp/help/C/filters/bumpmap.html
share/gimp/help/C/filters/burst.html
+share/gimp/help/C/filters/bz2.html
share/gimp/help/C/filters/c_astretch.html
share/gimp/help/C/filters/centerguide.html
share/gimp/help/C/filters/checkerboard.html
+share/gimp/help/C/filters/cml_explorer.html
share/gimp/help/C/filters/color_enhance.html
share/gimp/help/C/filters/colorify.html
share/gimp/help/C/filters/colortoalpha.html
+share/gimp/help/C/filters/convmatrix.html
share/gimp/help/C/filters/compose.html
share/gimp/help/C/filters/cubism.html
+share/gimp/help/C/filters/curve_bend.html
share/gimp/help/C/filters/decompose.html
+share/gimp/help/C/filters/deinterlace.html
+share/gimp/help/C/filters/depthmerge.html
+share/gimp/help/C/filters/despeckle.html
+share/gimp/help/C/filters/destripe.html
+share/gimp/help/C/filters/diffraction.html
+share/gimp/help/C/filters/displace.html
share/gimp/help/C/filters/ditherize.html
share/gimp/help/C/filters/dust.html
+share/gimp/help/C/filters/edge.html
+share/gimp/help/C/filters/emboss.html
+share/gimp/help/C/filters/engrave.html
share/gimp/help/C/filters/exchange.html
share/gimp/help/C/filters/fade-alpha.html
+share/gimp/help/C/filters/film.html
+share/gimp/help/C/filters/fire.html
share/gimp/help/C/filters/fit-text.html
share/gimp/help/C/filters/fits.html
share/gimp/help/C/filters/flame.html
+share/gimp/help/C/filters/flarefx.html
+share/gimp/help/C/filters/fractalexplorer.html
+share/gimp/help/C/filters/fractaltrace.html
share/gimp/help/C/filters/fp.html
share/gimp/help/C/filters/frame_filter.html
share/gimp/help/C/filters/gap_filter.html
+share/gimp/help/C/filters/gap_frontends.html
+share/gimp/help/C/filters/gap_navigator_dialog.html
+share/gimp/help/C/filters/gap_plugins.html
share/gimp/help/C/filters/gauss_iir.html
share/gimp/help/C/filters/gauss_rle.html
share/gimp/help/C/filters/gee_zoom.html
+share/gimp/help/C/filters/gdyntext.html
share/gimp/help/C/filters/gfig.html
+share/gimp/help/C/filters/gflare.html
share/gimp/help/C/filters/gih.html
+share/gimp/help/C/filters/gimpressionist.html
+share/gimp/help/C/filters/glasstile.html
+share/gimp/help/C/filters/glowing_steel.html
+share/gimp/help/C/filters/gouge.html
share/gimp/help/C/filters/gradmap.html
share/gimp/help/C/filters/grid.html
share/gimp/help/C/filters/gqbist.html
@@ -750,24 +795,45 @@ share/gimp/help/C/filters/guillotine.html
share/gimp/help/C/filters/gz.html
share/gimp/help/C/filters/hot.html
share/gimp/help/C/filters/hrz.html
+share/gimp/help/C/filters/ifscompose.html
+share/gimp/help/C/filters/illusion.html
+share/gimp/help/C/filters/image_tile.html
+share/gimp/help/C/filters/imagemap.html
+share/gimp/help/C/filters/iwarp.html
share/gimp/help/C/filters/index.html
share/gimp/help/C/filters/jigsaw.html
share/gimp/help/C/filters/jpeg.html
+share/gimp/help/C/filters/laplace.html
share/gimp/help/C/filters/layerfuncs.html
+share/gimp/help/C/filters/lic.html
+share/gimp/help/C/filters/lighting.html
+share/gimp/help/C/filters/logulator.html
share/gimp/help/C/filters/mail.html
+share/gimp/help/C/filters/map_to_gradient.html
share/gimp/help/C/filters/mapcolor.html
+share/gimp/help/C/filters/mapobject.html
share/gimp/help/C/filters/max_rgb.html
share/gimp/help/C/filters/maze.html
share/gimp/help/C/filters/mblur.html
share/gimp/help/C/filters/miff.html
+share/gimp/help/C/filters/mirrorsplit.html
share/gimp/help/C/filters/mosaic.html
+share/gimp/help/C/filters/newsprint.html
+share/gimp/help/C/filters/nlfilt.html
+share/gimp/help/C/filters/nova.html
share/gimp/help/C/filters/noisify.html
share/gimp/help/C/filters/none.html
share/gimp/help/C/filters/normalize.html
share/gimp/help/C/filters/oilify.html
+share/gimp/help/C/filters/pagecurl.html
+share/gimp/help/C/filters/papertile.html
share/gimp/help/C/filters/pat.html
+share/gimp/help/C/filters/perlotine.html
+share/gimp/help/C/filters/pixelmap.html
share/gimp/help/C/filters/pixelize.html
share/gimp/help/C/filters/plasma.html
+share/gimp/help/C/filters/polar.html
+share/gimp/help/C/filters/prep4gif.html
share/gimp/help/C/filters/png.html
share/gimp/help/C/filters/pnm.html
share/gimp/help/C/filters/print.html
@@ -779,21 +845,27 @@ share/gimp/help/C/filters/rcm.html
share/gimp/help/C/filters/repdup.html
share/gimp/help/C/filters/repeat_last.html
share/gimp/help/C/filters/reshow_last.html
+share/gimp/help/C/filters/resynth.html
share/gimp/help/C/filters/ripple.html
share/gimp/help/C/filters/rotate.html
share/gimp/help/C/filters/roundsel.html
share/gimp/help/C/filters/sample_colorize.html
share/gimp/help/C/filters/scatter_hsv.html
+share/gimp/help/C/filters/scratches.html
share/gimp/help/C/filters/sel2path.html
share/gimp/help/C/filters/sel_gauss.html
+share/gimp/help/C/filters/semiflatten.html
share/gimp/help/C/filters/sharpen.html
share/gimp/help/C/filters/shift.html
share/gimp/help/C/filters/sgi.html
-share/gimp/help/C/filters/semiflatten.html
+share/gimp/help/C/filters/sinus.html
share/gimp/help/C/filters/smooth_palette.html
share/gimp/help/C/filters/snoise.html
+share/gimp/help/C/filters/sobel.html
+share/gimp/help/C/filters/sparkle.html
share/gimp/help/C/filters/spread.html
share/gimp/help/C/filters/stampify.html
+share/gimp/help/C/filters/struc.html
share/gimp/help/C/filters/sunras.html
share/gimp/help/C/filters/terral_text.html
share/gimp/help/C/filters/tex-to-float.html
@@ -801,10 +873,25 @@ share/gimp/help/C/filters/tga.html
share/gimp/help/C/filters/threshold_alpha.html
share/gimp/help/C/filters/tiff.html
share/gimp/help/C/filters/tile.html
+share/gimp/help/C/filters/tileit.html
+share/gimp/help/C/filters/tiler.html
share/gimp/help/C/filters/tileable_blur.html
+share/gimp/help/C/filters/translogo.html
+share/gimp/help/C/filters/unsharp.html
share/gimp/help/C/filters/url.html
+share/gimp/help/C/filters/video.html
share/gimp/help/C/filters/vinvert.html
+share/gimp/help/C/filters/vpropagate.html
+share/gimp/help/C/filters/warp-sharp.html
+share/gimp/help/C/filters/warp.html
+share/gimp/help/C/filters/waves.html
+share/gimp/help/C/filters/webify.html
+share/gimp/help/C/filters/whirlpinch.html
+share/gimp/help/C/filters/wind.html
+share/gimp/help/C/filters/windify.html
share/gimp/help/C/filters/wmf.html
+share/gimp/help/C/filters/xachlego.html
+share/gimp/help/C/filters/xachshadow.html
share/gimp/help/C/filters/xachvision.html
share/gimp/help/C/filters/xwd.html
share/gimp/help/C/filters/zealouscrop.html
@@ -876,15 +963,97 @@ share/gimp/help/C/image/view/toggle_rulers.html
share/gimp/help/C/image/view/toggle_selection.html
share/gimp/help/C/image/view/toggle_statusbar.html
share/gimp/help/C/image/view/zoom.html
+share/gimp/help/C/images/add_point.png
+share/gimp/help/C/images/anchor_layer.png
+share/gimp/help/C/images/channel_to_selection.png
+share/gimp/help/C/images/delete_channel.png
+share/gimp/help/C/images/delete_directory.png
+share/gimp/help/C/images/delete_layer.png
+share/gimp/help/C/images/delete_path.png
+share/gimp/help/C/images/dotted_square.png
+share/gimp/help/C/images/duplicate_channel.png
+share/gimp/help/C/images/duplicate_layer.png
+share/gimp/help/C/images/duplicate_path.png
+share/gimp/help/C/images/edit_point.png
+share/gimp/help/C/images/eye.png
+share/gimp/help/C/images/examples/border-selection-01.png
+share/gimp/help/C/images/example/border-selection-02.png
+share/gimp/help/C/images/glossary/modes-addition.png
+share/gimp/help/C/images/glossary/modes-color.png
+share/gimp/help/C/images/glossary/modes-darken.png
+share/gimp/help/C/images/glossary/modes-difference.png
+share/gimp/help/C/images/glossary/modes-dissolve.png
+share/gimp/help/C/images/glossary/modes-divide.png
+share/gimp/help/C/images/glossary/modes-hue.png
+share/gimp/help/C/images/glossary/modes-lighten.png
+share/gimp/help/C/images/glossary/modes-multiply.png
+share/gimp/help/C/images/glossary/modes-normal.png
+share/gimp/help/C/images/glossary/modes-normal2.png
+share/gimp/help/C/images/glossary/modes-overlay.png
+share/gimp/help/C/images/glossary/modes-saturation.png
+share/gimp/help/C/images/glossary/modes-screen.png
+share/gimp/help/C/images/glossary/modes-subtract.png
+share/gimp/help/C/images/glossary/modes-value.png
+share/gimp/help/C/images/geezoom.png
share/gimp/help/C/images/image_menu.png
share/gimp/help/C/images/image_window.png
share/gimp/help/C/images/layers_dialog.png
+share/gimp/help/C/images/layers_example.png
share/gimp/help/C/images/layers_menu.png
+share/gimp/help/C/images/layers_overview.png
+share/gimp/help/C/images/lower_channel.png
+share/gimp/help/C/images/lower_directory.png
+share/gimp/help/C/images/lower_layer.png
+share/gimp/help/C/images/new_channel.png
+share/gimp/help/C/images/new_directory.png
+share/gimp/help/C/images/new_path.png
+share/gimp/help/C/images/new_point.png
+share/gimp/help/C/images/path_to_selection.png
+share/gimp/help/C/images/preview_box.png
share/gimp/help/C/images/print_color.png
share/gimp/help/C/images/print_main.png
share/gimp/help/C/images/print_setup.png
+share/gimp/help/C/images/raise_channel.png
+share/gimp/help/C/images/raise_directory.png
+share/gimp/help/C/images/raise_layer.png
+share/gimp/help/C/images/red_square.png
+share/gimp/help/C/images/remove_point.png
+share/gimp/help/C/images/selection_to_path.png
+share/gimp/help/C/images/stroke_path.png
share/gimp/help/C/images/tool_options.png
share/gimp/help/C/images/toolbox.png
+share/gimp/help/C/images/tools/tool-opt-increment.png
+share/gimp/help/C/images/tools/tool-opt-nonincrement.png
+share/gimp/help/C/images/tools/tool_airbrush.png
+share/gimp/help/C/images/tools/tool_apartheid.png
+share/gimp/help/C/images/tools/tool_bezier.png
+share/gimp/help/C/images/tools/tool_blend.png
+share/gimp/help/C/images/tools/tool_burndodge.png
+share/gimp/help/C/images/tools/tool_convolver.png
+share/gimp/help/C/images/tools/tool_crop.png
+share/gimp/help/C/images/tools/tool_dodgeburn.png
+share/gimp/help/C/images/tools/tool_ellipse_sel.png
+share/gimp/help/C/images/tools/tool_eraser.png
+share/gimp/help/C/images/tools/tool_fill.png
+share/gimp/help/C/images/tools/tool_flip.png
+share/gimp/help/C/images/tools/tool_free_sel.png
+share/gimp/help/C/images/tools/tool_fuzzy_sel.png
+share/gimp/help/C/images/tools/tool_gradient.png
+share/gimp/help/C/images/tools/tool_ink.png
+share/gimp/help/C/images/tools/tool_measure.png
+share/gimp/help/C/images/tools/tool_move.png
+share/gimp/help/C/images/tools/tool_paintbrush.png
+share/gimp/help/C/images/tools/tool_pencil.png
+share/gimp/help/C/images/tools/tool_picker.png
+share/gimp/help/C/images/tools/tool_rect_sel.png
+share/gimp/help/C/images/tools/tool_scissors.png
+share/gimp/help/C/images/tools/tool_smudge.png
+share/gimp/help/C/images/tools/tool_smuge.png
+share/gimp/help/C/images/tools/tool_text.png
+share/gimp/help/C/images/tools/tool_transform.png
+share/gimp/help/C/images/tools/tool_zoom.png
+share/gimp/help/C/images/triangle.png
+share/gimp/help/C/images/wilber.png
share/gimp/help/C/index.html
share/gimp/help/C/introduction.html
share/gimp/help/C/keyboard_shortcuts.html
@@ -947,6 +1116,9 @@ share/gimp/help/C/toolbox/help/context_help.html
@unexec rm -f %D/share/gimp/help/C/toolbox/help/dialogs
@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/toolbox/help/filters
@unexec rm -f %D/share/gimp/help/C/toolbox/help/filters
+share/gimp/help/C/stylesheet-images/note.gif
+share/gimp/help/C/stylesheet-images/tip.gif
+share/gimp/help/C/stylesheet-images/warning.gif
share/gimp/help/C/toolbox/index.html
share/gimp/help/C/toolbox/toolbox.html
share/gimp/help/C/tools/airbrush.html
@@ -986,42 +1158,6 @@ share/gimp/help/C/tools/threshold.html
share/gimp/help/C/tools/transform.html
share/gimp/help/C/using_gimp.html
share/gimp/help/C/why_gimp.html
-share/gimp/help/images/add_point.png
-share/gimp/help/images/anchor_layer.png
-share/gimp/help/images/channel_to_selection.png
-share/gimp/help/images/delete_channel.png
-share/gimp/help/images/delete_directory.png
-share/gimp/help/images/delete_layer.png
-share/gimp/help/images/delete_path.png
-share/gimp/help/images/dotted_square.png
-share/gimp/help/images/duplicate_channel.png
-share/gimp/help/images/duplicate_layer.png
-share/gimp/help/images/duplicate_path.png
-share/gimp/help/images/edit_point.png
-share/gimp/help/images/eek.png
-share/gimp/help/images/geezoom.png
-share/gimp/help/images/layers_example.png
-share/gimp/help/images/layers_overview.png
-share/gimp/help/images/lower_channel.png
-share/gimp/help/images/lower_directory.png
-share/gimp/help/images/lower_layer.png
-share/gimp/help/images/new_channel.png
-share/gimp/help/images/new_directory.png
-share/gimp/help/images/new_path.png
-share/gimp/help/images/new_point.png
-share/gimp/help/images/note.png
-share/gimp/help/images/path_to_selection.png
-share/gimp/help/images/preview_box.png
-share/gimp/help/images/raise_channel.png
-share/gimp/help/images/raise_directory.png
-share/gimp/help/images/raise_layer.png
-share/gimp/help/images/red_square.png
-share/gimp/help/images/remove_point.png
-share/gimp/help/images/selection_to_path.png
-share/gimp/help/images/stroke_path.png
-share/gimp/help/images/tip.png
-share/gimp/help/images/warning.png
-share/gimp/help/images/wilber.png
share/gimp/palettes/Bears
share/gimp/palettes/Bgold
share/gimp/palettes/Blues
@@ -1216,16 +1352,21 @@ share/gimp/scripts/web-browser.scm
share/gimp/scripts/xach-effect.scm
share/gimp/tips/gimp_conseils.fr.txt
share/gimp/tips/gimp_tips.cs.txt
+share/gimp/tips/gimp_tips.da.txt
share/gimp/tips/gimp_tips.de.txt
share/gimp/tips/gimp_tips.es.txt
+share/gimp/tips/gimp_tips.hu.txt
share/gimp/tips/gimp_tips.it.txt
share/gimp/tips/gimp_tips.ja.txt
share/gimp/tips/gimp_tips.ko.txt
+share/gimp/tips/gimp_tips.lt.txt
share/gimp/tips/gimp_tips.pl.txt
share/gimp/tips/gimp_tips.ru.txt
share/gimp/tips/gimp_tips.txt
share/gimp/tips/gimp_tips.tr.txt
share/gimp/tips/gimp_tips.uk.txt
+share/gimp/tips/gimp_tips.zh_CN.txt
+share/gimp/tips/gimp_tips.zh_TW.txt
share/gimp/user_install
share/locale/ca/LC_MESSAGES/gimp-libgimp.mo
share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
@@ -1331,10 +1472,14 @@ share/locale/uk/LC_MESSAGES/gimp-libgimp.mo
share/locale/uk/LC_MESSAGES/gimp-script-fu.mo
share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo
share/locale/uk/LC_MESSAGES/gimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-libgimp.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-script-fu.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp-std-plugins.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_CN/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/gimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-libgimp.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-script-fu.mo
+share/locale/zh_TW/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/gimp.mo
@dirrm etc/gimp/1.2
@dirrm etc/gimp
@dirrm include/gck
@@ -1363,6 +1508,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/dialogs/color_selectors
@dirrm share/gimp/help/C/dialogs/preferences
@dirrm share/gimp/help/C/dialogs
+@dirrm share/gimp/help/C/stylesheet-images
@dirrm share/gimp/help/C/tools
@dirrm share/gimp/help/C/layers/stack
@dirrm share/gimp/help/C/layers
@@ -1370,6 +1516,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/paths
@dirrm share/gimp/help/C/toolbox/help
@dirrm share/gimp/help/C/toolbox
+@dirrm share/gimp/help/C/images/examples
+@dirrm share/gimp/help/C/images/glossary
+@dirrm share/gimp/help/C/images/tools
@dirrm share/gimp/help/C/images
@dirrm share/gimp/help/C/image/edit
@dirrm share/gimp/help/C/image/select
@@ -1385,7 +1534,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gimp.mo
@dirrm share/gimp/help/C/filters
@dirrm share/gimp/help/C/file
@dirrm share/gimp/help/C
-@dirrm share/gimp/help/images
@dirrm share/gimp/help
@dirrm share/gimp/palettes
@dirrm share/gimp/patterns