From 0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 Mon Sep 17 00:00:00 2001
From: marcus <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/jumpgis/Makefile  | 6 +++---
 graphics/jumpgis/pkg-plist | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'graphics/jumpgis')

diff --git a/graphics/jumpgis/Makefile b/graphics/jumpgis/Makefile
index 6355d3ded45e..8bb9c5d417b0 100644
--- a/graphics/jumpgis/Makefile
+++ b/graphics/jumpgis/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jumpgis
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics java
 MASTER_SITES=	http://www.jump-project.org/downloads/jump/:main \
 		http://people.tecnik93.com/~sam/ports/:extra
@@ -63,8 +63,8 @@ do-install:
 
 .if ${HAVE_GNOME:Mgnomelibs}!=""
 	@${ECHO_MSG} "---> Installing GNOME application links"
-	${INSTALL_DATA} ${DISTDIR}/jump.desktop ${X11BASE}/share/gnome/applications/
-	${INSTALL_DATA} ${DISTDIR}/jump.png ${X11BASE}/share/gnome/pixmaps/
+	${INSTALL_DATA} ${DISTDIR}/jump.desktop ${LOCALBASE}/share/gnome/applications/
+	${INSTALL_DATA} ${DISTDIR}/jump.png ${LOCALBASE}/share/gnome/pixmaps/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/jumpgis/pkg-plist b/graphics/jumpgis/pkg-plist
index 42f348f1a5df..d753d8493ea9 100644
--- a/graphics/jumpgis/pkg-plist
+++ b/graphics/jumpgis/pkg-plist
@@ -7,10 +7,9 @@ jumpgis/lib/jump-1.1.2.jar
 jumpgis/lib/junit.jar
 jumpgis/lib/xercesImpl.jar
 jumpgis/lib/xml-apis.jar
+%%GNOMELINKS%%share/gnome/applications/jump.desktop
+%%GNOMELINKS%%share/gnome/pixmaps/jump.png
 @exec mkdir -p %D/jumpgis/lib/ext
 @dirrm jumpgis/lib/ext
 @dirrm jumpgis/lib
 @dirrm jumpgis
-@cwd %%X11BASE%%
-%%GNOMELINKS%%share/gnome/applications/jump.desktop
-%%GNOMELINKS%%share/gnome/pixmaps/jump.png
-- 
cgit