(Although I should not be wasting my time on this...)

Make $LOCALEBASE variable for Solamis.

4 files changed, 47 insertions, 35 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index e33564c0a72..8e8a98dab79 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/11/09 19:46:10 mycroft Exp $
+# $NetBSD: Makefile,v 1.13 2000/11/09 20:06:05 mycroft Exp $
 
 DISTNAME=		gnome-games-1.2.0
 CATEGORIES=		games gnome
@@ -21,7 +21,10 @@ USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS=		--localstatedir=/var
+CONFIGURE_ENV+=		LOCALEBASE=${LOCALEBASE}
+CONFIGURE_ARGS+=	--localstatedir=/var
+
+PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
 
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
@@ -29,7 +32,6 @@ AUTOGEN_ENV=		NOCONFIGURE=1
 AUTOGEN_ENV+=		srcdir=${WRKSRC}
 
 pre-configure:
-	#cd ${WRKSRC} && ${MV} -f aclocal.m4 acinclude.m4
 	cd ${WRKSRC} && ${SETENV} ${AUTOGEN_ENV} ${SH} macros/autogen.sh
 
 post-build:
@@ -38,6 +40,16 @@ post-build:
 
 .include "../../mk/bsd.prefs.mk"
 
+# The directory in which locale files are found is:
+#
+#	${PREFIX}/${LOCALEBASE}/locale/<lang>/LC_MESSAGES
+#
+.if ${OPSYS} == "SunOS"
+LOCALEBASE=		lib
+.else
+LOCALEBASE=		share
+.endif
+
 .if ${NEED_NCURSES} == "YES"
 CONFIGURE_ARGS+=--with-ncurses=${LOCALBASE}
 .endif
diff --git a/games/gnome-games/files/patch-sum b/games/gnome-games/files/patch-sum
index 1eee86ce43b..c8062df06c3 100644
--- a/games/gnome-games/files/patch-sum
+++ b/games/gnome-games/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.5 2000/11/09 19:46:11 mycroft Exp $
+$NetBSD: patch-sum,v 1.6 2000/11/09 20:06:05 mycroft Exp $
 
 MD5 (patch-aa) = 6f2f6b5422629a8968dc462cbdd1b9ec
 MD5 (patch-ab) = e21bc6ba9a3c999c4b7defd969c7fce2
 MD5 (patch-ac) = 3edf07e8535675ce6fe4a11e84735b29
-MD5 (patch-ad) = 9dbabff7c6838506efd88d2ab5f03696
+MD5 (patch-ad) = 85d9f6dbbea6ff023af8bfec35cdbca0
diff --git a/games/gnome-games/patches/patch-ad b/games/gnome-games/patches/patch-ad
index d69d5af002f..b26230b3e49 100644
--- a/games/gnome-games/patches/patch-ad
+++ b/games/gnome-games/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2000/11/09 19:46:11 mycroft Exp $
+$NetBSD: patch-ad,v 1.2 2000/11/09 20:06:05 mycroft Exp $
 
 --- aclocal.m4.orig	Sun May 21 23:56:34 2000
 +++ aclocal.m4	Thu Nov  9 18:58:34 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1 2000/11/09 19:46:11 mycroft Exp $
  		   DATADIRNAME=share],
  		  [CATOBJEXT=.mo
 -		   DATADIRNAME=lib])
-+		   DATADIRNAME=share])
++		   DATADIRNAME=${LOCALEBASE}])
  		INSTOBJEXT=.mo
  	      fi
  	    fi
diff --git a/games/gnome-games/pkg/PLIST b/games/gnome-games/pkg/PLIST
index 0abc1f76ea7..7d027248139 100644
--- a/games/gnome-games/pkg/PLIST
+++ b/games/gnome-games/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/11/09 19:46:11 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/11/09 20:06:05 mycroft Exp $
 bin/GnomeScott
 bin/ctali
 bin/freecell
@@ -187,33 +187,33 @@ share/gturing/examples/bin2dec.tur
 share/gturing/examples/dashnumbers.tur
 share/gturing/examples/dec2bin.tur
 share/gturing/examples/subst.tur
-share/locale/cs/LC_MESSAGES/gnome-games.mo
-share/locale/da/LC_MESSAGES/gnome-games.mo
-share/locale/de/LC_MESSAGES/gnome-games.mo
-share/locale/el/LC_MESSAGES/gnome-games.mo
-share/locale/en_GB/LC_MESSAGES/gnome-games.mo
-share/locale/es/LC_MESSAGES/gnome-games.mo
-share/locale/et/LC_MESSAGES/gnome-games.mo
-share/locale/fi/LC_MESSAGES/gnome-games.mo
-share/locale/fr/LC_MESSAGES/gnome-games.mo
-share/locale/ga/LC_MESSAGES/gnome-games.mo
-share/locale/gl/LC_MESSAGES/gnome-games.mo
-share/locale/hu/LC_MESSAGES/gnome-games.mo
-share/locale/it/LC_MESSAGES/gnome-games.mo
-share/locale/ja/LC_MESSAGES/gnome-games.mo
-share/locale/ko/LC_MESSAGES/gnome-games.mo
-share/locale/lt/LC_MESSAGES/gnome-games.mo
-share/locale/nl/LC_MESSAGES/gnome-games.mo
-share/locale/no/LC_MESSAGES/gnome-games.mo
-share/locale/pl/LC_MESSAGES/gnome-games.mo
-share/locale/pt/LC_MESSAGES/gnome-games.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-games.mo
-share/locale/ru/LC_MESSAGES/gnome-games.mo
-share/locale/sv/LC_MESSAGES/gnome-games.mo
-share/locale/uk/LC_MESSAGES/gnome-games.mo
-share/locale/wa/LC_MESSAGES/gnome-games.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-games.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/cs/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/da/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/de/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/el/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/en_GB/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/es/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/et/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/fi/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/fr/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/ga/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/gl/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/hu/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/it/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/ja/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/ko/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/lt/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/nl/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/no/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/pl/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/pt/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/ru/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/sv/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/uk/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/wa/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-games.mo
+${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
 share/mime-info/gnome-stones.keys
 share/mime-info/gnome-stones.mime
 share/pixmaps/cards/backs/beige.png