Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

1 files changed, 44 insertions, 48 deletions

diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 425810fc5..78017c615 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,82 +4,78 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		779cf81044e92cb51ad590960e7b3671
+PKG_VERSION:=		1.2.1
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		c3ccd16c147befd49fe4541a506dd177
 PKG_DESCR:= 		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net
+PKG_DEPENDS:=		kmod-nfsd
+
+ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
+PKG_DEPENDS+=		libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
+PKG_BUILDDEP+=		libnfsidmap krb5 libevent libgssglue librpcsecgss
+endif
+
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
+PKG_DEPENDS+=		libtirpc rpcbind
+PKG_BUILDDEP+=		libtirpc rpcbind
+else
 PKG_DEPENDS:=		portmap
+endif
+
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
-include ${TOPDIR}/mk/package.mk
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
-PKG_DEPENDS+=		krb5-libs libevent libnfsidmap librpcsecgss libcom_err libgssglue
-endif
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
-PKG_DEPENDS+=		heimdal-libs libevent libnfsidmap librpcsecgss libcom_err
-endif
+PKG_FLAVOURS:=		WITH_KERBEROS WITH_TIRPC
+PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
+PKGFD_WITH_TIRPC:=	enable Transport Independent RPC
 
-ifeq (${ADK_IPV6},y)
-PKG_DEPENDS+=		libtirpc
-endif
+include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autotool gnu
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KRB5),y)
-CONFIGURE_ARGS+=	--enable-nfsv4 \
-			--with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \
-			--enable-gss
-CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
-endif
-
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_HEIMDAL),y)
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 CONFIGURE_ARGS+=	--enable-nfsv4 \
-			--with-krb5-config=${STAGING_DIR}/usr/bin/krb5-config \
+			--with-krb5=${STAGING_DIR}/usr/ \
 			--enable-gss
 CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
-endif
-
-ifneq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y)
+else
 CONFIGURE_ARGS+=	--disable-nfsv4 \
 			--disable-gss
 endif
 
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
+CONFIGURE_ARGS+=	--enable-tirpc \
+			--with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc
+else
+CONFIGURE_ARGS+=	--disable-tirpc
+endif
+
 CONFIGURE_ENV+=		knfsd_cv_bsd_signals=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-tcp-wrappers \
 			--disable-uuid
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-TCPPFLAGS+=		-I${LINUX_DIR}/include
-
-ifeq (${ADK_IPV6},y)
-CONFIGURE_ARGS+=	--enable-tirpc \
-			--with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc
-endif
 
 post-install:
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc
+	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc
 	${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
-	${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \
+		${IDIR_NFS_UTILS}/usr/sbin/
 	${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports
-	${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/
-ifeq ($(ADK_COMPILE_NFS_UTILS_WITH_KERBEROS),y)
+	${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd \
+		${IDIR_NFS_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd \
+		${IDIR_NFS_UTILS}/usr/sbin/
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 	${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc
-	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd ${IDIR_NFS_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd \
+		${IDIR_NFS_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd \
+		${IDIR_NFS_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd \
+		${IDIR_NFS_UTILS}/usr/sbin/
 endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk