Merge pull request #7541 from BKPepe/findutils

findutils: polishing of Makefile

utils/findutils/Makefile

@@ -8,7 +8,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=findutils
 PKG_VERSION:=4.6.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
+
+PKG_LICENSE:=GPL-3.0+
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
@@ -20,9 +22,10 @@ PKG_INSTALL:=1
 include $(INCLUDE_DIR)/package.mk
 
 define Package/findutils/Default
-	TITLE:=GNU findutils
+	TITLE:=GNU Find Utilities
 	SECTION:=utils
 	CATEGORY:=Utilities
+	URL:=https://www.gnu.org/software/findutils/
 endef
 
 define Package/findutils/description/Default
@@ -32,56 +35,55 @@ sufficient functionality, but some users may want or need
 the full functionality of the GNU tools.
 endef
 
-define Package/findutils-find
+define Package/findutils
 	$(call Package/findutils/Default)
-	TITLE+= (find)
+	TITLE+= (all)
+	DEPENDS:= \
+	+findutils-find \
+	+findutils-xargs \
+	+findutils-locate
 endef
 
-define Package/findutils-find/description
-$(call Package/findutils/description/Default)
-This package contains the find utility
-endef
-
-define Package/findutils-xargs
+define Package/findutils-find
 	$(call Package/findutils/Default)
-	TITLE := (xargs)
-endef
-
-define Package/findutils-xargs/description
-$(call Package/findutils/description/Default)
-This package contains the xargs utility
+	TITLE+= - find utility
 endef
 
 define Package/findutils-locate
 	$(call Package/findutils/Default)
-	TITLE := (locate)
+	TITLE+= - locate and updatedb utility
 endef
 
-define Package/findutils-locate/description
-$(call Package/findutils/description/Default)
-This package contains the locate and related updatedb utility
+define Package/findutils-xargs
+	$(call Package/findutils/Default)
+	TITLE+= - xargs utility
 endef
 
 CONFIGURE_ARGS += --localstatedir=/srv/var
 CONFIGURE_VARS += ac_cv_path_SORT=sort
 
-define Package/findutils-find/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/find $(1)/usr/bin/	
+define Package/findutils/install
+	true
 endef
 
-define Package/findutils-xargs/install
+define Package/findutils-find/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xargs $(1)/usr/bin/	
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/find $(1)/usr/bin/
 endef
 
 define Package/findutils-locate/install
 	$(INSTALL_DIR) $(1)/usr/bin $(1)/srv/var
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/locate $(1)/usr/bin/	
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/updatedb $(1)/usr/bin/	
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/locate $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/updatedb $(1)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/
 endef
 
+define Package/findutils-xargs/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/xargs $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,findutils))
 $(eval $(call BuildPackage,findutils-find))
-$(eval $(call BuildPackage,findutils-xargs))
 $(eval $(call BuildPackage,findutils-locate))
+$(eval $(call BuildPackage,findutils-xargs))