works on solaris

4 files changed, 28 insertions, 21 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index bc818d60ad4..d1aa42d8f10 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 1999/12/13 11:06:00 soren Exp $
+# $NetBSD: Makefile,v 1.35 2000/01/04 17:12:59 bouyer Exp $
 
 DISTNAME=	mutt-${MUTT_VERSION}
 CATEGORIES=	mail
@@ -24,8 +24,15 @@ LDFLAGS+=	-s
 
 BUILD_DEFS+=	MUTT_INTERNATIONAL MUTT_VERSION
 
+
 .include "../../mk/bsd.pkg.mk"
 
+.if ${OPSYS} == "SunOS"
+PLIST_SUBST+=	LOCALEBASE=lib
+.else
+PLIST_SUBST+=	LOCALEBASE=share
+.endif
+
 MUTT_BASE_VERSION=	1.0
 .if defined(MUTT_INTERNATIONAL) && ${MUTT_INTERNATIONAL} == YES
 MUTT_VERSION=		${MUTT_BASE_VERSION}i
diff --git a/mail/mutt/pkg/PLIST b/mail/mutt/pkg/PLIST
index d25f7ebd64c..1b2c140e71b 100644
--- a/mail/mutt/pkg/PLIST
+++ b/mail/mutt/pkg/PLIST
@@ -1,24 +1,24 @@
-@comment $NetBSD: PLIST,v 1.8 1999/11/06 11:58:46 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/01/04 17:12:59 bouyer Exp $
 bin/mutt
 etc/Muttrc
 etc/mime.types
 man/man1/mutt.1
 man/man1/mutt_dotlock.1
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/uk/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/cs/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/de/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/es/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/fr/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/it/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/nl/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/pl/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/ru/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/uk/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/ko/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/sk/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/id/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
+${LOCALEBASE}/locale/el/LC_MESSAGES/mutt.mo
 share/doc/mutt/applying-patches.txt
 share/doc/mutt/devel-notes.txt
 share/doc/mutt/COPYRIGHT
diff --git a/misc/dialog/files/patch-sum b/misc/dialog/files/patch-sum
index cf83a96185d..72ffc9648c6 100644
--- a/misc/dialog/files/patch-sum
+++ b/misc/dialog/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:13 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/01/04 17:19:09 bouyer Exp $
 
 MD5 (patch-aa) = 930f24cc3c933b9e6a988d9d1f6bd9d3
 MD5 (patch-ab) = a060eb804e27c093f01ba1f3b3d4a37d
-MD5 (patch-ac) = 1b94f2cf094d4a6ea38f73974b993fef
+MD5 (patch-ac) = ca248e0907ac1fff30b1d8b1efe13fd3
 MD5 (patch-ad) = f300af373e3eaa1bf725482ee4aee725
 MD5 (patch-ae) = 7292f5a5ba47ef3d2dfae96191f93252
 MD5 (patch-af) = 2dc3b5970913a732eb8bf1b15662935d
diff --git a/misc/dialog/patches/patch-ac b/misc/dialog/patches/patch-ac
index 5bb4e276b31..e4a0f02191c 100644
--- a/misc/dialog/patches/patch-ac
+++ b/misc/dialog/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 1999/07/06 08:04:15 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2000/01/04 17:19:11 bouyer Exp $
 
 --- dialog.h.orig	Fri Jan 23 17:37:12 1998
 +++ dialog.h	Fri Jan 23 18:14:38 1998
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.3 1999/07/06 08:04:15 jlam Exp $
  #ifdef ultrix
  #include <cursesX.h>
  #else
-+#if defined(__NetBSD__)
++#if defined(HAVE_NCURSES)
 +#include <ncurses.h>
 +#else
  #include <curses.h>