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/libqmi/Makefile                   | 14 +++++++-------
 package/libqmi/patches/patch-configure_ac | 12 ++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 package/libqmi/patches/patch-configure_ac

(limited to 'package/libqmi')

diff --git a/package/libqmi/Makefile b/package/libqmi/Makefile
index 236f4a102..8f041d2ae 100644
--- a/package/libqmi/Makefile
+++ b/package/libqmi/Makefile
@@ -7,24 +7,24 @@ PKG_NAME:=		libqmi
 PKG_VERSION:=		1.12.4
 PKG_RELEASE:=		1
 PKG_HASH:=		5527342bc869400d2a9c3038d66ec8ef87980aefb6c7aae593a13ebfee686a15
-PKG_DESCR:=		QMI modem protocol helper library
+PKG_DESCR:=		qmi modem protocol helper library
 PKG_SECTION:=		libs/net
 PKG_DEPENDS:=		glib
 PKG_BUILDDEP:=		glib
 PKG_URL:=		http://cgit.freedesktop.org/libqmi/
 PKG_SITES:=		http://cgit.freedesktop.org/libqmi/snapshot/
+PKG_OPTS:=		dev
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBQMI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBQMI,libqmi,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
-pre-configure:
-	(cd ${WRKDIST}; ./autogen.sh)
+AUTOTOOL_STYLE:=	autogen
 
-post-install:
+libqmi-install:
 	$(INSTALL_DIR) $(IDIR_LIBQMI)/usr/{bin,lib}
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/qmi{-network,cli} \
 		$(IDIR_LIBQMI)/usr/bin
-	${CP} ${WRKINST}/usr/lib/libqmi-glib.so* ${IDIR_LIBQMI}/usr/lib/
+	$(CP) $(WRKINST)/usr/lib/libqmi-glib.so* $(IDIR_LIBQMI)/usr/lib/
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libqmi/patches/patch-configure_ac b/package/libqmi/patches/patch-configure_ac
new file mode 100644
index 000000000..37f519c4e
--- /dev/null
+++ b/package/libqmi/patches/patch-configure_ac
@@ -0,0 +1,12 @@
+--- libqmi-1.12.4.orig/configure.ac	2015-02-10 17:31:06.000000000 +0100
++++ libqmi-1.12.4/configure.ac	2015-02-27 22:15:42.000000000 +0100
+@@ -76,9 +76,6 @@ AC_SUBST(GLIB_LIBS)
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+ AC_SUBST(GLIB_MKENUMS)
+ 
+-dnl Documentation
+-GTK_DOC_CHECK(1.0)
+-
+ # QMI username
+ QMI_USERNAME="root"
+ AC_ARG_ENABLE(qmi-username,
-- 
cgit v1.2.3