From 29747f458a1eb2ce23b4594b09d0256dd62760b8 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Sat, 14 Oct 2006 08:54:54 +0000
Subject: Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
 new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)
---
 graphics/gimp/Makefile                    |  6 +++---
 graphics/gimp/files/patch-gimptool-2.0.in |  3 ---
 graphics/gimp/pkg-plist                   | 32 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 6 deletions(-)

(limited to 'graphics/gimp')

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 69f6414e7c5e..87d72307e68c 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,10 +3,11 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#
+#    $MCom: ports/graphics/gimp/Makefile,v 1.2 2006/08/25 18:14:57 pav Exp $
 
 PORTNAME=	gimp
 PORTVERSION=	2.2.13
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -34,7 +35,6 @@ CONFLICTS=	gimp-1.* gimpshop-[0-9]*
 SHLIBVER?=	200
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -104,7 +104,7 @@ CONFIGURE_ARGS+=	--enable-mp
 
 .if ${HAVE_GNOME:Mgnomepanel}!=""
 USE_GNOME+=		gnomepanel desktopfileutils
-CONFIGURE_ARGS+=	--with-desktop-dir=${X11BASE}/share/gnome
+CONFIGURE_ARGS+=	--with-desktop-dir=${LOCALBASE}/share/gnome
 CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 PKGNAMESUFFIX:=		-gnome
 PLIST_SUB+=		GNOMEPANEL:=""
diff --git a/graphics/gimp/files/patch-gimptool-2.0.in b/graphics/gimp/files/patch-gimptool-2.0.in
index 6f254900f5ca..3ee0f17b8be2 100644
--- a/graphics/gimp/files/patch-gimptool-2.0.in
+++ b/graphics/gimp/files/patch-gimptool-2.0.in
@@ -1,6 +1,3 @@
-
-$FreeBSD: /tmp/pcvs/ports/graphics/gimp/files/Attic/patch-gimptool-2.0.in,v 1.2 2004-12-24 18:39:50 pav Exp $
-
 --- gimptool-2.0.in.orig	Tue Jan 15 12:21:05 2002
 +++ gimptool-2.0.in	Fri May 17 20:46:18 2002
 @@ -215,19 +215,19 @@
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 6998b0799940..6946abf9f87a 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1937,3 +1937,35 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm etc/gimp/2.2
 @dirrm etc/gimp
 %%GNOMEPANEL:%%@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/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@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/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
-- 
cgit v1.2.3