Update to 2.5.2

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11187 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 30 insertions, 21 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 73dd8316b..7e4efe90a 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.22 2008/04/21 00:00:32 marcus Exp $
+#   $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.23 2008/06/06 21:38:49 marcus Exp $
 #
 
 PORTNAME=	gimp-app
-DISTVERSION=	2.5.0
-PORTREVISION?=	2
+DISTVERSION=	2.5.2
+PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -36,8 +36,6 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		curl.4:${PORTSDIR}/ftp/curl \
 		gegl-0.0.0:${PORTSDIR}/x11/gegl
 
-CONFLICTS=	gimp-app-[0-9]*
-
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XORG=	xpm xmu xext
@@ -81,13 +79,12 @@ LIB_DEPENDS+=	gimp-2.0.0:${PORTSDIR}/graphics/gimp-app-devel
 
 .else
 
-MAN1=	gimp-2.5.1 gimp-console-2.5.1 gimp-remote-2.5.1
-MAN5=	gimp-2.5.5 gimp-remote-2.5.5 gimprc-2.5.5
+MAN1=	gimp-2.5.1 gimptool-2.0.1
+MAN5=	gimp-2.5.5 gimprc-2.5.5
 MLINKS=	gimp-2.4.1 gimp.1 \
 	gimp-2.4.1 gimp-console-2.4.1 \
-	gimp-console-2.4.1 gimp-console.1 \
-	gimp-remote-2.4.1 gimp-remote.1 \
-	gimprc-2.4.5 gimprc.5
+	gimprc-2.4.5 gimprc.5 \
+	gimptool-2.0.1 gimptool
 
 .if defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--without-librsvg
@@ -115,11 +112,11 @@ PLIST_SUB+=		GNOME="@comment "
 .endif
 
 .if defined(WITH_HELPBROWSER)
-USE_GNOME+=		libgtkhtml
-CONFIGURE_ARGS+=	--with-gtkhtml2
+LIB_DEPENDS+=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+CONFIGURE_ARGS+=	--with-webkit
 PLIST_SUB+=		HELPBROWSER=""
 .else
-CONFIGURE_ARGS+=	--without-gtkhtml2
+CONFIGURE_ARGS+=	--without-webkit
 PLIST_SUB+=		HELPBROWSER="@comment "
 .endif
 
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index a0b34e50c..d4a80e9cd 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.5.0.tar.bz2) = 8ba5d24c700b495e8a9f32743369c925
-SHA256 (gimp-2.5.0.tar.bz2) = 936ed8b417323c71c81d6d7c2d40fab9999077430c44a58747fe2be691076484
-SIZE (gimp-2.5.0.tar.bz2) = 18105678
+MD5 (gimp-2.5.2.tar.bz2) = 98add4a1ca6af2e20f80ae3f5a84a922
+SHA256 (gimp-2.5.2.tar.bz2) = 78d209885768790be6d610d275430e6e775392b6384d326401a7ecc13606c539
+SIZE (gimp-2.5.2.tar.bz2) = 18863168
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 950e6b97e..8d43b53ef 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -2,8 +2,6 @@ bin/gimp
 bin/gimp-2.5
 bin/gimp-console
 bin/gimp-console-2.5
-bin/gimp-remote
-bin/gimp-remote-2.5
 bin/gimptool-2.0
 etc/gimp/2.2/controllerrc
 etc/gimp/2.2/gimprc
@@ -195,6 +193,7 @@ include/gimp-2.0/libgimpwidgets/gimpfileentry.h
 include/gimp-2.0/libgimpwidgets/gimpframe.h
 include/gimp-2.0/libgimpwidgets/gimphelpui.h
 include/gimp-2.0/libgimpwidgets/gimphintbox.h
+include/gimp-2.0/libgimpwidgets/gimphruler.h
 include/gimp-2.0/libgimpwidgets/gimpintcombobox.h
 include/gimp-2.0/libgimpwidgets/gimpintstore.h
 include/gimp-2.0/libgimpwidgets/gimpmemsizeentry.h
@@ -209,12 +208,14 @@ include/gimp-2.0/libgimpwidgets/gimppreview.h
 include/gimp-2.0/libgimpwidgets/gimppreviewarea.h
 include/gimp-2.0/libgimpwidgets/gimppropwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpquerybox.h
+include/gimp-2.0/libgimpwidgets/gimpruler.h
 include/gimp-2.0/libgimpwidgets/gimpscaleentry.h
 include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpstock.h
 include/gimp-2.0/libgimpwidgets/gimpstringcombobox.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
+include/gimp-2.0/libgimpwidgets/gimpvruler.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
@@ -362,12 +363,12 @@ libexec/gimp/2.2/plug-ins/glob
 libexec/gimp/2.2/plug-ins/gradient-flare
 libexec/gimp/2.2/plug-ins/gradient-map
 libexec/gimp/2.2/plug-ins/grid
-libexec/gimp/2.2/plug-ins/gtm
 libexec/gimp/2.2/plug-ins/guillotine
 libexec/gimp/2.2/plug-ins/header
 libexec/gimp/2.2/plug-ins/help
 %%HELPBROWSER%%libexec/gimp/2.2/plug-ins/help-browser
 libexec/gimp/2.2/plug-ins/hot
+libexec/gimp/2.2/plug-ins/html-table
 libexec/gimp/2.2/plug-ins/ico
 libexec/gimp/2.2/plug-ins/ifs-compose
 libexec/gimp/2.2/plug-ins/illusion
@@ -722,6 +723,7 @@ share/doc/gimp/libgimpwidgets/GimpPickButton.html
 share/doc/gimp/libgimpwidgets/GimpPixmap.html
 share/doc/gimp/libgimpwidgets/GimpPreview.html
 share/doc/gimp/libgimpwidgets/GimpPreviewArea.html
+share/doc/gimp/libgimpwidgets/GimpRuler.html
 share/doc/gimp/libgimpwidgets/GimpScrolledPreview.html
 share/doc/gimp/libgimpwidgets/GimpSizeEntry.html
 share/doc/gimp/libgimpwidgets/GimpStringComboBox.html
@@ -760,9 +762,11 @@ share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpCairoUtils.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpEnumWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHintBox.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpHRuler.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpPropWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpStock.html
+share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpVRuler.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-GimpWidgets.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-cell-renderers.html
 share/doc/gimp/libgimpwidgets/libgimpwidgets-colordisplay.html
@@ -1055,8 +1059,6 @@ share/doc/gimp/libgimpwidgets/stock-tool-perspective-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-perspective-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-perspective-clone-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-perspective-clone-22.png
-share/doc/gimp/libgimpwidgets/stock-tool-polygon-select-16.png
-share/doc/gimp/libgimpwidgets/stock-tool-polygon-select-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-posterize-16.png
 share/doc/gimp/libgimpwidgets/stock-tool-posterize-22.png
 share/doc/gimp/libgimpwidgets/stock-tool-rect-select-16.png
@@ -1081,6 +1083,10 @@ share/doc/gimp/libgimpwidgets/stock-transparency-16.png
 share/doc/gimp/libgimpwidgets/stock-transparency-24.png
 share/doc/gimp/libgimpwidgets/stock-undo-history-16.png
 share/doc/gimp/libgimpwidgets/stock-undo-history-24.png
+share/doc/gimp/libgimpwidgets/stock-user-manual-16.png
+share/doc/gimp/libgimpwidgets/stock-user-manual-24.png
+share/doc/gimp/libgimpwidgets/stock-user-manual-32.png
+share/doc/gimp/libgimpwidgets/stock-user-manual-64.png
 share/doc/gimp/libgimpwidgets/stock-vcenter-24.png
 share/doc/gimp/libgimpwidgets/stock-vchain-24.png
 share/doc/gimp/libgimpwidgets/stock-vchain-broken-24.png
@@ -1823,6 +1829,12 @@ share/locale/id/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/id/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/id/LC_MESSAGES/gimp20-tips.mo
 share/locale/id/LC_MESSAGES/gimp20.mo
+share/locale/is/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/is/LC_MESSAGES/gimp20-python.mo
+share/locale/is/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/is/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/is/LC_MESSAGES/gimp20-tips.mo
+share/locale/is/LC_MESSAGES/gimp20.mo
 share/locale/it/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/it/LC_MESSAGES/gimp20-python.mo
 share/locale/it/LC_MESSAGES/gimp20-script-fu.mo