- Sync w/ FreeBSD ports.

- As for the gimp-app-devel and gnome-build, be sure to do the force
  reinstall, because both of ports have PORTEPOCH bumped by mistake.
- As for avahi, bump to 0.6.21_1.
- As for cairo, reset the $FreeBSD$.


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

7 files changed, 76 insertions, 30 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 8a1c1bea5..fb6899ccc 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -2,8 +2,8 @@
 # Date created:		2004-10-06
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD: ports/graphics/cairo/Makefile,v 1.29 2007/06/28 00:22:14 ahze Exp $
-#   $MCom: ports/graphics/cairo/Makefile,v 1.56 2007/03/06 13:39:18 ahze Exp $
+# $FreeBSD$
+#   $MCom: ports/graphics/cairo/Makefile,v 1.58 2007/09/09 12:07:03 pav Exp $
 #
 
 PORTNAME=	cairo
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index dce1bc703..36cecf7ca 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -7,8 +7,9 @@
 #
 
 PORTNAME=	gimp-app
-PORTVERSION=	2.3.19
-PORTEPOCH?=	2
+DISTVERSION=	2.4.0-rc1
+PORTREVISION=	1
+PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
@@ -17,8 +18,9 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}
-DISTNAME=	gimp-${PORTVERSION}
+#MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	gimp/v2.4/testing
+DISTNAME=	gimp-${DISTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program development version
@@ -77,13 +79,13 @@ LIB_DEPENDS+=	gimp-2.0.0:${PORTSDIR}/graphics/gimp-app-devel
 
 CONFLICTS=	gimp-1.* gimp-app-[0-9]*
 
-MAN1+=	gimp-2.3.1 gimp-remote-2.3.1 gimptool-2.0.1
-MAN5+=	gimprc-2.3.5
-MLINKS=	gimp-2.3.1 gimp.1 \
-	gimp-2.3.1 gimp-console-2.3.1 \
-	gimp-console-2.3.1 gimp-console.1 \
-	gimp-remote-2.3.1 gimp-remote.1 \
-	gimprc-2.3.5 gimprc.5
+MAN1+=	gimp-2.4.1 gimp-remote-2.4.1 gimptool-2.0.1
+MAN5+=	gimprc-2.4.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
 
 .if defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--without-librsvg
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 3f99a63d1..fbf3684d1 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.3.19.tar.bz2) = 9b5cc6aef0baca3735ce9bc4fdc949d9
-SHA256 (gimp-2.3.19.tar.bz2) = f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
-SIZE (gimp-2.3.19.tar.bz2) = 16803491
+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
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 1e1b65550..e108a4b05 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,9 +1,9 @@
 bin/gimp
-bin/gimp-2.3
+bin/gimp-2.4
 bin/gimp-console
-bin/gimp-console-2.3
+bin/gimp-console-2.4
 bin/gimp-remote
-bin/gimp-remote-2.3
+bin/gimp-remote-2.4
 bin/gimptool-2.0
 etc/gimp/2.2/controllerrc
 etc/gimp/2.2/gimprc
@@ -176,6 +176,8 @@ include/gimp-2.0/libgimpwidgets/gimpcolordisplay.h
 include/gimp-2.0/libgimpwidgets/gimpcolordisplaystack.h
 include/gimp-2.0/libgimpwidgets/gimpcolorhexentry.h
 include/gimp-2.0/libgimpwidgets/gimpcolornotebook.h
+include/gimp-2.0/libgimpwidgets/gimpcolorprofilecombobox.h
+include/gimp-2.0/libgimpwidgets/gimpcolorprofilestore.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscale.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscales.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselect.h
@@ -194,6 +196,7 @@ include/gimp-2.0/libgimpwidgets/gimphintbox.h
 include/gimp-2.0/libgimpwidgets/gimpintcombobox.h
 include/gimp-2.0/libgimpwidgets/gimpintstore.h
 include/gimp-2.0/libgimpwidgets/gimpmemsizeentry.h
+include/gimp-2.0/libgimpwidgets/gimpnumberpairentry.h
 include/gimp-2.0/libgimpwidgets/gimpoffsetarea.h
 include/gimp-2.0/libgimpwidgets/gimpoldwidgets.h
 include/gimp-2.0/libgimpwidgets/gimppageselector.h
@@ -204,7 +207,6 @@ 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/gimpratioentry.h
 include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpstock.h
@@ -685,6 +687,8 @@ share/doc/gimp/libgimpwidgets/GimpColorDisplay.html
 share/doc/gimp/libgimpwidgets/GimpColorDisplayStack.html
 share/doc/gimp/libgimpwidgets/GimpColorHexEntry.html
 share/doc/gimp/libgimpwidgets/GimpColorNotebook.html
+share/doc/gimp/libgimpwidgets/GimpColorProfileComboBox.html
+share/doc/gimp/libgimpwidgets/GimpColorProfileStore.html
 share/doc/gimp/libgimpwidgets/GimpColorScale.html
 share/doc/gimp/libgimpwidgets/GimpColorScales.html
 share/doc/gimp/libgimpwidgets/GimpColorSelect.html
@@ -700,6 +704,7 @@ share/doc/gimp/libgimpwidgets/GimpFrame.html
 share/doc/gimp/libgimpwidgets/GimpIntComboBox.html
 share/doc/gimp/libgimpwidgets/GimpIntStore.html
 share/doc/gimp/libgimpwidgets/GimpMemsizeEntry.html
+share/doc/gimp/libgimpwidgets/GimpNumberPairEntry.html
 share/doc/gimp/libgimpwidgets/GimpOffsetArea.html
 share/doc/gimp/libgimpwidgets/GimpPageSelector.html
 share/doc/gimp/libgimpwidgets/GimpPathEditor.html
@@ -707,17 +712,18 @@ 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/GimpRatioEntry.html
 share/doc/gimp/libgimpwidgets/GimpScrolledPreview.html
 share/doc/gimp/libgimpwidgets/GimpSizeEntry.html
 share/doc/gimp/libgimpwidgets/GimpStringComboBox.html
 share/doc/gimp/libgimpwidgets/GimpUnitMenu.html
+share/doc/gimp/libgimpwidgets/GimpZoomModel.html
 share/doc/gimp/libgimpwidgets/gimp-browser.png
 share/doc/gimp/libgimpwidgets/gimp-button.png
 share/doc/gimp/libgimpwidgets/gimp-chain-button.png
 share/doc/gimp/libgimpwidgets/gimp-color-area.png
 share/doc/gimp/libgimpwidgets/gimp-color-button.png
 share/doc/gimp/libgimpwidgets/gimp-color-hex-entry.png
+share/doc/gimp/libgimpwidgets/gimp-color-profile-combo-box.png
 share/doc/gimp/libgimpwidgets/gimp-color-scale.png
 share/doc/gimp/libgimpwidgets/gimp-color-selection.png
 share/doc/gimp/libgimpwidgets/gimp-dialog.png
@@ -728,12 +734,12 @@ share/doc/gimp/libgimpwidgets/gimp-frame.png
 share/doc/gimp/libgimpwidgets/gimp-hint-box.png
 share/doc/gimp/libgimpwidgets/gimp-int-combo-box.png
 share/doc/gimp/libgimpwidgets/gimp-memsize-entry.png
+share/doc/gimp/libgimpwidgets/gimp-number-pair-entry.png
 share/doc/gimp/libgimpwidgets/gimp-offset-area.png
 share/doc/gimp/libgimpwidgets/gimp-page-selector.png
 share/doc/gimp/libgimpwidgets/gimp-path-editor.png
 share/doc/gimp/libgimpwidgets/gimp-pick-button.png
 share/doc/gimp/libgimpwidgets/gimp-preview-area.png
-share/doc/gimp/libgimpwidgets/gimp-ratio-entry.png
 share/doc/gimp/libgimpwidgets/gimp-string-combo-box.png
 share/doc/gimp/libgimpwidgets/gimp-unit-menu.png
 share/doc/gimp/libgimpwidgets/home.png
@@ -1507,7 +1513,6 @@ share/gimp/scripts/circuit.scm
 share/gimp/scripts/clothify.scm
 share/gimp/scripts/coffee.scm
 share/gimp/scripts/comic-logo.scm
-share/gimp/scripts/contactsheet.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
@@ -1515,7 +1520,6 @@ share/gimp/scripts/difference-clouds.scm
 share/gimp/scripts/distress-selection.scm
 share/gimp/scripts/drop-shadow.scm
 share/gimp/scripts/erase-rows.scm
-share/gimp/scripts/fade-outline.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
 share/gimp/scripts/frosty-logo.scm
@@ -1583,6 +1587,7 @@ share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
 share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
+
 share/gimp/themes/Default/gtkrc
 share/gimp/themes/Default/images/preferences/color-management-22.png
 share/gimp/themes/Default/images/preferences/color-management.png
@@ -2033,17 +2038,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/gthumb/Makefile b/graphics/gthumb/Makefile
index 7546dc2a6..6b1a394e3 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gthumb
-PORTVERSION=	2.10.5
+PORTVERSION=	2.10.6
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 62205dd4d..7a7b4e5c5 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gthumb-2.10.5.tar.bz2) = 5b9a050da06abecce058d9fca57d5307
-SHA256 (gnome2/gthumb-2.10.5.tar.bz2) = 32928cac8703208a4f7d363ad021102355c575e3ef3b4ab866834fa9c468c39f
-SIZE (gnome2/gthumb-2.10.5.tar.bz2) = 2160310
+MD5 (gnome2/gthumb-2.10.6.tar.bz2) = 6a52800a3adc55a705c9f7f38de9182a
+SHA256 (gnome2/gthumb-2.10.6.tar.bz2) = ccd148421d8815a827202fd484b21f6e915414e5895ffd887dfa7e6d8b7dea72
+SIZE (gnome2/gthumb-2.10.6.tar.bz2) = 2206799
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index 3e0db9e0d..56053fe15 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -20,6 +20,7 @@ lib/gthumb/modules/libwebexporter.so
 lib/libgthumb.a
 lib/libgthumb.la
 lib/libgthumb.so
+libdata/bonobo/servers/GNOME_GThumb.server
 share/applications/gthumb.desktop
 share/gthumb/albumthemes/BestFit/back.png
 share/gthumb/albumthemes/BestFit/BestFit.css
@@ -111,12 +112,18 @@ share/gnome/help/gthumb/C/figures/nav-button.png
 share/gnome/help/gthumb/C/figures/preferences.png
 share/gnome/help/gthumb/C/gthumb.xml
 share/gnome/help/gthumb/C/legal.xml
+share/gnome/help/gthumb/es/figures/comment.png
+share/gnome/help/gthumb/es/figures/main-win.png
+share/gnome/help/gthumb/es/figures/nav-button.png
+share/gnome/help/gthumb/es/figures/preferences.png
+share/gnome/help/gthumb/es/gthumb.xml
 share/gnome/help/gthumb/sv/figures/comment.png
 share/gnome/help/gthumb/sv/figures/main-win.png
 share/gnome/help/gthumb/sv/figures/nav-button.png
 share/gnome/help/gthumb/sv/figures/preferences.png
 share/gnome/help/gthumb/sv/gthumb.xml
 share/omf/gthumb/gthumb-C.omf
+share/omf/gthumb/gthumb-es.omf
 share/omf/gthumb/gthumb-sv.omf
 share/icons/hicolor/48x48/apps/gthumb.png
 share/locale/am/LC_MESSAGES/gthumb.mo
@@ -179,6 +186,8 @@ share/locale/zh_TW/LC_MESSAGES/gthumb.mo
 @dirrm share/omf/gthumb
 @dirrm share/gnome/help/gthumb/sv/figures
 @dirrm share/gnome/help/gthumb/sv
+@dirrm share/gnome/help/gthumb/es/figures
+@dirrm share/gnome/help/gthumb/es
 @dirrm share/gnome/help/gthumb/C/figures
 @dirrm share/gnome/help/gthumb/C
 @dirrm share/gnome/help/gthumb