bin/48861: make flock default like linux (-x)

[msporleder%gmail.com@localhost]

>Number:         48861
>Category:       bin
>Synopsis:       make flock default like linux (-x)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    bin-bug-people
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jun 01 18:15:00 +0000 2014
>Originator:     matt sporleder
>Release:        6.1
>Organization:
netbsd
>Environment:
NetBSD
>Description:
linux flock, which we are attempting to emulate, uses -x as the default.

Our flock defaults (no flags) to an error saying you need to pass a flag.

Using this local patch I was able to use npm without any issues.
>How-To-Repeat:

>Fix:
--- flock.c-orig        2014-05-31 14:08:41.000000000 -0400
+++ flock.c     2014-05-31 14:07:12.000000000 -0400
@@ -207,7 +207,8 @@
        argv += optind;
 
        if ((lock & ~LOCK_NB) == 0)
-               usage("Missing lock type flag");
+               /* usage("Missing lock type flag"); */
+               lock |= LOCK_EX;
 
        switch (argc) {
        case 0: