- Update to 2.3.19

- Install gimp default binaries since gimp and gimp-devel already conflict [1]

PR:		ports/114767 [1]
Submitted by:	Henrik Brix Andersen [1]

4 files changed, 15 insertions, 8 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 289e041..24bac53 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gimp-app
-PORTVERSION=	2.3.18
+PORTVERSION=	2.3.19
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -50,7 +50,8 @@ CONFIGURE_ARGS?=--disable-perl \
 		--without-print \
 		--disable-python \
 		--with-desktop-dir=${PREFIX}/share \
-		--docdir=${PREFIX}/share/doc/gimp
+		--docdir=${PREFIX}/share/doc/gimp \
+		--enable-default-binary
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
@@ -78,6 +79,11 @@ 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
 
 .if defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--without-librsvg
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 2aeb47a..3f99a63 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-2.3.18.tar.bz2) = 344945459dd23452b3ba42580a5655e4
-SHA256 (gimp-2.3.18.tar.bz2) = 984939e085c59a1dda56ba82a7f3e1ec46de8ae9ae9d59ab86bd6e2af4dd5122
-SIZE (gimp-2.3.18.tar.bz2) = 16926421
+MD5 (gimp-2.3.19.tar.bz2) = 9b5cc6aef0baca3735ce9bc4fdc949d9
+SHA256 (gimp-2.3.19.tar.bz2) = f4e388b7b52db1e91e052dcd0aeab0844fcf83a14ccd24228bf033e7937007f0
+SIZE (gimp-2.3.19.tar.bz2) = 16803491
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 4af43da..3f874be 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,5 +1,8 @@
+bin/gimp
 bin/gimp-2.3
+bin/gimp-console
 bin/gimp-console-2.3
+bin/gimp-remote
 bin/gimp-remote-2.3
 bin/gimptool-2.0
 etc/gimp/2.2/controllerrc
@@ -251,8 +254,6 @@ libdata/pkgconfig/gimp-2.0.pc
 libdata/pkgconfig/gimpthumb-2.0.pc
 libdata/pkgconfig/gimpui-2.0.pc
 libexec/gimp/2.2/environ/default.env
-@comment this is a simlink to gimp-2.3.1, so put it here because it gives me trouble with MAN1.
-man/man1/gimp-console-2.3.1
 libexec/gimp/2.2/interpreters/default.interp
 libexec/gimp/2.2/modules/libcdisplay_colorblind.a
 libexec/gimp/2.2/modules/libcdisplay_colorblind.la
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index c08323d..ae777b8 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION?=	2.3.18
+PORTVERSION?=	2.3.19
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome
 MASTER_SITES?=	# empty