Deal with the damn locale files.

5 files changed, 102 insertions, 29 deletions

diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index aed9bedc3c2..cfd9c9114f4 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,21 +1,45 @@
-# $NetBSD: Makefile,v 1.22 2000/06/25 16:03:23 rh Exp $
+# $NetBSD: Makefile,v 1.23 2000/11/09 21:09:43 mycroft Exp $
 
-DISTNAME=	gnome-utils-1.2.0
-CATEGORIES=	misc x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gnome-utils/}
+DISTNAME=		gnome-utils-1.2.0
+CATEGORIES=		misc x11 gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-utils/}
 
-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+=	ncurses>=4.2:../../devel/ncurses
-DEPENDS+=	gnome-core>=1.2.0:../../x11/gnome-core
-DEPENDS+=	libgtop>=1.0.9:../../devel/libgtop
-DEPENDS+=	libglade>=0.13:../../devel/libglade
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+BUILD_DEPENDS+=		automake:../../devel/automake
+BUILD_DEPENDS+=		bison:../../devel/bison
+DEPENDS+=		ncurses>=4.2:../../devel/ncurses
+DEPENDS+=		gnome-core>=1.2.0:../../x11/gnome-core
+DEPENDS+=		libgtop>=1.0.9:../../devel/libgtop
+DEPENDS+=		libglade>=0.13:../../devel/libglade
 
-GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
-CONFIGURE_ENV+=	XGETTEXT="${LOCALBASE}/bin/xgettext"
-CONFIGURE_ARGS=	--with-ncurses=${LOCALBASE}
+USE_GMAKE=		# defined
+USE_X11BASE=		# defined
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-ncurses=${LOCALBASE}
+CONFIGURE_ENV+=		LOCALEBASE=${LOCALEBASE}
+
+PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
+
+AUTOGEN_ENV=		NOCONFIGURE=1
+AUTOGEN_ENV+=		srcdir=${WRKSRC}
+
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} ${AUTOGEN_ENV} ${SH} macros/autogen.sh
+
+.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-utils/files/patch-sum b/misc/gnome-utils/files/patch-sum
index 72ee1a00a83..6c15f9fe45a 100644
--- a/misc/gnome-utils/files/patch-sum
+++ b/misc/gnome-utils/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.3 2000/06/01 16:10:54 rh Exp $
+$NetBSD: patch-sum,v 1.4 2000/11/09 21:09:43 mycroft Exp $
 
 MD5 (patch-aa) = bfa1d85780d82c9cd7bc756fbc5c061d
 MD5 (patch-ab) = 98f0a2dd5b3b9a773c324cadcce64b8b
-MD5 (patch-ac) = 5b620194dfd6732f7d5cb467ea9f3368
+MD5 (patch-ac) = 9a3528b2be780606dcf0a80904f1080a
+MD5 (patch-ad) = c86d8550effe1b66182f0793443bfe4b
diff --git a/misc/gnome-utils/patches/patch-ac b/misc/gnome-utils/patches/patch-ac
index 09aa0b116d6..e6dafbbea2b 100644
--- a/misc/gnome-utils/patches/patch-ac
+++ b/misc/gnome-utils/patches/patch-ac
@@ -1,13 +1,18 @@
-$NetBSD: patch-ac,v 1.1 2000/06/01 16:10:55 rh Exp $
+$NetBSD: patch-ac,v 1.2 2000/11/09 21:09:43 mycroft Exp $
 
---- configure.orig	Fri May 19 21:49:06 2000
-+++ configure	Thu Jun  1 17:44:51 2000
-@@ -8453,7 +8453,7 @@
-     esac
-   done
+--- configure.in.orig	Fri May 19 19:33:18 2000
++++ configure.in	Thu Nov  9 21:04:41 2000
+@@ -110,12 +110,7 @@
+ dnl ******************** 
+ dnl gfloppy
+ dnl ********************
+-AC_CHECK_HEADER(linux/fd.h, build_gfloppy=true,
+-                AC_MSG_WARN([*** gfloppy will not be built.]))
+-if $build_gfloppy; then
+-  AC_CONFIG_SUBDIRS(gfloppy)
+-fi
+-AM_CONDITIONAL(BUILD_GFLOPPY, test "$build_gfloppy" = true)
++AM_CONDITIONAL(BUILD_GFLOPPY, 0)
  
--  for ac_config_dir in gfloppy; do
-+  for ac_config_dir in ; do
- 
-     # Do not complain, so a configure script can configure whichever
-     # parts of a large source tree are present.
+ dnl ********************
+ dnl logview
diff --git a/misc/gnome-utils/patches/patch-ad b/misc/gnome-utils/patches/patch-ad
new file mode 100644
index 00000000000..29c36dcec62
--- /dev/null
+++ b/misc/gnome-utils/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2000/11/09 21:09:44 mycroft Exp $
+
+--- aclocal.m4.orig	Fri May 19 19:48:53 2000
++++ aclocal.m4	Thu Nov  9 20:56:05 2000
+@@ -946,7 +946,7 @@
+ 		  [CATOBJEXT=.gmo
+ 		   DATADIRNAME=share],
+ 		  [CATOBJEXT=.mo
+-		   DATADIRNAME=lib])
++		   DATADIRNAME=${LOCALEBASE}])
+ 		INSTOBJEXT=.mo
+ 	      fi
+ 	    fi
diff --git a/misc/gnome-utils/pkg/PLIST b/misc/gnome-utils/pkg/PLIST
index 03db1e5442e..4d795e9dfd6 100644
--- a/misc/gnome-utils/pkg/PLIST
+++ b/misc/gnome-utils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/07/10 18:44:03 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/11/09 21:09:44 mycroft Exp $
 bin/gcalc
 bin/gcharmap
 bin/gcolorsel
@@ -184,6 +184,36 @@ share/gcolorsel/glade/view-color-grid-properties.glade.h
 share/gcolorsel/glade/view-color-list-properties.glade
 share/gcolorsel/glade/view-color-list-properties.glade.h
 share/idl/gsu.idl
+${LOCALEBASE}/locale/ca/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/cs/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/da/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/de/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/el/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/en_GB/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/es/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/et/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/fi/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/fr/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/ga/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/gl/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/hu/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/it/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/ja/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/ko/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/lt/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/nl/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/no/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/pl/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/pt/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/ro/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/ru/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/sv/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/tr/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/uk/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/wa/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo
+${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo
 share/pixmaps/logview/logview.xpm
 share/pixmaps/gdict.png
 share/pixmaps/gnome-fontsel.png