Index: head/net/nfsshell/Makefile =================================================================== --- head/net/nfsshell/Makefile (revision 429969) +++ head/net/nfsshell/Makefile (revision 429970) @@ -1,26 +1,28 @@ # Created by: johans@stack.nl # $FreeBSD$ PORTNAME= nfsshell PORTVERSION= 20130510 +PORTREVISION= 1 CATEGORIES= net #MASTER_SITES= http://www.cs.vu.nl/pub/leendert/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= hrs@FreeBSD.org COMMENT= Userland NFS command tool +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +USES= localbase readline USE_GITHUB= yes GH_ACCOUNT= NetDirect GH_TAGNAME= 09cdd52 - -USES= readline - ALL_TARGET= nfsshell -MAKE_ARGS= CC="${CC}" LIBS="-lreadline ${LDFLAGS}" - +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DREADLINE" \ + LIBS="-lreadline ${LDFLAGS}" PLIST_FILES= bin/nfsshell do-install: ${INSTALL_PROGRAM} ${WRKSRC}/nfsshell ${STAGEDIR}${PREFIX}/bin/nfsshell .include Index: head/net/nfsshell/files/patch-nfs.c =================================================================== --- head/net/nfsshell/files/patch-nfs.c (revision 429969) +++ head/net/nfsshell/files/patch-nfs.c (nonexistent) @@ -1,11 +0,0 @@ ---- nfsshell.c.orig 2013-05-10 23:40:04.000000000 +0200 -+++ nfsshell.c 2013-12-28 16:34:53.000000000 +0100 -@@ -70,7 +70,7 @@ - #include - #include - #include --#include -+#include - #include "mount.h" - #include "nfs_prot.h" - #include Property changes on: head/net/nfsshell/files/patch-nfs.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/nfsshell/files/patch-nfs_prot_xdr.c =================================================================== --- head/net/nfsshell/files/patch-nfs_prot_xdr.c (revision 429969) +++ head/net/nfsshell/files/patch-nfs_prot_xdr.c (revision 429970) @@ -1,10 +1,10 @@ ---- nfs_prot_xdr.c.orig 2013-12-28 16:36:09.000000000 +0100 -+++ nfs_prot_xdr.c 2013-12-28 16:36:34.000000000 +0100 +--- nfs_prot_xdr.c.orig 2013-05-10 21:40:04 UTC ++++ nfs_prot_xdr.c @@ -4,6 +4,7 @@ */ #include "nfs_prot.h" +#define xdr_u_quad_t xdr_u_int64_t bool_t xdr_cookieverf3 (XDR *xdrs, cookieverf3 objp) Index: head/net/nfsshell/files/patch-nfsshell.c =================================================================== --- head/net/nfsshell/files/patch-nfsshell.c (nonexistent) +++ head/net/nfsshell/files/patch-nfsshell.c (revision 429970) @@ -0,0 +1,67 @@ +--- nfsshell.c.orig 2013-05-10 21:40:04 UTC ++++ nfsshell.c +@@ -70,7 +70,7 @@ + #include + #include + #include +-#include ++#include + #include "mount.h" + #include "nfs_prot.h" + #include +@@ -238,6 +238,7 @@ void do_status(int, char **); + void do_help(int, char **); + + AUTH *create_authenticator(void); ++char *mount_error(enum mountstat3); + char *nfs_error(enum nfsstat3); + int open_mount(char *); + void close_mount(void); +@@ -1915,7 +1916,7 @@ open_nfs(char *path, int port, int flags + } + if (mountpoint->fhs_status != MNT3_OK) { + fprintf(stderr, "Mount failed: %s\n", +- nfs_error(mountpoint->fhs_status)); ++ mount_error(mountpoint->fhs_status)); + return 0; + } + fhandle3_to_nfs_fh3(&directory_handle, &mountpoint->mountres3_u.mountinfo.fhandle); +@@ -2253,6 +2254,38 @@ umatchpattern(char *s, char *p) + } + + /* ++ * MOUNT errors ++ */ ++char * ++mount_error(enum mountstat3 stat) ++{ ++ switch (stat) { ++ case MNT3_OK: ++ return "No error"; ++ case MNT3ERR_PERM: ++ return "Not owner"; ++ case MNT3ERR_NOENT: ++ return "No such file or directory"; ++ case MNT3ERR_IO: ++ return "I/O error"; ++ case MNT3ERR_ACCES: ++ return "Permission denied"; ++ case MNT3ERR_NOTDIR: ++ return "Not a directory"; ++ case MNT3ERR_INVAL: ++ return "Invalid parameter"; ++ case MNT3ERR_NAMETOOLONG: ++ return "File name too long"; ++ case MNT3ERR_NOTSUPP: ++ return "Operation is not supported"; ++ case MNT3ERR_SERVERFAULT: ++ return "Other server error"; ++ default: ++ return "UKNOWN MOUNT ERROR"; ++ } ++} ++ ++/* + * NFS errors + */ + char * Property changes on: head/net/nfsshell/files/patch-nfsshell.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property