make MacOS X works as build system for most of the packages, update some packages to latest stable upstream version

3 files changed, 16 insertions, 14 deletions

diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index b57a70b95..ee3997259 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,15 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.2
+PKG_VERSION:=		1.2.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c3ccd16c147befd49fe4541a506dd177
+PKG_MD5SUM:=		1131dc5f27c4f3905a6e7ee0d594fd4d
 PKG_DESCR:= 		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		kmod-nfsd portmap
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
+PKG_HOST_DEPENDS:=	!darwin
+
 PKG_FLAVOURS:=		WITH_KERBEROS WITH_TIRPC
 PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
 PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in
index a97226111..51581c14a 100644
--- a/package/nfs-utils/patches/patch-tools_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_Makefile_in
@@ -1,19 +1,19 @@
---- nfs-utils-1.2.1.orig/tools/Makefile.in	2009-11-04 12:15:52.000000000 +0100
-+++ nfs-utils-1.2.1/tools/Makefile.in	2009-12-25 19:25:33.000000000 +0100
-@@ -71,7 +71,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+--- nfs-utils-1.2.3.orig/tools/Makefile.in	2010-09-28 14:32:32.000000000 +0200
++++ nfs-utils-1.2.3/tools/Makefile.in	2010-10-10 13:37:18.000000000 +0200
+@@ -77,7 +77,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
  	distdir
  ETAGS = etags
  CTAGS = ctags
--DIST_SUBDIRS = locktest rpcdebug nlmtest rpcgen
+-DIST_SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcgen
 +DIST_SUBDIRS = rpcgen
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
-@@ -257,7 +257,7 @@ top_build_prefix = @top_build_prefix@
+@@ -266,7 +266,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  OPTDIRS = $(am__append_1)
--SUBDIRS = locktest rpcdebug nlmtest $(OPTDIRS)
+-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS)
 +SUBDIRS = $(OPTDIRS)
  MAINTAINERCLEANFILES = Makefile.in
  all: all-recursive
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
index 16af3373b..d5fb62c97 100644
--- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -1,6 +1,6 @@
---- nfs-utils-1.2.1.orig/tools/rpcgen/Makefile.in	2009-11-04 12:15:52.000000000 +0100
-+++ nfs-utils-1.2.1/tools/rpcgen/Makefile.in	2010-01-16 11:01:44.015625000 +0100
-@@ -66,21 +66,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
+--- nfs-utils-1.2.3.orig/tools/rpcgen/Makefile.in	2010-09-28 14:32:33.000000000 +0200
++++ nfs-utils-1.2.3/tools/rpcgen/Makefile.in	2010-10-10 13:29:26.000000000 +0200
+@@ -72,21 +72,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
  rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
  rpcgen_LDADD = $(LDADD)
  rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -29,7 +29,7 @@
  SOURCES = $(rpcgen_SOURCES)
  DIST_SOURCES = $(rpcgen_SOURCES)
  ETAGS = etags
-@@ -100,10 +100,10 @@ AWK = @AWK@
+@@ -106,10 +106,10 @@ AWK = @AWK@
  CC = $(CC_FOR_BUILD)
  CCDEPMODE = @CCDEPMODE@
  CC_FOR_BUILD = @CC_FOR_BUILD@
@@ -42,7 +42,7 @@
  CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
  CXX = @CXX@
  CXXCPP = @CXXCPP@
-@@ -136,10 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+@@ -142,10 +142,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
  K5VERS = @K5VERS@
  KRBCFLAGS = @KRBCFLAGS@
  KRBDIR = @KRBDIR@
@@ -55,7 +55,7 @@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LIBBLKID = @LIBBLKID@
  LIBBSD = @LIBBSD@
-@@ -299,7 +299,7 @@ clean-noinstPROGRAMS:
+@@ -308,7 +308,7 @@ clean-noinstPROGRAMS:
  	rm -f $$list
  rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) 
  	@rm -f rpcgen$(EXEEXT)