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/stats/Makefile               | 11 +++++------
 package/stats/patches/patch-Makefile | 21 ++++++++++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'package/stats')

diff --git a/package/stats/Makefile b/package/stats/Makefile
index 0ff6c26de..7d52788e6 100644
--- a/package/stats/Makefile
+++ b/package/stats/Makefile
@@ -3,22 +3,21 @@
 
 include $(ADK_TOPDIR)/rules.mk
 
-
 PKG_NAME:=		stats
 PKG_VERSION:=		82bd4977b607b8714f361467e37a9d801ff911b6
 PKG_RELEASE:=		1
-PKG_DESCR:=		Rusty Russell\'s stats utility
+PKG_DESCR:=		stats utility
 PKG_SECTION:=		sys/utils
 PKG_URL:=		https://github.com/rustyrussell/stats
 PKG_SITES:=		git://github.com/rustyrussell/stats.git
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,STATS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,STATS,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
-post-install:
+stats-install:
 	$(INSTALL_DIR) $(IDIR_STATS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/local/bin/stats \
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/stats \
 		$(IDIR_STATS)/usr/bin
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/stats/patches/patch-Makefile b/package/stats/patches/patch-Makefile
index 8ab247023..0650a3adf 100644
--- a/package/stats/patches/patch-Makefile
+++ b/package/stats/patches/patch-Makefile
@@ -1,8 +1,14 @@
 	- allow for passing custom compiler FLAGS
 	- use host CC and CFLAGS for tools/configurator build
---- stats-82bd4977b607b8714f361467e37a9d801ff911b6.orig/Makefile	2015-02-23 22:34:48.000000000 +0100
-+++ stats-82bd4977b607b8714f361467e37a9d801ff911b6/Makefile	2015-02-23 22:38:45.478017862 +0100
-@@ -5,10 +5,10 @@ PREFIX = /usr/local
+--- stats-82bd4977b607b8714f361467e37a9d801ff911b6.orig/Makefile	2015-02-27 18:30:06.000000000 +0100
++++ stats-82bd4977b607b8714f361467e37a9d801ff911b6/Makefile	2015-02-27 18:37:14.000000000 +0100
+@@ -1,14 +1,15 @@
+ # Destination directory for installation (intended for packagers)
+ DESTDIR = 
+-PREFIX = /usr/local
++PREFIX = /usr
+ 
++CC ?=
  OPTFLAGS=-O3 -flto
  #OPTFLAGS=-g
  WARNFLAGS=-Wall -Wstrict-prototypes -Wundef
@@ -11,18 +17,19 @@
 -LDFLAGS=$(OPTFLAGS)
 -LDLIBS=-lm
 +CPPFLAGS+=-I.
-+CFLAGS+=$(OPTFLAGS) $(WARNFLAGS)
-+LDFLAGS+=$(OPTFLAGS)
++CFLAGS+=$(WARNFLAGS)
++LDFLAGS+=
 +LDLIBS+=-lm
  
  # Comment this out (or use "VALGRIND=" on cmdline) if you don't have valgrind.
  VALGRIND=valgrind --quiet --leak-check=full --error-exitcode=5
-@@ -41,6 +41,8 @@ $(OFILES): config.h
+@@ -41,6 +42,9 @@ $(OFILES): config.h
  config.h: tools/configurator
  	if $< > $@.tmp; then mv $@.tmp $@; else rm -f $@.tmp; fi
  
 +tools/configurator: CC=${CC_FOR_BUILD}
-+tools/configurator: CFLAGS=${OPTFLAGS} ${WARNFLAGS}
++tools/configurator: CFLAGS=${CFLAGS_FOR_BUILD}
++tools/configurator: LDFLAGS=${LDFLAGS_FOR_BUILD}
  stats: $(OFILES)
  
  distclean: clean
-- 
cgit v1.2.3