diff --git a/packages/network/nfs-utils/build b/packages/network/nfs-utils/build index 8351dff2a2..f19e84ef88 100755 --- a/packages/network/nfs-utils/build +++ b/packages/network/nfs-utils/build @@ -51,7 +51,6 @@ libblkid_is_recent="yes" \ --without-krb5 \ --disable-caps \ --enable-largefile \ - --with-mountfile=/etc/nfsmounts.conf \ --with-gnu-ld make -C support diff --git a/packages/network/nfs-utils/meta b/packages/network/nfs-utils/meta index 924dad4891..fc6e3c3eb7 100644 --- a/packages/network/nfs-utils/meta +++ b/packages/network/nfs-utils/meta @@ -22,7 +22,7 @@ PKG_NAME="nfs-utils" PKG_VERSION="1.2.3" PKG_REV="1" PKG_ARCH="any" -PKG_LICENSE="OSS" +PKG_LICENSE="GPL" PKG_SITE="http://nfs.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/nfs/nfs-utils/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="libevent libnfsidmap libtirpc util-linux" diff --git a/packages/network/nfs-utils/patches/nfs-utils-1.2.3-cross.patch b/packages/network/nfs-utils/patches/nfs-utils-1.2.3-cross.patch deleted file mode 100644 index 57c2f035c1..0000000000 --- a/packages/network/nfs-utils/patches/nfs-utils-1.2.3-cross.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur nfs-utils-1.1.0-old/tools/locktest/Makefile.am nfs-utils-1.1.0-new/tools/locktest/Makefile.am ---- nfs-utils-1.1.0-old/tools/locktest/Makefile.am 2007-05-10 20:40:57.000000000 -0700 -+++ nfs-utils-1.1.0-new/tools/locktest/Makefile.am 2007-08-11 19:18:59.000000000 -0700 -@@ -5,8 +5,8 @@ - - noinst_PROGRAMS = testlk - testlk_SOURCES = testlk.c --testlk_CFLAGS=$(CFLAGS_FOR_BUILD) --testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) --testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - MAINTAINERCLEANFILES = Makefile.in -diff -Naur nfs-utils-1.1.0-old/tools/rpcdebug/Makefile.am nfs-utils-1.1.0-new/tools/rpcdebug/Makefile.am ---- nfs-utils-1.1.0-old/tools/rpcdebug/Makefile.am 2007-05-10 20:40:57.000000000 -0700 -+++ nfs-utils-1.1.0-new/tools/rpcdebug/Makefile.am 2007-08-11 19:19:37.000000000 -0700 -@@ -8,8 +8,8 @@ - - sbin_PROGRAMS = rpcdebug - rpcdebug_SOURCES = rpcdebug.c --rpcdebug_CFLAGS=$(CFLAGS_FOR_BUILD) --rpcdebug_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include --rpcdebug_LDFLAGS=$(LDFLAGS_FOR_BUILD) -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -I$(top_srcdir)/support/include -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - MAINTAINERCLEANFILES = Makefile.in -diff -Naur nfs-utils-1.1.0-old/tools/rpcgen/Makefile.am nfs-utils-1.1.0-new/tools/rpcgen/Makefile.am ---- nfs-utils-1.1.0-old/tools/rpcgen/Makefile.am 2007-05-10 20:40:57.000000000 -0700 -+++ nfs-utils-1.1.0-new/tools/rpcgen/Makefile.am 2007-08-11 19:19:57.000000000 -0700 -@@ -9,9 +9,9 @@ - rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ - rpc_scan.h rpc_util.h - --rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) --rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) --rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - MAINTAINERCLEANFILES = Makefile.in -