Update to 2.4.6.

5 files changed, 54 insertions, 29 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index f88dc1cf18ef..eaa3b9f78a1e 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gimp-app
-DISTVERSION=	2.4.5
-PORTREVISION?=	2
+DISTVERSION=	2.4.6
+PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -34,12 +34,15 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		lcms.1:${PORTSDIR}/graphics/lcms
 
+CONFLICTS=	gimp-app-devel-[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XORG=	xpm xmu xext
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-USE_GNOME+=	gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils
+USE_GNOME+=	gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack \
+		desktopfileutils
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -56,6 +59,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 
 .if !defined(GIMP_SLAVE)
+WANT_GNOME=	yes
+
 OPTIONS?=	DEBUG "debugging" off \
 		DBUS "D-BUS support" on \
 		GNOMEVFS "Use GNOME VFS for the URI plug-in" on \
@@ -142,11 +147,13 @@ post-patch:
 
 post-install:
 .if !defined(GIMP_SLAVE)
-.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
+.  if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
 	${MKDIR} ${PREFIX}/share/mime-info ${PREFIX}/share/application-registry
-	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.applications ${PREFIX}/share/application-registry
-	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.keys ${PREFIX}/share/mime-info
-.endif
+	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.applications \
+		${PREFIX}/share/application-registry
+	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.keys \
+		${PREFIX}/share/mime-info
+.  endif
 .endif
 	@-update-desktop-database
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 3c04a3eefdf1..af4de90c9b4e 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.4.5.tar.bz2) = 162e264dc5f0c7e4de8794e78818381f
-SHA256 (gimp-2.4.5.tar.bz2) = dadf13c2e605245572f1bdb948969c3f3ef3d2b18a9ca1f64d6f9383ac48d5ae
-SIZE (gimp-2.4.5.tar.bz2) = 17819962
+MD5 (gimp-2.4.6.tar.bz2) = a0bd1560f81f15c23ed4c0c6cb9c4b59
+SHA256 (gimp-2.4.6.tar.bz2) = 99aef9e70edf80e4f3605727ba2979286c568a02cadf6e8c5d37a5ce6cce0bea
+SIZE (gimp-2.4.6.tar.bz2) = 18365363
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 38ad01226a2e..86c75f94a295 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -458,6 +458,7 @@ libexec/gimp/2.2/plug-ins/xpm
 libexec/gimp/2.2/plug-ins/xwd
 libexec/gimp/2.2/plug-ins/zealouscrop
 share/aclocal/gimp-2.0.m4
+%%GNOME%%share/application-registry/gimp.applications
 share/applications/gimp.desktop
 share/doc/gimp/libgimp/GimpAspectPreview.html
 share/doc/gimp/libgimp/GimpBrushSelectButton.html
@@ -1094,24 +1095,24 @@ share/gimp/brushes/Calligraphic-Brush-1.vbr
 share/gimp/brushes/Calligraphic-Brush-2.vbr
 share/gimp/brushes/Calligraphic-Brush-3.vbr
 share/gimp/brushes/Circle-1.vbr
-share/gimp/brushes/Circle-3.vbr
-share/gimp/brushes/Circle-5.vbr
-share/gimp/brushes/Circle-7.vbr
-share/gimp/brushes/Circle-9.vbr
 share/gimp/brushes/Circle-11.vbr
 share/gimp/brushes/Circle-13.vbr
 share/gimp/brushes/Circle-15.vbr
 share/gimp/brushes/Circle-17.vbr
 share/gimp/brushes/Circle-19.vbr
-share/gimp/brushes/Circle-Fuzzy-3.vbr
-share/gimp/brushes/Circle-Fuzzy-5.vbr
-share/gimp/brushes/Circle-Fuzzy-7.vbr
-share/gimp/brushes/Circle-Fuzzy-9.vbr
+share/gimp/brushes/Circle-3.vbr
+share/gimp/brushes/Circle-5.vbr
+share/gimp/brushes/Circle-7.vbr
+share/gimp/brushes/Circle-9.vbr
 share/gimp/brushes/Circle-Fuzzy-11.vbr
 share/gimp/brushes/Circle-Fuzzy-13.vbr
 share/gimp/brushes/Circle-Fuzzy-15.vbr
 share/gimp/brushes/Circle-Fuzzy-17.vbr
 share/gimp/brushes/Circle-Fuzzy-19.vbr
+share/gimp/brushes/Circle-Fuzzy-3.vbr
+share/gimp/brushes/Circle-Fuzzy-5.vbr
+share/gimp/brushes/Circle-Fuzzy-7.vbr
+share/gimp/brushes/Circle-Fuzzy-9.vbr
 share/gimp/brushes/Diagonal-Star-11.vbr
 share/gimp/brushes/Diagonal-Star-17.vbr
 share/gimp/brushes/Diagonal-Star-25.vbr
@@ -1611,16 +1612,16 @@ share/gimp/themes/Default/images/preferences/folders-interp-22.png
 share/gimp/themes/Default/images/preferences/folders-interp.png
 share/gimp/themes/Default/images/preferences/folders-modules-22.png
 share/gimp/themes/Default/images/preferences/folders-modules.png
-share/gimp/themes/Default/images/preferences/folders-palettes.png
 share/gimp/themes/Default/images/preferences/folders-palettes-22.png
+share/gimp/themes/Default/images/preferences/folders-palettes.png
 share/gimp/themes/Default/images/preferences/folders-patterns-22.png
 share/gimp/themes/Default/images/preferences/folders-patterns.png
 share/gimp/themes/Default/images/preferences/folders-plug-ins-22.png
 share/gimp/themes/Default/images/preferences/folders-plug-ins.png
 share/gimp/themes/Default/images/preferences/folders-scripts-22.png
 share/gimp/themes/Default/images/preferences/folders-scripts.png
-share/gimp/themes/Default/images/preferences/folders-themes.png
 share/gimp/themes/Default/images/preferences/folders-themes-22.png
+share/gimp/themes/Default/images/preferences/folders-themes.png
 share/gimp/themes/Default/images/preferences/folders-tool-plug-ins-22.png
 share/gimp/themes/Default/images/preferences/folders-tool-plug-ins.png
 share/gimp/themes/Default/images/preferences/folders-tools-22.png
@@ -1653,8 +1654,6 @@ share/gimp/themes/Default/images/stock-question-64.png
 share/gimp/themes/Default/images/stock-warning-64.png
 share/gimp/themes/Small/gtkrc
 share/gimp/tips/gimp-tips.xml
-%%GNOME%%share/application-registry/gimp.applications
-%%GNOME%%share/mime-info/gimp.keys
 share/icons/hicolor/16x16/apps/gimp.png
 share/icons/hicolor/22x22/apps/gimp.png
 share/icons/hicolor/24x24/apps/gimp.png
@@ -1668,6 +1667,12 @@ share/locale/ar/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ar/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ar/LC_MESSAGES/gimp20-tips.mo
 share/locale/ar/LC_MESSAGES/gimp20.mo
+share/locale/be/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/be/LC_MESSAGES/gimp20-python.mo
+share/locale/be/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/be/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/be/LC_MESSAGES/gimp20-tips.mo
+share/locale/be/LC_MESSAGES/gimp20.mo
 share/locale/bg/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/bg/LC_MESSAGES/gimp20-python.mo
 share/locale/bg/LC_MESSAGES/gimp20-script-fu.mo
@@ -1680,6 +1685,12 @@ share/locale/ca/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ca/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ca/LC_MESSAGES/gimp20-tips.mo
 share/locale/ca/LC_MESSAGES/gimp20.mo
+share/locale/ca@valencia/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/ca@valencia/LC_MESSAGES/gimp20-python.mo
+share/locale/ca@valencia/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ca@valencia/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/ca@valencia/LC_MESSAGES/gimp20-tips.mo
+share/locale/ca@valencia/LC_MESSAGES/gimp20.mo
 share/locale/cs/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/cs/LC_MESSAGES/gimp20-python.mo
 share/locale/cs/LC_MESSAGES/gimp20-script-fu.mo
@@ -1818,12 +1829,12 @@ share/locale/ja/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ja/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ja/LC_MESSAGES/gimp20-tips.mo
 share/locale/ja/LC_MESSAGES/gimp20.mo
-share/locale/km/LC_MESSAGES/gimp20.mo
 share/locale/km/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/km/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/km/LC_MESSAGES/gimp20-python.mo
 share/locale/km/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/km/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/km/LC_MESSAGES/gimp20-tips.mo
+share/locale/km/LC_MESSAGES/gimp20.mo
 share/locale/ko/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ko/LC_MESSAGES/gimp20-python.mo
 share/locale/ko/LC_MESSAGES/gimp20-script-fu.mo
@@ -1866,6 +1877,12 @@ share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/nl/LC_MESSAGES/gimp20-tips.mo
 share/locale/nl/LC_MESSAGES/gimp20.mo
+share/locale/nn/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nn/LC_MESSAGES/gimp20-python.mo
+share/locale/nn/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/nn/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nn/LC_MESSAGES/gimp20-tips.mo
+share/locale/nn/LC_MESSAGES/gimp20.mo
 share/locale/oc/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/oc/LC_MESSAGES/gimp20-python.mo
 share/locale/oc/LC_MESSAGES/gimp20-script-fu.mo
@@ -1992,6 +2009,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-tips.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
+%%GNOME%%share/mime-info/gimp.keys
 @dirrm share/gimp/tips
 @dirrm share/gimp/themes/Small
 @dirrm share/gimp/themes/Default/images/preferences
@@ -2050,8 +2068,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -2060,3 +2076,5 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrmtry share/locale/km
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 958bcf628286..bda678f2a4c7 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gimp
-DISTVERSION?=	2.4.5
-PORTREVISION?=	1
+DISTVERSION?=	2.4.6
+PORTREVISION?=	0
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES?=	# empty
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 434c157cd189..092de5253b24 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/graphics/py-gimp/Makefile,v 1.4 2007/10/24 21:22:00 ahze Exp $
 
-PORTREVISION=	1
+PORTREVISION=	0
 PORTEPOCH=	0
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}