5 files changed, 31 insertions, 34 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 3875948d6023..2ddedae2e3c5 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 #   $MCom: ports/graphics/gimp-app/Makefile,v 1.65 2012/12/30 18:09:11 mezz Exp $
 
-PORTNAME=	gimp-app
-PORTVERSION=	2.8.6
-PORTREVISION?=	1
+PORTNAME?=	gimp-app
+PORTVERSION=	2.8.8
+PORTREVISION?=	0
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -27,7 +27,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
-		liblcms.so:${PORTSDIR}/graphics/lcms \
+		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
 		libgegl-0.2.so:${PORTSDIR}/graphics/gegl \
 		libbabl-0.1.so:${PORTSDIR}/x11/babl
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
@@ -35,8 +35,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co
 USE_BZIP2=	yes
 USE_XORG=	xpm xmu xext
 USE_AUTOTOOLS=	libtool
-USE_GNOME+=	intltool intlhack gtk20 libartlgpl2 ltverhack gnomehier \
-		desktopfileutils
+USE_GNOME+=	intltool intlhack gtk20 libartlgpl2 ltverhack gnomehier
 USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
@@ -46,12 +45,14 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc/gimp \
 		--without-linux-input \
 		--with-print \
 		--enable-default-binary \
+		--with-lcms=lcms2 \
 		--disable-gimp-console \
 		--disable-python \
 		--with-desktop-dir=${PREFIX}/share \
 		--docdir=${PREFIX}/share/doc/gimp \
 		--enable-default-binary
-CONFIGURE_ENV=	GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV=	GIMP_THREAD_LIBS=${PTHREAD_LIBS} \
+		LIBS=${LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -180,6 +181,11 @@ PLIST_SUB+=		WMF="@comment "
 
 .endif
 
+.if ${OSVERSION} < 1000052
+LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+.endif
+LIBS+=-lexecinfo
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \
 		s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \
@@ -191,4 +197,14 @@ post-patch:
 	    	-e 's|x86_64|amd64|g' \
 		${WRKSRC}/configure
 
+
+.if defined(GIMP_SLAVE) && ${GIMP_SLAVE}==pygimp
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gimp/2.2/python/*.so
+.else ! defined(GIMP_SLAVE)
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgimp*-2.0.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gimp/2.2/modules/*.so
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 87a94f315fb4..bad945e68a8a 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gimp-2.8.6.tar.bz2) = 215865b0ff4534bbced551995ae3093ede1918246ead914984603a5c1a5be845
-SIZE (gimp-2.8.6.tar.bz2) = 20306442
+SHA256 (gimp-2.8.8.tar.bz2) = 74c4509bae55f07140bc46f16100fc1e0e052829c13d4d87dc31d07d3e696a67
+SIZE (gimp-2.8.8.tar.bz2) = 20345808
diff --git a/graphics/gimp-app/files/patch-app_base_base-utils.c b/graphics/gimp-app/files/patch-app_base_base-utils.c
deleted file mode 100644
index 7cf17b3d70f4..000000000000
--- a/graphics/gimp-app/files/patch-app_base_base-utils.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- app/base/base-utils.c~
-+++ app/base/base-utils.c
-@@ -29,7 +29,7 @@
- #include <process.h>
- #endif
- 
--#ifdef G_OS_UNIX
-+#ifdef __GLIBC__
- /* For get_backtrace() */
- #include <stdlib.h>
- #include <string.h>
-@@ -112,7 +112,7 @@ get_physical_memory_size (void)
- char *
- get_backtrace (void)
- {
--#ifdef G_OS_UNIX
-+#ifdef __GLIBC__
-   void     *functions[MAX_FUNC];
-   char    **function_names;
-   int       n_functions;
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index b66f819c29b5..2f059ac8ef05 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/graphics/gimp/Makefile,v 1.22 2012/11/26 13:31:16 kwm Exp $
 
 PORTNAME=	gimp
-DISTVERSION?=	2.8.6
+DISTVERSION?=	2.8.8
 PORTREVISION?=	0
 PORTEPOCH?=	2
 CATEGORIES=	graphics gnome
@@ -23,8 +23,9 @@ PRINT_DESC=	Gutenprint (gimp-print) plugin
 HELP_DESC=	Gimp-Help (50+MB distfile)
 
 NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHELP}
@@ -40,6 +41,4 @@ RUN_DEPENDS+=	${LOCALBASE}/libexec/gimp/2.2/plug-ins/gutenprint:${PORTSDIR}/prin
 RUN_DEPENDS+=	gutenprint>0:${PORTSDIR}/print/gutenprint
 .endif
 
-do-install:	# empty
-
 .include <bsd.port.mk>
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 7a57ef6344a9..7507e99b1e3e 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -2,9 +2,11 @@
 # $FreeBSD$
 #    $MCom: ports/graphics/py-gimp/Makefile,v 1.6 2009/08/25 00:06:39 marcus Exp $
 
-PORTREVISION=	1
+PORTNAME=	gimp
+PORTREVISION=	0
 PORTEPOCH=	0
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GIMP python plugin