From 84f4d16072c0476586346ccf534be15769ed85d3 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Mon, 13 Apr 2020 00:35:57 +0800
Subject: [PATCH] luci-app-njitclient: sort out files

---
 package/ntlf9t/luci-app-njitclient/Makefile  | 48 ++++----------------
 package/ntlf9t/luci-app-njitclient/README.md | 14 ------
 2 files changed, 9 insertions(+), 53 deletions(-)
 delete mode 100644 package/ntlf9t/luci-app-njitclient/README.md

diff --git a/package/ntlf9t/luci-app-njitclient/Makefile b/package/ntlf9t/luci-app-njitclient/Makefile
index 59cbeb6683..3b2ac0c2a3 100644
--- a/package/ntlf9t/luci-app-njitclient/Makefile
+++ b/package/ntlf9t/luci-app-njitclient/Makefile
@@ -1,44 +1,14 @@
 include $(TOPDIR)/rules.mk
 
+LUCI_TITLE:=NJIT 802.1X Client for LuCI
+LUCI_DESCRIPTION:=This package contains LuCI configuration pages for njit8021xclient.
+LUCI_DEPENDS:=+njit8021xclient
+LUCI_PKGARCH:=all
+
 PKG_NAME:=luci-app-njitclient
-PKG_VERSION=1.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.0
+PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+include $(TOPDIR)/feeds/luci/luci.mk
 
-include $(INCLUDE_DIR)/package.mk
-
-define Package/luci-app-njitclient
-	SECTION:=luci
-	CATEGORY:=LuCI
-	SUBMENU:=3. Applications
-	TITLE:=NJIT 802.1X Client for LuCI
-	DEPENDS:=+njit8021xclient
-	PKGARCH:=all
-endef
-
-define Package/luci-app-njitclient/description
-	This package contains LuCI configuration pages for njit8021xclient.
-endef
-
-define Build/Prepare
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/luci-app-njitclient/install
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
-	$(INSTALL_DATA) ./luasrc/controller/njitclient.lua $(1)/usr/lib/lua/luci/controller/njitclient.lua
-	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi
-	$(INSTALL_DATA) ./luasrc/model/cbi/njitclient.lua $(1)/usr/lib/lua/luci/model/cbi/njitclient.lua
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./root/etc/config/njitclient $(1)/etc/config/njitclient
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./root/etc/init.d/njitclient $(1)/etc/init.d/njitclient
-endef
-
-$(eval $(call BuildPackage,luci-app-njitclient))
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/package/ntlf9t/luci-app-njitclient/README.md b/package/ntlf9t/luci-app-njitclient/README.md
deleted file mode 100644
index b280b21bc9..0000000000
--- a/package/ntlf9t/luci-app-njitclient/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-luci-app-njitclient
-===================
-
-LuCI configuration pages for <a href="https://github.com/liuqun/njit8021xclient/" target="_blank">njit8021xclient</a> (NJIT 802.1X Client)
-
-适用于<a href="https://github.com/liuqun/njit8021xclient" target="_blank">njit8021xclient</a> (NJIT 802.1X Client) 的LuCI网页管理界面，支持设置是否自启动NJIT Client、保存用户配置信息等。
-
-luci-app-njitclient 1.0 编译后的文件：<a href="https://github.com/mayswind/luci-app-njitclient/releases/download/1.0/luci-app-njitclient_1.0-1_all.zip" target="_blank">https://github.com/mayswind/luci-app-njitclient/releases/download/1.0/luci-app-njitclient_1.0-1_all.zip</a>
-
-由于代码中只包含Lua和Bash脚本，所以不受限于平台，编译后的文件可以在任何平台安装：<br/>
-opkg install luci-app-njitclient_1.0-1_all.ipk<br/>
-同时由于没有设置依赖包，所以可以直接安装。
-
-安装后请访问LuCI中的“系统”->“启动项”，并将“njitclient”设置为启用。