Merge branch 'master' of git://factorcode.org/git/factor

basis/io/unix/files/freebsd/freebsd.factor

@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax kernel unix math accessors
-combinators system io.backend alien.c-types unix.statfs 
-io.files ;
+USING: accessors alien.c-types alien.syntax combinators
+io.backend io.files io.unix.files kernel math system unix
+unix.statfs unix.statvfs.freebsd ;
 IN: io.unix.files.freebsd
 
 M: freebsd file-system-statvfs ( path -- byte-array )

basis/io/unix/files/openbsd/openbsd.factor

@@ -2,16 +2,19 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien.syntax accessors combinators kernel
 unix.types math system io.backend alien.c-types unix
-unix.statfs io.files ;
+unix.statfs io.files io.unix.files unix.statvfs.openbsd ;
 IN: io.unix.files.openbsd
 
-M: openbsd >file-system-info ( file-system-info statvfs -- file-system-info' )
+M: openbsd file-system-statvfs ( normalized-path -- statvfs )
+    "statvfs" <c-object> tuck statvfs io-error ;
+
+M: openbsd statvfs>file-system-info ( file-system-info statvfs -- file-system-info' )
     {
         [ statvfs-f_bsize >>block-size ]
         [ statvfs-f_frsize >>preferred-block-size ]
         [ statvfs-f_blocks >>blocks ]
         [ statvfs-f_bfree >>blocks-free ]
-        [ statvfs-f_bavail >>blocks-avail ]
+        [ statvfs-f_bavail >>blocks-available ]
         [ statvfs-f_files >>files ]
         [ statvfs-f_ffree >>files-free ]
         [ statvfs-f_favail >>files-available ]
@@ -19,6 +22,3 @@ M: openbsd >file-system-info ( file-system-info statvfs -- file-system-info' )
         [ statvfs-f_flag >>flags ]
         [ statvfs-f_namemax >>name-max ]
     } cleave ;
-
-M: openbsd file-system-statvfs ( normalized-path -- statvfs )
-    "statvfs" <c-object> tuck statvfs io-error ;

extra/line-art/authors.txt

@@ -1 +0,0 @@
-Joe Groff

extra/line-art/summary.txt

@@ -1 +0,0 @@
-Stanford Bunny rendered with cartoon-style lines instead of shading

extra/line-art/tags.txt

@@ -1,3 +0,0 @@
-demos
-opengl
-glsl