[packages] djbdns: remove junk from last commit

[openwrt/svn-archive/archive.git] / net / nfs-kernel-server / Makefile

diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile
index abe0b0062bce1b637b19700c15142c27045d0770..6f09bccf21d636e4c294c5f4a50d8d9b62f8fdc7 100644 (file)
--- a/net/nfs-kernel-server/Makefile
+++ b/net/nfs-kernel-server/Makefile
@@ -1,69 +1,68 @@
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nfs-kernel-server
-PKG_VERSION:=1.0.7
-PKG_RELEASE:=1
-PKG_MD5SUM:=8f863120261cd572ad320a9152581e11
+PKG_VERSION:=1.1.5
+PKG_RELEASE:=2
+PKG_MD5SUM:=2848072a5e53840b9bc520fbb6782b57
 
 PKG_SOURCE_URL:=@SF/nfs
-PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/nfs-utils-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/nfs-kernel-server/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://nfs.sourceforge.net/
+endef
+
 define Package/nfs-kernel-server
-SECTION:=net
-CATEGORY:=Network
-TITLE:=Kernel NFS server support
-URL:=http://nfs.sourceforge.net/
-DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap
+  TITLE:=Kernel NFS server support
+  DEPENDS:=+kmod-fs-nfsd +kmod-fs-nfs +portmap +libwrap +libblkid
 endef
 
 define Package/nfs-kernel-server/description
-Kernel NFS server support
+  Kernel NFS server support
 endef
 
 define Package/nfs-kernel-server-utils
-SECTION:=net
-CATEGORY:=Network
-TITLE:=NFS server utils
-URL:=http://nfs.sourceforge.net
-DEPENDS:=nfs-kernel-server
+  TITLE:=NFS server utils
+  DEPENDS:=+nfs-kernel-server
 endef
 
 define Package/nfs-kernel-server-utils/description
-NFS server utils
+  NFS server utils
 endef
 
 define Package/nfs-kernel-server/conffiles
 /etc/exports
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-static \
-               --enable-shared \
-               --disable-nfsv4 \
-               --disable-gss \
-       )
-endef
+CONFIGURE_ARGS += \
+       --disable-gss \
+       --disable-nfsv4 \
+       --enable-static \
+       --enable-shared
+
+TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib 
+TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
-       $(MAKE) -C $(PKG_BUILD_DIR)
+        $(call Build/Compile/Default, \
+                OPT="$(TARGET_CFLAGS)" \
+                INSTALLSUID="install -m 4755" \
+                DESTDIR="$(PKG_INSTALL_DIR)" \
+                all install \
+        )
 endef
 
 define Package/nfs-kernel-server/install
        $(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
        $(INSTALL_DATA) ./files/nfsd.exports $(1)/etc/exports
        $(INSTALL_BIN) ./files/nfsd.init $(1)/etc/init.d/nfsd
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/lockd/lockd $(1)/usr/sbin/rpc.lockd
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/statd/statd $(1)/usr/sbin/rpc.statd
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/nfsd/nfsd $(1)/usr/sbin/rpc.nfsd
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/utils/mountd/mountd $(1)/usr/sbin/rpc.mountd