From 3b7e950a2a226d1344e78da8fb10e3cdb92f37a0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 28 Feb 2015 10:11:11 +0100
Subject: cleanup phil's submissions

- use () instead of {} in make variables for now
- use PKG_HASH instead of PKG_MD5SUM
- update to latest upstream versions
- use a newline between PKG_* variables and DISTFILES
- use <pkgname>-install instead of post-install
- use lowercase description texts only
- fix some missing PKG_BUILDDEP
- elfutils needs argp, which is not available in uClibc-ng, yet
- PKG_HASH is not required for git sources
---
 package/hwids/Makefile | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'package/hwids')

diff --git a/package/hwids/Makefile b/package/hwids/Makefile
index e17c08b31..ceeca3a72 100644
--- a/package/hwids/Makefile
+++ b/package/hwids/Makefile
@@ -7,28 +7,28 @@ PKG_NAME:=		hwids
 PKG_VERSION:=		20150129
 PKG_RELEASE:=		1
 PKG_HASH:=		33a7f4dbf14704076b0fe1d0052e86bb618e386a1ff18107097311df44f979d7
-PKG_DESCR:=		Combined repository of pci.ids and usb.ids
+PKG_DESCR:=		combined repository of pci.ids and usb.ids
 PKG_SECTION:=		sys/hw
 PKG_URL:=		https://github.com/gentoo/hwids
 PKG_SITES:=		https://github.com/gentoo/hwids/archive/
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.gz
 
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 # typical problem of having tags like '<name>-<version>' in github
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_NAME}-${PKG_VERSION}
+WRKDIST=		$(WRKDIR)/$(PKG_NAME)-$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SUBPKGS:=		HWIDS_NET HWIDS_PCI HWIDS_USB
 PKGSD_HWIDS_NET:=	HWIDS files oui.txt and iab.txt
 PKGSD_HWIDS_PCI:=	HWIDS file pci.ids
 PKGSD_HWIDS_USB:=	HWIDS file usb.ids
 
-PKG_FLAVOURS_PKGNAME:=	WITH_GZIP
+PKG_FLAVOURS_HWIDS:=	WITH_GZIP
 PKGFD_WITH_GZIP:=	gzip pci.ids and usb.ids before installation
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,HWIDS_NET,hwids-net,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_HWIDS_NET},${PKG_SECTION}))
-$(eval $(call PKG_template,HWIDS_PCI,hwids-pci,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_HWIDS_PCI},${PKG_SECTION}))
-$(eval $(call PKG_template,HWIDS_USB,hwids-usb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_HWIDS_USB},${PKG_SECTION}))
+$(eval $(call PKG_template,HWIDS_NET,hwids-net,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_NET),$(PKG_SECTION)))
+$(eval $(call PKG_template,HWIDS_PCI,hwids-pci,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_PCI),$(PKG_SECTION)))
+$(eval $(call PKG_template,HWIDS_USB,hwids-usb,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_HWIDS_USB),$(PKG_SECTION)))
 
 CONFIG_STYLE:=		manual
 XAKE_FLAGS+=		NET=yes \
@@ -38,19 +38,19 @@ XAKE_FLAGS+=		NET=yes \
 # note: Can't pass GZIP=yes to make, as this will turn it
 #       into an env var automatically which makes gzip trip.
 #       Therefore assume here that GZIP=yes is the default.
-ifneq (${ADK_PACKAGE_HWIDS_WITH_GZIP},y)
+ifneq ($(ADK_PACKAGE_HWIDS_WITH_GZIP),y)
 XAKE_FLAGS+=		GZIP=no
 endif
 
 define HWIDS_INSTALL_template
 $(2)-install:
-	$${INSTALL_DIR} $${IDIR_$(1)}/usr/share/misc
-	$${INSTALL_DATA} $$(patsubst %,$${WRKINST}/usr/share/misc/%,$(3)) \
-		$${IDIR_$(1)}/usr/share/misc/
+	$$(INSTALL_DIR) $$(IDIR_$(1))/usr/share/misc
+	$$(INSTALL_DATA) $$(patsubst %,$$(WRKINST)/usr/share/misc/%,$(3)) \
+		$$(IDIR_$(1))/usr/share/misc/
 endef
 
 $(eval $(call HWIDS_INSTALL_template,HWIDS_NET,hwids-net,oui.txt iab.txt))
-ifeq (${ADK_PACKAGE_HWIDS_WITH_GZIP},y)
+ifeq ($(ADK_PACKAGE_HWIDS_WITH_GZIP),y)
 $(eval $(call HWIDS_INSTALL_template,HWIDS_PCI,hwids-pci,pci.ids.gz))
 $(eval $(call HWIDS_INSTALL_template,HWIDS_USB,hwids-usb,usb.ids.gz))
 else
@@ -58,4 +58,4 @@ $(eval $(call HWIDS_INSTALL_template,HWIDS_PCI,hwids-pci,pci.ids))
 $(eval $(call HWIDS_INSTALL_template,HWIDS_USB,hwids-usb,usb.ids))
 endif
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
-- 
cgit v1.2.3