6 files changed, 71 insertions, 157 deletions
diff --git a/package/shfs/Config.in b/package/shfs/Config.in
index 14b1fa3713..935429a46a 100644
--- a/package/shfs/Config.in
+++ b/package/shfs/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SHFS
-	tristate "shfs (SHell FileSystem kernel module and utilities)"
-	default m if CONFIG_DEVEL
+	bool "shfs"
+	default n
 	help
 	  ShFS is a simple and easy to use Linux kernel module which 
 	  allows you to mount remote filesystems using a plain shell 
@@ -22,3 +22,21 @@ config BR2_PACKAGE_SHFS
 	  http://shfs.sourceforge.net/
 	  
 
+config BR2_PACKAGE_KMOD_SHFS
+	depends BR2_PACKAGE_SHFS
+	tristate "kmod-shfs (ShFS kernel module)"
+	default n
+	help
+	  
+	  SHell FileSystem kernel module
+	  
+
+config BR2_PACKAGE_SHFS_UTILS
+	depends BR2_PACKAGE_KMOD_SHFS
+	tristate "shfs-utils (ShFS mount/umount utilities)"
+	default m
+	help
+	  
+	  SHell FileSystem mount/umount utilities
+	  
+
diff --git a/package/shfs/Makefile b/package/shfs/Makefile
index ab9251472b..470e972724 100644
--- a/package/shfs/Makefile
+++ b/package/shfs/Makefile
@@ -7,47 +7,55 @@ PKG_VERSION := 0.35
 PKG_RELEASE := 2
 PKG_MD5SUM := 016f49d71bc32eee2b5d11fc1600cfbe
 
-PKG_SOURCE_SITE := @SF/shfs
-PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_CAT := zcat
-PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
-
-I_KMOD_SHFS := $(PACKAGE_DIR)/kmod-shfs_$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-I_SHFS_UTILS := $(PACKAGE_DIR)/shfs-utils_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-
-
-$(DL_DIR)/$(PKG_SOURCE_FILE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
-
-$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
-	mkdir -p $(TOOL_BUILD_DIR)
-	rm -rf $(PKG_BUILD_DIR)
-	$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	cp -fpR ./ipkg $(PKG_BUILD_DIR)/
-	find $(PKG_BUILD_DIR) -name CVS | xargs rm -rf
-	chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
-	touch $(PKG_BUILD_DIR)/ipkg/rules
-
-$(I_KMOD_SHFS) $(I_SHFS_UTILS): $(PKG_BUILD_DIR)/ipkg/rules
-	cd $(PKG_BUILD_DIR); \
-	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-	./ipkg/rules package
-
-$(IPKG_STATE_DIR)/info/kmod-shfs.list: $(I_KMOD_SHFS)
-	$(IPKG) install $(I_KMOD_SHFS)
-
-$(IPKG_STATE_DIR)/info/shfs-utils.list: $(I_SHFS_UTILS)
-	$(IPKG) install $(I_SHFS_UTILS)
-
-source: $(DL_DIR)/$(PKG_SOURCE_FILE)
-prepare: $(PKG_BUILD_DIR)/ipkg/rules
-compile: $(I_KMOD_SHFS) $(I_SHFS_UTILS)
-install: $(IPKG_STATE_DIR)/info/kmod-shfs.list $(IPKG_STATE_DIR)/info/shfs-utils.list
-
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(I_KMOD_SHFS) $(I_SHFS_UTILS)
+PKG_SOURCE_URL := \
+	@SF/shfs \
+	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
+PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT := zcat
+PKG_SOURCE_DIR := 
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/templates.mk
+
+$(eval $(call PKG_template,KMOD_SHFS,kmod-shfs,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,SHFS_UTILS,shfs-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+include $(TOPDIR)/package/rules.mk
+
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	  OFLAGS="$(TARGET_CFLAGS)" \
+	  CC="$(TARGET_CC)" \
+	  LINKER="$(TARGET_CC)" \
+	  KERNEL="$(LINUX_VERSION)" \
+	  KERNEL_SOURCES="$(LINUX_DIR)" \
+	 all
+	touch $(PKG_BUILD_DIR)/.built
+
+$(PKG_BUILD_DIR)/.installed: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	  ROOT="$(PKG_INSTALL_DIR)" \
+	  KERNEL="$(LINUX_VERSION)" \
+	  KERNEL_SOURCES="$(LINUX_DIR)" \
+	 install
+	touch $(PKG_BUILD_DIR)/.installed
+
+$(IPKG_KMOD_SHFS): $(IDIR_KMOD_SHFS)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+	install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)
+	cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.o \
+	 $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
+	$(RSTRIP_KMOD) $(IDIR_KMOD_SHFS)
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR)
+
+$(IPKG_SHFS_UTILS): $(IDIR_SHFS_UTILS)/CONTROL/control $(PKG_BUILD_DIR)/.installed
+	install -m0755 -d $(IDIR_SHFS_UTILS)/usr/sbin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/shfs{,u}mount $(IDIR_SHFS_UTILS)/usr/sbin/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mount.shfs $(IDIR_SHFS_UTILS)/usr/sbin/
+	$(RSTRIP) $(IDIR_SHFS_UTILS)
+	mkdir -p $(PACKAGE_DIR)
+	$(IPKG_BUILD) $(IDIR_SHFS_UTILS) $(PACKAGE_DIR)
 
diff --git a/package/shfs/ipkg/kmod-shfs/CONTROL/control b/package/shfs/ipkg/kmod-shfs.control
index b7ce612933..b7ce612933 100644
--- a/package/shfs/ipkg/kmod-shfs/CONTROL/control
+++ b/package/shfs/ipkg/kmod-shfs.control
diff --git a/package/shfs/ipkg/rules b/package/shfs/ipkg/rules
deleted file mode 100644
index 2297c98880..0000000000
--- a/package/shfs/ipkg/rules
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/make -f
-
-ifneq ($(strip ${IPKG_RULES_INC}),)
- include $(IPKG_RULES_INC)
-endif
-
-##
-
-PKG_VERSION := $(shell cat ./ipkg/version)
-CURRENT_DIR := $(shell pwd)
-INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install
-
-unexport INSTALL_DIR
-
-I_KMOD_SHFS := ipkg/kmod-shfs
-I_SHFS_UTILS := ipkg/shfs-utils
-
-BUILD_DEPS = \
-
-##
-
-all: package
-
-
-.stamp-configured: $(BUILD_DEPS)
-
-	touch .stamp-configured
-
-
-.stamp-built: .stamp-configured
-
-	$(MAKE) \
-	  OFLAGS="$(TARGET_CFLAGS)" \
-	  CC="$(TARGET_CC)" \
-	  LINKER="$(TARGET_CC)" \
-	  KERNEL="$(LINUX_VERSION)" \
-	  KERNEL_SOURCES="$(LINUX_DIR)" \
-	 all
-	
-	touch .stamp-built
-	
-
-$(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/shfs.o: .stamp-built
-
-	mkdir -p $(INSTALL_DIR)
-	
-	$(MAKE) \
-	  ROOT="$(INSTALL_DIR)" \
-	  KERNEL="$(LINUX_VERSION)" \
-	  KERNEL_SOURCES="$(LINUX_DIR)" \
-	 install
-	
-
-configure: .stamp-configured
-
-
-build: .stamp-built
-
-
-install: $(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/shfs.o
-
-
-package: $(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/shfs.o
-
-	mkdir -p $(I_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)
-	cp -fpR $(INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.o \
-	  $(I_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/
-	$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note \
-	  $(I_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/*.o
-	
-	mkdir -p $(I_SHFS_UTILS)/usr/sbin
-	cp -fpR $(INSTALL_DIR)/usr/sbin/shfs{,u}mount $(I_SHFS_UTILS)/usr/sbin/
-	cp -fpR $(INSTALL_DIR)/usr/sbin/mount.shfs $(I_SHFS_UTILS)/usr/sbin/
-	$(STRIP) $(I_SHFS_UTILS)/usr/sbin/shfs*
-	
-	chmod 0755 ipkg/*/CONTROL/
-	chmod 0644 ipkg/*/CONTROL/control
-	
-	perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control
-ifneq ($(strip $(PKG_VERSION)),)
-	perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control
-	perl -pi -e "s/^Vers.*:.*/Version: $(LINUX_VERSION)+$(PKG_VERSION)/g" $(I_KMOD_SHFS)/CONTROL/control
-endif
-	
-	$(IPKG_BUILD) $(I_KMOD_SHFS) $(IPKG_TARGET_DIR)
-	$(IPKG_BUILD) $(I_SHFS_UTILS) $(IPKG_TARGET_DIR)
-
-
-clean:
-
-	-$(MAKE) \
-	  ROOT="$(INSTALL_DIR)" \
-	  KERNEL="$(LINUX_VERSION)" \
-	  KERNEL_SOURCES="$(LINUX_DIR)" \
-	 uninstall clean
-	
-	rm -rf .stamp-* \
-	  $(INSTALL_DIR) \
-	  $(I_KMOD_SHFS)/lib \
-	  $(I_SHFS_UTILS)/usr \
-
-
-control:
-
-	@cat $(I_KMOD_SHFS)/CONTROL/control
-	@echo
-	@cat $(I_SHFS_UTILS)/CONTROL/control
-	@echo
-	
-
-.PHONY: configure build install package clean control
diff --git a/package/shfs/ipkg/shfs-utils/CONTROL/control b/package/shfs/ipkg/shfs-utils.control
index af3b897f2d..af3b897f2d 100644
--- a/package/shfs/ipkg/shfs-utils/CONTROL/control
+++ b/package/shfs/ipkg/shfs-utils.control
diff --git a/package/shfs/ipkg/version b/package/shfs/ipkg/version
deleted file mode 100644
index 3a36fd6788..0000000000
--- a/package/shfs/ipkg/version
+++ /dev/null
@@ -1 +0,0 @@
-0.35-2