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

4 files changed, 76 insertions, 12 deletions

diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 9ced7042cc4..f245de838c8 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,17 +1,33 @@
-# $NetBSD: Makefile,v 1.16 2000/05/30 21:08:25 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2000/10/23 17:06:57 jlam Exp $
 #
 
-DISTNAME=	gnome-pim-1.2.0
-CATEGORIES=	misc x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gnome-pim/}
+DISTNAME=		gnome-pim-1.2.0
+CATEGORIES=		misc x11 gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-pim/}
 
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/bison:../../devel/bison
-DEPENDS+=	gnome-core-*:../../x11/gnome-core
+BUILD_DEPENDS=		${LOCALBASE}/bin/bison:../../devel/bison
+DEPENDS+=		gnome-core-*:../../x11/gnome-core
 
-GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
+USE_X11BASE=		# defined
+
+GNU_CONFIGURE=		# defined
+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/misc/gnome-pim/files/patch-sum b/misc/gnome-pim/files/patch-sum
index 3d1c603477a..ffc49a982f9 100644
--- a/misc/gnome-pim/files/patch-sum
+++ b/misc/gnome-pim/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/05/30 21:08:26 drochner Exp $
+$NetBSD: patch-sum,v 1.5 2000/10/23 17:06:57 jlam Exp $
 
 MD5 (patch-aa) = aec56861a229f8fca23a02dbd951a264
+MD5 (patch-ab) = d6acc7732cf4d297ecda0f0b692c6681
diff --git a/misc/gnome-pim/patches/patch-ab b/misc/gnome-pim/patches/patch-ab
new file mode 100644
index 00000000000..a9e52f053ae
--- /dev/null
+++ b/misc/gnome-pim/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.3 2000/10/23 17:06:57 jlam Exp $
+
+--- configure.orig	Sat May 20 21:50:23 2000
++++ configure
+@@ -6393,6 +6393,10 @@
+ 
+ 
+ 
++# Set DATADIRNAME to "${LOCALEBASE}"
++DATADIRNAME="${LOCALEBASE}"
++INTLDEPS=
++INTLLIBS="-lintl"
+ 
+ trap '' 1 2 15
+ cat > confcache <<\EOF
diff --git a/misc/gnome-pim/pkg/PLIST b/misc/gnome-pim/pkg/PLIST
index 6a50d3b4eca..b26c301f212 100644
--- a/misc/gnome-pim/pkg/PLIST
+++ b/misc/gnome-pim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/05/30 21:08:27 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/10/23 17:06:57 jlam Exp $
 bin/gnomecal
 bin/gnomecard
 etc/CORBA/servers/gnomecal.gnorba
@@ -25,6 +25,38 @@ share/gnome/help/gnomecal/C/gcal.html
 share/gnome/help/gnomecal/C/ln20.html
 share/gnome/help/gnomecal/C/tech.html.html
 share/gnome/help/gnomecal/C/docbook.css
+${LOCALEBASE}/locale/ca/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/cs/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/cy/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/da/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/de/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/el/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/en_GB/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/es/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/et/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/fi/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/fr/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/ga/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/gd/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/gl/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/gv/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/hu/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/it/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/ja/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/ko/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/kw/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/lt/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/nl/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/no/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/pl/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/pt/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/ru/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/sv/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/uk/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/wa/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo
+${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
 @dirrm share/gnome/help/gnomecal/C/images
 @dirrm share/gnome/help/gnomecal/C
 @dirrm share/gnome/help/gnomecal