From ccdd571261219fbabad99b469d6d9e76305742cf Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 19 Dec 2010 00:09:06 +0100
Subject: update to latest upstream version

---
 package/libp11/Makefile         | 19 ++++++++++++++++---
 package/openssl-pkcs11/Makefile |  4 ++--
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'package')

diff --git a/package/libp11/Makefile b/package/libp11/Makefile
index 34ac1a204..9ba2fec39 100644
--- a/package/libp11/Makefile
+++ b/package/libp11/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libp11
-PKG_VERSION:=		0.2.4
+PKG_VERSION:=		0.2.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		9e2c5cbececde245e2d2f535bd49ce35
+PKG_MD5SUM:=		564ab53ad7353903ddfdc15b153c44fb
 PKG_DESCR:=		library implementing a small layer on top of PKCS11 API
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libltdl
@@ -14,12 +14,25 @@ PKG_BUILDDEP:=		openssl libtool
 PKG_URL:=		http://www.opensc-project.org/libp11
 PKG_SITES:=		http://www.opensc-project.org/files/libp11/
 
+PKG_SUBPKGS:=		LIBP11 LIBP11_DEV
+PKGSD_LIBP11_DEV:=	development files for libp11
+PKGSC_LIBP11_DEV:=	devel
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBP11_DEV,libp11-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBP11_DEV},${PKGSC_LIBP11_DEV}))
+
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBP11_DEV}+=	libp11-dev-install
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib
 
+libp11-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBP11_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBP11_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile
index 06199ed39..a9b83c8bb 100644
--- a/package/openssl-pkcs11/Makefile
+++ b/package/openssl-pkcs11/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openssl-pkcs11
-PKG_VERSION:=		0.1.5
+PKG_VERSION:=		0.1.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		840af6e54dc21445c54f74e15005ba4d
+PKG_MD5SUM:=		693b402eafba152666e66431ed4c1b9e
 PKG_DESCR:=		pkcs11 engine for openssl
 PKG_SECTION:=		crypto
 PKG_BUILDDEP:=		libp11
-- 
cgit v1.2.3