Use <machine/endian.h> on Net2-derived BSDs.

Switch off -Werror (there are a lot of warnings from gcc3), and don't
bother running lint when building.

Allows this to compile on -current.

3 files changed, 88 insertions, 2 deletions

diff --git a/net/netatalk-umich/Makefile b/net/netatalk-umich/Makefile
index ff93fda4de8..27769b9ae89 100644
--- a/net/netatalk-umich/Makefile
+++ b/net/netatalk-umich/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:51:27 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/08 12:06:37 agc Exp $
 #
 # XXX do not use -- see ../netatalk instead
 
@@ -16,6 +16,8 @@ COMMENT=		University of Michigan's netatalk; AppleTalk interworking
 CONFLICTS=		netatalk-asun-[0-9]*
 CONFLICTS+=		netatalk-[0-9]*
 
+MAKE_ENV+=		MKLINT=no NOGCCERROR=true
+
 do-configure:
 	${CP} ${FILESDIR}/shlib_version ${WRKSRC}/libatalk
 
diff --git a/net/netatalk-umich/distinfo b/net/netatalk-umich/distinfo
index 659364ccdf2..9e6c0612dc5 100644
--- a/net/netatalk-umich/distinfo
+++ b/net/netatalk-umich/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/25 12:25:51 markd Exp $
+$NetBSD: distinfo,v 1.2 2004/01/08 12:06:37 agc Exp $
 
 SHA1 (netatalk-990130.tar.gz) = 30f16274edc756bd68b0dc00946d5978b7102b3c
 Size (netatalk-990130.tar.gz) = 244708 bytes
@@ -36,3 +36,4 @@ SHA1 (patch-be) = 171df73ca215ee4c09ecab4330573e6d6ca5dce3
 SHA1 (patch-bf) = ba3fd24f72e8e8b3ec42f970586cf46c3d067cd7
 SHA1 (patch-bg) = ed9f8a18fdcd109d7e7cb65bb507abf29429843d
 SHA1 (patch-bh) = d2188c4cfc40a74d8bfcad7b0a81ae537fa4f273
+SHA1 (patch-bi) = 3829d2a1a7c811863e7e2d72c24e9f9a501af1d8
diff --git a/net/netatalk-umich/patches/patch-bi b/net/netatalk-umich/patches/patch-bi
new file mode 100644
index 00000000000..4f1960c712b
--- /dev/null
+++ b/net/netatalk-umich/patches/patch-bi
@@ -0,0 +1,83 @@
+$NetBSD: patch-bi,v 1.1 2004/01/08 12:06:37 agc Exp $
+
+--- include/netatalk/endian.h	2004/01/08 11:45:27	1.1
++++ include/netatalk/endian.h	2004/01/08 11:56:33
+@@ -8,17 +8,25 @@
+ 
+ #ifdef _IBMR2
+ #include <sys/machine.h>
+-#endif _IBMR2
++#endif /* _IBMR2 */
+ 
+ #ifdef linux
+ #include <bytesex.h>
+ #define BYTE_ORDER	__BYTE_ORDER
+ #include <asm/byteorder.h>
+-#endif linux
++#endif /* linux */
+ 
+ #ifdef __svr4__
+ #include <sys/byteorder.h>
+-#endif __svr4__
++#endif /* __svr4__ */
++
++#include <sys/param.h>
++
++/* All Net2-derived systems should have <machine/endian.h> */
++
++#if (defined(BSD) && BSD >= 199306)
++#include <machine/endian.h>
++#endif
+ 
+ # ifndef BYTE_ORDER
+ #define LITTLE_ENDIAN	1234
+@@ -28,9 +36,9 @@
+ #ifdef sun
+ #ifdef i386
+ #define BYTE_ORDER	LITTLE_ENDIAN
+-#else i386
++#else /* i386 */
+ #define BYTE_ORDER	BIG_ENDIAN
+-#endif i386
++#endif /* i386 */
+ #else
+ #ifdef MIPSEB
+ #define BYTE_ORDER	BIG_ENDIAN
+@@ -39,10 +47,10 @@
+ #define BYTE_ORDER	LITTLE_ENDIAN
+ #else
+ Like, what is your byte order, man?
+-#endif MIPSEL
+-#endif MIPSEB
+-#endif sun
+-# endif BYTE_ORDER
++#endif /* MIPSEL */
++#endif /* MIPSEB */
++#endif /* sun */
++# endif /* BYTE_ORDER */
+ 
+ # ifndef ntohl
+ # if defined( sun ) || defined( ultrix ) || defined( _IBMR2 )
+@@ -59,15 +67,15 @@
+ #define	htonl(x)	nuxi_l(x)
+ #define	htons(x)	nuxi_s(x)
+ 
+-#else mips KERNEL
++#else /* mips KERNEL */
+ 
+ #if !( defined( sun ) && defined( i386 ))
+ unsigned short	ntohs(), htons();
+ unsigned long	ntohl(), htonl();
+-#endif sun i386
++#endif /* sun i386 */
+ 
+-#endif mips KERNEL
+-#endif BYTE_ORDER
+-# endif sun ultrix _IBMR2
+-# endif ntohl
+-#  endif _ATALK_ENDIAN_H_
++#endif /* mips KERNEL */
++#endif /* BYTE_ORDER */
++# endif /* sun ultrix _IBMR2 */
++# endif /* ntohl */
++#  endif /* _ATALK_ENDIAN_H_ */