Sync w/ FreeBSD ports, no cookie or beer for ahze. ;-)

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

5 files changed, 46 insertions, 21 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 6b5606302..966f961b1 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.15 2007/09/09 22:45:26 mezz Exp $
+#   $MCom$
 #
 
 PORTNAME=	gimp-app
-DISTVERSION=	2.4.0-rc1
-PORTREVISION?=	2
+DISTVERSION=	2.4.0-rc2
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -33,7 +33,9 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		lcms.1:${PORTSDIR}/graphics/lcms
+		lcms.1:${PORTSDIR}/graphics/lcms \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index fbf3684d1..f300b65ea 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.4.0-rc1.tar.bz2) = 788fb85712ea1d8b52d70f7b2ebdb439
-SHA256 (gimp-2.4.0-rc1.tar.bz2) = a136bf8460f1c9a78e7831d0e897e95e7f62d13f8371d76e23114ad96b752f59
-SIZE (gimp-2.4.0-rc1.tar.bz2) = 16966553
+MD5 (gimp-2.4.0-rc2.tar.bz2) = 4a17f7d002cfc0ddf13d64181030a71b
+SHA256 (gimp-2.4.0-rc2.tar.bz2) = 6eca07a873852e1027154a0617d2b2199bd9d59a0c5566907177fd3c1c76b2f2
+SIZE (gimp-2.4.0-rc2.tar.bz2) = 17646885
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 832b4d59c..0c9b1a311 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1613,6 +1613,7 @@ 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-patterns-22.png
 share/gimp/themes/Default/images/preferences/folders-patterns.png
 share/gimp/themes/Default/images/preferences/folders-plug-ins-22.png
@@ -1620,6 +1621,7 @@ 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-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
@@ -2037,17 +2039,47 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm etc/gimp
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
 @dirrmtry share/locale/yi/LC_MESSAGES
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/eo/LC_MESSAGES
+@dirrmtry share/locale/eo
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 972b8d6c2..2a9064ed3 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimpshop
 PORTVERSION=	2.2.11
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.plasticbugs.com/blogimg/ \
 		http://freebsd.powered.net/distfiles/
@@ -40,7 +40,8 @@ PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
 		--disable-gtk-doc \
-		--enable-static
+		--enable-static \
+		--disable-print
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
@@ -51,7 +52,6 @@ MAN5=	gimprc.5 gimprc-2.2.5
 
 OPTIONS=	DEBUG "debugging" off \
 		PYTHON "Python-Fu support" off \
-		PRINT "GIMP printing" on \
 		HTML_HELP_BROWSER "GIMP help browser" on \
 		MP "multiple processor support" off
 
@@ -74,14 +74,6 @@ CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=		PYTHON:="@comment "
 .endif
 
-.if defined(WITHOUT_PRINT)
-CONFIGURE_ARGS+=	--disable-print
-PLIST_SUB+=		PRINT="@comment "
-.else
-LIB_DEPENDS+=		gimpprint.2:${PORTSDIR}/print/gimp-print
-PLIST_SUB+=		PRINT=""
-.endif
-
 .if defined(WITH_MP)
 CONFIGURE_ARGS+=	--enable-mp
 .endif
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 329a68a33..1709ab277 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -310,7 +310,6 @@ libexec/gimp/2.2/plug-ins/png
 libexec/gimp/2.2/plug-ins/pnm
 libexec/gimp/2.2/plug-ins/polar
 libexec/gimp/2.2/plug-ins/postscript
-%%PRINT%%libexec/gimp/2.2/plug-ins/print
 libexec/gimp/2.2/plug-ins/procedure-browser
 libexec/gimp/2.2/plug-ins/psd
 libexec/gimp/2.2/plug-ins/psd_save