Re-enable NLS support.

Reported by:	Rolf Großmann <Rolf.Grossmann@PROGTECH.net>

4 files changed, 92 insertions, 4 deletions

diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 6bdb1fd624e3..1517a78f171d 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
@@ -17,7 +18,6 @@ COMMENT=	A collection of themes and icons for GNOME 2 designed for accessibility
 
 BUILD_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
 		${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
-LIB_DEPENDS=	metacity-private.0:${PORTSDIR}/x11-wm/metacity
 RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
 		${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
 
@@ -25,7 +25,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+USE_GNOME=	gnomehack metacity
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+	       	LIBS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index f69543fe3d6f..e478aacbe122 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -923,6 +923,48 @@ share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png
 share/icons/Smokey-Red/index.theme
+share/locale/am/LC_MESSAGES/gnome-themes.mo
+share/locale/az/LC_MESSAGES/gnome-themes.mo
+share/locale/be/LC_MESSAGES/gnome-themes.mo
+share/locale/bg/LC_MESSAGES/gnome-themes.mo
+share/locale/bn/LC_MESSAGES/gnome-themes.mo
+share/locale/ca/LC_MESSAGES/gnome-themes.mo
+share/locale/cs/LC_MESSAGES/gnome-themes.mo
+share/locale/da/LC_MESSAGES/gnome-themes.mo
+share/locale/de/LC_MESSAGES/gnome-themes.mo
+share/locale/el/LC_MESSAGES/gnome-themes.mo
+share/locale/es/LC_MESSAGES/gnome-themes.mo
+share/locale/et/LC_MESSAGES/gnome-themes.mo
+share/locale/fa/LC_MESSAGES/gnome-themes.mo
+share/locale/fi/LC_MESSAGES/gnome-themes.mo
+share/locale/fr/LC_MESSAGES/gnome-themes.mo
+share/locale/he/LC_MESSAGES/gnome-themes.mo
+share/locale/hu/LC_MESSAGES/gnome-themes.mo
+share/locale/id/LC_MESSAGES/gnome-themes.mo
+share/locale/it/LC_MESSAGES/gnome-themes.mo
+share/locale/ja/LC_MESSAGES/gnome-themes.mo
+share/locale/ko/LC_MESSAGES/gnome-themes.mo
+share/locale/lv/LC_MESSAGES/gnome-themes.mo
+share/locale/mk/LC_MESSAGES/gnome-themes.mo
+share/locale/mn/LC_MESSAGES/gnome-themes.mo
+share/locale/ms/LC_MESSAGES/gnome-themes.mo
+share/locale/nl/LC_MESSAGES/gnome-themes.mo
+share/locale/no/LC_MESSAGES/gnome-themes.mo
+share/locale/pl/LC_MESSAGES/gnome-themes.mo
+share/locale/pt/LC_MESSAGES/gnome-themes.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-themes.mo
+share/locale/ro/LC_MESSAGES/gnome-themes.mo
+share/locale/ru/LC_MESSAGES/gnome-themes.mo
+share/locale/sk/LC_MESSAGES/gnome-themes.mo
+share/locale/sl/LC_MESSAGES/gnome-themes.mo
+share/locale/sq/LC_MESSAGES/gnome-themes.mo
+share/locale/sv/LC_MESSAGES/gnome-themes.mo
+share/locale/th/LC_MESSAGES/gnome-themes.mo
+share/locale/tr/LC_MESSAGES/gnome-themes.mo
+share/locale/uk/LC_MESSAGES/gnome-themes.mo
+share/locale/vi/LC_MESSAGES/gnome-themes.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
 share/themes/Crux/gtk-2.0/gtkrc
 share/themes/Crux/index.theme
 share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png
diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index 6bdb1fd624e3..1517a78f171d 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
@@ -17,7 +18,6 @@ COMMENT=	A collection of themes and icons for GNOME 2 designed for accessibility
 
 BUILD_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
 		${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
-LIB_DEPENDS=	metacity-private.0:${PORTSDIR}/x11-wm/metacity
 RUN_DEPENDS=	${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
 		${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
 
@@ -25,7 +25,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+USE_GNOME=	gnomehack metacity
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+	       	LIBS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist
index f69543fe3d6f..e478aacbe122 100644
--- a/x11-toolkits/gnome-themes/pkg-plist
+++ b/x11-toolkits/gnome-themes/pkg-plist
@@ -923,6 +923,48 @@ share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png
 share/icons/Smokey-Red/index.theme
+share/locale/am/LC_MESSAGES/gnome-themes.mo
+share/locale/az/LC_MESSAGES/gnome-themes.mo
+share/locale/be/LC_MESSAGES/gnome-themes.mo
+share/locale/bg/LC_MESSAGES/gnome-themes.mo
+share/locale/bn/LC_MESSAGES/gnome-themes.mo
+share/locale/ca/LC_MESSAGES/gnome-themes.mo
+share/locale/cs/LC_MESSAGES/gnome-themes.mo
+share/locale/da/LC_MESSAGES/gnome-themes.mo
+share/locale/de/LC_MESSAGES/gnome-themes.mo
+share/locale/el/LC_MESSAGES/gnome-themes.mo
+share/locale/es/LC_MESSAGES/gnome-themes.mo
+share/locale/et/LC_MESSAGES/gnome-themes.mo
+share/locale/fa/LC_MESSAGES/gnome-themes.mo
+share/locale/fi/LC_MESSAGES/gnome-themes.mo
+share/locale/fr/LC_MESSAGES/gnome-themes.mo
+share/locale/he/LC_MESSAGES/gnome-themes.mo
+share/locale/hu/LC_MESSAGES/gnome-themes.mo
+share/locale/id/LC_MESSAGES/gnome-themes.mo
+share/locale/it/LC_MESSAGES/gnome-themes.mo
+share/locale/ja/LC_MESSAGES/gnome-themes.mo
+share/locale/ko/LC_MESSAGES/gnome-themes.mo
+share/locale/lv/LC_MESSAGES/gnome-themes.mo
+share/locale/mk/LC_MESSAGES/gnome-themes.mo
+share/locale/mn/LC_MESSAGES/gnome-themes.mo
+share/locale/ms/LC_MESSAGES/gnome-themes.mo
+share/locale/nl/LC_MESSAGES/gnome-themes.mo
+share/locale/no/LC_MESSAGES/gnome-themes.mo
+share/locale/pl/LC_MESSAGES/gnome-themes.mo
+share/locale/pt/LC_MESSAGES/gnome-themes.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-themes.mo
+share/locale/ro/LC_MESSAGES/gnome-themes.mo
+share/locale/ru/LC_MESSAGES/gnome-themes.mo
+share/locale/sk/LC_MESSAGES/gnome-themes.mo
+share/locale/sl/LC_MESSAGES/gnome-themes.mo
+share/locale/sq/LC_MESSAGES/gnome-themes.mo
+share/locale/sv/LC_MESSAGES/gnome-themes.mo
+share/locale/th/LC_MESSAGES/gnome-themes.mo
+share/locale/tr/LC_MESSAGES/gnome-themes.mo
+share/locale/uk/LC_MESSAGES/gnome-themes.mo
+share/locale/vi/LC_MESSAGES/gnome-themes.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
 share/themes/Crux/gtk-2.0/gtkrc
 share/themes/Crux/index.theme
 share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png