aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/gimp-app-devel/Makefile43
-rw-r--r--graphics/gimp-app-devel/distinfo2
-rw-r--r--graphics/gimp-app-devel/files/patch-ab22
-rw-r--r--graphics/gimp-app-devel/files/patch-ah34
-rw-r--r--graphics/gimp-app-devel/pkg-plist155
-rw-r--r--graphics/gimp-app/Makefile43
-rw-r--r--graphics/gimp-app/distinfo2
-rw-r--r--graphics/gimp-app/files/patch-ab22
-rw-r--r--graphics/gimp-app/files/patch-ah34
-rw-r--r--graphics/gimp-app/pkg-plist155
-rw-r--r--graphics/gimp-devel/Makefile43
-rw-r--r--graphics/gimp-devel/distinfo2
-rw-r--r--graphics/gimp-devel/files/patch-ab22
-rw-r--r--graphics/gimp-devel/files/patch-ah34
-rw-r--r--graphics/gimp-devel/pkg-plist155
-rw-r--r--graphics/gimp/Makefile43
-rw-r--r--graphics/gimp/distinfo2
-rw-r--r--graphics/gimp/files/patch-ab22
-rw-r--r--graphics/gimp/files/patch-ah34
-rw-r--r--graphics/gimp/pkg-plist155
-rw-r--r--graphics/gimp1/Makefile43
-rw-r--r--graphics/gimp1/distinfo2
-rw-r--r--graphics/gimp1/files/patch-ab22
-rw-r--r--graphics/gimp1/files/patch-ah34
-rw-r--r--graphics/gimp1/pkg-plist155
-rw-r--r--graphics/gimpshop/Makefile43
-rw-r--r--graphics/gimpshop/distinfo2
-rw-r--r--graphics/gimpshop/files/patch-ab22
-rw-r--r--graphics/gimpshop/files/patch-ah34
-rw-r--r--graphics/gimpshop/pkg-plist155
30 files changed, 1056 insertions, 480 deletions
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index e31c449cf70f..3924ad384690 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 1.1.23
+PORTVERSION= 1.1.24
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -15,12 +15,6 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
MAINTAINER= vanilla@FreeBSD.org
-.if defined(WITH_PERL)
-BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-.endif
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
aa.1:${PORTSDIR}/graphics/aalib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -31,6 +25,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+SHLIBVER?= ${PORTVERSION:S/1.//g}
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -38,10 +33,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
-
-.if !defined(WITH_PERL)
-CONFIGURE_ARGS= --disable-perl
-.endif
+PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GLIB_CONFIG="${GLIB_CONFIG}" \
@@ -52,27 +44,28 @@ MAN1= gimp.1 gimptool.1
MAN5= gimprc.5
.if !defined(WITH_PERL)
-PLISTORIG= ${PKGDIR}/PLIST
-PLIST= ${WRKDIR}/PLIST
+CONFIGURE_ARGS= --disable-perl
+PLIST_SUB+= PERL:="@comment "
.else
-PLISTORIG= ${PKGDIR}/PLIST.perl
-PLIST= ${WRKDIR}/PLIST.perl
-.endif
-
-.if !defined(WITH_PERL)
-pre-fetch:
- @${ECHO} -n "If you want to compile with perl support use"
- @${ECHO} "'make -DWITH_PERL' instead"
+BUILD_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+PLIST_SUB+= PERL:=""
.endif
.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
&& !defined(WITHOUT_GNOME))
LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
-pre-install:
- @${CAT} ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:=""
.else
-pre-install:
- @${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:="@comment "
+.endif
+
+.if !defined(WITH_PERL)
+pre-fetch:
+ @${ECHO} -n "If you want to compile with perl support use "
+ @${ECHO} "'make -DWITH_PERL' instead"
.endif
post-install:
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 7b8db138bf6d..768dd8156426 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.23.tar.bz2) = 09ef0e0f676d36ca1c9a3193ec478f5c
+MD5 (gimp-1.1.24.tar.bz2) = 18c0ea8a814a468767a939e9895df6b3
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab
index 2e37f7c44cff..d0d7c4ef2415 100644
--- a/graphics/gimp-app-devel/files/patch-ab
+++ b/graphics/gimp-app-devel/files/patch-ab
@@ -1,13 +1,13 @@
---- plug-ins/common/url.c.orig Tue Feb 1 16:09:01 2000
-+++ plug-ins/common/url.c Sat Feb 19 13:51:36 2000
-@@ -158,8 +158,8 @@
- }
- else if (pid == 0)
- {
-- execlp ("wget", "wget", filename, "-O", tmpname, NULL);
-- g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
-+ execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
-+ g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+--- plug-ins/common/url.c.orig Wed Jun 7 21:46:43 2000
++++ plug-ins/common/url.c Mon Jun 26 12:20:54 2000
+@@ -187,8 +187,8 @@
+ dup (p[1]);
+ close (p[1]);
+ putenv ("LC_ALL=C"); /* produce deterministic output */
+- execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+- g_message ("url: exec() failed: wget: %s", g_strerror (errno));
++ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", tmpname, NULL);
++ g_message ("url: exec() failed: fetch: %s", g_strerror(errno));
g_free (tmpname);
- _exit(127);
+ _exit (127);
}
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
index 963f2c046f7d..02c26a51f920 100644
--- a/graphics/gimp-app-devel/files/patch-ah
+++ b/graphics/gimp-app-devel/files/patch-ah
@@ -1,30 +1,6 @@
---- configure.orig Wed Mar 29 18:55:23 2000
-+++ configure Sun Apr 9 14:46:44 2000
-@@ -1494,8 +1494,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
- # Reload cache, that may have been modified by ltconfig
-@@ -1509,10 +1509,10 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL="/usr/local/bin/libtool"
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3480,7 +3480,11 @@
+--- configure.orig Thu Jun 22 23:49:05 2000
++++ configure Mon Jun 26 16:04:16 2000
+@@ -3478,7 +3478,11 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -37,7 +13,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -7016,8 +7020,8 @@
+@@ -7148,8 +7152,8 @@
fi
@@ -48,7 +24,7 @@
localedir='${prefix}/${DATADIRNAME}/locale'
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8602,11 +8606,6 @@
+@@ -8415,11 +8419,6 @@
*) # Relative path.
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index e1e94302dbc8..0556077da6f5 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -4,59 +4,94 @@ bin/gimp.setfont
bin/gimptool
include/gck/gck.h
include/libgimp/gimp.h
+include/libgimp/gimp_pdb.h
+include/libgimp/gimpbrushes_pdb.h
+include/libgimp/gimpbrushselect_pdb.h
include/libgimp/gimpchainbutton.h
+include/libgimp/gimpchannel.h
+include/libgimp/gimpchannel_pdb.h
+include/libgimp/gimpchannelops_pdb.h
+include/libgimp/gimpcolor_pdb.h
include/libgimp/gimpcolorbutton.h
include/libgimp/gimpcolordisplay.h
include/libgimp/gimpcolorselector.h
include/libgimp/gimpcolorspace.h
include/libgimp/gimpcompat.h
+include/libgimp/gimpconvert_pdb.h
include/libgimp/gimpdialog.h
+include/libgimp/gimpdisplay_pdb.h
+include/libgimp/gimpdrawable.h
+include/libgimp/gimpdrawable_pdb.h
+include/libgimp/gimpedit_pdb.h
include/libgimp/gimpenums.h
include/libgimp/gimpenv.h
include/libgimp/gimpexport.h
include/libgimp/gimpfeatures.h
+include/libgimp/gimpfileops_pdb.h
include/libgimp/gimpfileselection.h
+include/libgimp/gimpfloatingsel_pdb.h
+include/libgimp/gimpgimprc_pdb.h
+include/libgimp/gimpgradients_pdb.h
+include/libgimp/gimpgradientselect.h
+include/libgimp/gimpgradientselect_pdb.h
+include/libgimp/gimpguides_pdb.h
+include/libgimp/gimphelp_pdb.h
include/libgimp/gimphelpui.h
+include/libgimp/gimpimage.h
+include/libgimp/gimpimage_pdb.h
include/libgimp/gimpintl.h
+include/libgimp/gimplayer.h
+include/libgimp/gimplayer_pdb.h
include/libgimp/gimplimits.h
include/libgimp/gimpmath.h
include/libgimp/gimpmatrix.h
include/libgimp/gimpmenu.h
+include/libgimp/gimpmessage_pdb.h
+include/libgimp/gimpmisc_pdb.h
include/libgimp/gimpmodule.h
+include/libgimp/gimppalette_pdb.h
include/libgimp/gimpparasite.h
+include/libgimp/gimpparasite_pdb.h
include/libgimp/gimpparasiteio.h
include/libgimp/gimppatheditor.h
+include/libgimp/gimppaths_pdb.h
+include/libgimp/gimppatterns_pdb.h
+include/libgimp/gimppatternselect_pdb.h
+include/libgimp/gimppixelrgn.h
include/libgimp/gimppixmap.h
+include/libgimp/gimpplugin_pdb.h
+include/libgimp/gimpproceduraldb.h
+include/libgimp/gimpproceduraldb_pdb.h
include/libgimp/gimpquerybox.h
+include/libgimp/gimpselection.h
+include/libgimp/gimpselection_pdb.h
include/libgimp/gimpsignal.h
include/libgimp/gimpsizeentry.h
+include/libgimp/gimptexttool_pdb.h
+include/libgimp/gimptile.h
+include/libgimp/gimptools_pdb.h
+include/libgimp/gimptypes.h
include/libgimp/gimpui.h
-include/libgimp/gimputils.h
+include/libgimp/gimpundo_pdb.h
include/libgimp/gimpunit.h
+include/libgimp/gimpunit_pdb.h
include/libgimp/gimpunitmenu.h
+include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
-lib/libgck.la
lib/libgck.so
-lib/libgck.so.23
+lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
-lib/libgimp.la
lib/libgimp.so
-lib/libgimp.so.23
+lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
-lib/libgimpui.la
lib/libgimpui.so
-lib/libgimpui.so.23
-libexec/gimp/1.1/modules/libcdisplay_gamma.la
+lib/libgimpui.so.%%SHLIBVER%%
libexec/gimp/1.1/modules/libcdisplay_gamma.so
-libexec/gimp/1.1/modules/libcdisplay_highcontrast.la
libexec/gimp/1.1/modules/libcdisplay_highcontrast.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.la
libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.la
libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.la
libexec/gimp/1.1/modules/libcolorsel_water.so
libexec/gimp/1.1/plug-ins/AlienMap
libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,22 +100,34 @@ libexec/gimp/1.1/plug-ins/CML_explorer
libexec/gimp/1.1/plug-ins/FractalExplorer
libexec/gimp/1.1/plug-ins/Lighting
libexec/gimp/1.1/plug-ins/MapObject
+%%PERL:%%libexec/gimp/1.1/plug-ins/PDB
+%%PERL:%%libexec/gimp/1.1/plug-ins/Perl-Server
libexec/gimp/1.1/plug-ins/aa
libexec/gimp/1.1/plug-ins/align_layers
+%%PERL:%%libexec/gimp/1.1/plug-ins/animate_cells
libexec/gimp/1.1/plug-ins/animationplay
libexec/gimp/1.1/plug-ins/animoptimize
libexec/gimp/1.1/plug-ins/apply_lens
libexec/gimp/1.1/plug-ins/autocrop
libexec/gimp/1.1/plug-ins/autostretch_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/avi
+%%PERL:%%libexec/gimp/1.1/plug-ins/blended2
libexec/gimp/1.1/plug-ins/blinds
+%%PERL:%%libexec/gimp/1.1/plug-ins/blowinout
libexec/gimp/1.1/plug-ins/blur
libexec/gimp/1.1/plug-ins/bmp
+%%PERL:%%libexec/gimp/1.1/plug-ins/border
libexec/gimp/1.1/plug-ins/borderaverage
+%%PERL:%%libexec/gimp/1.1/plug-ins/bricks
libexec/gimp/1.1/plug-ins/bumpmap
+%%PERL:%%libexec/gimp/1.1/plug-ins/burst
libexec/gimp/1.1/plug-ins/bz2
libexec/gimp/1.1/plug-ins/c_astretch
+%%PERL:%%libexec/gimp/1.1/plug-ins/centerguide
libexec/gimp/1.1/plug-ins/checkerboard
+%%PERL:%%libexec/gimp/1.1/plug-ins/clear_alpha
libexec/gimp/1.1/plug-ins/color_enhance
+%%PERL:%%libexec/gimp/1.1/plug-ins/colorhtml
libexec/gimp/1.1/plug-ins/colorify
libexec/gimp/1.1/plug-ins/colortoalpha
libexec/gimp/1.1/plug-ins/compose
@@ -88,6 +135,7 @@ libexec/gimp/1.1/plug-ins/convmatrix
libexec/gimp/1.1/plug-ins/csource
libexec/gimp/1.1/plug-ins/cubism
libexec/gimp/1.1/plug-ins/curve_bend
+%%PERL:%%libexec/gimp/1.1/plug-ins/dataurl
libexec/gimp/1.1/plug-ins/dbbrowser
libexec/gimp/1.1/plug-ins/decompose
libexec/gimp/1.1/plug-ins/deinterlace
@@ -96,17 +144,24 @@ libexec/gimp/1.1/plug-ins/despeckle
libexec/gimp/1.1/plug-ins/destripe
libexec/gimp/1.1/plug-ins/diffraction
libexec/gimp/1.1/plug-ins/displace
+%%PERL:%%libexec/gimp/1.1/plug-ins/ditherize
+%%PERL:%%libexec/gimp/1.1/plug-ins/dust
libexec/gimp/1.1/plug-ins/edge
libexec/gimp/1.1/plug-ins/emboss
libexec/gimp/1.1/plug-ins/engrave
libexec/gimp/1.1/plug-ins/exchange
libexec/gimp/1.1/plug-ins/faxg3
libexec/gimp/1.1/plug-ins/film
+%%PERL:%%libexec/gimp/1.1/plug-ins/fire
+%%PERL:%%libexec/gimp/1.1/plug-ins/fit-text
libexec/gimp/1.1/plug-ins/fits
libexec/gimp/1.1/plug-ins/flame
libexec/gimp/1.1/plug-ins/flarefx
+%%PERL:%%libexec/gimp/1.1/plug-ins/font_table
libexec/gimp/1.1/plug-ins/fp
libexec/gimp/1.1/plug-ins/fractaltrace
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_filter
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_reshuffle
libexec/gimp/1.1/plug-ins/gap_decode_mpeg
libexec/gimp/1.1/plug-ins/gap_filter
libexec/gimp/1.1/plug-ins/gap_frontends
@@ -125,30 +180,42 @@ libexec/gimp/1.1/plug-ins/gif
libexec/gimp/1.1/plug-ins/gifload
libexec/gimp/1.1/plug-ins/gimpressionist
libexec/gimp/1.1/plug-ins/glasstile
+%%PERL:%%libexec/gimp/1.1/plug-ins/glowing_steel
+%%PERL:%%libexec/gimp/1.1/plug-ins/goldenmean
+%%PERL:%%libexec/gimp/1.1/plug-ins/gouge
libexec/gimp/1.1/plug-ins/gpb
libexec/gimp/1.1/plug-ins/gqbist
libexec/gimp/1.1/plug-ins/gradmap
libexec/gimp/1.1/plug-ins/grid
libexec/gimp/1.1/plug-ins/gtm
+%%PERL:%%libexec/gimp/1.1/plug-ins/guide_remove
+%%PERL:%%libexec/gimp/1.1/plug-ins/guidegrid
+%%PERL:%%libexec/gimp/1.1/plug-ins/guides_to_selection
libexec/gimp/1.1/plug-ins/guillotine
libexec/gimp/1.1/plug-ins/gz
libexec/gimp/1.1/plug-ins/header
-libexec/gimp/1.1/plug-ins/helpbrowser
+%%GNOME:%%libexec/gimp/1.1/plug-ins/helpbrowser
libexec/gimp/1.1/plug-ins/hot
libexec/gimp/1.1/plug-ins/hrz
libexec/gimp/1.1/plug-ins/ifscompose
libexec/gimp/1.1/plug-ins/illusion
+%%PERL:%%libexec/gimp/1.1/plug-ins/image_tile
libexec/gimp/1.1/plug-ins/imagemap
+%%PERL:%%libexec/gimp/1.1/plug-ins/innerbevel
libexec/gimp/1.1/plug-ins/iwarp
libexec/gimp/1.1/plug-ins/jigsaw
libexec/gimp/1.1/plug-ins/jpeg
libexec/gimp/1.1/plug-ins/laplace
+%%PERL:%%libexec/gimp/1.1/plug-ins/layerfuncs
libexec/gimp/1.1/plug-ins/lic
+%%PERL:%%libexec/gimp/1.1/plug-ins/logulator
libexec/gimp/1.1/plug-ins/mail
libexec/gimp/1.1/plug-ins/mapcolor
libexec/gimp/1.1/plug-ins/max_rgb
libexec/gimp/1.1/plug-ins/maze
libexec/gimp/1.1/plug-ins/mblur
+%%PERL:%%libexec/gimp/1.1/plug-ins/miff
+%%PERL:%%libexec/gimp/1.1/plug-ins/mirrorsplit
libexec/gimp/1.1/plug-ins/mosaic
libexec/gimp/1.1/plug-ins/mpeg
libexec/gimp/1.1/plug-ins/newsprint
@@ -159,30 +226,41 @@ libexec/gimp/1.1/plug-ins/nova
libexec/gimp/1.1/plug-ins/oilify
libexec/gimp/1.1/plug-ins/pagecurl
libexec/gimp/1.1/plug-ins/papertile
+%%PERL:%%libexec/gimp/1.1/plug-ins/parasite-editor
libexec/gimp/1.1/plug-ins/pat
libexec/gimp/1.1/plug-ins/pcx
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlcc
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlotine
libexec/gimp/1.1/plug-ins/pix
libexec/gimp/1.1/plug-ins/pixelize
+%%PERL:%%libexec/gimp/1.1/plug-ins/pixelmap
libexec/gimp/1.1/plug-ins/plasma
libexec/gimp/1.1/plug-ins/plugindetails
libexec/gimp/1.1/plug-ins/png
libexec/gimp/1.1/plug-ins/pnm
libexec/gimp/1.1/plug-ins/polar
+%%PERL:%%libexec/gimp/1.1/plug-ins/prep4gif
libexec/gimp/1.1/plug-ins/print
libexec/gimp/1.1/plug-ins/ps
libexec/gimp/1.1/plug-ins/psd
libexec/gimp/1.1/plug-ins/psp
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomart1
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomblends
libexec/gimp/1.1/plug-ins/randomize
libexec/gimp/1.1/plug-ins/rcm
+%%PERL:%%libexec/gimp/1.1/plug-ins/repdup
libexec/gimp/1.1/plug-ins/ripple
libexec/gimp/1.1/plug-ins/rotate
+%%PERL:%%libexec/gimp/1.1/plug-ins/roundsel
libexec/gimp/1.1/plug-ins/sample_colorize
libexec/gimp/1.1/plug-ins/scatter_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/scratches
libexec/gimp/1.1/plug-ins/screenshot
libexec/gimp/1.1/plug-ins/script-fu
libexec/gimp/1.1/plug-ins/sel2path
libexec/gimp/1.1/plug-ins/sel_gauss
libexec/gimp/1.1/plug-ins/semiflatten
+%%PERL:%%libexec/gimp/1.1/plug-ins/sethspin
libexec/gimp/1.1/plug-ins/sgi
libexec/gimp/1.1/plug-ins/sharpen
libexec/gimp/1.1/plug-ins/shift
@@ -193,30 +271,43 @@ libexec/gimp/1.1/plug-ins/sobel
libexec/gimp/1.1/plug-ins/sparkle
libexec/gimp/1.1/plug-ins/spheredesigner
libexec/gimp/1.1/plug-ins/spread
+%%PERL:%%libexec/gimp/1.1/plug-ins/stampify
+%%PERL:%%libexec/gimp/1.1/plug-ins/stamps
libexec/gimp/1.1/plug-ins/struc
libexec/gimp/1.1/plug-ins/sunras
+%%PERL:%%libexec/gimp/1.1/plug-ins/terral_text
+%%PERL:%%libexec/gimp/1.1/plug-ins/tex-to-float
libexec/gimp/1.1/plug-ins/tga
libexec/gimp/1.1/plug-ins/threshold_alpha
libexec/gimp/1.1/plug-ins/tiff
libexec/gimp/1.1/plug-ins/tile
libexec/gimp/1.1/plug-ins/tileit
libexec/gimp/1.1/plug-ins/tiler
+%%PERL:%%libexec/gimp/1.1/plug-ins/translogo
libexec/gimp/1.1/plug-ins/uniteditor
libexec/gimp/1.1/plug-ins/unsharp
libexec/gimp/1.1/plug-ins/url
libexec/gimp/1.1/plug-ins/video
+%%PERL:%%libexec/gimp/1.1/plug-ins/view3d
libexec/gimp/1.1/plug-ins/vinvert
libexec/gimp/1.1/plug-ins/vpropagate
libexec/gimp/1.1/plug-ins/warp
+%%PERL:%%libexec/gimp/1.1/plug-ins/warp-sharp
libexec/gimp/1.1/plug-ins/waves
libexec/gimp/1.1/plug-ins/webbrowser
+%%PERL:%%libexec/gimp/1.1/plug-ins/webify
libexec/gimp/1.1/plug-ins/whirlpinch
libexec/gimp/1.1/plug-ins/wind
+%%PERL:%%libexec/gimp/1.1/plug-ins/windify
libexec/gimp/1.1/plug-ins/wmf
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachlego
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachshadow
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachvision
libexec/gimp/1.1/plug-ins/xbm
libexec/gimp/1.1/plug-ins/xjt
libexec/gimp/1.1/plug-ins/xpm
libexec/gimp/1.1/plug-ins/xwd
+%%PERL:%%libexec/gimp/1.1/plug-ins/yinyang
libexec/gimp/1.1/plug-ins/zealouscrop
share/aclocal/gimp.m4
share/gimp/brushes/10x10square.gbr
@@ -247,6 +338,9 @@ share/gimp/brushes/9fcircle.gbr
share/gimp/brushes/DStar11.gbr
share/gimp/brushes/DStar17.gbr
share/gimp/brushes/DStar25.gbr
+share/gimp/brushes/SketchBrush-16.gih
+share/gimp/brushes/SketchBrush-32.gih
+share/gimp/brushes/SketchBrush-64.gih
share/gimp/brushes/callig1.gbr
share/gimp/brushes/callig2.gbr
share/gimp/brushes/callig3.gbr
@@ -275,29 +369,56 @@ share/gimp/devel-docs/html/libgimp/index.sgml
share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpbrushes.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannelops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpcolor.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolordisplay.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorselector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcompat.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpconvert.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpdialog.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdisplay.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdrawable.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpedit.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenums.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenv.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpexport.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpfeatures.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfileops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfloatingsel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgimprc.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgradients.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpguides.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimphelp.html
share/gimp/devel-docs/html/libgimp/libgimp-gimphelpui.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpimage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimplayer.html
share/gimp/devel-docs/html/libgimp/libgimp-gimplimits.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmath.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmessage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmisc.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppalette.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasite.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppixelrgn.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpplugin.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpproceduraldb.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpselection.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpsignal.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptexttool.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptile.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptools.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpui.html
-share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpundo.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
@@ -1192,6 +1313,7 @@ share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
share/locale/ca/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ca/LC_MESSAGES/gimp.mo
share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/cs/LC_MESSAGES/gimp-perl.mo
share/locale/cs/LC_MESSAGES/gimp-script-fu.mo
share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
share/locale/cs/LC_MESSAGES/gimp.mo
@@ -1200,6 +1322,7 @@ share/locale/da/LC_MESSAGES/gimp-script-fu.mo
share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
share/locale/da/LC_MESSAGES/gimp.mo
share/locale/de/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/de/LC_MESSAGES/gimp-perl.mo
share/locale/de/LC_MESSAGES/gimp-script-fu.mo
share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
share/locale/de/LC_MESSAGES/gimp.mo
@@ -1216,6 +1339,7 @@ share/locale/fi/LC_MESSAGES/gimp-script-fu.mo
share/locale/fi/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fi/LC_MESSAGES/gimp.mo
share/locale/fr/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/fr/LC_MESSAGES/gimp-perl.mo
share/locale/fr/LC_MESSAGES/gimp-script-fu.mo
share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fr/LC_MESSAGES/gimp.mo
@@ -1224,6 +1348,7 @@ share/locale/hu/LC_MESSAGES/gimp-script-fu.mo
share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
share/locale/hu/LC_MESSAGES/gimp.mo
share/locale/it/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/it/LC_MESSAGES/gimp-perl.mo
share/locale/it/LC_MESSAGES/gimp-script-fu.mo
share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
share/locale/it/LC_MESSAGES/gimp.mo
@@ -1240,6 +1365,7 @@ share/locale/nl/LC_MESSAGES/gimp-script-fu.mo
share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/nl/LC_MESSAGES/gimp.mo
share/locale/no/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/no/LC_MESSAGES/gimp-perl.mo
share/locale/no/LC_MESSAGES/gimp-script-fu.mo
share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
share/locale/no/LC_MESSAGES/gimp.mo
@@ -1248,6 +1374,7 @@ share/locale/pl/LC_MESSAGES/gimp-script-fu.mo
share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/pl/LC_MESSAGES/gimp.mo
share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/ru/LC_MESSAGES/gimp-perl.mo
share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ru/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index e31c449cf70f..3924ad384690 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 1.1.23
+PORTVERSION= 1.1.24
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -15,12 +15,6 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
MAINTAINER= vanilla@FreeBSD.org
-.if defined(WITH_PERL)
-BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-.endif
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
aa.1:${PORTSDIR}/graphics/aalib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -31,6 +25,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+SHLIBVER?= ${PORTVERSION:S/1.//g}
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -38,10 +33,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
-
-.if !defined(WITH_PERL)
-CONFIGURE_ARGS= --disable-perl
-.endif
+PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GLIB_CONFIG="${GLIB_CONFIG}" \
@@ -52,27 +44,28 @@ MAN1= gimp.1 gimptool.1
MAN5= gimprc.5
.if !defined(WITH_PERL)
-PLISTORIG= ${PKGDIR}/PLIST
-PLIST= ${WRKDIR}/PLIST
+CONFIGURE_ARGS= --disable-perl
+PLIST_SUB+= PERL:="@comment "
.else
-PLISTORIG= ${PKGDIR}/PLIST.perl
-PLIST= ${WRKDIR}/PLIST.perl
-.endif
-
-.if !defined(WITH_PERL)
-pre-fetch:
- @${ECHO} -n "If you want to compile with perl support use"
- @${ECHO} "'make -DWITH_PERL' instead"
+BUILD_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+PLIST_SUB+= PERL:=""
.endif
.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
&& !defined(WITHOUT_GNOME))
LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
-pre-install:
- @${CAT} ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:=""
.else
-pre-install:
- @${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:="@comment "
+.endif
+
+.if !defined(WITH_PERL)
+pre-fetch:
+ @${ECHO} -n "If you want to compile with perl support use "
+ @${ECHO} "'make -DWITH_PERL' instead"
.endif
post-install:
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 7b8db138bf6d..768dd8156426 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.23.tar.bz2) = 09ef0e0f676d36ca1c9a3193ec478f5c
+MD5 (gimp-1.1.24.tar.bz2) = 18c0ea8a814a468767a939e9895df6b3
diff --git a/graphics/gimp-app/files/patch-ab b/graphics/gimp-app/files/patch-ab
index 2e37f7c44cff..d0d7c4ef2415 100644
--- a/graphics/gimp-app/files/patch-ab
+++ b/graphics/gimp-app/files/patch-ab
@@ -1,13 +1,13 @@
---- plug-ins/common/url.c.orig Tue Feb 1 16:09:01 2000
-+++ plug-ins/common/url.c Sat Feb 19 13:51:36 2000
-@@ -158,8 +158,8 @@
- }
- else if (pid == 0)
- {
-- execlp ("wget", "wget", filename, "-O", tmpname, NULL);
-- g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
-+ execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
-+ g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+--- plug-ins/common/url.c.orig Wed Jun 7 21:46:43 2000
++++ plug-ins/common/url.c Mon Jun 26 12:20:54 2000
+@@ -187,8 +187,8 @@
+ dup (p[1]);
+ close (p[1]);
+ putenv ("LC_ALL=C"); /* produce deterministic output */
+- execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+- g_message ("url: exec() failed: wget: %s", g_strerror (errno));
++ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", tmpname, NULL);
++ g_message ("url: exec() failed: fetch: %s", g_strerror(errno));
g_free (tmpname);
- _exit(127);
+ _exit (127);
}
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index 963f2c046f7d..02c26a51f920 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,30 +1,6 @@
---- configure.orig Wed Mar 29 18:55:23 2000
-+++ configure Sun Apr 9 14:46:44 2000
-@@ -1494,8 +1494,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
- # Reload cache, that may have been modified by ltconfig
-@@ -1509,10 +1509,10 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL="/usr/local/bin/libtool"
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3480,7 +3480,11 @@
+--- configure.orig Thu Jun 22 23:49:05 2000
++++ configure Mon Jun 26 16:04:16 2000
+@@ -3478,7 +3478,11 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -37,7 +13,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -7016,8 +7020,8 @@
+@@ -7148,8 +7152,8 @@
fi
@@ -48,7 +24,7 @@
localedir='${prefix}/${DATADIRNAME}/locale'
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8602,11 +8606,6 @@
+@@ -8415,11 +8419,6 @@
*) # Relative path.
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index e1e94302dbc8..0556077da6f5 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -4,59 +4,94 @@ bin/gimp.setfont
bin/gimptool
include/gck/gck.h
include/libgimp/gimp.h
+include/libgimp/gimp_pdb.h
+include/libgimp/gimpbrushes_pdb.h
+include/libgimp/gimpbrushselect_pdb.h
include/libgimp/gimpchainbutton.h
+include/libgimp/gimpchannel.h
+include/libgimp/gimpchannel_pdb.h
+include/libgimp/gimpchannelops_pdb.h
+include/libgimp/gimpcolor_pdb.h
include/libgimp/gimpcolorbutton.h
include/libgimp/gimpcolordisplay.h
include/libgimp/gimpcolorselector.h
include/libgimp/gimpcolorspace.h
include/libgimp/gimpcompat.h
+include/libgimp/gimpconvert_pdb.h
include/libgimp/gimpdialog.h
+include/libgimp/gimpdisplay_pdb.h
+include/libgimp/gimpdrawable.h
+include/libgimp/gimpdrawable_pdb.h
+include/libgimp/gimpedit_pdb.h
include/libgimp/gimpenums.h
include/libgimp/gimpenv.h
include/libgimp/gimpexport.h
include/libgimp/gimpfeatures.h
+include/libgimp/gimpfileops_pdb.h
include/libgimp/gimpfileselection.h
+include/libgimp/gimpfloatingsel_pdb.h
+include/libgimp/gimpgimprc_pdb.h
+include/libgimp/gimpgradients_pdb.h
+include/libgimp/gimpgradientselect.h
+include/libgimp/gimpgradientselect_pdb.h
+include/libgimp/gimpguides_pdb.h
+include/libgimp/gimphelp_pdb.h
include/libgimp/gimphelpui.h
+include/libgimp/gimpimage.h
+include/libgimp/gimpimage_pdb.h
include/libgimp/gimpintl.h
+include/libgimp/gimplayer.h
+include/libgimp/gimplayer_pdb.h
include/libgimp/gimplimits.h
include/libgimp/gimpmath.h
include/libgimp/gimpmatrix.h
include/libgimp/gimpmenu.h
+include/libgimp/gimpmessage_pdb.h
+include/libgimp/gimpmisc_pdb.h
include/libgimp/gimpmodule.h
+include/libgimp/gimppalette_pdb.h
include/libgimp/gimpparasite.h
+include/libgimp/gimpparasite_pdb.h
include/libgimp/gimpparasiteio.h
include/libgimp/gimppatheditor.h
+include/libgimp/gimppaths_pdb.h
+include/libgimp/gimppatterns_pdb.h
+include/libgimp/gimppatternselect_pdb.h
+include/libgimp/gimppixelrgn.h
include/libgimp/gimppixmap.h
+include/libgimp/gimpplugin_pdb.h
+include/libgimp/gimpproceduraldb.h
+include/libgimp/gimpproceduraldb_pdb.h
include/libgimp/gimpquerybox.h
+include/libgimp/gimpselection.h
+include/libgimp/gimpselection_pdb.h
include/libgimp/gimpsignal.h
include/libgimp/gimpsizeentry.h
+include/libgimp/gimptexttool_pdb.h
+include/libgimp/gimptile.h
+include/libgimp/gimptools_pdb.h
+include/libgimp/gimptypes.h
include/libgimp/gimpui.h
-include/libgimp/gimputils.h
+include/libgimp/gimpundo_pdb.h
include/libgimp/gimpunit.h
+include/libgimp/gimpunit_pdb.h
include/libgimp/gimpunitmenu.h
+include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
-lib/libgck.la
lib/libgck.so
-lib/libgck.so.23
+lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
-lib/libgimp.la
lib/libgimp.so
-lib/libgimp.so.23
+lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
-lib/libgimpui.la
lib/libgimpui.so
-lib/libgimpui.so.23
-libexec/gimp/1.1/modules/libcdisplay_gamma.la
+lib/libgimpui.so.%%SHLIBVER%%
libexec/gimp/1.1/modules/libcdisplay_gamma.so
-libexec/gimp/1.1/modules/libcdisplay_highcontrast.la
libexec/gimp/1.1/modules/libcdisplay_highcontrast.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.la
libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.la
libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.la
libexec/gimp/1.1/modules/libcolorsel_water.so
libexec/gimp/1.1/plug-ins/AlienMap
libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,22 +100,34 @@ libexec/gimp/1.1/plug-ins/CML_explorer
libexec/gimp/1.1/plug-ins/FractalExplorer
libexec/gimp/1.1/plug-ins/Lighting
libexec/gimp/1.1/plug-ins/MapObject
+%%PERL:%%libexec/gimp/1.1/plug-ins/PDB
+%%PERL:%%libexec/gimp/1.1/plug-ins/Perl-Server
libexec/gimp/1.1/plug-ins/aa
libexec/gimp/1.1/plug-ins/align_layers
+%%PERL:%%libexec/gimp/1.1/plug-ins/animate_cells
libexec/gimp/1.1/plug-ins/animationplay
libexec/gimp/1.1/plug-ins/animoptimize
libexec/gimp/1.1/plug-ins/apply_lens
libexec/gimp/1.1/plug-ins/autocrop
libexec/gimp/1.1/plug-ins/autostretch_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/avi
+%%PERL:%%libexec/gimp/1.1/plug-ins/blended2
libexec/gimp/1.1/plug-ins/blinds
+%%PERL:%%libexec/gimp/1.1/plug-ins/blowinout
libexec/gimp/1.1/plug-ins/blur
libexec/gimp/1.1/plug-ins/bmp
+%%PERL:%%libexec/gimp/1.1/plug-ins/border
libexec/gimp/1.1/plug-ins/borderaverage
+%%PERL:%%libexec/gimp/1.1/plug-ins/bricks
libexec/gimp/1.1/plug-ins/bumpmap
+%%PERL:%%libexec/gimp/1.1/plug-ins/burst
libexec/gimp/1.1/plug-ins/bz2
libexec/gimp/1.1/plug-ins/c_astretch
+%%PERL:%%libexec/gimp/1.1/plug-ins/centerguide
libexec/gimp/1.1/plug-ins/checkerboard
+%%PERL:%%libexec/gimp/1.1/plug-ins/clear_alpha
libexec/gimp/1.1/plug-ins/color_enhance
+%%PERL:%%libexec/gimp/1.1/plug-ins/colorhtml
libexec/gimp/1.1/plug-ins/colorify
libexec/gimp/1.1/plug-ins/colortoalpha
libexec/gimp/1.1/plug-ins/compose
@@ -88,6 +135,7 @@ libexec/gimp/1.1/plug-ins/convmatrix
libexec/gimp/1.1/plug-ins/csource
libexec/gimp/1.1/plug-ins/cubism
libexec/gimp/1.1/plug-ins/curve_bend
+%%PERL:%%libexec/gimp/1.1/plug-ins/dataurl
libexec/gimp/1.1/plug-ins/dbbrowser
libexec/gimp/1.1/plug-ins/decompose
libexec/gimp/1.1/plug-ins/deinterlace
@@ -96,17 +144,24 @@ libexec/gimp/1.1/plug-ins/despeckle
libexec/gimp/1.1/plug-ins/destripe
libexec/gimp/1.1/plug-ins/diffraction
libexec/gimp/1.1/plug-ins/displace
+%%PERL:%%libexec/gimp/1.1/plug-ins/ditherize
+%%PERL:%%libexec/gimp/1.1/plug-ins/dust
libexec/gimp/1.1/plug-ins/edge
libexec/gimp/1.1/plug-ins/emboss
libexec/gimp/1.1/plug-ins/engrave
libexec/gimp/1.1/plug-ins/exchange
libexec/gimp/1.1/plug-ins/faxg3
libexec/gimp/1.1/plug-ins/film
+%%PERL:%%libexec/gimp/1.1/plug-ins/fire
+%%PERL:%%libexec/gimp/1.1/plug-ins/fit-text
libexec/gimp/1.1/plug-ins/fits
libexec/gimp/1.1/plug-ins/flame
libexec/gimp/1.1/plug-ins/flarefx
+%%PERL:%%libexec/gimp/1.1/plug-ins/font_table
libexec/gimp/1.1/plug-ins/fp
libexec/gimp/1.1/plug-ins/fractaltrace
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_filter
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_reshuffle
libexec/gimp/1.1/plug-ins/gap_decode_mpeg
libexec/gimp/1.1/plug-ins/gap_filter
libexec/gimp/1.1/plug-ins/gap_frontends
@@ -125,30 +180,42 @@ libexec/gimp/1.1/plug-ins/gif
libexec/gimp/1.1/plug-ins/gifload
libexec/gimp/1.1/plug-ins/gimpressionist
libexec/gimp/1.1/plug-ins/glasstile
+%%PERL:%%libexec/gimp/1.1/plug-ins/glowing_steel
+%%PERL:%%libexec/gimp/1.1/plug-ins/goldenmean
+%%PERL:%%libexec/gimp/1.1/plug-ins/gouge
libexec/gimp/1.1/plug-ins/gpb
libexec/gimp/1.1/plug-ins/gqbist
libexec/gimp/1.1/plug-ins/gradmap
libexec/gimp/1.1/plug-ins/grid
libexec/gimp/1.1/plug-ins/gtm
+%%PERL:%%libexec/gimp/1.1/plug-ins/guide_remove
+%%PERL:%%libexec/gimp/1.1/plug-ins/guidegrid
+%%PERL:%%libexec/gimp/1.1/plug-ins/guides_to_selection
libexec/gimp/1.1/plug-ins/guillotine
libexec/gimp/1.1/plug-ins/gz
libexec/gimp/1.1/plug-ins/header
-libexec/gimp/1.1/plug-ins/helpbrowser
+%%GNOME:%%libexec/gimp/1.1/plug-ins/helpbrowser
libexec/gimp/1.1/plug-ins/hot
libexec/gimp/1.1/plug-ins/hrz
libexec/gimp/1.1/plug-ins/ifscompose
libexec/gimp/1.1/plug-ins/illusion
+%%PERL:%%libexec/gimp/1.1/plug-ins/image_tile
libexec/gimp/1.1/plug-ins/imagemap
+%%PERL:%%libexec/gimp/1.1/plug-ins/innerbevel
libexec/gimp/1.1/plug-ins/iwarp
libexec/gimp/1.1/plug-ins/jigsaw
libexec/gimp/1.1/plug-ins/jpeg
libexec/gimp/1.1/plug-ins/laplace
+%%PERL:%%libexec/gimp/1.1/plug-ins/layerfuncs
libexec/gimp/1.1/plug-ins/lic
+%%PERL:%%libexec/gimp/1.1/plug-ins/logulator
libexec/gimp/1.1/plug-ins/mail
libexec/gimp/1.1/plug-ins/mapcolor
libexec/gimp/1.1/plug-ins/max_rgb
libexec/gimp/1.1/plug-ins/maze
libexec/gimp/1.1/plug-ins/mblur
+%%PERL:%%libexec/gimp/1.1/plug-ins/miff
+%%PERL:%%libexec/gimp/1.1/plug-ins/mirrorsplit
libexec/gimp/1.1/plug-ins/mosaic
libexec/gimp/1.1/plug-ins/mpeg
libexec/gimp/1.1/plug-ins/newsprint
@@ -159,30 +226,41 @@ libexec/gimp/1.1/plug-ins/nova
libexec/gimp/1.1/plug-ins/oilify
libexec/gimp/1.1/plug-ins/pagecurl
libexec/gimp/1.1/plug-ins/papertile
+%%PERL:%%libexec/gimp/1.1/plug-ins/parasite-editor
libexec/gimp/1.1/plug-ins/pat
libexec/gimp/1.1/plug-ins/pcx
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlcc
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlotine
libexec/gimp/1.1/plug-ins/pix
libexec/gimp/1.1/plug-ins/pixelize
+%%PERL:%%libexec/gimp/1.1/plug-ins/pixelmap
libexec/gimp/1.1/plug-ins/plasma
libexec/gimp/1.1/plug-ins/plugindetails
libexec/gimp/1.1/plug-ins/png
libexec/gimp/1.1/plug-ins/pnm
libexec/gimp/1.1/plug-ins/polar
+%%PERL:%%libexec/gimp/1.1/plug-ins/prep4gif
libexec/gimp/1.1/plug-ins/print
libexec/gimp/1.1/plug-ins/ps
libexec/gimp/1.1/plug-ins/psd
libexec/gimp/1.1/plug-ins/psp
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomart1
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomblends
libexec/gimp/1.1/plug-ins/randomize
libexec/gimp/1.1/plug-ins/rcm
+%%PERL:%%libexec/gimp/1.1/plug-ins/repdup
libexec/gimp/1.1/plug-ins/ripple
libexec/gimp/1.1/plug-ins/rotate
+%%PERL:%%libexec/gimp/1.1/plug-ins/roundsel
libexec/gimp/1.1/plug-ins/sample_colorize
libexec/gimp/1.1/plug-ins/scatter_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/scratches
libexec/gimp/1.1/plug-ins/screenshot
libexec/gimp/1.1/plug-ins/script-fu
libexec/gimp/1.1/plug-ins/sel2path
libexec/gimp/1.1/plug-ins/sel_gauss
libexec/gimp/1.1/plug-ins/semiflatten
+%%PERL:%%libexec/gimp/1.1/plug-ins/sethspin
libexec/gimp/1.1/plug-ins/sgi
libexec/gimp/1.1/plug-ins/sharpen
libexec/gimp/1.1/plug-ins/shift
@@ -193,30 +271,43 @@ libexec/gimp/1.1/plug-ins/sobel
libexec/gimp/1.1/plug-ins/sparkle
libexec/gimp/1.1/plug-ins/spheredesigner
libexec/gimp/1.1/plug-ins/spread
+%%PERL:%%libexec/gimp/1.1/plug-ins/stampify
+%%PERL:%%libexec/gimp/1.1/plug-ins/stamps
libexec/gimp/1.1/plug-ins/struc
libexec/gimp/1.1/plug-ins/sunras
+%%PERL:%%libexec/gimp/1.1/plug-ins/terral_text
+%%PERL:%%libexec/gimp/1.1/plug-ins/tex-to-float
libexec/gimp/1.1/plug-ins/tga
libexec/gimp/1.1/plug-ins/threshold_alpha
libexec/gimp/1.1/plug-ins/tiff
libexec/gimp/1.1/plug-ins/tile
libexec/gimp/1.1/plug-ins/tileit
libexec/gimp/1.1/plug-ins/tiler
+%%PERL:%%libexec/gimp/1.1/plug-ins/translogo
libexec/gimp/1.1/plug-ins/uniteditor
libexec/gimp/1.1/plug-ins/unsharp
libexec/gimp/1.1/plug-ins/url
libexec/gimp/1.1/plug-ins/video
+%%PERL:%%libexec/gimp/1.1/plug-ins/view3d
libexec/gimp/1.1/plug-ins/vinvert
libexec/gimp/1.1/plug-ins/vpropagate
libexec/gimp/1.1/plug-ins/warp
+%%PERL:%%libexec/gimp/1.1/plug-ins/warp-sharp
libexec/gimp/1.1/plug-ins/waves
libexec/gimp/1.1/plug-ins/webbrowser
+%%PERL:%%libexec/gimp/1.1/plug-ins/webify
libexec/gimp/1.1/plug-ins/whirlpinch
libexec/gimp/1.1/plug-ins/wind
+%%PERL:%%libexec/gimp/1.1/plug-ins/windify
libexec/gimp/1.1/plug-ins/wmf
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachlego
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachshadow
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachvision
libexec/gimp/1.1/plug-ins/xbm
libexec/gimp/1.1/plug-ins/xjt
libexec/gimp/1.1/plug-ins/xpm
libexec/gimp/1.1/plug-ins/xwd
+%%PERL:%%libexec/gimp/1.1/plug-ins/yinyang
libexec/gimp/1.1/plug-ins/zealouscrop
share/aclocal/gimp.m4
share/gimp/brushes/10x10square.gbr
@@ -247,6 +338,9 @@ share/gimp/brushes/9fcircle.gbr
share/gimp/brushes/DStar11.gbr
share/gimp/brushes/DStar17.gbr
share/gimp/brushes/DStar25.gbr
+share/gimp/brushes/SketchBrush-16.gih
+share/gimp/brushes/SketchBrush-32.gih
+share/gimp/brushes/SketchBrush-64.gih
share/gimp/brushes/callig1.gbr
share/gimp/brushes/callig2.gbr
share/gimp/brushes/callig3.gbr
@@ -275,29 +369,56 @@ share/gimp/devel-docs/html/libgimp/index.sgml
share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpbrushes.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannelops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpcolor.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolordisplay.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorselector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcompat.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpconvert.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpdialog.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdisplay.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdrawable.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpedit.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenums.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenv.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpexport.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpfeatures.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfileops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfloatingsel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgimprc.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgradients.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpguides.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimphelp.html
share/gimp/devel-docs/html/libgimp/libgimp-gimphelpui.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpimage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimplayer.html
share/gimp/devel-docs/html/libgimp/libgimp-gimplimits.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmath.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmessage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmisc.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppalette.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasite.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppixelrgn.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpplugin.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpproceduraldb.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpselection.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpsignal.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptexttool.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptile.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptools.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpui.html
-share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpundo.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
@@ -1192,6 +1313,7 @@ share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
share/locale/ca/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ca/LC_MESSAGES/gimp.mo
share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/cs/LC_MESSAGES/gimp-perl.mo
share/locale/cs/LC_MESSAGES/gimp-script-fu.mo
share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
share/locale/cs/LC_MESSAGES/gimp.mo
@@ -1200,6 +1322,7 @@ share/locale/da/LC_MESSAGES/gimp-script-fu.mo
share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
share/locale/da/LC_MESSAGES/gimp.mo
share/locale/de/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/de/LC_MESSAGES/gimp-perl.mo
share/locale/de/LC_MESSAGES/gimp-script-fu.mo
share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
share/locale/de/LC_MESSAGES/gimp.mo
@@ -1216,6 +1339,7 @@ share/locale/fi/LC_MESSAGES/gimp-script-fu.mo
share/locale/fi/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fi/LC_MESSAGES/gimp.mo
share/locale/fr/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/fr/LC_MESSAGES/gimp-perl.mo
share/locale/fr/LC_MESSAGES/gimp-script-fu.mo
share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fr/LC_MESSAGES/gimp.mo
@@ -1224,6 +1348,7 @@ share/locale/hu/LC_MESSAGES/gimp-script-fu.mo
share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
share/locale/hu/LC_MESSAGES/gimp.mo
share/locale/it/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/it/LC_MESSAGES/gimp-perl.mo
share/locale/it/LC_MESSAGES/gimp-script-fu.mo
share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
share/locale/it/LC_MESSAGES/gimp.mo
@@ -1240,6 +1365,7 @@ share/locale/nl/LC_MESSAGES/gimp-script-fu.mo
share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/nl/LC_MESSAGES/gimp.mo
share/locale/no/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/no/LC_MESSAGES/gimp-perl.mo
share/locale/no/LC_MESSAGES/gimp-script-fu.mo
share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
share/locale/no/LC_MESSAGES/gimp.mo
@@ -1248,6 +1374,7 @@ share/locale/pl/LC_MESSAGES/gimp-script-fu.mo
share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/pl/LC_MESSAGES/gimp.mo
share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/ru/LC_MESSAGES/gimp-perl.mo
share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ru/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index e31c449cf70f..3924ad384690 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 1.1.23
+PORTVERSION= 1.1.24
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -15,12 +15,6 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
MAINTAINER= vanilla@FreeBSD.org
-.if defined(WITH_PERL)
-BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-.endif
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
aa.1:${PORTSDIR}/graphics/aalib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -31,6 +25,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+SHLIBVER?= ${PORTVERSION:S/1.//g}
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -38,10 +33,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
-
-.if !defined(WITH_PERL)
-CONFIGURE_ARGS= --disable-perl
-.endif
+PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GLIB_CONFIG="${GLIB_CONFIG}" \
@@ -52,27 +44,28 @@ MAN1= gimp.1 gimptool.1
MAN5= gimprc.5
.if !defined(WITH_PERL)
-PLISTORIG= ${PKGDIR}/PLIST
-PLIST= ${WRKDIR}/PLIST
+CONFIGURE_ARGS= --disable-perl
+PLIST_SUB+= PERL:="@comment "
.else
-PLISTORIG= ${PKGDIR}/PLIST.perl
-PLIST= ${WRKDIR}/PLIST.perl
-.endif
-
-.if !defined(WITH_PERL)
-pre-fetch:
- @${ECHO} -n "If you want to compile with perl support use"
- @${ECHO} "'make -DWITH_PERL' instead"
+BUILD_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+PLIST_SUB+= PERL:=""
.endif
.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
&& !defined(WITHOUT_GNOME))
LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
-pre-install:
- @${CAT} ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:=""
.else
-pre-install:
- @${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:="@comment "
+.endif
+
+.if !defined(WITH_PERL)
+pre-fetch:
+ @${ECHO} -n "If you want to compile with perl support use "
+ @${ECHO} "'make -DWITH_PERL' instead"
.endif
post-install:
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 7b8db138bf6d..768dd8156426 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.23.tar.bz2) = 09ef0e0f676d36ca1c9a3193ec478f5c
+MD5 (gimp-1.1.24.tar.bz2) = 18c0ea8a814a468767a939e9895df6b3
diff --git a/graphics/gimp-devel/files/patch-ab b/graphics/gimp-devel/files/patch-ab
index 2e37f7c44cff..d0d7c4ef2415 100644
--- a/graphics/gimp-devel/files/patch-ab
+++ b/graphics/gimp-devel/files/patch-ab
@@ -1,13 +1,13 @@
---- plug-ins/common/url.c.orig Tue Feb 1 16:09:01 2000
-+++ plug-ins/common/url.c Sat Feb 19 13:51:36 2000
-@@ -158,8 +158,8 @@
- }
- else if (pid == 0)
- {
-- execlp ("wget", "wget", filename, "-O", tmpname, NULL);
-- g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
-+ execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
-+ g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+--- plug-ins/common/url.c.orig Wed Jun 7 21:46:43 2000
++++ plug-ins/common/url.c Mon Jun 26 12:20:54 2000
+@@ -187,8 +187,8 @@
+ dup (p[1]);
+ close (p[1]);
+ putenv ("LC_ALL=C"); /* produce deterministic output */
+- execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+- g_message ("url: exec() failed: wget: %s", g_strerror (errno));
++ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", tmpname, NULL);
++ g_message ("url: exec() failed: fetch: %s", g_strerror(errno));
g_free (tmpname);
- _exit(127);
+ _exit (127);
}
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index 963f2c046f7d..02c26a51f920 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -1,30 +1,6 @@
---- configure.orig Wed Mar 29 18:55:23 2000
-+++ configure Sun Apr 9 14:46:44 2000
-@@ -1494,8 +1494,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
- # Reload cache, that may have been modified by ltconfig
-@@ -1509,10 +1509,10 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL="/usr/local/bin/libtool"
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3480,7 +3480,11 @@
+--- configure.orig Thu Jun 22 23:49:05 2000
++++ configure Mon Jun 26 16:04:16 2000
+@@ -3478,7 +3478,11 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -37,7 +13,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -7016,8 +7020,8 @@
+@@ -7148,8 +7152,8 @@
fi
@@ -48,7 +24,7 @@
localedir='${prefix}/${DATADIRNAME}/locale'
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8602,11 +8606,6 @@
+@@ -8415,11 +8419,6 @@
*) # Relative path.
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index e1e94302dbc8..0556077da6f5 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -4,59 +4,94 @@ bin/gimp.setfont
bin/gimptool
include/gck/gck.h
include/libgimp/gimp.h
+include/libgimp/gimp_pdb.h
+include/libgimp/gimpbrushes_pdb.h
+include/libgimp/gimpbrushselect_pdb.h
include/libgimp/gimpchainbutton.h
+include/libgimp/gimpchannel.h
+include/libgimp/gimpchannel_pdb.h
+include/libgimp/gimpchannelops_pdb.h
+include/libgimp/gimpcolor_pdb.h
include/libgimp/gimpcolorbutton.h
include/libgimp/gimpcolordisplay.h
include/libgimp/gimpcolorselector.h
include/libgimp/gimpcolorspace.h
include/libgimp/gimpcompat.h
+include/libgimp/gimpconvert_pdb.h
include/libgimp/gimpdialog.h
+include/libgimp/gimpdisplay_pdb.h
+include/libgimp/gimpdrawable.h
+include/libgimp/gimpdrawable_pdb.h
+include/libgimp/gimpedit_pdb.h
include/libgimp/gimpenums.h
include/libgimp/gimpenv.h
include/libgimp/gimpexport.h
include/libgimp/gimpfeatures.h
+include/libgimp/gimpfileops_pdb.h
include/libgimp/gimpfileselection.h
+include/libgimp/gimpfloatingsel_pdb.h
+include/libgimp/gimpgimprc_pdb.h
+include/libgimp/gimpgradients_pdb.h
+include/libgimp/gimpgradientselect.h
+include/libgimp/gimpgradientselect_pdb.h
+include/libgimp/gimpguides_pdb.h
+include/libgimp/gimphelp_pdb.h
include/libgimp/gimphelpui.h
+include/libgimp/gimpimage.h
+include/libgimp/gimpimage_pdb.h
include/libgimp/gimpintl.h
+include/libgimp/gimplayer.h
+include/libgimp/gimplayer_pdb.h
include/libgimp/gimplimits.h
include/libgimp/gimpmath.h
include/libgimp/gimpmatrix.h
include/libgimp/gimpmenu.h
+include/libgimp/gimpmessage_pdb.h
+include/libgimp/gimpmisc_pdb.h
include/libgimp/gimpmodule.h
+include/libgimp/gimppalette_pdb.h
include/libgimp/gimpparasite.h
+include/libgimp/gimpparasite_pdb.h
include/libgimp/gimpparasiteio.h
include/libgimp/gimppatheditor.h
+include/libgimp/gimppaths_pdb.h
+include/libgimp/gimppatterns_pdb.h
+include/libgimp/gimppatternselect_pdb.h
+include/libgimp/gimppixelrgn.h
include/libgimp/gimppixmap.h
+include/libgimp/gimpplugin_pdb.h
+include/libgimp/gimpproceduraldb.h
+include/libgimp/gimpproceduraldb_pdb.h
include/libgimp/gimpquerybox.h
+include/libgimp/gimpselection.h
+include/libgimp/gimpselection_pdb.h
include/libgimp/gimpsignal.h
include/libgimp/gimpsizeentry.h
+include/libgimp/gimptexttool_pdb.h
+include/libgimp/gimptile.h
+include/libgimp/gimptools_pdb.h
+include/libgimp/gimptypes.h
include/libgimp/gimpui.h
-include/libgimp/gimputils.h
+include/libgimp/gimpundo_pdb.h
include/libgimp/gimpunit.h
+include/libgimp/gimpunit_pdb.h
include/libgimp/gimpunitmenu.h
+include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
-lib/libgck.la
lib/libgck.so
-lib/libgck.so.23
+lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
-lib/libgimp.la
lib/libgimp.so
-lib/libgimp.so.23
+lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
-lib/libgimpui.la
lib/libgimpui.so
-lib/libgimpui.so.23
-libexec/gimp/1.1/modules/libcdisplay_gamma.la
+lib/libgimpui.so.%%SHLIBVER%%
libexec/gimp/1.1/modules/libcdisplay_gamma.so
-libexec/gimp/1.1/modules/libcdisplay_highcontrast.la
libexec/gimp/1.1/modules/libcdisplay_highcontrast.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.la
libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.la
libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.la
libexec/gimp/1.1/modules/libcolorsel_water.so
libexec/gimp/1.1/plug-ins/AlienMap
libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,22 +100,34 @@ libexec/gimp/1.1/plug-ins/CML_explorer
libexec/gimp/1.1/plug-ins/FractalExplorer
libexec/gimp/1.1/plug-ins/Lighting
libexec/gimp/1.1/plug-ins/MapObject
+%%PERL:%%libexec/gimp/1.1/plug-ins/PDB
+%%PERL:%%libexec/gimp/1.1/plug-ins/Perl-Server
libexec/gimp/1.1/plug-ins/aa
libexec/gimp/1.1/plug-ins/align_layers
+%%PERL:%%libexec/gimp/1.1/plug-ins/animate_cells
libexec/gimp/1.1/plug-ins/animationplay
libexec/gimp/1.1/plug-ins/animoptimize
libexec/gimp/1.1/plug-ins/apply_lens
libexec/gimp/1.1/plug-ins/autocrop
libexec/gimp/1.1/plug-ins/autostretch_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/avi
+%%PERL:%%libexec/gimp/1.1/plug-ins/blended2
libexec/gimp/1.1/plug-ins/blinds
+%%PERL:%%libexec/gimp/1.1/plug-ins/blowinout
libexec/gimp/1.1/plug-ins/blur
libexec/gimp/1.1/plug-ins/bmp
+%%PERL:%%libexec/gimp/1.1/plug-ins/border
libexec/gimp/1.1/plug-ins/borderaverage
+%%PERL:%%libexec/gimp/1.1/plug-ins/bricks
libexec/gimp/1.1/plug-ins/bumpmap
+%%PERL:%%libexec/gimp/1.1/plug-ins/burst
libexec/gimp/1.1/plug-ins/bz2
libexec/gimp/1.1/plug-ins/c_astretch
+%%PERL:%%libexec/gimp/1.1/plug-ins/centerguide
libexec/gimp/1.1/plug-ins/checkerboard
+%%PERL:%%libexec/gimp/1.1/plug-ins/clear_alpha
libexec/gimp/1.1/plug-ins/color_enhance
+%%PERL:%%libexec/gimp/1.1/plug-ins/colorhtml
libexec/gimp/1.1/plug-ins/colorify
libexec/gimp/1.1/plug-ins/colortoalpha
libexec/gimp/1.1/plug-ins/compose
@@ -88,6 +135,7 @@ libexec/gimp/1.1/plug-ins/convmatrix
libexec/gimp/1.1/plug-ins/csource
libexec/gimp/1.1/plug-ins/cubism
libexec/gimp/1.1/plug-ins/curve_bend
+%%PERL:%%libexec/gimp/1.1/plug-ins/dataurl
libexec/gimp/1.1/plug-ins/dbbrowser
libexec/gimp/1.1/plug-ins/decompose
libexec/gimp/1.1/plug-ins/deinterlace
@@ -96,17 +144,24 @@ libexec/gimp/1.1/plug-ins/despeckle
libexec/gimp/1.1/plug-ins/destripe
libexec/gimp/1.1/plug-ins/diffraction
libexec/gimp/1.1/plug-ins/displace
+%%PERL:%%libexec/gimp/1.1/plug-ins/ditherize
+%%PERL:%%libexec/gimp/1.1/plug-ins/dust
libexec/gimp/1.1/plug-ins/edge
libexec/gimp/1.1/plug-ins/emboss
libexec/gimp/1.1/plug-ins/engrave
libexec/gimp/1.1/plug-ins/exchange
libexec/gimp/1.1/plug-ins/faxg3
libexec/gimp/1.1/plug-ins/film
+%%PERL:%%libexec/gimp/1.1/plug-ins/fire
+%%PERL:%%libexec/gimp/1.1/plug-ins/fit-text
libexec/gimp/1.1/plug-ins/fits
libexec/gimp/1.1/plug-ins/flame
libexec/gimp/1.1/plug-ins/flarefx
+%%PERL:%%libexec/gimp/1.1/plug-ins/font_table
libexec/gimp/1.1/plug-ins/fp
libexec/gimp/1.1/plug-ins/fractaltrace
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_filter
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_reshuffle
libexec/gimp/1.1/plug-ins/gap_decode_mpeg
libexec/gimp/1.1/plug-ins/gap_filter
libexec/gimp/1.1/plug-ins/gap_frontends
@@ -125,30 +180,42 @@ libexec/gimp/1.1/plug-ins/gif
libexec/gimp/1.1/plug-ins/gifload
libexec/gimp/1.1/plug-ins/gimpressionist
libexec/gimp/1.1/plug-ins/glasstile
+%%PERL:%%libexec/gimp/1.1/plug-ins/glowing_steel
+%%PERL:%%libexec/gimp/1.1/plug-ins/goldenmean
+%%PERL:%%libexec/gimp/1.1/plug-ins/gouge
libexec/gimp/1.1/plug-ins/gpb
libexec/gimp/1.1/plug-ins/gqbist
libexec/gimp/1.1/plug-ins/gradmap
libexec/gimp/1.1/plug-ins/grid
libexec/gimp/1.1/plug-ins/gtm
+%%PERL:%%libexec/gimp/1.1/plug-ins/guide_remove
+%%PERL:%%libexec/gimp/1.1/plug-ins/guidegrid
+%%PERL:%%libexec/gimp/1.1/plug-ins/guides_to_selection
libexec/gimp/1.1/plug-ins/guillotine
libexec/gimp/1.1/plug-ins/gz
libexec/gimp/1.1/plug-ins/header
-libexec/gimp/1.1/plug-ins/helpbrowser
+%%GNOME:%%libexec/gimp/1.1/plug-ins/helpbrowser
libexec/gimp/1.1/plug-ins/hot
libexec/gimp/1.1/plug-ins/hrz
libexec/gimp/1.1/plug-ins/ifscompose
libexec/gimp/1.1/plug-ins/illusion
+%%PERL:%%libexec/gimp/1.1/plug-ins/image_tile
libexec/gimp/1.1/plug-ins/imagemap
+%%PERL:%%libexec/gimp/1.1/plug-ins/innerbevel
libexec/gimp/1.1/plug-ins/iwarp
libexec/gimp/1.1/plug-ins/jigsaw
libexec/gimp/1.1/plug-ins/jpeg
libexec/gimp/1.1/plug-ins/laplace
+%%PERL:%%libexec/gimp/1.1/plug-ins/layerfuncs
libexec/gimp/1.1/plug-ins/lic
+%%PERL:%%libexec/gimp/1.1/plug-ins/logulator
libexec/gimp/1.1/plug-ins/mail
libexec/gimp/1.1/plug-ins/mapcolor
libexec/gimp/1.1/plug-ins/max_rgb
libexec/gimp/1.1/plug-ins/maze
libexec/gimp/1.1/plug-ins/mblur
+%%PERL:%%libexec/gimp/1.1/plug-ins/miff
+%%PERL:%%libexec/gimp/1.1/plug-ins/mirrorsplit
libexec/gimp/1.1/plug-ins/mosaic
libexec/gimp/1.1/plug-ins/mpeg
libexec/gimp/1.1/plug-ins/newsprint
@@ -159,30 +226,41 @@ libexec/gimp/1.1/plug-ins/nova
libexec/gimp/1.1/plug-ins/oilify
libexec/gimp/1.1/plug-ins/pagecurl
libexec/gimp/1.1/plug-ins/papertile
+%%PERL:%%libexec/gimp/1.1/plug-ins/parasite-editor
libexec/gimp/1.1/plug-ins/pat
libexec/gimp/1.1/plug-ins/pcx
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlcc
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlotine
libexec/gimp/1.1/plug-ins/pix
libexec/gimp/1.1/plug-ins/pixelize
+%%PERL:%%libexec/gimp/1.1/plug-ins/pixelmap
libexec/gimp/1.1/plug-ins/plasma
libexec/gimp/1.1/plug-ins/plugindetails
libexec/gimp/1.1/plug-ins/png
libexec/gimp/1.1/plug-ins/pnm
libexec/gimp/1.1/plug-ins/polar
+%%PERL:%%libexec/gimp/1.1/plug-ins/prep4gif
libexec/gimp/1.1/plug-ins/print
libexec/gimp/1.1/plug-ins/ps
libexec/gimp/1.1/plug-ins/psd
libexec/gimp/1.1/plug-ins/psp
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomart1
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomblends
libexec/gimp/1.1/plug-ins/randomize
libexec/gimp/1.1/plug-ins/rcm
+%%PERL:%%libexec/gimp/1.1/plug-ins/repdup
libexec/gimp/1.1/plug-ins/ripple
libexec/gimp/1.1/plug-ins/rotate
+%%PERL:%%libexec/gimp/1.1/plug-ins/roundsel
libexec/gimp/1.1/plug-ins/sample_colorize
libexec/gimp/1.1/plug-ins/scatter_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/scratches
libexec/gimp/1.1/plug-ins/screenshot
libexec/gimp/1.1/plug-ins/script-fu
libexec/gimp/1.1/plug-ins/sel2path
libexec/gimp/1.1/plug-ins/sel_gauss
libexec/gimp/1.1/plug-ins/semiflatten
+%%PERL:%%libexec/gimp/1.1/plug-ins/sethspin
libexec/gimp/1.1/plug-ins/sgi
libexec/gimp/1.1/plug-ins/sharpen
libexec/gimp/1.1/plug-ins/shift
@@ -193,30 +271,43 @@ libexec/gimp/1.1/plug-ins/sobel
libexec/gimp/1.1/plug-ins/sparkle
libexec/gimp/1.1/plug-ins/spheredesigner
libexec/gimp/1.1/plug-ins/spread
+%%PERL:%%libexec/gimp/1.1/plug-ins/stampify
+%%PERL:%%libexec/gimp/1.1/plug-ins/stamps
libexec/gimp/1.1/plug-ins/struc
libexec/gimp/1.1/plug-ins/sunras
+%%PERL:%%libexec/gimp/1.1/plug-ins/terral_text
+%%PERL:%%libexec/gimp/1.1/plug-ins/tex-to-float
libexec/gimp/1.1/plug-ins/tga
libexec/gimp/1.1/plug-ins/threshold_alpha
libexec/gimp/1.1/plug-ins/tiff
libexec/gimp/1.1/plug-ins/tile
libexec/gimp/1.1/plug-ins/tileit
libexec/gimp/1.1/plug-ins/tiler
+%%PERL:%%libexec/gimp/1.1/plug-ins/translogo
libexec/gimp/1.1/plug-ins/uniteditor
libexec/gimp/1.1/plug-ins/unsharp
libexec/gimp/1.1/plug-ins/url
libexec/gimp/1.1/plug-ins/video
+%%PERL:%%libexec/gimp/1.1/plug-ins/view3d
libexec/gimp/1.1/plug-ins/vinvert
libexec/gimp/1.1/plug-ins/vpropagate
libexec/gimp/1.1/plug-ins/warp
+%%PERL:%%libexec/gimp/1.1/plug-ins/warp-sharp
libexec/gimp/1.1/plug-ins/waves
libexec/gimp/1.1/plug-ins/webbrowser
+%%PERL:%%libexec/gimp/1.1/plug-ins/webify
libexec/gimp/1.1/plug-ins/whirlpinch
libexec/gimp/1.1/plug-ins/wind
+%%PERL:%%libexec/gimp/1.1/plug-ins/windify
libexec/gimp/1.1/plug-ins/wmf
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachlego
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachshadow
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachvision
libexec/gimp/1.1/plug-ins/xbm
libexec/gimp/1.1/plug-ins/xjt
libexec/gimp/1.1/plug-ins/xpm
libexec/gimp/1.1/plug-ins/xwd
+%%PERL:%%libexec/gimp/1.1/plug-ins/yinyang
libexec/gimp/1.1/plug-ins/zealouscrop
share/aclocal/gimp.m4
share/gimp/brushes/10x10square.gbr
@@ -247,6 +338,9 @@ share/gimp/brushes/9fcircle.gbr
share/gimp/brushes/DStar11.gbr
share/gimp/brushes/DStar17.gbr
share/gimp/brushes/DStar25.gbr
+share/gimp/brushes/SketchBrush-16.gih
+share/gimp/brushes/SketchBrush-32.gih
+share/gimp/brushes/SketchBrush-64.gih
share/gimp/brushes/callig1.gbr
share/gimp/brushes/callig2.gbr
share/gimp/brushes/callig3.gbr
@@ -275,29 +369,56 @@ share/gimp/devel-docs/html/libgimp/index.sgml
share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpbrushes.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannelops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpcolor.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolordisplay.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorselector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcompat.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpconvert.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpdialog.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdisplay.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdrawable.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpedit.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenums.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenv.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpexport.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpfeatures.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfileops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfloatingsel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgimprc.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgradients.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpguides.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimphelp.html
share/gimp/devel-docs/html/libgimp/libgimp-gimphelpui.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpimage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimplayer.html
share/gimp/devel-docs/html/libgimp/libgimp-gimplimits.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmath.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmessage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmisc.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppalette.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasite.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppixelrgn.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpplugin.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpproceduraldb.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpselection.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpsignal.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptexttool.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptile.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptools.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpui.html
-share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpundo.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
@@ -1192,6 +1313,7 @@ share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
share/locale/ca/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ca/LC_MESSAGES/gimp.mo
share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/cs/LC_MESSAGES/gimp-perl.mo
share/locale/cs/LC_MESSAGES/gimp-script-fu.mo
share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
share/locale/cs/LC_MESSAGES/gimp.mo
@@ -1200,6 +1322,7 @@ share/locale/da/LC_MESSAGES/gimp-script-fu.mo
share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
share/locale/da/LC_MESSAGES/gimp.mo
share/locale/de/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/de/LC_MESSAGES/gimp-perl.mo
share/locale/de/LC_MESSAGES/gimp-script-fu.mo
share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
share/locale/de/LC_MESSAGES/gimp.mo
@@ -1216,6 +1339,7 @@ share/locale/fi/LC_MESSAGES/gimp-script-fu.mo
share/locale/fi/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fi/LC_MESSAGES/gimp.mo
share/locale/fr/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/fr/LC_MESSAGES/gimp-perl.mo
share/locale/fr/LC_MESSAGES/gimp-script-fu.mo
share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fr/LC_MESSAGES/gimp.mo
@@ -1224,6 +1348,7 @@ share/locale/hu/LC_MESSAGES/gimp-script-fu.mo
share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
share/locale/hu/LC_MESSAGES/gimp.mo
share/locale/it/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/it/LC_MESSAGES/gimp-perl.mo
share/locale/it/LC_MESSAGES/gimp-script-fu.mo
share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
share/locale/it/LC_MESSAGES/gimp.mo
@@ -1240,6 +1365,7 @@ share/locale/nl/LC_MESSAGES/gimp-script-fu.mo
share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/nl/LC_MESSAGES/gimp.mo
share/locale/no/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/no/LC_MESSAGES/gimp-perl.mo
share/locale/no/LC_MESSAGES/gimp-script-fu.mo
share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
share/locale/no/LC_MESSAGES/gimp.mo
@@ -1248,6 +1374,7 @@ share/locale/pl/LC_MESSAGES/gimp-script-fu.mo
share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/pl/LC_MESSAGES/gimp.mo
share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/ru/LC_MESSAGES/gimp-perl.mo
share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ru/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index e31c449cf70f..3924ad384690 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 1.1.23
+PORTVERSION= 1.1.24
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -15,12 +15,6 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
MAINTAINER= vanilla@FreeBSD.org
-.if defined(WITH_PERL)
-BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-.endif
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
aa.1:${PORTSDIR}/graphics/aalib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -31,6 +25,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+SHLIBVER?= ${PORTVERSION:S/1.//g}
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -38,10 +33,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
-
-.if !defined(WITH_PERL)
-CONFIGURE_ARGS= --disable-perl
-.endif
+PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GLIB_CONFIG="${GLIB_CONFIG}" \
@@ -52,27 +44,28 @@ MAN1= gimp.1 gimptool.1
MAN5= gimprc.5
.if !defined(WITH_PERL)
-PLISTORIG= ${PKGDIR}/PLIST
-PLIST= ${WRKDIR}/PLIST
+CONFIGURE_ARGS= --disable-perl
+PLIST_SUB+= PERL:="@comment "
.else
-PLISTORIG= ${PKGDIR}/PLIST.perl
-PLIST= ${WRKDIR}/PLIST.perl
-.endif
-
-.if !defined(WITH_PERL)
-pre-fetch:
- @${ECHO} -n "If you want to compile with perl support use"
- @${ECHO} "'make -DWITH_PERL' instead"
+BUILD_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+PLIST_SUB+= PERL:=""
.endif
.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
&& !defined(WITHOUT_GNOME))
LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
-pre-install:
- @${CAT} ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:=""
.else
-pre-install:
- @${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:="@comment "
+.endif
+
+.if !defined(WITH_PERL)
+pre-fetch:
+ @${ECHO} -n "If you want to compile with perl support use "
+ @${ECHO} "'make -DWITH_PERL' instead"
.endif
post-install:
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 7b8db138bf6d..768dd8156426 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.23.tar.bz2) = 09ef0e0f676d36ca1c9a3193ec478f5c
+MD5 (gimp-1.1.24.tar.bz2) = 18c0ea8a814a468767a939e9895df6b3
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index 2e37f7c44cff..d0d7c4ef2415 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -1,13 +1,13 @@
---- plug-ins/common/url.c.orig Tue Feb 1 16:09:01 2000
-+++ plug-ins/common/url.c Sat Feb 19 13:51:36 2000
-@@ -158,8 +158,8 @@
- }
- else if (pid == 0)
- {
-- execlp ("wget", "wget", filename, "-O", tmpname, NULL);
-- g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
-+ execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
-+ g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+--- plug-ins/common/url.c.orig Wed Jun 7 21:46:43 2000
++++ plug-ins/common/url.c Mon Jun 26 12:20:54 2000
+@@ -187,8 +187,8 @@
+ dup (p[1]);
+ close (p[1]);
+ putenv ("LC_ALL=C"); /* produce deterministic output */
+- execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+- g_message ("url: exec() failed: wget: %s", g_strerror (errno));
++ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", tmpname, NULL);
++ g_message ("url: exec() failed: fetch: %s", g_strerror(errno));
g_free (tmpname);
- _exit(127);
+ _exit (127);
}
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index 963f2c046f7d..02c26a51f920 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,30 +1,6 @@
---- configure.orig Wed Mar 29 18:55:23 2000
-+++ configure Sun Apr 9 14:46:44 2000
-@@ -1494,8 +1494,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
- # Reload cache, that may have been modified by ltconfig
-@@ -1509,10 +1509,10 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL="/usr/local/bin/libtool"
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3480,7 +3480,11 @@
+--- configure.orig Thu Jun 22 23:49:05 2000
++++ configure Mon Jun 26 16:04:16 2000
+@@ -3478,7 +3478,11 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -37,7 +13,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -7016,8 +7020,8 @@
+@@ -7148,8 +7152,8 @@
fi
@@ -48,7 +24,7 @@
localedir='${prefix}/${DATADIRNAME}/locale'
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8602,11 +8606,6 @@
+@@ -8415,11 +8419,6 @@
*) # Relative path.
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index e1e94302dbc8..0556077da6f5 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -4,59 +4,94 @@ bin/gimp.setfont
bin/gimptool
include/gck/gck.h
include/libgimp/gimp.h
+include/libgimp/gimp_pdb.h
+include/libgimp/gimpbrushes_pdb.h
+include/libgimp/gimpbrushselect_pdb.h
include/libgimp/gimpchainbutton.h
+include/libgimp/gimpchannel.h
+include/libgimp/gimpchannel_pdb.h
+include/libgimp/gimpchannelops_pdb.h
+include/libgimp/gimpcolor_pdb.h
include/libgimp/gimpcolorbutton.h
include/libgimp/gimpcolordisplay.h
include/libgimp/gimpcolorselector.h
include/libgimp/gimpcolorspace.h
include/libgimp/gimpcompat.h
+include/libgimp/gimpconvert_pdb.h
include/libgimp/gimpdialog.h
+include/libgimp/gimpdisplay_pdb.h
+include/libgimp/gimpdrawable.h
+include/libgimp/gimpdrawable_pdb.h
+include/libgimp/gimpedit_pdb.h
include/libgimp/gimpenums.h
include/libgimp/gimpenv.h
include/libgimp/gimpexport.h
include/libgimp/gimpfeatures.h
+include/libgimp/gimpfileops_pdb.h
include/libgimp/gimpfileselection.h
+include/libgimp/gimpfloatingsel_pdb.h
+include/libgimp/gimpgimprc_pdb.h
+include/libgimp/gimpgradients_pdb.h
+include/libgimp/gimpgradientselect.h
+include/libgimp/gimpgradientselect_pdb.h
+include/libgimp/gimpguides_pdb.h
+include/libgimp/gimphelp_pdb.h
include/libgimp/gimphelpui.h
+include/libgimp/gimpimage.h
+include/libgimp/gimpimage_pdb.h
include/libgimp/gimpintl.h
+include/libgimp/gimplayer.h
+include/libgimp/gimplayer_pdb.h
include/libgimp/gimplimits.h
include/libgimp/gimpmath.h
include/libgimp/gimpmatrix.h
include/libgimp/gimpmenu.h
+include/libgimp/gimpmessage_pdb.h
+include/libgimp/gimpmisc_pdb.h
include/libgimp/gimpmodule.h
+include/libgimp/gimppalette_pdb.h
include/libgimp/gimpparasite.h
+include/libgimp/gimpparasite_pdb.h
include/libgimp/gimpparasiteio.h
include/libgimp/gimppatheditor.h
+include/libgimp/gimppaths_pdb.h
+include/libgimp/gimppatterns_pdb.h
+include/libgimp/gimppatternselect_pdb.h
+include/libgimp/gimppixelrgn.h
include/libgimp/gimppixmap.h
+include/libgimp/gimpplugin_pdb.h
+include/libgimp/gimpproceduraldb.h
+include/libgimp/gimpproceduraldb_pdb.h
include/libgimp/gimpquerybox.h
+include/libgimp/gimpselection.h
+include/libgimp/gimpselection_pdb.h
include/libgimp/gimpsignal.h
include/libgimp/gimpsizeentry.h
+include/libgimp/gimptexttool_pdb.h
+include/libgimp/gimptile.h
+include/libgimp/gimptools_pdb.h
+include/libgimp/gimptypes.h
include/libgimp/gimpui.h
-include/libgimp/gimputils.h
+include/libgimp/gimpundo_pdb.h
include/libgimp/gimpunit.h
+include/libgimp/gimpunit_pdb.h
include/libgimp/gimpunitmenu.h
+include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
-lib/libgck.la
lib/libgck.so
-lib/libgck.so.23
+lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
-lib/libgimp.la
lib/libgimp.so
-lib/libgimp.so.23
+lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
-lib/libgimpui.la
lib/libgimpui.so
-lib/libgimpui.so.23
-libexec/gimp/1.1/modules/libcdisplay_gamma.la
+lib/libgimpui.so.%%SHLIBVER%%
libexec/gimp/1.1/modules/libcdisplay_gamma.so
-libexec/gimp/1.1/modules/libcdisplay_highcontrast.la
libexec/gimp/1.1/modules/libcdisplay_highcontrast.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.la
libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.la
libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.la
libexec/gimp/1.1/modules/libcolorsel_water.so
libexec/gimp/1.1/plug-ins/AlienMap
libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,22 +100,34 @@ libexec/gimp/1.1/plug-ins/CML_explorer
libexec/gimp/1.1/plug-ins/FractalExplorer
libexec/gimp/1.1/plug-ins/Lighting
libexec/gimp/1.1/plug-ins/MapObject
+%%PERL:%%libexec/gimp/1.1/plug-ins/PDB
+%%PERL:%%libexec/gimp/1.1/plug-ins/Perl-Server
libexec/gimp/1.1/plug-ins/aa
libexec/gimp/1.1/plug-ins/align_layers
+%%PERL:%%libexec/gimp/1.1/plug-ins/animate_cells
libexec/gimp/1.1/plug-ins/animationplay
libexec/gimp/1.1/plug-ins/animoptimize
libexec/gimp/1.1/plug-ins/apply_lens
libexec/gimp/1.1/plug-ins/autocrop
libexec/gimp/1.1/plug-ins/autostretch_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/avi
+%%PERL:%%libexec/gimp/1.1/plug-ins/blended2
libexec/gimp/1.1/plug-ins/blinds
+%%PERL:%%libexec/gimp/1.1/plug-ins/blowinout
libexec/gimp/1.1/plug-ins/blur
libexec/gimp/1.1/plug-ins/bmp
+%%PERL:%%libexec/gimp/1.1/plug-ins/border
libexec/gimp/1.1/plug-ins/borderaverage
+%%PERL:%%libexec/gimp/1.1/plug-ins/bricks
libexec/gimp/1.1/plug-ins/bumpmap
+%%PERL:%%libexec/gimp/1.1/plug-ins/burst
libexec/gimp/1.1/plug-ins/bz2
libexec/gimp/1.1/plug-ins/c_astretch
+%%PERL:%%libexec/gimp/1.1/plug-ins/centerguide
libexec/gimp/1.1/plug-ins/checkerboard
+%%PERL:%%libexec/gimp/1.1/plug-ins/clear_alpha
libexec/gimp/1.1/plug-ins/color_enhance
+%%PERL:%%libexec/gimp/1.1/plug-ins/colorhtml
libexec/gimp/1.1/plug-ins/colorify
libexec/gimp/1.1/plug-ins/colortoalpha
libexec/gimp/1.1/plug-ins/compose
@@ -88,6 +135,7 @@ libexec/gimp/1.1/plug-ins/convmatrix
libexec/gimp/1.1/plug-ins/csource
libexec/gimp/1.1/plug-ins/cubism
libexec/gimp/1.1/plug-ins/curve_bend
+%%PERL:%%libexec/gimp/1.1/plug-ins/dataurl
libexec/gimp/1.1/plug-ins/dbbrowser
libexec/gimp/1.1/plug-ins/decompose
libexec/gimp/1.1/plug-ins/deinterlace
@@ -96,17 +144,24 @@ libexec/gimp/1.1/plug-ins/despeckle
libexec/gimp/1.1/plug-ins/destripe
libexec/gimp/1.1/plug-ins/diffraction
libexec/gimp/1.1/plug-ins/displace
+%%PERL:%%libexec/gimp/1.1/plug-ins/ditherize
+%%PERL:%%libexec/gimp/1.1/plug-ins/dust
libexec/gimp/1.1/plug-ins/edge
libexec/gimp/1.1/plug-ins/emboss
libexec/gimp/1.1/plug-ins/engrave
libexec/gimp/1.1/plug-ins/exchange
libexec/gimp/1.1/plug-ins/faxg3
libexec/gimp/1.1/plug-ins/film
+%%PERL:%%libexec/gimp/1.1/plug-ins/fire
+%%PERL:%%libexec/gimp/1.1/plug-ins/fit-text
libexec/gimp/1.1/plug-ins/fits
libexec/gimp/1.1/plug-ins/flame
libexec/gimp/1.1/plug-ins/flarefx
+%%PERL:%%libexec/gimp/1.1/plug-ins/font_table
libexec/gimp/1.1/plug-ins/fp
libexec/gimp/1.1/plug-ins/fractaltrace
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_filter
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_reshuffle
libexec/gimp/1.1/plug-ins/gap_decode_mpeg
libexec/gimp/1.1/plug-ins/gap_filter
libexec/gimp/1.1/plug-ins/gap_frontends
@@ -125,30 +180,42 @@ libexec/gimp/1.1/plug-ins/gif
libexec/gimp/1.1/plug-ins/gifload
libexec/gimp/1.1/plug-ins/gimpressionist
libexec/gimp/1.1/plug-ins/glasstile
+%%PERL:%%libexec/gimp/1.1/plug-ins/glowing_steel
+%%PERL:%%libexec/gimp/1.1/plug-ins/goldenmean
+%%PERL:%%libexec/gimp/1.1/plug-ins/gouge
libexec/gimp/1.1/plug-ins/gpb
libexec/gimp/1.1/plug-ins/gqbist
libexec/gimp/1.1/plug-ins/gradmap
libexec/gimp/1.1/plug-ins/grid
libexec/gimp/1.1/plug-ins/gtm
+%%PERL:%%libexec/gimp/1.1/plug-ins/guide_remove
+%%PERL:%%libexec/gimp/1.1/plug-ins/guidegrid
+%%PERL:%%libexec/gimp/1.1/plug-ins/guides_to_selection
libexec/gimp/1.1/plug-ins/guillotine
libexec/gimp/1.1/plug-ins/gz
libexec/gimp/1.1/plug-ins/header
-libexec/gimp/1.1/plug-ins/helpbrowser
+%%GNOME:%%libexec/gimp/1.1/plug-ins/helpbrowser
libexec/gimp/1.1/plug-ins/hot
libexec/gimp/1.1/plug-ins/hrz
libexec/gimp/1.1/plug-ins/ifscompose
libexec/gimp/1.1/plug-ins/illusion
+%%PERL:%%libexec/gimp/1.1/plug-ins/image_tile
libexec/gimp/1.1/plug-ins/imagemap
+%%PERL:%%libexec/gimp/1.1/plug-ins/innerbevel
libexec/gimp/1.1/plug-ins/iwarp
libexec/gimp/1.1/plug-ins/jigsaw
libexec/gimp/1.1/plug-ins/jpeg
libexec/gimp/1.1/plug-ins/laplace
+%%PERL:%%libexec/gimp/1.1/plug-ins/layerfuncs
libexec/gimp/1.1/plug-ins/lic
+%%PERL:%%libexec/gimp/1.1/plug-ins/logulator
libexec/gimp/1.1/plug-ins/mail
libexec/gimp/1.1/plug-ins/mapcolor
libexec/gimp/1.1/plug-ins/max_rgb
libexec/gimp/1.1/plug-ins/maze
libexec/gimp/1.1/plug-ins/mblur
+%%PERL:%%libexec/gimp/1.1/plug-ins/miff
+%%PERL:%%libexec/gimp/1.1/plug-ins/mirrorsplit
libexec/gimp/1.1/plug-ins/mosaic
libexec/gimp/1.1/plug-ins/mpeg
libexec/gimp/1.1/plug-ins/newsprint
@@ -159,30 +226,41 @@ libexec/gimp/1.1/plug-ins/nova
libexec/gimp/1.1/plug-ins/oilify
libexec/gimp/1.1/plug-ins/pagecurl
libexec/gimp/1.1/plug-ins/papertile
+%%PERL:%%libexec/gimp/1.1/plug-ins/parasite-editor
libexec/gimp/1.1/plug-ins/pat
libexec/gimp/1.1/plug-ins/pcx
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlcc
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlotine
libexec/gimp/1.1/plug-ins/pix
libexec/gimp/1.1/plug-ins/pixelize
+%%PERL:%%libexec/gimp/1.1/plug-ins/pixelmap
libexec/gimp/1.1/plug-ins/plasma
libexec/gimp/1.1/plug-ins/plugindetails
libexec/gimp/1.1/plug-ins/png
libexec/gimp/1.1/plug-ins/pnm
libexec/gimp/1.1/plug-ins/polar
+%%PERL:%%libexec/gimp/1.1/plug-ins/prep4gif
libexec/gimp/1.1/plug-ins/print
libexec/gimp/1.1/plug-ins/ps
libexec/gimp/1.1/plug-ins/psd
libexec/gimp/1.1/plug-ins/psp
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomart1
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomblends
libexec/gimp/1.1/plug-ins/randomize
libexec/gimp/1.1/plug-ins/rcm
+%%PERL:%%libexec/gimp/1.1/plug-ins/repdup
libexec/gimp/1.1/plug-ins/ripple
libexec/gimp/1.1/plug-ins/rotate
+%%PERL:%%libexec/gimp/1.1/plug-ins/roundsel
libexec/gimp/1.1/plug-ins/sample_colorize
libexec/gimp/1.1/plug-ins/scatter_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/scratches
libexec/gimp/1.1/plug-ins/screenshot
libexec/gimp/1.1/plug-ins/script-fu
libexec/gimp/1.1/plug-ins/sel2path
libexec/gimp/1.1/plug-ins/sel_gauss
libexec/gimp/1.1/plug-ins/semiflatten
+%%PERL:%%libexec/gimp/1.1/plug-ins/sethspin
libexec/gimp/1.1/plug-ins/sgi
libexec/gimp/1.1/plug-ins/sharpen
libexec/gimp/1.1/plug-ins/shift
@@ -193,30 +271,43 @@ libexec/gimp/1.1/plug-ins/sobel
libexec/gimp/1.1/plug-ins/sparkle
libexec/gimp/1.1/plug-ins/spheredesigner
libexec/gimp/1.1/plug-ins/spread
+%%PERL:%%libexec/gimp/1.1/plug-ins/stampify
+%%PERL:%%libexec/gimp/1.1/plug-ins/stamps
libexec/gimp/1.1/plug-ins/struc
libexec/gimp/1.1/plug-ins/sunras
+%%PERL:%%libexec/gimp/1.1/plug-ins/terral_text
+%%PERL:%%libexec/gimp/1.1/plug-ins/tex-to-float
libexec/gimp/1.1/plug-ins/tga
libexec/gimp/1.1/plug-ins/threshold_alpha
libexec/gimp/1.1/plug-ins/tiff
libexec/gimp/1.1/plug-ins/tile
libexec/gimp/1.1/plug-ins/tileit
libexec/gimp/1.1/plug-ins/tiler
+%%PERL:%%libexec/gimp/1.1/plug-ins/translogo
libexec/gimp/1.1/plug-ins/uniteditor
libexec/gimp/1.1/plug-ins/unsharp
libexec/gimp/1.1/plug-ins/url
libexec/gimp/1.1/plug-ins/video
+%%PERL:%%libexec/gimp/1.1/plug-ins/view3d
libexec/gimp/1.1/plug-ins/vinvert
libexec/gimp/1.1/plug-ins/vpropagate
libexec/gimp/1.1/plug-ins/warp
+%%PERL:%%libexec/gimp/1.1/plug-ins/warp-sharp
libexec/gimp/1.1/plug-ins/waves
libexec/gimp/1.1/plug-ins/webbrowser
+%%PERL:%%libexec/gimp/1.1/plug-ins/webify
libexec/gimp/1.1/plug-ins/whirlpinch
libexec/gimp/1.1/plug-ins/wind
+%%PERL:%%libexec/gimp/1.1/plug-ins/windify
libexec/gimp/1.1/plug-ins/wmf
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachlego
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachshadow
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachvision
libexec/gimp/1.1/plug-ins/xbm
libexec/gimp/1.1/plug-ins/xjt
libexec/gimp/1.1/plug-ins/xpm
libexec/gimp/1.1/plug-ins/xwd
+%%PERL:%%libexec/gimp/1.1/plug-ins/yinyang
libexec/gimp/1.1/plug-ins/zealouscrop
share/aclocal/gimp.m4
share/gimp/brushes/10x10square.gbr
@@ -247,6 +338,9 @@ share/gimp/brushes/9fcircle.gbr
share/gimp/brushes/DStar11.gbr
share/gimp/brushes/DStar17.gbr
share/gimp/brushes/DStar25.gbr
+share/gimp/brushes/SketchBrush-16.gih
+share/gimp/brushes/SketchBrush-32.gih
+share/gimp/brushes/SketchBrush-64.gih
share/gimp/brushes/callig1.gbr
share/gimp/brushes/callig2.gbr
share/gimp/brushes/callig3.gbr
@@ -275,29 +369,56 @@ share/gimp/devel-docs/html/libgimp/index.sgml
share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpbrushes.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannelops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpcolor.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolordisplay.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorselector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcompat.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpconvert.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpdialog.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdisplay.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdrawable.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpedit.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenums.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenv.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpexport.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpfeatures.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfileops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfloatingsel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgimprc.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgradients.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpguides.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimphelp.html
share/gimp/devel-docs/html/libgimp/libgimp-gimphelpui.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpimage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimplayer.html
share/gimp/devel-docs/html/libgimp/libgimp-gimplimits.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmath.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmessage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmisc.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppalette.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasite.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppixelrgn.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpplugin.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpproceduraldb.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpselection.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpsignal.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptexttool.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptile.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptools.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpui.html
-share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpundo.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
@@ -1192,6 +1313,7 @@ share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
share/locale/ca/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ca/LC_MESSAGES/gimp.mo
share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/cs/LC_MESSAGES/gimp-perl.mo
share/locale/cs/LC_MESSAGES/gimp-script-fu.mo
share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
share/locale/cs/LC_MESSAGES/gimp.mo
@@ -1200,6 +1322,7 @@ share/locale/da/LC_MESSAGES/gimp-script-fu.mo
share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
share/locale/da/LC_MESSAGES/gimp.mo
share/locale/de/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/de/LC_MESSAGES/gimp-perl.mo
share/locale/de/LC_MESSAGES/gimp-script-fu.mo
share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
share/locale/de/LC_MESSAGES/gimp.mo
@@ -1216,6 +1339,7 @@ share/locale/fi/LC_MESSAGES/gimp-script-fu.mo
share/locale/fi/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fi/LC_MESSAGES/gimp.mo
share/locale/fr/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/fr/LC_MESSAGES/gimp-perl.mo
share/locale/fr/LC_MESSAGES/gimp-script-fu.mo
share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fr/LC_MESSAGES/gimp.mo
@@ -1224,6 +1348,7 @@ share/locale/hu/LC_MESSAGES/gimp-script-fu.mo
share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
share/locale/hu/LC_MESSAGES/gimp.mo
share/locale/it/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/it/LC_MESSAGES/gimp-perl.mo
share/locale/it/LC_MESSAGES/gimp-script-fu.mo
share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
share/locale/it/LC_MESSAGES/gimp.mo
@@ -1240,6 +1365,7 @@ share/locale/nl/LC_MESSAGES/gimp-script-fu.mo
share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/nl/LC_MESSAGES/gimp.mo
share/locale/no/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/no/LC_MESSAGES/gimp-perl.mo
share/locale/no/LC_MESSAGES/gimp-script-fu.mo
share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
share/locale/no/LC_MESSAGES/gimp.mo
@@ -1248,6 +1374,7 @@ share/locale/pl/LC_MESSAGES/gimp-script-fu.mo
share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/pl/LC_MESSAGES/gimp.mo
share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/ru/LC_MESSAGES/gimp-perl.mo
share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ru/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index e31c449cf70f..3924ad384690 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 1.1.23
+PORTVERSION= 1.1.24
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -15,12 +15,6 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
MAINTAINER= vanilla@FreeBSD.org
-.if defined(WITH_PERL)
-BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-.endif
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
aa.1:${PORTSDIR}/graphics/aalib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -31,6 +25,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+SHLIBVER?= ${PORTVERSION:S/1.//g}
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -38,10 +33,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
-
-.if !defined(WITH_PERL)
-CONFIGURE_ARGS= --disable-perl
-.endif
+PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GLIB_CONFIG="${GLIB_CONFIG}" \
@@ -52,27 +44,28 @@ MAN1= gimp.1 gimptool.1
MAN5= gimprc.5
.if !defined(WITH_PERL)
-PLISTORIG= ${PKGDIR}/PLIST
-PLIST= ${WRKDIR}/PLIST
+CONFIGURE_ARGS= --disable-perl
+PLIST_SUB+= PERL:="@comment "
.else
-PLISTORIG= ${PKGDIR}/PLIST.perl
-PLIST= ${WRKDIR}/PLIST.perl
-.endif
-
-.if !defined(WITH_PERL)
-pre-fetch:
- @${ECHO} -n "If you want to compile with perl support use"
- @${ECHO} "'make -DWITH_PERL' instead"
+BUILD_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+PLIST_SUB+= PERL:=""
.endif
.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
&& !defined(WITHOUT_GNOME))
LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
-pre-install:
- @${CAT} ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:=""
.else
-pre-install:
- @${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:="@comment "
+.endif
+
+.if !defined(WITH_PERL)
+pre-fetch:
+ @${ECHO} -n "If you want to compile with perl support use "
+ @${ECHO} "'make -DWITH_PERL' instead"
.endif
post-install:
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 7b8db138bf6d..768dd8156426 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.23.tar.bz2) = 09ef0e0f676d36ca1c9a3193ec478f5c
+MD5 (gimp-1.1.24.tar.bz2) = 18c0ea8a814a468767a939e9895df6b3
diff --git a/graphics/gimp1/files/patch-ab b/graphics/gimp1/files/patch-ab
index 2e37f7c44cff..d0d7c4ef2415 100644
--- a/graphics/gimp1/files/patch-ab
+++ b/graphics/gimp1/files/patch-ab
@@ -1,13 +1,13 @@
---- plug-ins/common/url.c.orig Tue Feb 1 16:09:01 2000
-+++ plug-ins/common/url.c Sat Feb 19 13:51:36 2000
-@@ -158,8 +158,8 @@
- }
- else if (pid == 0)
- {
-- execlp ("wget", "wget", filename, "-O", tmpname, NULL);
-- g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
-+ execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
-+ g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+--- plug-ins/common/url.c.orig Wed Jun 7 21:46:43 2000
++++ plug-ins/common/url.c Mon Jun 26 12:20:54 2000
+@@ -187,8 +187,8 @@
+ dup (p[1]);
+ close (p[1]);
+ putenv ("LC_ALL=C"); /* produce deterministic output */
+- execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+- g_message ("url: exec() failed: wget: %s", g_strerror (errno));
++ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", tmpname, NULL);
++ g_message ("url: exec() failed: fetch: %s", g_strerror(errno));
g_free (tmpname);
- _exit(127);
+ _exit (127);
}
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index 963f2c046f7d..02c26a51f920 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,30 +1,6 @@
---- configure.orig Wed Mar 29 18:55:23 2000
-+++ configure Sun Apr 9 14:46:44 2000
-@@ -1494,8 +1494,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
- # Reload cache, that may have been modified by ltconfig
-@@ -1509,10 +1509,10 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL="/usr/local/bin/libtool"
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3480,7 +3480,11 @@
+--- configure.orig Thu Jun 22 23:49:05 2000
++++ configure Mon Jun 26 16:04:16 2000
+@@ -3478,7 +3478,11 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -37,7 +13,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -7016,8 +7020,8 @@
+@@ -7148,8 +7152,8 @@
fi
@@ -48,7 +24,7 @@
localedir='${prefix}/${DATADIRNAME}/locale'
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8602,11 +8606,6 @@
+@@ -8415,11 +8419,6 @@
*) # Relative path.
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index e1e94302dbc8..0556077da6f5 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -4,59 +4,94 @@ bin/gimp.setfont
bin/gimptool
include/gck/gck.h
include/libgimp/gimp.h
+include/libgimp/gimp_pdb.h
+include/libgimp/gimpbrushes_pdb.h
+include/libgimp/gimpbrushselect_pdb.h
include/libgimp/gimpchainbutton.h
+include/libgimp/gimpchannel.h
+include/libgimp/gimpchannel_pdb.h
+include/libgimp/gimpchannelops_pdb.h
+include/libgimp/gimpcolor_pdb.h
include/libgimp/gimpcolorbutton.h
include/libgimp/gimpcolordisplay.h
include/libgimp/gimpcolorselector.h
include/libgimp/gimpcolorspace.h
include/libgimp/gimpcompat.h
+include/libgimp/gimpconvert_pdb.h
include/libgimp/gimpdialog.h
+include/libgimp/gimpdisplay_pdb.h
+include/libgimp/gimpdrawable.h
+include/libgimp/gimpdrawable_pdb.h
+include/libgimp/gimpedit_pdb.h
include/libgimp/gimpenums.h
include/libgimp/gimpenv.h
include/libgimp/gimpexport.h
include/libgimp/gimpfeatures.h
+include/libgimp/gimpfileops_pdb.h
include/libgimp/gimpfileselection.h
+include/libgimp/gimpfloatingsel_pdb.h
+include/libgimp/gimpgimprc_pdb.h
+include/libgimp/gimpgradients_pdb.h
+include/libgimp/gimpgradientselect.h
+include/libgimp/gimpgradientselect_pdb.h
+include/libgimp/gimpguides_pdb.h
+include/libgimp/gimphelp_pdb.h
include/libgimp/gimphelpui.h
+include/libgimp/gimpimage.h
+include/libgimp/gimpimage_pdb.h
include/libgimp/gimpintl.h
+include/libgimp/gimplayer.h
+include/libgimp/gimplayer_pdb.h
include/libgimp/gimplimits.h
include/libgimp/gimpmath.h
include/libgimp/gimpmatrix.h
include/libgimp/gimpmenu.h
+include/libgimp/gimpmessage_pdb.h
+include/libgimp/gimpmisc_pdb.h
include/libgimp/gimpmodule.h
+include/libgimp/gimppalette_pdb.h
include/libgimp/gimpparasite.h
+include/libgimp/gimpparasite_pdb.h
include/libgimp/gimpparasiteio.h
include/libgimp/gimppatheditor.h
+include/libgimp/gimppaths_pdb.h
+include/libgimp/gimppatterns_pdb.h
+include/libgimp/gimppatternselect_pdb.h
+include/libgimp/gimppixelrgn.h
include/libgimp/gimppixmap.h
+include/libgimp/gimpplugin_pdb.h
+include/libgimp/gimpproceduraldb.h
+include/libgimp/gimpproceduraldb_pdb.h
include/libgimp/gimpquerybox.h
+include/libgimp/gimpselection.h
+include/libgimp/gimpselection_pdb.h
include/libgimp/gimpsignal.h
include/libgimp/gimpsizeentry.h
+include/libgimp/gimptexttool_pdb.h
+include/libgimp/gimptile.h
+include/libgimp/gimptools_pdb.h
+include/libgimp/gimptypes.h
include/libgimp/gimpui.h
-include/libgimp/gimputils.h
+include/libgimp/gimpundo_pdb.h
include/libgimp/gimpunit.h
+include/libgimp/gimpunit_pdb.h
include/libgimp/gimpunitmenu.h
+include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
-lib/libgck.la
lib/libgck.so
-lib/libgck.so.23
+lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
-lib/libgimp.la
lib/libgimp.so
-lib/libgimp.so.23
+lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
-lib/libgimpui.la
lib/libgimpui.so
-lib/libgimpui.so.23
-libexec/gimp/1.1/modules/libcdisplay_gamma.la
+lib/libgimpui.so.%%SHLIBVER%%
libexec/gimp/1.1/modules/libcdisplay_gamma.so
-libexec/gimp/1.1/modules/libcdisplay_highcontrast.la
libexec/gimp/1.1/modules/libcdisplay_highcontrast.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.la
libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.la
libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.la
libexec/gimp/1.1/modules/libcolorsel_water.so
libexec/gimp/1.1/plug-ins/AlienMap
libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,22 +100,34 @@ libexec/gimp/1.1/plug-ins/CML_explorer
libexec/gimp/1.1/plug-ins/FractalExplorer
libexec/gimp/1.1/plug-ins/Lighting
libexec/gimp/1.1/plug-ins/MapObject
+%%PERL:%%libexec/gimp/1.1/plug-ins/PDB
+%%PERL:%%libexec/gimp/1.1/plug-ins/Perl-Server
libexec/gimp/1.1/plug-ins/aa
libexec/gimp/1.1/plug-ins/align_layers
+%%PERL:%%libexec/gimp/1.1/plug-ins/animate_cells
libexec/gimp/1.1/plug-ins/animationplay
libexec/gimp/1.1/plug-ins/animoptimize
libexec/gimp/1.1/plug-ins/apply_lens
libexec/gimp/1.1/plug-ins/autocrop
libexec/gimp/1.1/plug-ins/autostretch_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/avi
+%%PERL:%%libexec/gimp/1.1/plug-ins/blended2
libexec/gimp/1.1/plug-ins/blinds
+%%PERL:%%libexec/gimp/1.1/plug-ins/blowinout
libexec/gimp/1.1/plug-ins/blur
libexec/gimp/1.1/plug-ins/bmp
+%%PERL:%%libexec/gimp/1.1/plug-ins/border
libexec/gimp/1.1/plug-ins/borderaverage
+%%PERL:%%libexec/gimp/1.1/plug-ins/bricks
libexec/gimp/1.1/plug-ins/bumpmap
+%%PERL:%%libexec/gimp/1.1/plug-ins/burst
libexec/gimp/1.1/plug-ins/bz2
libexec/gimp/1.1/plug-ins/c_astretch
+%%PERL:%%libexec/gimp/1.1/plug-ins/centerguide
libexec/gimp/1.1/plug-ins/checkerboard
+%%PERL:%%libexec/gimp/1.1/plug-ins/clear_alpha
libexec/gimp/1.1/plug-ins/color_enhance
+%%PERL:%%libexec/gimp/1.1/plug-ins/colorhtml
libexec/gimp/1.1/plug-ins/colorify
libexec/gimp/1.1/plug-ins/colortoalpha
libexec/gimp/1.1/plug-ins/compose
@@ -88,6 +135,7 @@ libexec/gimp/1.1/plug-ins/convmatrix
libexec/gimp/1.1/plug-ins/csource
libexec/gimp/1.1/plug-ins/cubism
libexec/gimp/1.1/plug-ins/curve_bend
+%%PERL:%%libexec/gimp/1.1/plug-ins/dataurl
libexec/gimp/1.1/plug-ins/dbbrowser
libexec/gimp/1.1/plug-ins/decompose
libexec/gimp/1.1/plug-ins/deinterlace
@@ -96,17 +144,24 @@ libexec/gimp/1.1/plug-ins/despeckle
libexec/gimp/1.1/plug-ins/destripe
libexec/gimp/1.1/plug-ins/diffraction
libexec/gimp/1.1/plug-ins/displace
+%%PERL:%%libexec/gimp/1.1/plug-ins/ditherize
+%%PERL:%%libexec/gimp/1.1/plug-ins/dust
libexec/gimp/1.1/plug-ins/edge
libexec/gimp/1.1/plug-ins/emboss
libexec/gimp/1.1/plug-ins/engrave
libexec/gimp/1.1/plug-ins/exchange
libexec/gimp/1.1/plug-ins/faxg3
libexec/gimp/1.1/plug-ins/film
+%%PERL:%%libexec/gimp/1.1/plug-ins/fire
+%%PERL:%%libexec/gimp/1.1/plug-ins/fit-text
libexec/gimp/1.1/plug-ins/fits
libexec/gimp/1.1/plug-ins/flame
libexec/gimp/1.1/plug-ins/flarefx
+%%PERL:%%libexec/gimp/1.1/plug-ins/font_table
libexec/gimp/1.1/plug-ins/fp
libexec/gimp/1.1/plug-ins/fractaltrace
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_filter
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_reshuffle
libexec/gimp/1.1/plug-ins/gap_decode_mpeg
libexec/gimp/1.1/plug-ins/gap_filter
libexec/gimp/1.1/plug-ins/gap_frontends
@@ -125,30 +180,42 @@ libexec/gimp/1.1/plug-ins/gif
libexec/gimp/1.1/plug-ins/gifload
libexec/gimp/1.1/plug-ins/gimpressionist
libexec/gimp/1.1/plug-ins/glasstile
+%%PERL:%%libexec/gimp/1.1/plug-ins/glowing_steel
+%%PERL:%%libexec/gimp/1.1/plug-ins/goldenmean
+%%PERL:%%libexec/gimp/1.1/plug-ins/gouge
libexec/gimp/1.1/plug-ins/gpb
libexec/gimp/1.1/plug-ins/gqbist
libexec/gimp/1.1/plug-ins/gradmap
libexec/gimp/1.1/plug-ins/grid
libexec/gimp/1.1/plug-ins/gtm
+%%PERL:%%libexec/gimp/1.1/plug-ins/guide_remove
+%%PERL:%%libexec/gimp/1.1/plug-ins/guidegrid
+%%PERL:%%libexec/gimp/1.1/plug-ins/guides_to_selection
libexec/gimp/1.1/plug-ins/guillotine
libexec/gimp/1.1/plug-ins/gz
libexec/gimp/1.1/plug-ins/header
-libexec/gimp/1.1/plug-ins/helpbrowser
+%%GNOME:%%libexec/gimp/1.1/plug-ins/helpbrowser
libexec/gimp/1.1/plug-ins/hot
libexec/gimp/1.1/plug-ins/hrz
libexec/gimp/1.1/plug-ins/ifscompose
libexec/gimp/1.1/plug-ins/illusion
+%%PERL:%%libexec/gimp/1.1/plug-ins/image_tile
libexec/gimp/1.1/plug-ins/imagemap
+%%PERL:%%libexec/gimp/1.1/plug-ins/innerbevel
libexec/gimp/1.1/plug-ins/iwarp
libexec/gimp/1.1/plug-ins/jigsaw
libexec/gimp/1.1/plug-ins/jpeg
libexec/gimp/1.1/plug-ins/laplace
+%%PERL:%%libexec/gimp/1.1/plug-ins/layerfuncs
libexec/gimp/1.1/plug-ins/lic
+%%PERL:%%libexec/gimp/1.1/plug-ins/logulator
libexec/gimp/1.1/plug-ins/mail
libexec/gimp/1.1/plug-ins/mapcolor
libexec/gimp/1.1/plug-ins/max_rgb
libexec/gimp/1.1/plug-ins/maze
libexec/gimp/1.1/plug-ins/mblur
+%%PERL:%%libexec/gimp/1.1/plug-ins/miff
+%%PERL:%%libexec/gimp/1.1/plug-ins/mirrorsplit
libexec/gimp/1.1/plug-ins/mosaic
libexec/gimp/1.1/plug-ins/mpeg
libexec/gimp/1.1/plug-ins/newsprint
@@ -159,30 +226,41 @@ libexec/gimp/1.1/plug-ins/nova
libexec/gimp/1.1/plug-ins/oilify
libexec/gimp/1.1/plug-ins/pagecurl
libexec/gimp/1.1/plug-ins/papertile
+%%PERL:%%libexec/gimp/1.1/plug-ins/parasite-editor
libexec/gimp/1.1/plug-ins/pat
libexec/gimp/1.1/plug-ins/pcx
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlcc
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlotine
libexec/gimp/1.1/plug-ins/pix
libexec/gimp/1.1/plug-ins/pixelize
+%%PERL:%%libexec/gimp/1.1/plug-ins/pixelmap
libexec/gimp/1.1/plug-ins/plasma
libexec/gimp/1.1/plug-ins/plugindetails
libexec/gimp/1.1/plug-ins/png
libexec/gimp/1.1/plug-ins/pnm
libexec/gimp/1.1/plug-ins/polar
+%%PERL:%%libexec/gimp/1.1/plug-ins/prep4gif
libexec/gimp/1.1/plug-ins/print
libexec/gimp/1.1/plug-ins/ps
libexec/gimp/1.1/plug-ins/psd
libexec/gimp/1.1/plug-ins/psp
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomart1
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomblends
libexec/gimp/1.1/plug-ins/randomize
libexec/gimp/1.1/plug-ins/rcm
+%%PERL:%%libexec/gimp/1.1/plug-ins/repdup
libexec/gimp/1.1/plug-ins/ripple
libexec/gimp/1.1/plug-ins/rotate
+%%PERL:%%libexec/gimp/1.1/plug-ins/roundsel
libexec/gimp/1.1/plug-ins/sample_colorize
libexec/gimp/1.1/plug-ins/scatter_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/scratches
libexec/gimp/1.1/plug-ins/screenshot
libexec/gimp/1.1/plug-ins/script-fu
libexec/gimp/1.1/plug-ins/sel2path
libexec/gimp/1.1/plug-ins/sel_gauss
libexec/gimp/1.1/plug-ins/semiflatten
+%%PERL:%%libexec/gimp/1.1/plug-ins/sethspin
libexec/gimp/1.1/plug-ins/sgi
libexec/gimp/1.1/plug-ins/sharpen
libexec/gimp/1.1/plug-ins/shift
@@ -193,30 +271,43 @@ libexec/gimp/1.1/plug-ins/sobel
libexec/gimp/1.1/plug-ins/sparkle
libexec/gimp/1.1/plug-ins/spheredesigner
libexec/gimp/1.1/plug-ins/spread
+%%PERL:%%libexec/gimp/1.1/plug-ins/stampify
+%%PERL:%%libexec/gimp/1.1/plug-ins/stamps
libexec/gimp/1.1/plug-ins/struc
libexec/gimp/1.1/plug-ins/sunras
+%%PERL:%%libexec/gimp/1.1/plug-ins/terral_text
+%%PERL:%%libexec/gimp/1.1/plug-ins/tex-to-float
libexec/gimp/1.1/plug-ins/tga
libexec/gimp/1.1/plug-ins/threshold_alpha
libexec/gimp/1.1/plug-ins/tiff
libexec/gimp/1.1/plug-ins/tile
libexec/gimp/1.1/plug-ins/tileit
libexec/gimp/1.1/plug-ins/tiler
+%%PERL:%%libexec/gimp/1.1/plug-ins/translogo
libexec/gimp/1.1/plug-ins/uniteditor
libexec/gimp/1.1/plug-ins/unsharp
libexec/gimp/1.1/plug-ins/url
libexec/gimp/1.1/plug-ins/video
+%%PERL:%%libexec/gimp/1.1/plug-ins/view3d
libexec/gimp/1.1/plug-ins/vinvert
libexec/gimp/1.1/plug-ins/vpropagate
libexec/gimp/1.1/plug-ins/warp
+%%PERL:%%libexec/gimp/1.1/plug-ins/warp-sharp
libexec/gimp/1.1/plug-ins/waves
libexec/gimp/1.1/plug-ins/webbrowser
+%%PERL:%%libexec/gimp/1.1/plug-ins/webify
libexec/gimp/1.1/plug-ins/whirlpinch
libexec/gimp/1.1/plug-ins/wind
+%%PERL:%%libexec/gimp/1.1/plug-ins/windify
libexec/gimp/1.1/plug-ins/wmf
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachlego
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachshadow
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachvision
libexec/gimp/1.1/plug-ins/xbm
libexec/gimp/1.1/plug-ins/xjt
libexec/gimp/1.1/plug-ins/xpm
libexec/gimp/1.1/plug-ins/xwd
+%%PERL:%%libexec/gimp/1.1/plug-ins/yinyang
libexec/gimp/1.1/plug-ins/zealouscrop
share/aclocal/gimp.m4
share/gimp/brushes/10x10square.gbr
@@ -247,6 +338,9 @@ share/gimp/brushes/9fcircle.gbr
share/gimp/brushes/DStar11.gbr
share/gimp/brushes/DStar17.gbr
share/gimp/brushes/DStar25.gbr
+share/gimp/brushes/SketchBrush-16.gih
+share/gimp/brushes/SketchBrush-32.gih
+share/gimp/brushes/SketchBrush-64.gih
share/gimp/brushes/callig1.gbr
share/gimp/brushes/callig2.gbr
share/gimp/brushes/callig3.gbr
@@ -275,29 +369,56 @@ share/gimp/devel-docs/html/libgimp/index.sgml
share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpbrushes.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannelops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpcolor.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolordisplay.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorselector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcompat.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpconvert.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpdialog.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdisplay.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdrawable.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpedit.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenums.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenv.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpexport.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpfeatures.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfileops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfloatingsel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgimprc.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgradients.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpguides.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimphelp.html
share/gimp/devel-docs/html/libgimp/libgimp-gimphelpui.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpimage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimplayer.html
share/gimp/devel-docs/html/libgimp/libgimp-gimplimits.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmath.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmessage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmisc.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppalette.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasite.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppixelrgn.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpplugin.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpproceduraldb.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpselection.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpsignal.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptexttool.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptile.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptools.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpui.html
-share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpundo.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
@@ -1192,6 +1313,7 @@ share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
share/locale/ca/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ca/LC_MESSAGES/gimp.mo
share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/cs/LC_MESSAGES/gimp-perl.mo
share/locale/cs/LC_MESSAGES/gimp-script-fu.mo
share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
share/locale/cs/LC_MESSAGES/gimp.mo
@@ -1200,6 +1322,7 @@ share/locale/da/LC_MESSAGES/gimp-script-fu.mo
share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
share/locale/da/LC_MESSAGES/gimp.mo
share/locale/de/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/de/LC_MESSAGES/gimp-perl.mo
share/locale/de/LC_MESSAGES/gimp-script-fu.mo
share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
share/locale/de/LC_MESSAGES/gimp.mo
@@ -1216,6 +1339,7 @@ share/locale/fi/LC_MESSAGES/gimp-script-fu.mo
share/locale/fi/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fi/LC_MESSAGES/gimp.mo
share/locale/fr/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/fr/LC_MESSAGES/gimp-perl.mo
share/locale/fr/LC_MESSAGES/gimp-script-fu.mo
share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fr/LC_MESSAGES/gimp.mo
@@ -1224,6 +1348,7 @@ share/locale/hu/LC_MESSAGES/gimp-script-fu.mo
share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
share/locale/hu/LC_MESSAGES/gimp.mo
share/locale/it/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/it/LC_MESSAGES/gimp-perl.mo
share/locale/it/LC_MESSAGES/gimp-script-fu.mo
share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
share/locale/it/LC_MESSAGES/gimp.mo
@@ -1240,6 +1365,7 @@ share/locale/nl/LC_MESSAGES/gimp-script-fu.mo
share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/nl/LC_MESSAGES/gimp.mo
share/locale/no/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/no/LC_MESSAGES/gimp-perl.mo
share/locale/no/LC_MESSAGES/gimp-script-fu.mo
share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
share/locale/no/LC_MESSAGES/gimp.mo
@@ -1248,6 +1374,7 @@ share/locale/pl/LC_MESSAGES/gimp-script-fu.mo
share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/pl/LC_MESSAGES/gimp.mo
share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/ru/LC_MESSAGES/gimp-perl.mo
share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ru/LC_MESSAGES/gimp.mo
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index e31c449cf70f..3924ad384690 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gimp
-PORTVERSION= 1.1.23
+PORTVERSION= 1.1.24
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${PORTVERSION}/ \
@@ -15,12 +15,6 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${PORTVERSION}/ \
MAINTAINER= vanilla@FreeBSD.org
-.if defined(WITH_PERL)
-BUILD_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-RUN_DEPENDS= perldl:${PORTSDIR}/math/PDL \
- ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-.endif
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
aa.1:${PORTSDIR}/graphics/aalib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -31,6 +25,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
+SHLIBVER?= ${PORTVERSION:S/1.//g}
USE_BZIP2= yes
USE_X_PREFIX= yes
@@ -38,10 +33,7 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
-
-.if !defined(WITH_PERL)
-CONFIGURE_ARGS= --disable-perl
-.endif
+PLIST_SUB= SHLIBVER="${SHLIBVER}"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
GLIB_CONFIG="${GLIB_CONFIG}" \
@@ -52,27 +44,28 @@ MAN1= gimp.1 gimptool.1
MAN5= gimprc.5
.if !defined(WITH_PERL)
-PLISTORIG= ${PKGDIR}/PLIST
-PLIST= ${WRKDIR}/PLIST
+CONFIGURE_ARGS= --disable-perl
+PLIST_SUB+= PERL:="@comment "
.else
-PLISTORIG= ${PKGDIR}/PLIST.perl
-PLIST= ${WRKDIR}/PLIST.perl
-.endif
-
-.if !defined(WITH_PERL)
-pre-fetch:
- @${ECHO} -n "If you want to compile with perl support use"
- @${ECHO} "'make -DWITH_PERL' instead"
+BUILD_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS+= perldl:${PORTSDIR}/math/PDL \
+ ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+PLIST_SUB+= PERL:=""
.endif
.if defined(WITH_GNOME) || (exists(${X11BASE}/bin/gnome-config) \
&& !defined(WITHOUT_GNOME))
LIB_DEPENDS+= gtkxmhtml.4:${PORTSDIR}/x11/gnomelibs
-pre-install:
- @${CAT} ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:=""
.else
-pre-install:
- @${SED} -e '/helpbrowser/d' ${PLISTORIG} > ${PLIST}
+PLIST_SUB+= GNOME:="@comment "
+.endif
+
+.if !defined(WITH_PERL)
+pre-fetch:
+ @${ECHO} -n "If you want to compile with perl support use "
+ @${ECHO} "'make -DWITH_PERL' instead"
.endif
post-install:
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 7b8db138bf6d..768dd8156426 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.23.tar.bz2) = 09ef0e0f676d36ca1c9a3193ec478f5c
+MD5 (gimp-1.1.24.tar.bz2) = 18c0ea8a814a468767a939e9895df6b3
diff --git a/graphics/gimpshop/files/patch-ab b/graphics/gimpshop/files/patch-ab
index 2e37f7c44cff..d0d7c4ef2415 100644
--- a/graphics/gimpshop/files/patch-ab
+++ b/graphics/gimpshop/files/patch-ab
@@ -1,13 +1,13 @@
---- plug-ins/common/url.c.orig Tue Feb 1 16:09:01 2000
-+++ plug-ins/common/url.c Sat Feb 19 13:51:36 2000
-@@ -158,8 +158,8 @@
- }
- else if (pid == 0)
- {
-- execlp ("wget", "wget", filename, "-O", tmpname, NULL);
-- g_message ("url: exec failed: wget: %s\n", g_strerror(errno));
-+ execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
-+ g_message ("url: exec failed: fetch: %s\n", g_strerror(errno));
+--- plug-ins/common/url.c.orig Wed Jun 7 21:46:43 2000
++++ plug-ins/common/url.c Mon Jun 26 12:20:54 2000
+@@ -187,8 +187,8 @@
+ dup (p[1]);
+ close (p[1]);
+ putenv ("LC_ALL=C"); /* produce deterministic output */
+- execlp ("wget", "wget", "-T", TIMEOUT, filename, "-O", tmpname, NULL);
+- g_message ("url: exec() failed: wget: %s", g_strerror (errno));
++ execlp ("fetch", "fetch", "-T", TIMEOUT, filename, "-p", "-o", tmpname, NULL);
++ g_message ("url: exec() failed: fetch: %s", g_strerror(errno));
g_free (tmpname);
- _exit(127);
+ _exit (127);
}
diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
index 963f2c046f7d..02c26a51f920 100644
--- a/graphics/gimpshop/files/patch-ah
+++ b/graphics/gimpshop/files/patch-ah
@@ -1,30 +1,6 @@
---- configure.orig Wed Mar 29 18:55:23 2000
-+++ configure Sun Apr 9 14:46:44 2000
-@@ -1494,8 +1494,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
- # Reload cache, that may have been modified by ltconfig
-@@ -1509,10 +1509,10 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL="/usr/local/bin/libtool"
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -3480,7 +3480,11 @@
+--- configure.orig Thu Jun 22 23:49:05 2000
++++ configure Mon Jun 26 16:04:16 2000
+@@ -3478,7 +3478,11 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
@@ -37,7 +13,7 @@
fi
rm -f conftest*
INSTOBJEXT=.mo
-@@ -7016,8 +7020,8 @@
+@@ -7148,8 +7152,8 @@
fi
@@ -48,7 +24,7 @@
localedir='${prefix}/${DATADIRNAME}/locale'
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8602,11 +8606,6 @@
+@@ -8415,11 +8419,6 @@
*) # Relative path.
srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
top_srcdir="$ac_dots$ac_given_srcdir" ;;
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index e1e94302dbc8..0556077da6f5 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -4,59 +4,94 @@ bin/gimp.setfont
bin/gimptool
include/gck/gck.h
include/libgimp/gimp.h
+include/libgimp/gimp_pdb.h
+include/libgimp/gimpbrushes_pdb.h
+include/libgimp/gimpbrushselect_pdb.h
include/libgimp/gimpchainbutton.h
+include/libgimp/gimpchannel.h
+include/libgimp/gimpchannel_pdb.h
+include/libgimp/gimpchannelops_pdb.h
+include/libgimp/gimpcolor_pdb.h
include/libgimp/gimpcolorbutton.h
include/libgimp/gimpcolordisplay.h
include/libgimp/gimpcolorselector.h
include/libgimp/gimpcolorspace.h
include/libgimp/gimpcompat.h
+include/libgimp/gimpconvert_pdb.h
include/libgimp/gimpdialog.h
+include/libgimp/gimpdisplay_pdb.h
+include/libgimp/gimpdrawable.h
+include/libgimp/gimpdrawable_pdb.h
+include/libgimp/gimpedit_pdb.h
include/libgimp/gimpenums.h
include/libgimp/gimpenv.h
include/libgimp/gimpexport.h
include/libgimp/gimpfeatures.h
+include/libgimp/gimpfileops_pdb.h
include/libgimp/gimpfileselection.h
+include/libgimp/gimpfloatingsel_pdb.h
+include/libgimp/gimpgimprc_pdb.h
+include/libgimp/gimpgradients_pdb.h
+include/libgimp/gimpgradientselect.h
+include/libgimp/gimpgradientselect_pdb.h
+include/libgimp/gimpguides_pdb.h
+include/libgimp/gimphelp_pdb.h
include/libgimp/gimphelpui.h
+include/libgimp/gimpimage.h
+include/libgimp/gimpimage_pdb.h
include/libgimp/gimpintl.h
+include/libgimp/gimplayer.h
+include/libgimp/gimplayer_pdb.h
include/libgimp/gimplimits.h
include/libgimp/gimpmath.h
include/libgimp/gimpmatrix.h
include/libgimp/gimpmenu.h
+include/libgimp/gimpmessage_pdb.h
+include/libgimp/gimpmisc_pdb.h
include/libgimp/gimpmodule.h
+include/libgimp/gimppalette_pdb.h
include/libgimp/gimpparasite.h
+include/libgimp/gimpparasite_pdb.h
include/libgimp/gimpparasiteio.h
include/libgimp/gimppatheditor.h
+include/libgimp/gimppaths_pdb.h
+include/libgimp/gimppatterns_pdb.h
+include/libgimp/gimppatternselect_pdb.h
+include/libgimp/gimppixelrgn.h
include/libgimp/gimppixmap.h
+include/libgimp/gimpplugin_pdb.h
+include/libgimp/gimpproceduraldb.h
+include/libgimp/gimpproceduraldb_pdb.h
include/libgimp/gimpquerybox.h
+include/libgimp/gimpselection.h
+include/libgimp/gimpselection_pdb.h
include/libgimp/gimpsignal.h
include/libgimp/gimpsizeentry.h
+include/libgimp/gimptexttool_pdb.h
+include/libgimp/gimptile.h
+include/libgimp/gimptools_pdb.h
+include/libgimp/gimptypes.h
include/libgimp/gimpui.h
-include/libgimp/gimputils.h
+include/libgimp/gimpundo_pdb.h
include/libgimp/gimpunit.h
+include/libgimp/gimpunit_pdb.h
include/libgimp/gimpunitmenu.h
+include/libgimp/gimputils.h
include/libgimp/gimpvector.h
include/libgimp/gimpwidgets.h
lib/libgck.a
-lib/libgck.la
lib/libgck.so
-lib/libgck.so.23
+lib/libgck.so.%%SHLIBVER%%
lib/libgimp.a
-lib/libgimp.la
lib/libgimp.so
-lib/libgimp.so.23
+lib/libgimp.so.%%SHLIBVER%%
lib/libgimpui.a
-lib/libgimpui.la
lib/libgimpui.so
-lib/libgimpui.so.23
-libexec/gimp/1.1/modules/libcdisplay_gamma.la
+lib/libgimpui.so.%%SHLIBVER%%
libexec/gimp/1.1/modules/libcdisplay_gamma.so
-libexec/gimp/1.1/modules/libcdisplay_highcontrast.la
libexec/gimp/1.1/modules/libcdisplay_highcontrast.so
-libexec/gimp/1.1/modules/libcolorsel_gtk.la
libexec/gimp/1.1/modules/libcolorsel_gtk.so
-libexec/gimp/1.1/modules/libcolorsel_triangle.la
libexec/gimp/1.1/modules/libcolorsel_triangle.so
-libexec/gimp/1.1/modules/libcolorsel_water.la
libexec/gimp/1.1/modules/libcolorsel_water.so
libexec/gimp/1.1/plug-ins/AlienMap
libexec/gimp/1.1/plug-ins/AlienMap2
@@ -65,22 +100,34 @@ libexec/gimp/1.1/plug-ins/CML_explorer
libexec/gimp/1.1/plug-ins/FractalExplorer
libexec/gimp/1.1/plug-ins/Lighting
libexec/gimp/1.1/plug-ins/MapObject
+%%PERL:%%libexec/gimp/1.1/plug-ins/PDB
+%%PERL:%%libexec/gimp/1.1/plug-ins/Perl-Server
libexec/gimp/1.1/plug-ins/aa
libexec/gimp/1.1/plug-ins/align_layers
+%%PERL:%%libexec/gimp/1.1/plug-ins/animate_cells
libexec/gimp/1.1/plug-ins/animationplay
libexec/gimp/1.1/plug-ins/animoptimize
libexec/gimp/1.1/plug-ins/apply_lens
libexec/gimp/1.1/plug-ins/autocrop
libexec/gimp/1.1/plug-ins/autostretch_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/avi
+%%PERL:%%libexec/gimp/1.1/plug-ins/blended2
libexec/gimp/1.1/plug-ins/blinds
+%%PERL:%%libexec/gimp/1.1/plug-ins/blowinout
libexec/gimp/1.1/plug-ins/blur
libexec/gimp/1.1/plug-ins/bmp
+%%PERL:%%libexec/gimp/1.1/plug-ins/border
libexec/gimp/1.1/plug-ins/borderaverage
+%%PERL:%%libexec/gimp/1.1/plug-ins/bricks
libexec/gimp/1.1/plug-ins/bumpmap
+%%PERL:%%libexec/gimp/1.1/plug-ins/burst
libexec/gimp/1.1/plug-ins/bz2
libexec/gimp/1.1/plug-ins/c_astretch
+%%PERL:%%libexec/gimp/1.1/plug-ins/centerguide
libexec/gimp/1.1/plug-ins/checkerboard
+%%PERL:%%libexec/gimp/1.1/plug-ins/clear_alpha
libexec/gimp/1.1/plug-ins/color_enhance
+%%PERL:%%libexec/gimp/1.1/plug-ins/colorhtml
libexec/gimp/1.1/plug-ins/colorify
libexec/gimp/1.1/plug-ins/colortoalpha
libexec/gimp/1.1/plug-ins/compose
@@ -88,6 +135,7 @@ libexec/gimp/1.1/plug-ins/convmatrix
libexec/gimp/1.1/plug-ins/csource
libexec/gimp/1.1/plug-ins/cubism
libexec/gimp/1.1/plug-ins/curve_bend
+%%PERL:%%libexec/gimp/1.1/plug-ins/dataurl
libexec/gimp/1.1/plug-ins/dbbrowser
libexec/gimp/1.1/plug-ins/decompose
libexec/gimp/1.1/plug-ins/deinterlace
@@ -96,17 +144,24 @@ libexec/gimp/1.1/plug-ins/despeckle
libexec/gimp/1.1/plug-ins/destripe
libexec/gimp/1.1/plug-ins/diffraction
libexec/gimp/1.1/plug-ins/displace
+%%PERL:%%libexec/gimp/1.1/plug-ins/ditherize
+%%PERL:%%libexec/gimp/1.1/plug-ins/dust
libexec/gimp/1.1/plug-ins/edge
libexec/gimp/1.1/plug-ins/emboss
libexec/gimp/1.1/plug-ins/engrave
libexec/gimp/1.1/plug-ins/exchange
libexec/gimp/1.1/plug-ins/faxg3
libexec/gimp/1.1/plug-ins/film
+%%PERL:%%libexec/gimp/1.1/plug-ins/fire
+%%PERL:%%libexec/gimp/1.1/plug-ins/fit-text
libexec/gimp/1.1/plug-ins/fits
libexec/gimp/1.1/plug-ins/flame
libexec/gimp/1.1/plug-ins/flarefx
+%%PERL:%%libexec/gimp/1.1/plug-ins/font_table
libexec/gimp/1.1/plug-ins/fp
libexec/gimp/1.1/plug-ins/fractaltrace
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_filter
+%%PERL:%%libexec/gimp/1.1/plug-ins/frame_reshuffle
libexec/gimp/1.1/plug-ins/gap_decode_mpeg
libexec/gimp/1.1/plug-ins/gap_filter
libexec/gimp/1.1/plug-ins/gap_frontends
@@ -125,30 +180,42 @@ libexec/gimp/1.1/plug-ins/gif
libexec/gimp/1.1/plug-ins/gifload
libexec/gimp/1.1/plug-ins/gimpressionist
libexec/gimp/1.1/plug-ins/glasstile
+%%PERL:%%libexec/gimp/1.1/plug-ins/glowing_steel
+%%PERL:%%libexec/gimp/1.1/plug-ins/goldenmean
+%%PERL:%%libexec/gimp/1.1/plug-ins/gouge
libexec/gimp/1.1/plug-ins/gpb
libexec/gimp/1.1/plug-ins/gqbist
libexec/gimp/1.1/plug-ins/gradmap
libexec/gimp/1.1/plug-ins/grid
libexec/gimp/1.1/plug-ins/gtm
+%%PERL:%%libexec/gimp/1.1/plug-ins/guide_remove
+%%PERL:%%libexec/gimp/1.1/plug-ins/guidegrid
+%%PERL:%%libexec/gimp/1.1/plug-ins/guides_to_selection
libexec/gimp/1.1/plug-ins/guillotine
libexec/gimp/1.1/plug-ins/gz
libexec/gimp/1.1/plug-ins/header
-libexec/gimp/1.1/plug-ins/helpbrowser
+%%GNOME:%%libexec/gimp/1.1/plug-ins/helpbrowser
libexec/gimp/1.1/plug-ins/hot
libexec/gimp/1.1/plug-ins/hrz
libexec/gimp/1.1/plug-ins/ifscompose
libexec/gimp/1.1/plug-ins/illusion
+%%PERL:%%libexec/gimp/1.1/plug-ins/image_tile
libexec/gimp/1.1/plug-ins/imagemap
+%%PERL:%%libexec/gimp/1.1/plug-ins/innerbevel
libexec/gimp/1.1/plug-ins/iwarp
libexec/gimp/1.1/plug-ins/jigsaw
libexec/gimp/1.1/plug-ins/jpeg
libexec/gimp/1.1/plug-ins/laplace
+%%PERL:%%libexec/gimp/1.1/plug-ins/layerfuncs
libexec/gimp/1.1/plug-ins/lic
+%%PERL:%%libexec/gimp/1.1/plug-ins/logulator
libexec/gimp/1.1/plug-ins/mail
libexec/gimp/1.1/plug-ins/mapcolor
libexec/gimp/1.1/plug-ins/max_rgb
libexec/gimp/1.1/plug-ins/maze
libexec/gimp/1.1/plug-ins/mblur
+%%PERL:%%libexec/gimp/1.1/plug-ins/miff
+%%PERL:%%libexec/gimp/1.1/plug-ins/mirrorsplit
libexec/gimp/1.1/plug-ins/mosaic
libexec/gimp/1.1/plug-ins/mpeg
libexec/gimp/1.1/plug-ins/newsprint
@@ -159,30 +226,41 @@ libexec/gimp/1.1/plug-ins/nova
libexec/gimp/1.1/plug-ins/oilify
libexec/gimp/1.1/plug-ins/pagecurl
libexec/gimp/1.1/plug-ins/papertile
+%%PERL:%%libexec/gimp/1.1/plug-ins/parasite-editor
libexec/gimp/1.1/plug-ins/pat
libexec/gimp/1.1/plug-ins/pcx
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlcc
+%%PERL:%%libexec/gimp/1.1/plug-ins/perlotine
libexec/gimp/1.1/plug-ins/pix
libexec/gimp/1.1/plug-ins/pixelize
+%%PERL:%%libexec/gimp/1.1/plug-ins/pixelmap
libexec/gimp/1.1/plug-ins/plasma
libexec/gimp/1.1/plug-ins/plugindetails
libexec/gimp/1.1/plug-ins/png
libexec/gimp/1.1/plug-ins/pnm
libexec/gimp/1.1/plug-ins/polar
+%%PERL:%%libexec/gimp/1.1/plug-ins/prep4gif
libexec/gimp/1.1/plug-ins/print
libexec/gimp/1.1/plug-ins/ps
libexec/gimp/1.1/plug-ins/psd
libexec/gimp/1.1/plug-ins/psp
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomart1
+%%PERL:%%libexec/gimp/1.1/plug-ins/randomblends
libexec/gimp/1.1/plug-ins/randomize
libexec/gimp/1.1/plug-ins/rcm
+%%PERL:%%libexec/gimp/1.1/plug-ins/repdup
libexec/gimp/1.1/plug-ins/ripple
libexec/gimp/1.1/plug-ins/rotate
+%%PERL:%%libexec/gimp/1.1/plug-ins/roundsel
libexec/gimp/1.1/plug-ins/sample_colorize
libexec/gimp/1.1/plug-ins/scatter_hsv
+%%PERL:%%libexec/gimp/1.1/plug-ins/scratches
libexec/gimp/1.1/plug-ins/screenshot
libexec/gimp/1.1/plug-ins/script-fu
libexec/gimp/1.1/plug-ins/sel2path
libexec/gimp/1.1/plug-ins/sel_gauss
libexec/gimp/1.1/plug-ins/semiflatten
+%%PERL:%%libexec/gimp/1.1/plug-ins/sethspin
libexec/gimp/1.1/plug-ins/sgi
libexec/gimp/1.1/plug-ins/sharpen
libexec/gimp/1.1/plug-ins/shift
@@ -193,30 +271,43 @@ libexec/gimp/1.1/plug-ins/sobel
libexec/gimp/1.1/plug-ins/sparkle
libexec/gimp/1.1/plug-ins/spheredesigner
libexec/gimp/1.1/plug-ins/spread
+%%PERL:%%libexec/gimp/1.1/plug-ins/stampify
+%%PERL:%%libexec/gimp/1.1/plug-ins/stamps
libexec/gimp/1.1/plug-ins/struc
libexec/gimp/1.1/plug-ins/sunras
+%%PERL:%%libexec/gimp/1.1/plug-ins/terral_text
+%%PERL:%%libexec/gimp/1.1/plug-ins/tex-to-float
libexec/gimp/1.1/plug-ins/tga
libexec/gimp/1.1/plug-ins/threshold_alpha
libexec/gimp/1.1/plug-ins/tiff
libexec/gimp/1.1/plug-ins/tile
libexec/gimp/1.1/plug-ins/tileit
libexec/gimp/1.1/plug-ins/tiler
+%%PERL:%%libexec/gimp/1.1/plug-ins/translogo
libexec/gimp/1.1/plug-ins/uniteditor
libexec/gimp/1.1/plug-ins/unsharp
libexec/gimp/1.1/plug-ins/url
libexec/gimp/1.1/plug-ins/video
+%%PERL:%%libexec/gimp/1.1/plug-ins/view3d
libexec/gimp/1.1/plug-ins/vinvert
libexec/gimp/1.1/plug-ins/vpropagate
libexec/gimp/1.1/plug-ins/warp
+%%PERL:%%libexec/gimp/1.1/plug-ins/warp-sharp
libexec/gimp/1.1/plug-ins/waves
libexec/gimp/1.1/plug-ins/webbrowser
+%%PERL:%%libexec/gimp/1.1/plug-ins/webify
libexec/gimp/1.1/plug-ins/whirlpinch
libexec/gimp/1.1/plug-ins/wind
+%%PERL:%%libexec/gimp/1.1/plug-ins/windify
libexec/gimp/1.1/plug-ins/wmf
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachlego
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachshadow
+%%PERL:%%libexec/gimp/1.1/plug-ins/xachvision
libexec/gimp/1.1/plug-ins/xbm
libexec/gimp/1.1/plug-ins/xjt
libexec/gimp/1.1/plug-ins/xpm
libexec/gimp/1.1/plug-ins/xwd
+%%PERL:%%libexec/gimp/1.1/plug-ins/yinyang
libexec/gimp/1.1/plug-ins/zealouscrop
share/aclocal/gimp.m4
share/gimp/brushes/10x10square.gbr
@@ -247,6 +338,9 @@ share/gimp/brushes/9fcircle.gbr
share/gimp/brushes/DStar11.gbr
share/gimp/brushes/DStar17.gbr
share/gimp/brushes/DStar25.gbr
+share/gimp/brushes/SketchBrush-16.gih
+share/gimp/brushes/SketchBrush-32.gih
+share/gimp/brushes/SketchBrush-64.gih
share/gimp/brushes/callig1.gbr
share/gimp/brushes/callig2.gbr
share/gimp/brushes/callig3.gbr
@@ -275,29 +369,56 @@ share/gimp/devel-docs/html/libgimp/index.sgml
share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpbrushes.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpchannelops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpcolor.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolordisplay.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorselector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpcompat.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpconvert.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpdialog.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdisplay.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdrawable.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpedit.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenums.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpenv.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpexport.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpfeatures.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfileops.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfloatingsel.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgimprc.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpgradients.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpguides.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimphelp.html
share/gimp/devel-docs/html/libgimp/libgimp-gimphelpui.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpimage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimplayer.html
share/gimp/devel-docs/html/libgimp/libgimp-gimplimits.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmath.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmessage.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmisc.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppalette.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasite.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpparasiteio.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimppixelrgn.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpplugin.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpproceduraldb.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpquerybox.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpselection.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpsignal.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptexttool.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptile.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimptools.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpui.html
-share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpundo.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimputils.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpvector.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
@@ -1192,6 +1313,7 @@ share/locale/ca/LC_MESSAGES/gimp-script-fu.mo
share/locale/ca/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ca/LC_MESSAGES/gimp.mo
share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/cs/LC_MESSAGES/gimp-perl.mo
share/locale/cs/LC_MESSAGES/gimp-script-fu.mo
share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
share/locale/cs/LC_MESSAGES/gimp.mo
@@ -1200,6 +1322,7 @@ share/locale/da/LC_MESSAGES/gimp-script-fu.mo
share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
share/locale/da/LC_MESSAGES/gimp.mo
share/locale/de/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/de/LC_MESSAGES/gimp-perl.mo
share/locale/de/LC_MESSAGES/gimp-script-fu.mo
share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
share/locale/de/LC_MESSAGES/gimp.mo
@@ -1216,6 +1339,7 @@ share/locale/fi/LC_MESSAGES/gimp-script-fu.mo
share/locale/fi/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fi/LC_MESSAGES/gimp.mo
share/locale/fr/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/fr/LC_MESSAGES/gimp-perl.mo
share/locale/fr/LC_MESSAGES/gimp-script-fu.mo
share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo
share/locale/fr/LC_MESSAGES/gimp.mo
@@ -1224,6 +1348,7 @@ share/locale/hu/LC_MESSAGES/gimp-script-fu.mo
share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
share/locale/hu/LC_MESSAGES/gimp.mo
share/locale/it/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/it/LC_MESSAGES/gimp-perl.mo
share/locale/it/LC_MESSAGES/gimp-script-fu.mo
share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
share/locale/it/LC_MESSAGES/gimp.mo
@@ -1240,6 +1365,7 @@ share/locale/nl/LC_MESSAGES/gimp-script-fu.mo
share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/nl/LC_MESSAGES/gimp.mo
share/locale/no/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/no/LC_MESSAGES/gimp-perl.mo
share/locale/no/LC_MESSAGES/gimp-script-fu.mo
share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
share/locale/no/LC_MESSAGES/gimp.mo
@@ -1248,6 +1374,7 @@ share/locale/pl/LC_MESSAGES/gimp-script-fu.mo
share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
share/locale/pl/LC_MESSAGES/gimp.mo
share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
+%%PERL:%%share/locale/ru/LC_MESSAGES/gimp-perl.mo
share/locale/ru/LC_MESSAGES/gimp-script-fu.mo
share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
share/locale/ru/LC_MESSAGES/gimp.mo