uftp: Bit the bullet and decided to just update to uftp4

Rather than maintaining a separate package, it just seems
easier to update the package in cero and push to openwrt
when its ready.

net/uftp4/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 # orig http://173.71.68.52:22000/uftp/uftp-4.0a4.tar
-PKG_NAME:=uftp4
+PKG_NAME:=uftp
 PKG_VERSION:=4.0a4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=uftp-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://snapon.lab.bufferbloat.net/~cero2/uftp4/
+PKG_SOURCE_URL:=http://snapon.lab.bufferbloat.net/~cero2/uftp/
 PKG_MD5SUM:=e122c41c2e1db8b7819bbda5bcc4c280
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@@ -22,98 +22,98 @@ PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/uftp4/Default
+define Package/uftp/Default
   SECTION:=net
   CATEGORY:=Network
   SUBMENU:=File Transfer
   TITLE:=Multicast UDP FTP version 4 with ipv6 support
   URL:=https://www.tcnj.edu/~bush/uftp.html
 endef
 
-define Package/uftp4/Default/description
+define Package/uftp/Default/description
   UFTP is an encrypted multicast file transfer program, designed to securely,
   reliably, and efficiently transfer files to multiple receivers
   simultaneously.
 endef
 
-define Package/uftp4
-  $(call Package/uftp4/Default)
+define Package/uftp
+  $(call Package/uftp/Default)
   TITLE+= server with TLS support
   VARIANT:=tls
   DEPENDS:=+libopenssl
 endef
 
-define Package/uftp4/description
-  $(call Package/uftp4/Default/description)
+define Package/uftp/description
+  $(call Package/uftp/Default/description)
   This package contains the server built with TLS support.
 endef
 
-define Package/uftp4-notls
+define Package/uftp-notls
   $(call Package/uftp/Default)
   TITLE+= server without TLS support
   VARIANT:=notls
 endef
 
-define Package/uftp4-notls/description
+define Package/uftp-notls/description
   $(call Package/uftp/Default/description)
   This package contains the server built without TLS support.
 endef
 
-define Package/uftpd4
-  $(call Package/uftp4/Default)
+define Package/uftpd
+  $(call Package/uftp/Default)
   TITLE+= client daemon with TLS support
   VARIANT:=tls
   DEPENDS:=+libopenssl
 endef
 
-define Package/uftpd4/description
-  $(call Package/uftp4/Default/description)
+define Package/uftpd/description
+  $(call Package/uftp/Default/description)
   This package contains the client daemon built with TLS support.
 endef
 
-define Package/uftpd4-notls
+define Package/uftpd-notls
   $(call Package/uftp/Default)
   TITLE+= client daemon without TLS support
   VARIANT:=notls
 endef
 
-define Package/uftpd4-notls/description
-  $(call Package/uftp4/Default/description)
+define Package/uftpd-notls/description
+  $(call Package/uftp/Default/description)
   This package contains the client daemon built without TLS support.
 endef
 
-define Package/uftpproxyd4
-  $(call Package/uftp4/Default)
+define Package/uftpproxyd
+  $(call Package/uftp/Default)
   TITLE+= proxy daemon with TLS support
   VARIANT:=tls
   DEPENDS:=+libopenssl
 endef
 
-define Package/uftpproxyd4/description
-  $(call Package/uftp4/Default/description)
+define Package/uftpproxyd/description
+  $(call Package/uftp/Default/description)
   This package contains the proxy daemon built with TLS support.
 endef
 
-define Package/uftpproxyd4-notls
-  $(call Package/uftp4/Default)
+define Package/uftpproxyd-notls
+  $(call Package/uftp/Default)
   TITLE+= proxy daemon without TLS support
   VARIANT:=notls
 endef
 
-define Package/uftpproxyd4-notls/description
-  $(call Package/uftp4/Default/description)
+define Package/uftpproxyd-notls/description
+  $(call Package/uftp/Default/description)
   This package contains the proxy daemon built without TLS support.
 endef
 
-define Package/uftp4-keymgt
-  $(call Package/uftp4/Default)
+define Package/uftp-keymgt
+  $(call Package/uftp/Default)
   TITLE+= key management utility
   VARIANT:=tls
   DEPENDS:=+libopenssl
 endef
 
-define Package/uftp4-keymgt/description
-  $(call Package/uftp4/Default/description)
+define Package/uftp-keymgt/description
+  $(call Package/uftp/Default/description)
   This package contains the key management utility.
 endef
 
@@ -131,34 +131,34 @@ ifeq ($(BUILD_VARIANT),notls)
 		NO_ENCRYPTION="1"
 endif
 
-define Package/uftp4/install
+define Package/uftp/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/uftp $(1)/usr/bin/
 endef
 
-define Package/uftpd4/install
+define Package/uftpd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/uftpd $(1)/usr/sbin/
 endef
 
-define Package/uftpproxyd4/install
+define Package/uftpproxyd/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/uftpproxyd $(1)/usr/sbin/
 endef
 
-Package/uftp4-notls/install=$(Package/uftp4/install)
-Package/uftpd4-notls/install=$(Package/uftpd4/install)
-Package/uftpproxyd4-notls/install=$(Package/uftpproxyd4/install)
+Package/uftp-notls/install=$(Package/uftp/install)
+Package/uftpd-notls/install=$(Package/uftpd/install)
+Package/uftpproxyd-notls/install=$(Package/uftpproxyd/install)
 
-define Package/uftp4-keymgt/install
+define Package/uftp-keymgt/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/uftp_keymgt $(1)/usr/bin/
 endef
 
-$(eval $(call BuildPackage,uftp4))
-$(eval $(call BuildPackage,uftp4-notls))
-$(eval $(call BuildPackage,uftpd4))
-$(eval $(call BuildPackage,uftpd4-notls))
-$(eval $(call BuildPackage,uftpproxyd4))
-$(eval $(call BuildPackage,uftpproxyd4-notls))
-$(eval $(call BuildPackage,uftp4-keymgt))
+$(eval $(call BuildPackage,uftp))
+$(eval $(call BuildPackage,uftp-notls))
+$(eval $(call BuildPackage,uftpd))
+$(eval $(call BuildPackage,uftpd-notls))
+$(eval $(call BuildPackage,uftpproxyd))
+$(eval $(call BuildPackage,uftpproxyd-notls))
+$(eval $(call BuildPackage,uftp-keymgt))