Use the same method as devel/ee to get the locale files in the right place.

4 files changed, 57 insertions, 23 deletions

diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 90aafb50874..99e186d26bd 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/10/15 17:20:44 rh Exp $
+# $NetBSD: Makefile,v 1.18 2000/11/09 17:59:51 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp
 #
 
@@ -13,9 +13,13 @@ HOMEPAGE=	http://glade.pn.org/
 DEPENDS+=	gnome-core>=1.2.0:../../x11/gnome-core
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 USE_X11BASE=	yes
 
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV+=	LOCALEBASE=${LOCALEBASE}
+
+PLIST_SUBST+=	LOCALEBASE=${LOCALEBASE}
+
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/glade
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/glade
@@ -28,4 +32,16 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/portability.txt ${PREFIX}/share/doc/glade
 	${INSTALL_MAN} ${WRKSRC}/doc/source_code.txt ${PREFIX}/share/doc/glade
 
+.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/devel/glade/files/patch-sum b/devel/glade/files/patch-sum
new file mode 100644
index 00000000000..c252bd5065e
--- /dev/null
+++ b/devel/glade/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1 2000/11/09 17:59:52 mycroft Exp $
+
+MD5 (patch-aa) = c95363396f90b1a0ebe9fd98405c59d5
diff --git a/devel/glade/patches/patch-aa b/devel/glade/patches/patch-aa
new file mode 100644
index 00000000000..3c6e42c60ed
--- /dev/null
+++ b/devel/glade/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2000/11/09 17:59:52 mycroft Exp $
+
+--- configure.orig	Sun Oct  1 12:40:47 2000
++++ configure	Thu Nov  9 17:52:48 2000
+@@ -4490,6 +4490,10 @@
+ 
+ 
+ 
++# Set DATADIRNAME to "${LOCALEBASE}"
++DATADIRNAME="${LOCALEBASE}"
++INTLDEPS=
++INTLLIBS="-lintl"
+ 
+ trap '' 1 2 15
+ cat > confcache <<\EOF
diff --git a/devel/glade/pkg/PLIST b/devel/glade/pkg/PLIST
index 946dd5a4555..7a1cf7a769e 100644
--- a/devel/glade/pkg/PLIST
+++ b/devel/glade/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2000/10/15 17:20:46 rh Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/11/09 17:59:53 mycroft Exp $
 bin/glade
 share/doc/glade/README
 share/doc/glade/TODO
@@ -9,26 +9,26 @@ share/doc/glade/manual.txt
 share/doc/glade/notes.txt
 share/doc/glade/portability.txt
 share/doc/glade/source_code.txt
-share/locale/da/LC_MESSAGES/glade.mo
-share/locale/de/LC_MESSAGES/glade.mo
-share/locale/en_GB/LC_MESSAGES/glade.mo
-share/locale/es/LC_MESSAGES/glade.mo
-share/locale/fr/LC_MESSAGES/glade.mo
-share/locale/it/LC_MESSAGES/glade.mo
-share/locale/ja/LC_MESSAGES/glade.mo
-share/locale/ko/LC_MESSAGES/glade.mo
-share/locale/no/LC_MESSAGES/glade.mo
-share/locale/pl/LC_MESSAGES/glade.mo
-share/locale/ru/LC_MESSAGES/glade.mo
-share/locale/ca/LC_MESSAGES/glade.mo
-share/locale/cs/LC_MESSAGES/glade.mo
-share/locale/el/LC_MESSAGES/glade.mo
-share/locale/ga/LC_MESSAGES/glade.mo
-share/locale/sv/LC_MESSAGES/glade.mo
-share/locale/uk/LC_MESSAGES/glade.mo
-share/locale/gl/LC_MESSAGES/glade.mo
-share/locale/pt_BR/LC_MESSAGES/glade.mo
-share/locale/tr/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/da/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/de/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/en_GB/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/es/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/fr/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/it/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/ja/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/ko/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/no/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/pl/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/ru/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/ca/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/cs/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/el/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/ga/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/sv/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/uk/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/gl/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/glade.mo
+${LOCALEBASE}/locale/tr/LC_MESSAGES/glade.mo
 share/gnome/apps/Development/glade.desktop
 share/gnome/help/glade/C/topic.dat
 share/gnome/help/glade/C/user-guide/user-guide-images/edit-menu.png