From 8e8872b2b6aa7e9aa1ad5eba8396284104a6b711 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Sat, 15 Feb 2020 23:27:48 +0800
Subject: [PATCH] frp: bump to v0.31.2

frpc: fix typo

frp: fix typo
---
 package/lean/{frpc => frp}/Makefile | 37 +++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 7 deletions(-)
 rename package/lean/{frpc => frp}/Makefile (61%)

diff --git a/package/lean/frpc/Makefile b/package/lean/frp/Makefile
similarity index 61%
rename from package/lean/frpc/Makefile
rename to package/lean/frp/Makefile
index 262cb72f25..a9ac1c9b09 100644
--- a/package/lean/frpc/Makefile
+++ b/package/lean/frp/Makefile
@@ -6,8 +6,8 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=frpc
-PKG_VERSION:=0.31.1
+PKG_NAME:=frp
+PKG_VERSION:=0.31.2
 PKG_RELEASE:=1
 
 ifeq ($(ARCH),mipsel)
@@ -38,20 +38,37 @@ PKG_HASH:=skip
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/$(PKG_NAME)
+define Package/$(PKG_NAME)/default
 	SECTION:=net
 	CATEGORY:=Network
-	TITLE:=FRPC Client
-	DEPENDS:=
+	TITLE:=FRPC
 	URL:=https://github.com/fatedier/frp/releases
 endef
 
+define Package/$(PKG_NAME)s
+	$(call Package/$(PKG_NAME)/default)
+	TITLE+= (Server)
+	VARIANT:=s
+endef
 
+define Package/$(PKG_NAME)c
+	$(call Package/$(PKG_NAME)/default)
+	TITLE+= (Client)
+	VARIANT:=c
+endef
 
 define Package/$(PKG_NAME)/description
 frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet
 endef
 
+define Package/$(PKG_NAME)s/description
+	$(call Package/$(PKG_NAME)/description)
+endef
+
+define Package/$(PKG_NAME)c/description
+	$(call Package/$(PKG_NAME)/description)
+endef
+
 define Build/Prepare
 	$(PKG_UNPACK)
 endef
@@ -62,9 +79,15 @@ endef
 define Build/Compile
 endef
 
-define Package/$(PKG_NAME)/install
+define Package/$(PKG_NAME)s/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/frps $(1)/usr/bin/
+endef
+
+define Package/$(PKG_NAME)c/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/frpc $(1)/usr/bin/
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call BuildPackage,$(PKG_NAME)s))
+$(eval $(call BuildPackage,$(PKG_NAME)c))