From 4f0f8f8e35f4728727995f84949bdc0f4d8d48b3 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 18 May 2005 13:28:02 +0000
Subject: [PATCH] Convert nfs-server to new packaging style

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@931 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 openwrt/package/Makefile                      |  2 +-
 openwrt/package/nfs-server/Config.in          |  4 +-
 openwrt/package/nfs-server/Makefile           | 89 ++++++++-----------
 .../files/{etc/exports => nfsd.exports}       |  0
 .../files/{etc/init.d/S60nfsd => nfsd.init}   |  0
 .../nfs-server/{ => ipkg}/nfs-server.control  |  0
 6 files changed, 42 insertions(+), 53 deletions(-)
 rename openwrt/package/nfs-server/files/{etc/exports => nfsd.exports} (100%)
 rename openwrt/package/nfs-server/files/{etc/init.d/S60nfsd => nfsd.init} (100%)
 mode change 100755 => 100644
 rename openwrt/package/nfs-server/{ => ipkg}/nfs-server.control (100%)

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index b5573a14e..62718f773 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -38,7 +38,7 @@ package-$(BR2_PACKAGE_MARADNS) += maradns
 package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_PACKAGE_MONIT) += monit
 package-$(BR2_PACKAGE_NCURSES) += ncurses
-package-$(BR2_PACKAGE_NFSD) += nfs-server
+package-$(BR2_PACKAGE_NFS_SERVER) += nfs-server
 package-$(BR2_PACKAGE_NMAP) += nmap
 package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
 package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
diff --git a/openwrt/package/nfs-server/Config.in b/openwrt/package/nfs-server/Config.in
index 9ace94cb1..5f410d6cb 100644
--- a/openwrt/package/nfs-server/Config.in
+++ b/openwrt/package/nfs-server/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_NFSD
-	tristate "NFS Server"
+config BR2_PACKAGE_NFS_SERVER
+	tristate "nfs-server - User Space NFS server"
 	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_PORTMAP
 	help
diff --git a/openwrt/package/nfs-server/Makefile b/openwrt/package/nfs-server/Makefile
index 2d5845137..1f72ddfca 100644
--- a/openwrt/package/nfs-server/Makefile
+++ b/openwrt/package/nfs-server/Makefile
@@ -9,63 +9,52 @@ PKG_MD5SUM:=79a29fe9f79b2f3241d4915767b8c511
 
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/n/nfs-user-server
 PKG_SOURCE:=nfs-user-server_$(PKG_VERSION).orig.tar.gz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
-$(DL_DIR)/$(PKG_SOURCE):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.patched
+$(eval $(call PKG_template,NFS_SERVER,nfs-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+$(PKG_BUILD_DIR)/.configured:
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
+		  --target=$(GNU_TARGET_NAME) \
+		  --host=$(GNU_TARGET_NAME) \
+		  --build=$(GNU_HOST_NAME) \
+		  --program-prefix="" \
+		  --program-suffix="" \
+		  --prefix=/usr \
+		  --exec-prefix=/usr \
+		  --bindir=/usr/bin \
+		  --datadir=/usr/share \
+		  --includedir=/usr/include \
+		  --infodir=/usr/share/info \
+		  --libdir=/usr/lib \
+		  --libexecdir=/usr/lib \
+		  --localstatedir=/var \
+		  --mandir=/usr/share/man \
+		  --sbindir=/usr/sbin \
+		  --sysconfdir=/etc \
+		  $(DISABLE_LARGEFILE) \
+		  $(DISABLE_NLS) \
 	);
 	touch $(PKG_BUILD_DIR)/.configured
 
-$(PKG_BUILD_DIR)/rpc.nfsd: $(PKG_BUILD_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(PKG_BUILD_DIR)
-
-$(PKG_IPK): $(PKG_BUILD_DIR)/rpc.nfsd
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	mkdir -p $(PKG_IPK_DIR)/usr/sbin
-	cp $(PKG_BUILD_DIR)/rpc.* $(PKG_IPK_DIR)/usr/sbin/
-	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/*
-	cp -a ./files/* $(PKG_IPK_DIR)/
-	mkdir -p $(PACKAGE_DIR)
-	find $(PKG_IPK_DIR) -name CVS | xargs rm -rf
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR)
+	touch $(PKG_BUILD_DIR)/.built
+
+$(IPKG_NFS_SERVER):
+	install -d -m0755 $(IDIR_NFS_SERVER)/etc
+	install -m0644 ./files/nfsd.exports $(IDIR_NFS_SERVER)/etc/exports
+	install -d -m0755 $(IDIR_NFS_SERVER)/etc/init.d
+	install -m0644 ./files/nfsd.init $(IDIR_NFS_SERVER)/etc/init.d/S60nfsd
+	install -d -m0755 $(IDIR_NFS_SERVER)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/rpc.* $(IDIR_NFS_SERVER)/usr/sbin/
+	$(RSTRIP) $(IDIR_NFS_SERVER)
+	$(IPKG_BUILD) $(IDIR_NFS_SERVER) $(PACKAGE_DIR)
diff --git a/openwrt/package/nfs-server/files/etc/exports b/openwrt/package/nfs-server/files/nfsd.exports
similarity index 100%
rename from openwrt/package/nfs-server/files/etc/exports
rename to openwrt/package/nfs-server/files/nfsd.exports
diff --git a/openwrt/package/nfs-server/files/etc/init.d/S60nfsd b/openwrt/package/nfs-server/files/nfsd.init
old mode 100755
new mode 100644
similarity index 100%
rename from openwrt/package/nfs-server/files/etc/init.d/S60nfsd
rename to openwrt/package/nfs-server/files/nfsd.init
diff --git a/openwrt/package/nfs-server/nfs-server.control b/openwrt/package/nfs-server/ipkg/nfs-server.control
similarity index 100%
rename from openwrt/package/nfs-server/nfs-server.control
rename to openwrt/package/nfs-server/ipkg/nfs-server.control
-- 
2.20.1