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)

5 files changed, 28 insertions, 9 deletions

diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 7dd2e7b31608..c66cb682bedd 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	celestia
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	celestia
@@ -23,7 +24,6 @@ USE_GMAKE=	yes
 USE_GL=		yes
 USE_GETTEXT=	yes
 WANT_GNOME=	yes
-USE_X_PREFIX=	yes
 
 CONFIGURE_ARGS=	--program-prefix=""
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -90,6 +90,7 @@ pre-patch:
 	@${REINPLACE_CMD} -e 's|COPYING||g' ${WRKSRC}/Makefile.in
 
 post-install:
+	${MKDIR} ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/src/celestia/gtk/data/celestia.png \
 		${PREFIX}/share/pixmaps
 .if !defined(NOPORTDOCS)
diff --git a/astro/celestia/pkg-plist b/astro/celestia/pkg-plist
index 032c80dd26ed..016119805d9b 100644
--- a/astro/celestia/pkg-plist
+++ b/astro/celestia/pkg-plist
@@ -309,6 +309,7 @@ share/locale/pt_br/LC_MESSAGES/celestia.mo
 share/locale/ru/LC_MESSAGES/celestia.mo
 share/pixmaps/celestia.png
 @exec mkdir -p %D/share/celestia/textures/hires
+@dirrmtry share/pixmaps
 @dirrm share/celestia/textures/medres
 @dirrm share/celestia/textures/lores
 @dirrm share/celestia/textures/hires
@@ -322,3 +323,9 @@ share/pixmaps/celestia.png
 @dirrm share/celestia
 @dirrmtry share/locale/pt_br/LC_MESSAGES
 @dirrmtry share/locale/pt_br
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index fd325d1aa81a..e682a46cb8f0 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	glunarclock
 PORTVERSION=	0.32.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME applet that displays the current phase of the Moon
 
-LIB_DEPENDS=	xklavier.10:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	xklavier.11:${PORTSDIR}/x11/libxklavier
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gail gnomehack gnomepanel gnomeprefix gnometarget intlhack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/astro/glunarclock/pkg-plist b/astro/glunarclock/pkg-plist
index ef4ba67da76f..6081838f728e 100644
--- a/astro/glunarclock/pkg-plist
+++ b/astro/glunarclock/pkg-plist
@@ -38,9 +38,19 @@ share/locale/wa/LC_MESSAGES/glunarclock-%%VERSION%%.mo
 @dirrm share/gnome/help/glunarclock-applet-2/C
 @dirrm share/gnome/help/glunarclock-applet-2
 @dirrm share/gnome/glunarclock
-@dirrmtry share/locale/ast_ES/LC_MESSAGES
-@dirrmtry share/locale/ast_ES
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/ast_ES/LC_MESSAGES
+@dirrmtry share/locale/ast_ES
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index 457d9a618caa..f2d4312038f4 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nightfall
 PORTVERSION=	1.52
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://www.la-samhna.de/nightfall/
 
@@ -15,7 +16,7 @@ COMMENT=	An interactive binary star application
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnomehier gnometarget gtk20
 USE_PERL5=	yes