head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.6
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.4
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.2
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.1.0.48
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.46
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.44
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.42
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.40
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.38
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.36
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.34
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.32
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.30
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.28
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.26
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.24
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.22
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.20
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.18
	pkgsrc-2008Q1:1.1.0.16
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.14
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.12
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.10
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.8
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.6
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.4
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.2
	pkgsrc-2006Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.10.25.16.28.17;	author ryoon;	state dead;
branches;
next	1.1;

1.1
date	2006.06.21.19.34.45;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to 20100604 aka 6

* Convert patches to MAKE_FLAGS and BUILDLINK_TRANSFORM.
* Add CONF_FILES support.
* Replace /bin/rc.
* Add workaround for NetBSD 5.1

Tested on NetBSD/i386 4.0.1, 5.1, 5.99.56, and NetBSD/amd64 5.99.55,
and DragonFly/i386 2.10.1.

Changelog:
unknown
@
text
@$NetBSD: patch-av,v 1.1 2006/06/21 19:34:45 joerg Exp $

--- lib9/dirread.c.orig	2006-06-21 17:11:56.000000000 +0000
+++ lib9/dirread.c
@@@@ -18,7 +18,7 @@@@ mygetdents(int fd, struct dirent *buf, i
 	nn = getdirentries(fd, (void*)buf, n, &off);
 	return nn;
 }
-#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 static int
 mygetdents(int fd, struct dirent *buf, int n)
 {
@@@@ -44,14 +44,22 @@@@ countde(char *p, int n)
 	m = 0;
 	while(p < e){
 		de = (struct dirent*)p;
+#if defined(__DragonFly__)
+		if (p + _DIRENT_DIRSIZ(de) > e)
+#else
 		if(de->d_reclen <= 4+2+2+1 || p+de->d_reclen > e)
+#endif
 			break;
 		if(de->d_name[0]=='.' && de->d_name[1]==0)
 			de->d_name[0] = 0;
 		else if(de->d_name[0]=='.' && de->d_name[1]=='.' && de->d_name[2]==0)
 			de->d_name[0] = 0;
 		m++;
+#if defined(__DragonFly__)
+		p += _DIRENT_DIRSIZ(de);
+#else
 		p += de->d_reclen;
+#endif
 	}
 	return m;
 }
@@@@ -91,7 +99,11 @@@@ dirpackage(int fd, char *buf, int n, Dir
 				stat(de->d_name, &st);
 			nstr += _p9dir(&lst, &st, de->d_name, nil, nil, nil);
 		}
+#if defined(__DragonFly__)
+		p += _DIRENT_DIRSIZ(de);
+#else
 		p += de->d_reclen;
+#endif
 	}
 
 	d = malloc(sizeof(Dir)*n+nstr);
@@@@ -113,7 +125,11 @@@@ dirpackage(int fd, char *buf, int n, Dir
 				stat(de->d_name, &st);
 			_p9dir(&lst, &st, de->d_name, &d[m++], &str, estr);
 		}
+#if defined(__DragonFly__)
+		p += _DIRENT_DIRSIZ(de);
+#else
 		p += de->d_reclen;
+#endif
 	}
 
 	fchdir(oldwd);
@


1.1
log
@Add DragonFly support.
@
text
@d1 1
a1 1
$NetBSD$
@