Install locale files into correct places, depending on the OS.

4 files changed, 61 insertions, 30 deletions

diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index ec6df212530..84a0e41001a 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/07/31 07:48:37 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/10/23 17:06:56 jlam Exp $
 
 DISTNAME=		ee-0.3.12
 CATEGORIES=		x11 gnome
@@ -20,5 +20,20 @@ LOCALSTATEDIR=		/var/gnome
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
 			--with-glib-prefix=${LOCALBASE}
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
+CONFIGURE_ENV+=		LOCALEBASE=${LOCALEBASE}
+
+PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
+
+.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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ee/files/patch-sum b/graphics/ee/files/patch-sum
index b708be80cbe..5f922b7f57b 100644
--- a/graphics/ee/files/patch-sum
+++ b/graphics/ee/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/10/23 17:06:56 jlam Exp $
 
 MD5 (patch-aa) = 5c95160d7dd2621b28f9536609189e1a
+MD5 (patch-ab) = 8c5a00324ba6f3ff7d7a310738353ef1
diff --git a/graphics/ee/patches/patch-ab b/graphics/ee/patches/patch-ab
new file mode 100644
index 00000000000..53ff81e82e3
--- /dev/null
+++ b/graphics/ee/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2000/10/23 17:06:56 jlam Exp $
+
+--- configure.orig	Mon Jul 17 17:42:39 2000
++++ configure
+@@ -4740,6 +4740,10 @@
+ 
+ 
+ 
++# Set DATADIRNAME to "${LOCALEBASE}"
++DATADIRNAME="${LOCALEBASE}"
++INTLDEPS=
++INTLLIBS="-lintl"
+ 
+ trap '' 1 2 15
+ cat > confcache <<\EOF
diff --git a/graphics/ee/pkg/PLIST b/graphics/ee/pkg/PLIST
index f2453d44b49..319d5275256 100644
--- a/graphics/ee/pkg/PLIST
+++ b/graphics/ee/pkg/PLIST
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.3 2000/07/31 07:48:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/10/23 17:06:57 jlam Exp $
 bin/ee
 share/gnome/apps/Graphics/ee.desktop
 share/gnome/help/ee/C/index.html
 share/gnome/help/ee/C/ee.jpg
-share/locale/hu/LC_MESSAGES/ee.mo
-share/locale/nl/LC_MESSAGES/ee.mo
-share/locale/pl/LC_MESSAGES/ee.mo
-share/locale/da/LC_MESSAGES/ee.mo
-share/locale/pt_BR/LC_MESSAGES/ee.mo
-share/locale/ro/LC_MESSAGES/ee.mo
-share/locale/en_GB/LC_MESSAGES/ee.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/ee.mo
-share/locale/de/LC_MESSAGES/ee.mo
-share/locale/fr/LC_MESSAGES/ee.mo
-share/locale/sv/LC_MESSAGES/ee.mo
-share/locale/es/LC_MESSAGES/ee.mo
-share/locale/ru/LC_MESSAGES/ee.mo
-share/locale/it/LC_MESSAGES/ee.mo
-share/locale/pt/LC_MESSAGES/ee.mo
-share/locale/no/LC_MESSAGES/ee.mo
-share/locale/fi/LC_MESSAGES/ee.mo
-share/locale/ja/LC_MESSAGES/ee.mo
-share/locale/ko/LC_MESSAGES/ee.mo
-share/locale/ga/LC_MESSAGES/ee.mo
-share/locale/ca/LC_MESSAGES/ee.mo
-share/locale/el/LC_MESSAGES/ee.mo
-share/locale/tr/LC_MESSAGES/ee.mo
-share/locale/uk/LC_MESSAGES/ee.mo
-share/locale/gl/LC_MESSAGES/ee.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/ee.mo
-share/locale/lt/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/ca/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/da/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/de/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/el/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/en_GB/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/es/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/fi/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/fr/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/ga/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/gl/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/hu/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/it/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/ja/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/ko/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/lt/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/nl/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/no/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/pl/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/pt/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/ru/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/sv/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/uk/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/ro/LC_MESSAGES/ee.mo
+${LOCALEBASE}/locale/tr/LC_MESSAGES/ee.mo
 share/mime-info/ee.keys
 share/pixmaps/gnome-ee.png
 @dirrm share/gnome/help/ee/C