[libnfs] - version bump to new api and new buildsys

5 files changed, 113 insertions, 134 deletions

diff --git a/lib/libnfs/Makefile b/lib/libnfs/Makefile
index 9a7d706fa1..cc3e4220c8 100644
--- a/lib/libnfs/Makefile
+++ b/lib/libnfs/Makefile
@@ -6,7 +6,7 @@
 
 # lib name, version
 LIBNAME=libnfs
-VERSION=0977fbb
+VERSION=9f88cb0
 SOURCE=$(LIBNAME)-$(VERSION)
 # download location and format
 BASE_URL=http://mirrors.xbmc.org/build-deps/darwin-libs
@@ -16,10 +16,9 @@ RETRIEVE_TOOL=/usr/bin/curl
 RETRIEVE_TOOL_FLAGS=-Ls --create-dirs --output $(TARBALLS_LOCATION)/$(ARCHIVE)
 ARCHIVE_TOOL=tar
 ARCHIVE_TOOL_FLAGS=xf
-prefix=/usr
 
 # configuration settings
-CONFIGURE=./configure --prefix=$(prefix) --without-examples --without-ldconfig
+CONFIGURE=./configure
 
 SO_NAME=$(SOURCE)/lib/libnfs.so
 
@@ -34,25 +33,19 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	rm -rf $(SOURCE)
 	$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
 	echo $(SOURCE) > .gitignore
-	cd $(SOURCE);autoreconf -vif;$(CONFIGURE)
-	cd $(SOURCE); patch -p0 < ../printf.patch
+	cd $(SOURCE);./bootstrap;$(CONFIGURE)
 
 $(SO_NAME): $(SOURCE)
 	make -C $(SOURCE)
 
 install:
 	make -C $(SOURCE) install
-	rm -f $(prefix)/lib/libnfs.so
-	rm -f $(prefix)/lib/libnfs.so.1
-	ln -s $(prefix)/lib/libnfs.so.1.0.0 $(prefix)/lib/libnfs.so
-	ln -s $(prefix)/lib/libnfs.so.1.0.0 $(prefix)/lib/libnfs.so.1
 clean:
 	make -C $(SOURCE) clean
 	rm  -f .installed
 	rm -f -r include
 	rm -f -r lib
 	rm -f *.tar.gz
-	rm -r -f Memphiz-libnfs*
 	rm -r -f nfsc
 
 distclean::
diff --git a/lib/libnfs/printf.patch b/lib/libnfs/printf.patch
deleted file mode 100644
index 2cdf264c6c..0000000000
--- a/lib/libnfs/printf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/libnfs-sync.c  2011-06-11 01:23:58.000000000 +0200
-+++ lib/libnfs-sync.c  2011-06-13 15:04:59.000000000 +0200
-@@ -34,6 +34,9 @@
- #include "libnfs-raw-mount.h"
- #include "libnfs-raw-nfs.h"
- 
-+#undef printf
-+int printf(const char* str, ...){return 0;}
-+
- struct sync_cb_data {
-        int is_finished;
-        int status;
diff --git a/tools/darwin/depends/libnfs/Makefile b/tools/darwin/depends/libnfs/Makefile
index ce2ec98441..d4e2c2fa60 100644
--- a/tools/darwin/depends/libnfs/Makefile
+++ b/tools/darwin/depends/libnfs/Makefile
@@ -3,16 +3,15 @@ include ../config.site.mk
 
 # lib name, version
 LIBNAME=libnfs
-VERSION=0977fbb
+VERSION=9f88cb0
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
 # configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --without-examples
+CONFIGURE=./configure --prefix=$(PREFIX)
 
 RPC_HEADERS=rpcinc/auth.h rpcinc/auth_unix.h rpcinc/clnt.h rpcinc/pmap_clnt.h rpcinc/pmap_prot.h rpcinc/pmap_rmt.h rpcinc/rpc.h rpcinc/rpc_msg.h rpcinc/svc.h rpcinc/svc_auth.h rpcinc/types.h rpcinc/xdr.h
 
-DYLIBNAME=libnfs.1.0.0.dylib
 LIBDYLIB=$(SOURCE)/lib/$(DYLIBNAME)
 
 CLEAN_FILES=$(ARCHIVE) $(SOURCE)
@@ -28,17 +27,14 @@ $(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
 	echo $(SOURCE) > .gitignore
 	mkdir -p $(PREFIX)/include/rpc
 	install -c -m 644  $(RPC_HEADERS) $(PREFIX)/include/rpc/
-	cd $(SOURCE); ./autogen.sh
+	cd $(SOURCE); ./bootstrap
 	cd $(SOURCE); $(CONFIGURE)
-	cd $(SOURCE); patch -p0 < ../printf.patch
 
 $(LIBDYLIB): $(SOURCE)
 	make -C $(SOURCE)
 
 .installed:
 	make -C $(SOURCE) install
-	rm -f $(PREFIX)/lib/libnfs.dylib
-	ln -s $(PREFIX)/lib/$(DYLIBNAME) $(PREFIX)/lib/libnfs.dylib
 	touch $@
 clean:
 	make -C $(SOURCE) clean
diff --git a/tools/darwin/depends/libnfs/printf.patch b/tools/darwin/depends/libnfs/printf.patch
deleted file mode 100644
index 2cdf264c6c..0000000000
--- a/tools/darwin/depends/libnfs/printf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/libnfs-sync.c  2011-06-11 01:23:58.000000000 +0200
-+++ lib/libnfs-sync.c  2011-06-13 15:04:59.000000000 +0200
-@@ -34,6 +34,9 @@
- #include "libnfs-raw-mount.h"
- #include "libnfs-raw-nfs.h"
- 
-+#undef printf
-+int printf(const char* str, ...){return 0;}
-+
- struct sync_cb_data {
-        int is_finished;
-        int status;
diff --git a/xbmc/filesystem/DllLibNfs.h b/xbmc/filesystem/DllLibNfs.h
index 0dd4682702..d946309752 100644
--- a/xbmc/filesystem/DllLibNfs.h
+++ b/xbmc/filesystem/DllLibNfs.h
@@ -36,89 +36,103 @@ class DllLibNfsInterface
 public:
   virtual ~DllLibNfsInterface() {}
 
+//  virtual struct rpc_context *rpc_init_context(void)=0;
+//  virtual void rpc_destroy_context(struct rpc_context *rpc)=0;
+  virtual void mount_free_export_list(struct exportnode *exports)=0;
+  virtual struct exportnode *mount_getexports(const char *server)=0;
+  virtual struct nfs_server_list *nfs_find_local_servers(void)=0;
+  virtual void   free_nfs_srvr_list(struct nfs_server_list *srv)=0;
   virtual struct nfs_context *nfs_init_context(void)=0;
   virtual void nfs_destroy_context(struct nfs_context *nfs)=0;  
   virtual size_t nfs_get_readmax(struct nfs_context *nfs)=0;  
   virtual size_t nfs_get_writemax(struct nfs_context *nfs)=0;
   virtual char *nfs_get_error(struct nfs_context *nfs)=0;  
-  virtual int nfs_close_sync(struct nfs_context *nfs,     struct nfsfh *nfsfh)=0;
-  virtual int nfs_fsync_sync(struct nfs_context *nfs,     struct nfsfh *nfsfh)=0;  
-  virtual int nfs_mkdir_sync(struct nfs_context *nfs,     const char *path)=0;
-  virtual int nfs_rmdir_sync(struct nfs_context *nfs,     const char *path)=0;
-  virtual int nfs_unlink_sync(struct nfs_context *nfs,    const char *path)=0;
+  virtual int nfs_close(struct nfs_context *nfs,     struct nfsfh *nfsfh)=0;
+  virtual int nfs_fsync(struct nfs_context *nfs,     struct nfsfh *nfsfh)=0;  
+  virtual int nfs_mkdir(struct nfs_context *nfs,     const char *path)=0;
+  virtual int nfs_rmdir(struct nfs_context *nfs,     const char *path)=0;
+  virtual int nfs_unlink(struct nfs_context *nfs,    const char *path)=0;
   virtual void nfs_closedir(struct nfs_context *nfs,      struct nfsdir *nfsdir)=0;      
   virtual struct nfsdirent *nfs_readdir(struct nfs_context *nfs, struct nfsdir *nfsdir)=0;  
-  virtual int nfs_mount_sync(struct nfs_context *nfs,     const char *server,   const char *exportname)=0;
-  virtual int nfs_stat_sync(struct nfs_context *nfs,      const char *path,     struct stat *st)=0;
-  virtual int nfs_fstat_sync(struct nfs_context *nfs,     struct nfsfh *nfsfh,  struct stat *st)=0;
-  virtual int nfs_truncate_sync(struct nfs_context *nfs,  const char *path,     off_t length)=0;
-  virtual int nfs_ftruncate_sync(struct nfs_context *nfs, struct nfsfh *nfsfh,  off_t length)=0;
-  virtual int nfs_opendir_sync(struct nfs_context *nfs,   const char *path,     struct nfsdir **nfsdir)=0;
-  virtual int nfs_statvfs_sync(struct nfs_context *nfs,   const char *path,     struct statvfs *svfs)=0;
-  virtual int nfs_chmod_sync(struct nfs_context *nfs,     const char *path,     int mode)=0;
-  virtual int nfs_fchmod_sync(struct nfs_context *nfs,    struct nfsfh *nfsfh,  int mode)=0;
-  virtual int nfs_access_sync(struct nfs_context *nfs,    const char *path,     int mode)=0;
-  virtual int nfs_utimes_sync(struct nfs_context *nfs,    const char *path,     struct timeval *times)=0;
-  virtual int nfs_utime_sync(struct nfs_context *nfs,     const char *path,     struct utimbuf *times)=0;
-  virtual int nfs_symlink_sync(struct nfs_context *nfs,   const char *oldpath,  const char *newpath)=0;
-  virtual int nfs_rename_sync(struct nfs_context *nfs,    const char *oldpath,  const char *newpath)=0;
-  virtual int nfs_link_sync(struct nfs_context *nfs,      const char *oldpath,  const char *newpath)=0;  
-  virtual int nfs_readlink_sync(struct nfs_context *nfs,  const char *path,     char *buf,    int bufsize)=0;
-  virtual int nfs_chown_sync(struct nfs_context *nfs,     const char *path,     int uid,      int gid)=0;
-  virtual int nfs_fchown_sync(struct nfs_context *nfs,    struct nfsfh *nfsfh,  int uid,      int gid)=0;
-  virtual int nfs_open_sync(struct nfs_context *nfs,      const char *path,     int mode,     struct nfsfh **nfsfh)=0;  
-  virtual int nfs_read_sync(struct nfs_context *nfs,      struct nfsfh *nfsfh,  size_t count, char *buf)=0;  
-  virtual int nfs_write_sync(struct nfs_context *nfs,     struct nfsfh *nfsfh,  size_t count, char *buf)=0;
-  virtual int nfs_creat_sync(struct nfs_context *nfs,     const char *path,     int mode,     struct nfsfh **nfsfh)=0;  
-  virtual int nfs_pread_sync(struct nfs_context *nfs,     struct nfsfh *nfsfh,  off_t offset, size_t count, char *buf)=0;
-  virtual int nfs_pwrite_sync(struct nfs_context *nfs,    struct nfsfh *nfsfh,  off_t offset, size_t count, char *buf)=0;
-  virtual int nfs_lseek_sync(struct nfs_context *nfs,     struct nfsfh *nfsfh,  off_t offset, int whence,   off_t *current_offset)=0;
+  virtual int nfs_mount(struct nfs_context *nfs,     const char *server,   const char *exportname)=0;
+  virtual int nfs_stat(struct nfs_context *nfs,      const char *path,     struct stat *st)=0;
+  virtual int nfs_fstat(struct nfs_context *nfs,     struct nfsfh *nfsfh,  struct stat *st)=0;
+  virtual int nfs_truncate(struct nfs_context *nfs,  const char *path,     off_t length)=0;
+  virtual int nfs_ftruncate(struct nfs_context *nfs, struct nfsfh *nfsfh,  off_t length)=0;
+  virtual int nfs_opendir(struct nfs_context *nfs,   const char *path,     struct nfsdir **nfsdir)=0;
+  virtual int nfs_statvfs(struct nfs_context *nfs,   const char *path,     struct statvfs *svfs)=0;
+  virtual int nfs_chmod(struct nfs_context *nfs,     const char *path,     int mode)=0;
+  virtual int nfs_fchmod(struct nfs_context *nfs,    struct nfsfh *nfsfh,  int mode)=0;
+  virtual int nfs_access(struct nfs_context *nfs,    const char *path,     int mode)=0;
+  virtual int nfs_utimes(struct nfs_context *nfs,    const char *path,     struct timeval *times)=0;
+  virtual int nfs_utime(struct nfs_context *nfs,     const char *path,     struct utimbuf *times)=0;
+  virtual int nfs_symlink(struct nfs_context *nfs,   const char *oldpath,  const char *newpath)=0;
+  virtual int nfs_rename(struct nfs_context *nfs,    const char *oldpath,  const char *newpath)=0;
+  virtual int nfs_link(struct nfs_context *nfs,      const char *oldpath,  const char *newpath)=0;  
+  virtual int nfs_readlink(struct nfs_context *nfs,  const char *path,     char *buf,    int bufsize)=0;
+  virtual int nfs_chown(struct nfs_context *nfs,     const char *path,     int uid,      int gid)=0;
+  virtual int nfs_fchown(struct nfs_context *nfs,    struct nfsfh *nfsfh,  int uid,      int gid)=0;
+  virtual int nfs_open(struct nfs_context *nfs,      const char *path,     int mode,     struct nfsfh **nfsfh)=0;  
+  virtual int nfs_read(struct nfs_context *nfs,      struct nfsfh *nfsfh,  size_t count, char *buf)=0;  
+  virtual int nfs_write(struct nfs_context *nfs,     struct nfsfh *nfsfh,  size_t count, char *buf)=0;
+  virtual int nfs_creat(struct nfs_context *nfs,     const char *path,     int mode,     struct nfsfh **nfsfh)=0;  
+  virtual int nfs_pread(struct nfs_context *nfs,     struct nfsfh *nfsfh,  off_t offset, size_t count, char *buf)=0;
+  virtual int nfs_pwrite(struct nfs_context *nfs,    struct nfsfh *nfsfh,  off_t offset, size_t count, char *buf)=0;
+  virtual int nfs_lseek(struct nfs_context *nfs,     struct nfsfh *nfsfh,  off_t offset, int whence,   off_t *current_offset)=0;
 };
 
 class DllLibNfs : public DllDynamic, DllLibNfsInterface
 {
   DECLARE_DLL_WRAPPER(DllLibNfs, DLL_PATH_LIBNFS)
   DEFINE_METHOD0(struct   nfs_context *, nfs_init_context)
+  DEFINE_METHOD0(struct nfs_server_list *, nfs_find_local_servers)
+  DEFINE_METHOD1(void, free_nfs_srvr_list, (struct nfs_server_list *p1))
+  DEFINE_METHOD1(struct exportnode *, mount_getexports,     (const char *p1))
+  DEFINE_METHOD1(void,    mount_free_export_list,           (struct exportnode *p1))
   DEFINE_METHOD1(void,    nfs_destroy_context,              (struct nfs_context *p1))
   DEFINE_METHOD1(size_t,  nfs_get_readmax,                  (struct nfs_context *p1))
   DEFINE_METHOD1(size_t,  nfs_get_writemax,                 (struct nfs_context *p1)) 
-  DEFINE_METHOD1(char *, nfs_get_error,   (struct nfs_context *p1))    
-  DEFINE_METHOD2(struct nfsdirent *, nfs_readdir, (struct nfs_context *p1, struct nfsdir *p2))  
-  DEFINE_METHOD2(int, nfs_fsync_sync,     (struct nfs_context *p1, struct nfsfh *p2))
-  DEFINE_METHOD2(int, nfs_mkdir_sync,     (struct nfs_context *p1, const char *p2))
-  DEFINE_METHOD2(int, nfs_rmdir_sync,     (struct nfs_context *p1, const char *p2))
-  DEFINE_METHOD2(int, nfs_unlink_sync,    (struct nfs_context *p1, const char *p2))
-  DEFINE_METHOD2(void,nfs_closedir,       (struct nfs_context *p1, struct nfsdir *p2))        
-  DEFINE_METHOD2(int, nfs_close_sync,     (struct nfs_context *p1, struct nfsfh *p2)) 
-  DEFINE_METHOD3(int, nfs_mount_sync,     (struct nfs_context *p1, const char *p2,    const char *p3))
-  DEFINE_METHOD3(int, nfs_stat_sync,      (struct nfs_context *p1, const char *p2,    struct stat *p3))
-  DEFINE_METHOD3(int, nfs_fstat_sync,     (struct nfs_context *p1, struct nfsfh *p2,  struct stat *p3))
-  DEFINE_METHOD3(int, nfs_truncate_sync,  (struct nfs_context *p1, const char *p2,    off_t p3))
-  DEFINE_METHOD3(int, nfs_ftruncate_sync, (struct nfs_context *p1, struct nfsfh *p2,  off_t p3))
-  DEFINE_METHOD3(int, nfs_opendir_sync,   (struct nfs_context *p1, const char *p2,    struct nfsdir **p3))
-  DEFINE_METHOD3(int, nfs_statvfs_sync,   (struct nfs_context *p1, const char *p2,    struct statvfs *p3))
-  DEFINE_METHOD3(int, nfs_chmod_sync,     (struct nfs_context *p1, const char *p2,    int p3))
-  DEFINE_METHOD3(int, nfs_fchmod_sync,    (struct nfs_context *p1, struct nfsfh *p2,  int p3))
-  DEFINE_METHOD3(int, nfs_utimes_sync,    (struct nfs_context *p1, const char *p2,    struct timeval *p3))
-  DEFINE_METHOD3(int, nfs_utime_sync,     (struct nfs_context *p1, const char *p2,    struct utimbuf *p3))
-  DEFINE_METHOD3(int, nfs_access_sync,    (struct nfs_context *p1, const char *p2,    int p3))
-  DEFINE_METHOD3(int, nfs_symlink_sync,   (struct nfs_context *p1, const char *p2,    const char *p3))
-  DEFINE_METHOD3(int, nfs_rename_sync,    (struct nfs_context *p1, const char *p2,    const char *p3))
-  DEFINE_METHOD3(int, nfs_link_sync,      (struct nfs_context *p1, const char *p2,    const char *p3))  
-  DEFINE_METHOD4(int, nfs_open_sync,      (struct nfs_context *p1, const char *p2,    int p3,     struct nfsfh **p4))
-  DEFINE_METHOD4(int, nfs_read_sync,      (struct nfs_context *p1, struct nfsfh *p2,  size_t p3,  char *p4))
-  DEFINE_METHOD4(int, nfs_write_sync,     (struct nfs_context *p1, struct nfsfh *p2,  size_t p3,  char *p4))
-  DEFINE_METHOD4(int, nfs_creat_sync,     (struct nfs_context *p1, const char *p2,    int p3,     struct nfsfh **p4))
-  DEFINE_METHOD4(int, nfs_readlink_sync,  (struct nfs_context *p1, const char *p2,    char *p3,   int p4))
-  DEFINE_METHOD4(int, nfs_chown_sync,     (struct nfs_context *p1, const char *p2,    int p3,     int p4))
-  DEFINE_METHOD4(int, nfs_fchown_sync,    (struct nfs_context *p1, struct nfsfh *p2,  int p3,     int p4))
-  DEFINE_METHOD5(int, nfs_pread_sync,     (struct nfs_context *p1, struct nfsfh *p2,  off_t p3,   size_t p4,  char *p5))
-  DEFINE_METHOD5(int, nfs_pwrite_sync,    (struct nfs_context *p1, struct nfsfh *p2,  off_t p3,   size_t p4,  char *p5))
-  DEFINE_METHOD5(int, nfs_lseek_sync,     (struct nfs_context *p1, struct nfsfh *p2,  off_t p3,   int p4,     off_t *p5))
+  DEFINE_METHOD1(char *,  nfs_get_error,                    (struct nfs_context *p1))    
+  DEFINE_METHOD2(struct nfsdirent *, nfs_readdir,           (struct nfs_context *p1, struct nfsdir *p2))
+  DEFINE_METHOD2(int, nfs_fsync,     (struct nfs_context *p1, struct nfsfh *p2))
+  DEFINE_METHOD2(int, nfs_mkdir,     (struct nfs_context *p1, const char *p2))
+  DEFINE_METHOD2(int, nfs_rmdir,     (struct nfs_context *p1, const char *p2))
+  DEFINE_METHOD2(int, nfs_unlink,    (struct nfs_context *p1, const char *p2))
+  DEFINE_METHOD2(void,nfs_closedir,  (struct nfs_context *p1, struct nfsdir *p2))        
+  DEFINE_METHOD2(int, nfs_close,     (struct nfs_context *p1, struct nfsfh *p2)) 
+  DEFINE_METHOD3(int, nfs_mount,     (struct nfs_context *p1, const char *p2,    const char *p3))
+  DEFINE_METHOD3(int, nfs_stat,      (struct nfs_context *p1, const char *p2,    struct stat *p3))
+  DEFINE_METHOD3(int, nfs_fstat,     (struct nfs_context *p1, struct nfsfh *p2,  struct stat *p3))
+  DEFINE_METHOD3(int, nfs_truncate,  (struct nfs_context *p1, const char *p2,    off_t p3))
+  DEFINE_METHOD3(int, nfs_ftruncate, (struct nfs_context *p1, struct nfsfh *p2,  off_t p3))
+  DEFINE_METHOD3(int, nfs_opendir,   (struct nfs_context *p1, const char *p2,    struct nfsdir **p3))
+  DEFINE_METHOD3(int, nfs_statvfs,   (struct nfs_context *p1, const char *p2,    struct statvfs *p3))
+  DEFINE_METHOD3(int, nfs_chmod,     (struct nfs_context *p1, const char *p2,    int p3))
+  DEFINE_METHOD3(int, nfs_fchmod,    (struct nfs_context *p1, struct nfsfh *p2,  int p3))
+  DEFINE_METHOD3(int, nfs_utimes,    (struct nfs_context *p1, const char *p2,    struct timeval *p3))
+  DEFINE_METHOD3(int, nfs_utime,     (struct nfs_context *p1, const char *p2,    struct utimbuf *p3))
+  DEFINE_METHOD3(int, nfs_access,    (struct nfs_context *p1, const char *p2,    int p3))
+  DEFINE_METHOD3(int, nfs_symlink,   (struct nfs_context *p1, const char *p2,    const char *p3))
+  DEFINE_METHOD3(int, nfs_rename,    (struct nfs_context *p1, const char *p2,    const char *p3))
+  DEFINE_METHOD3(int, nfs_link,      (struct nfs_context *p1, const char *p2,    const char *p3))  
+  DEFINE_METHOD4(int, nfs_open,      (struct nfs_context *p1, const char *p2,    int p3,     struct nfsfh **p4))
+  DEFINE_METHOD4(int, nfs_read,      (struct nfs_context *p1, struct nfsfh *p2,  size_t p3,  char *p4))
+  DEFINE_METHOD4(int, nfs_write,     (struct nfs_context *p1, struct nfsfh *p2,  size_t p3,  char *p4))
+  DEFINE_METHOD4(int, nfs_creat,     (struct nfs_context *p1, const char *p2,    int p3,     struct nfsfh **p4))
+  DEFINE_METHOD4(int, nfs_readlink,  (struct nfs_context *p1, const char *p2,    char *p3,   int p4))
+  DEFINE_METHOD4(int, nfs_chown,     (struct nfs_context *p1, const char *p2,    int p3,     int p4))
+  DEFINE_METHOD4(int, nfs_fchown,    (struct nfs_context *p1, struct nfsfh *p2,  int p3,     int p4))
+  DEFINE_METHOD5(int, nfs_pread,     (struct nfs_context *p1, struct nfsfh *p2,  off_t p3,   size_t p4,  char *p5))
+  DEFINE_METHOD5(int, nfs_pwrite,    (struct nfs_context *p1, struct nfsfh *p2,  off_t p3,   size_t p4,  char *p5))
+  DEFINE_METHOD5(int, nfs_lseek,     (struct nfs_context *p1, struct nfsfh *p2,  off_t p3,   int p4,     off_t *p5))
 
 
 
   BEGIN_METHOD_RESOLVE()
+    RESOLVE_METHOD_RENAME(mount_free_export_list, mount_free_export_list)
+    RESOLVE_METHOD_RENAME(mount_getexports, mount_getexports)
+    RESOLVE_METHOD_RENAME(nfs_find_local_servers, nfs_find_local_servers)
+    RESOLVE_METHOD_RENAME(free_nfs_srvr_list, free_nfs_srvr_list)        
     RESOLVE_METHOD_RENAME(nfs_init_context,   nfs_init_context)
     RESOLVE_METHOD_RENAME(nfs_destroy_context,nfs_destroy_context)
     RESOLVE_METHOD_RENAME(nfs_get_readmax,    nfs_get_readmax)
@@ -126,36 +140,36 @@ class DllLibNfs : public DllDynamic, DllLibNfsInterface
     RESOLVE_METHOD_RENAME(nfs_get_error,      nfs_get_error)
     RESOLVE_METHOD_RENAME(nfs_readdir,        nfs_readdir)    
     RESOLVE_METHOD_RENAME(nfs_closedir,       nfs_closedir)  
-    RESOLVE_METHOD_RENAME(nfs_mount_sync,     nfs_mount_sync)
-    RESOLVE_METHOD_RENAME(nfs_stat_sync,      nfs_stat_sync)
-    RESOLVE_METHOD_RENAME(nfs_fstat_sync,     nfs_fstat_sync)
-    RESOLVE_METHOD_RENAME(nfs_open_sync,      nfs_open_sync)
-    RESOLVE_METHOD_RENAME(nfs_close_sync,     nfs_close_sync)
-    RESOLVE_METHOD_RENAME(nfs_pread_sync,     nfs_pread_sync)
-    RESOLVE_METHOD_RENAME(nfs_read_sync,      nfs_read_sync)
-    RESOLVE_METHOD_RENAME(nfs_pwrite_sync,    nfs_pwrite_sync)
-    RESOLVE_METHOD_RENAME(nfs_write_sync,     nfs_write_sync)
-    RESOLVE_METHOD_RENAME(nfs_lseek_sync,     nfs_lseek_sync)
-    RESOLVE_METHOD_RENAME(nfs_fsync_sync,     nfs_fsync_sync)
-    RESOLVE_METHOD_RENAME(nfs_truncate_sync,  nfs_truncate_sync)
-    RESOLVE_METHOD_RENAME(nfs_ftruncate_sync, nfs_ftruncate_sync)
-    RESOLVE_METHOD_RENAME(nfs_mkdir_sync,     nfs_mkdir_sync)
-    RESOLVE_METHOD_RENAME(nfs_rmdir_sync,     nfs_rmdir_sync)
-    RESOLVE_METHOD_RENAME(nfs_creat_sync,     nfs_creat_sync)
-    RESOLVE_METHOD_RENAME(nfs_unlink_sync,    nfs_unlink_sync)
-    RESOLVE_METHOD_RENAME(nfs_opendir_sync,   nfs_opendir_sync)
-    RESOLVE_METHOD_RENAME(nfs_statvfs_sync,   nfs_statvfs_sync)
-    RESOLVE_METHOD_RENAME(nfs_readlink_sync,  nfs_readlink_sync)
-    RESOLVE_METHOD_RENAME(nfs_chmod_sync,     nfs_chmod_sync)
-    RESOLVE_METHOD_RENAME(nfs_fchmod_sync,    nfs_fchmod_sync)
-    RESOLVE_METHOD_RENAME(nfs_chown_sync,     nfs_chown_sync)
-    RESOLVE_METHOD_RENAME(nfs_fchown_sync,    nfs_fchown_sync)
-    RESOLVE_METHOD_RENAME(nfs_utimes_sync,    nfs_utimes_sync)
-    RESOLVE_METHOD_RENAME(nfs_utime_sync,     nfs_utime_sync)
-    RESOLVE_METHOD_RENAME(nfs_access_sync,    nfs_access_sync)
-    RESOLVE_METHOD_RENAME(nfs_symlink_sync,   nfs_symlink_sync)
-    RESOLVE_METHOD_RENAME(nfs_rename_sync,    nfs_rename_sync)
-    RESOLVE_METHOD_RENAME(nfs_link_sync,      nfs_link_sync)      
+    RESOLVE_METHOD_RENAME(nfs_mount,     nfs_mount)
+    RESOLVE_METHOD_RENAME(nfs_stat,      nfs_stat)
+    RESOLVE_METHOD_RENAME(nfs_fstat,     nfs_fstat)
+    RESOLVE_METHOD_RENAME(nfs_open,      nfs_open)
+    RESOLVE_METHOD_RENAME(nfs_close,     nfs_close)
+    RESOLVE_METHOD_RENAME(nfs_pread,     nfs_pread)
+    RESOLVE_METHOD_RENAME(nfs_read,      nfs_read)
+    RESOLVE_METHOD_RENAME(nfs_pwrite,    nfs_pwrite)
+    RESOLVE_METHOD_RENAME(nfs_write,     nfs_write)
+    RESOLVE_METHOD_RENAME(nfs_lseek,     nfs_lseek)
+    RESOLVE_METHOD_RENAME(nfs_fsync,     nfs_fsync)
+    RESOLVE_METHOD_RENAME(nfs_truncate,  nfs_truncate)
+    RESOLVE_METHOD_RENAME(nfs_ftruncate, nfs_ftruncate)
+    RESOLVE_METHOD_RENAME(nfs_mkdir,     nfs_mkdir)
+    RESOLVE_METHOD_RENAME(nfs_rmdir,     nfs_rmdir)
+    RESOLVE_METHOD_RENAME(nfs_creat,     nfs_creat)
+    RESOLVE_METHOD_RENAME(nfs_unlink,    nfs_unlink)
+    RESOLVE_METHOD_RENAME(nfs_opendir,   nfs_opendir)
+    RESOLVE_METHOD_RENAME(nfs_statvfs,   nfs_statvfs)
+    RESOLVE_METHOD_RENAME(nfs_readlink,  nfs_readlink)
+    RESOLVE_METHOD_RENAME(nfs_chmod,     nfs_chmod)
+    RESOLVE_METHOD_RENAME(nfs_fchmod,    nfs_fchmod)
+    RESOLVE_METHOD_RENAME(nfs_chown,     nfs_chown)
+    RESOLVE_METHOD_RENAME(nfs_fchown,    nfs_fchown)
+    RESOLVE_METHOD_RENAME(nfs_utimes,    nfs_utimes)
+    RESOLVE_METHOD_RENAME(nfs_utime,     nfs_utime)
+    RESOLVE_METHOD_RENAME(nfs_access,    nfs_access)
+    RESOLVE_METHOD_RENAME(nfs_symlink,   nfs_symlink)
+    RESOLVE_METHOD_RENAME(nfs_rename,    nfs_rename)
+    RESOLVE_METHOD_RENAME(nfs_link,      nfs_link)      
   END_METHOD_RESOLVE()
 };