Update to p11-kit-0.14.

This commit is contained in:
ajacoutot 2012-09-27 09:30:06 +00:00
parent b00ec4bf8d
commit 235bf21a91
3 changed files with 4 additions and 48 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2012/09/21 14:48:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2012/09/27 09:30:06 ajacoutot Exp $
COMMENT= library for loading and enumurating of PKCS\#11 modules
DISTNAME= p11-kit-0.13
DISTNAME= p11-kit-0.14
CATEGORIES= security
@ -40,18 +40,4 @@ CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
FAKE_FLAGS= exampledir=${PREFIX}/share/examples/p11-kit/pkcs11
### https://bugs.freedesktop.org/show_bug.cgi?id=53706 ###
AUTOCONF_VERSION= 2.68
AUTOMAKE_VERSION= 1.11
BUILD_DEPENDS += devel/autoconf/${AUTOCONF_VERSION} \
devel/automake/${AUTOMAKE_VERSION} \
devel/libtool
pre-configure:
@cd ${WRKSRC} && \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
autoreconf -i
######
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (p11-kit-0.13.tar.gz) = PLlCRl79W94cGHWCYRj+S8pFsMntx8h4NZCaWGa+0yU=
SIZE (p11-kit-0.13.tar.gz) = 544632
SHA256 (p11-kit-0.14.tar.gz) = el5WG4tMbiXteonvNsgSdDfI8YvYb+TNQdiZxcfe9tM=
SIZE (p11-kit-0.14.tar.gz) = 545993

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-configure_ac,v 1.4 2012/08/23 13:29:02 ajacoutot Exp $
From 56860b7f72c444eed5923e11d735b85b630a171d Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Thu, 23 Aug 2012 12:00:16 +0000
Subject: configure.ac: Fix bogus comma, and fix up spacing
From 359bb15bc83484e4de69fa8dbc9113d97817d01e Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Tue, 21 Aug 2012 09:16:00 +0000
Subject: Use AC_LANG_PROGRAM to detect program_invocation_short_name functionality
--- configure.ac.orig Mon Jul 16 15:05:03 2012
+++ configure.ac Thu Aug 23 15:19:04 2012
@@ -71,8 +71,13 @@ if test "$os_unix" = "yes"; then
# Check if these are declared and/or available to link against
AC_CHECK_DECLS([program_invocation_short_name])
- AC_LINK_IFELSE([AC_LANG_SOURCE([extern char *program_invocation_short_name; void main() { }])],
- [AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, [1], [Whether program_invocation_short_name available])])
+ AC_MSG_CHECKING([whether program_invocation_short_name is available])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <argp.h>]],
+ [[program_invocation_short_name = "test";]])],
+ [AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME], [1],
+ [Whether program_invocation_short_name available])
+ AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])])
AC_CHECK_DECLS([__progname])
AC_LINK_IFELSE([AC_LANG_SOURCE([extern char *__progname; void main() { }])],
[AC_DEFINE(HAVE___PROGNAME, [1], [Whether __progname available])])