Update to 2.4.0-rc1

4 files changed, 27 insertions, 22 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 24bac536f3f9..82d07f0651a7 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gimp-app
-PORTVERSION=	2.3.19
+DISTVERSION=	2.4.0-rc1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -17,8 +17,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 +78,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 3f99a63d17da..fbf3684d138a 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 3f874be7c9f1..dec0988714ea 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
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index ae777b8bf630..b0afcf0a1e53 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION?=	2.3.19
+DISTVERSION?=	2.4.0-rc1
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES?=	# empty