works on solaris

7 files changed, 78 insertions, 32 deletions

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 2f659e87d41..1497f864b3f 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2000/01/02 18:02:41 tron Exp $
+# $NetBSD: Makefile,v 1.35 2000/01/04 17:52:02 bouyer Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
@@ -25,3 +25,8 @@ CFLAGS+=		-Dunix -I${LOCALBASE}/include -DxBSD
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 .include "../../mk/bsd.pkg.mk"
+.if ${OPSYS} == "SunOS"
+PLIST_SUBST+=	LOCALEBASE=lib
+.else
+PLIST_SUBST+=	LOCALEBASE=share
+.endif
diff --git a/sysutils/mc/pkg/PLIST b/sysutils/mc/pkg/PLIST
index b57683e7637..49f9f865d77 100644
--- a/sysutils/mc/pkg/PLIST
+++ b/sysutils/mc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 1999/10/23 11:52:07 tron Exp $
+@comment $NetBSD: PLIST,v 1.13 2000/01/04 17:52:03 bouyer Exp $
 bin/mc
 bin/mcedit
 bin/mcmfmt
@@ -72,28 +72,28 @@ lib/mc/term/xterm.ti
 man/man1/mc.1
 man/man1/mcedit.1
 man/man8/mcserv.8
-share/locale/ca/LC_MESSAGES/mc.mo
-share/locale/cs/LC_MESSAGES/mc.mo
-share/locale/da/LC_MESSAGES/mc.mo
-share/locale/de/LC_MESSAGES/mc.mo
-share/locale/el/LC_MESSAGES/mc.mo
-share/locale/es/LC_MESSAGES/mc.mo
-share/locale/es_ES/LC_MESSAGES/mc.mo
-share/locale/fi/LC_MESSAGES/mc.mo
-share/locale/fr/LC_MESSAGES/mc.mo
-share/locale/hu/LC_MESSAGES/mc.mo
-share/locale/it/LC_MESSAGES/mc.mo
-share/locale/ja/LC_MESSAGES/mc.mo
-share/locale/ko/LC_MESSAGES/mc.mo
-share/locale/nl/LC_MESSAGES/mc.mo
-share/locale/no/LC_MESSAGES/mc.mo
-share/locale/pl/LC_MESSAGES/mc.mo
-share/locale/pt_BR/LC_MESSAGES/mc.mo
-share/locale/ro/LC_MESSAGES/mc.mo
-share/locale/ru/LC_MESSAGES/mc.mo
-share/locale/sv/LC_MESSAGES/mc.mo
-share/locale/wa/LC_MESSAGES/mc.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/ca/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/cs/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/da/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/de/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/el/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/es/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/es_ES/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/fi/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/fr/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/hu/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/it/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/ja/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/ko/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/nl/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/no/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/pl/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/ro/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/ru/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/sv/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/wa/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
 @dirrm lib/mc/term
 @dirrm lib/mc/syntax
 @dirrm lib/mc/extfs
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index a2cb208eaa6..fbdbe3a5f96 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/06/02 20:09:02 christos Exp $
+# $NetBSD: Makefile,v 1.17 2000/01/04 17:49:41 bouyer Exp $
 #
 
 DISTNAME=	mtools-3.9.5
@@ -27,7 +27,7 @@ post-patch:
 	@${RM} ${WRKSRC}/mtools
 
 post-install:
-	@if [ -e ${PREFIX}/bin/floppyd ]; then \
+	@if [ -x ${PREFIX}/bin/floppyd ]; then \
 	  ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
 	else \
 	  ${ECHO} ${RM} -f ${PREFIX}/man/man1/floppyd.1; \
diff --git a/sysutils/mtools/files/patch-sum b/sysutils/mtools/files/patch-sum
index 40c7f897d3f..8a7c9c04a5b 100644
--- a/sysutils/mtools/files/patch-sum
+++ b/sysutils/mtools/files/patch-sum
@@ -1,5 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:10 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/01/04 17:49:43 bouyer Exp $
 
 MD5 (patch-aa) = edf769ee7f71b1bac02185b003eff69f
 MD5 (patch-ab) = f7f2bd87ed7656147a5b69b1a3f17496
-MD5 (patch-ac) = af289ae63872e6d78a3f0c6f5455e71f
+MD5 (patch-ac) = 514d49464ae21e296bfa27f0f9023834
+MD5 (patch-ad) = 3c1e5aba6d4bb0d82052f08c1de94867
+MD5 (patch-ae) = 30bfddbbc43f7a9a196f280215ce8d77
diff --git a/sysutils/mtools/patches/patch-ac b/sysutils/mtools/patches/patch-ac
index 8371188eee5..31f30bf0b74 100644
--- a/sysutils/mtools/patches/patch-ac
+++ b/sysutils/mtools/patches/patch-ac
@@ -1,8 +1,18 @@
-$NetBSD: patch-ac,v 1.3 1999/06/03 14:22:09 tron Exp $
+$NetBSD: patch-ac,v 1.4 2000/01/04 17:49:43 bouyer Exp $
 
---- floppyd.c.orig	Thu Jun  3 15:12:56 1999
-+++ floppyd.c	Thu Jun  3 15:19:46 1999
-@@ -758,8 +758,8 @@
+--- floppyd.c.old	Mon Dec 13 18:11:58 1999
++++ floppyd.c	Mon Dec 13 18:16:52 1999
+@@ -85,7 +85,9 @@
+ 
+ typedef unsigned char Byte;
+ typedef unsigned long Dword;
++#ifndef OS_solaris2
+ typedef unsigned long ipaddr_t;
++#endif
+ 
+ enum Opcodes {
+ 	OP_READ,
+@@ -758,8 +760,8 @@
  	int			run_as_server = 0;
  	ipaddr_t		bind_ip = INADDR_ANY;
  	short			bind_port = FLOPPYD_DEFAULT_PORT;
diff --git a/sysutils/mtools/patches/patch-ad b/sysutils/mtools/patches/patch-ad
new file mode 100644
index 00000000000..ac2c849e369
--- /dev/null
+++ b/sysutils/mtools/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2000/01/04 17:49:43 bouyer Exp $
+
+--- floppyd_io.c.old	Mon Dec 13 18:10:17 1999
++++ floppyd_io.c	Mon Dec 13 18:10:36 1999
+@@ -21,7 +21,9 @@
+ 
+ /* ######################################################################## */
+ 
++#ifndef OS_solaris2
+ typedef unsigned long   ipaddr_t;
++#endif
+ typedef unsigned char Byte;
+ typedef unsigned long Dword;
+ 
diff --git a/sysutils/mtools/patches/patch-ae b/sysutils/mtools/patches/patch-ae
new file mode 100644
index 00000000000..a1bccb6f613
--- /dev/null
+++ b/sysutils/mtools/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2000/01/04 17:49:43 bouyer Exp $
+
+--- floppyd_installtest.c.old	Mon Dec 13 19:18:09 1999
++++ floppyd_installtest.c	Mon Dec 13 19:18:45 1999
+@@ -24,8 +24,9 @@
+ #include <netdb.h>
+ 
+ /* ######################################################################## */
+-
++#ifndef OS_solaris2
+ typedef unsigned long   ipaddr_t;
++#endif
+ typedef unsigned char Byte;
+ typedef unsigned long Dword;
+