From: Karel Kočí Date: Tue, 26 Nov 2019 12:56:22 +0000 (+0100) Subject: wget: do not provide itself X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b0757844319fcaaef742a63d0b2c44a5d0d65398;p=feed%2Fpackages.git wget: do not provide itself The package wget should not say that it provides itself. This also make gnu-wget provide general so it is not written in Makefile twice. Signed-off-by: Karel Kočí Signed-off-by: Yousong Zhou (cherry picked from commit 75f2be7d509e802f2d946d732e7a7539c2b27d2e & resolved conflict) --- diff --git a/net/wget/Makefile b/net/wget/Makefile index da59e04c14..8068bd621f 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wget PKG_VERSION:=1.19.5 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) @@ -28,8 +28,8 @@ define Package/wget/Default DEPENDS:=+libpcre +zlib SUBMENU:=File Transfer TITLE:=Non-interactive network downloader - URL:=http://www.gnu.org/software/wget/index.html - PROVIDES:=wget + URL:=https://www.gnu.org/software/wget/index.html + PROVIDES:=gnu-wget endef define Package/wget/Default/description @@ -46,7 +46,6 @@ $(call Package/wget/Default) DEPENDS+= +libopenssl +librt TITLE+= (with SSL support) VARIANT:=ssl - PROVIDES+=gnu-wget endef define Package/wget/description @@ -58,7 +57,7 @@ define Package/wget-nossl $(call Package/wget/Default) TITLE+= (without SSL support) VARIANT:=nossl - PROVIDES+=gnu-wget + PROVIDES+=wget endef define Package/wget-nossl/description