Attachment #165208 for bug #206002

View | Details | Raw Unified | Return to bug 206002
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	libp11
PORTVERSION=	0.3.0
PORTREVISION=	2
CATEGORIES=	security devel
MASTER_SITES=	https://github.com/OpenSC/${PORTNAME}/archive/

MAINTAINER=	ale@FreeBSD.org
COMMENT=	Small layer on top of PKCS\#11 API


USE_OPENSSL=	yes
GNU_CONFIGURE=	yes
USES=		autoreconf libtool pkgconfig
USE_LDCONFIG=	yes
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}

CONFIGURE_ENV=	LTLIB_CFLAGS="-I${LOCALBASE}/include" \
		LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \
		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"

PORTDOCS=	*

post-configure:

post-patch:
	@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} 's|install-data-am: install-apidocDATA install-dist_docDATA|install-data-am: install-dist_docDATA|' \
		${WRKSRC}/doc/Makefile

post-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA}	${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA}	${WRKSRC}/examples/Makefile ${STAGEDIR}${EXAMPLESDIR}
	${INSTALL_DATA}	${WRKSRC}/examples/README ${STAGEDIR}${EXAMPLESDIR}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)security/libp11/distinfo (-2 / +2 lines)
1	SHA256 (libp11-0.2.8.tar.gz) = a4121015503ade98074b5e2a2517fc8a139f8b28aed10021db2bb77283f40691	1	SHA256 (libp11-0.3.0.tar.gz) = 83184d9e8e74402398e1a269fb79b68dc3615c86839eaf053a95438941a63b5d
2	SIZE (libp11-0.2.8.tar.gz) = 377508	2	SIZE (libp11-0.3.0.tar.gz) = 78674




diff --git configure.ac configure.ac
index b437122..6491280 100644
--- configure.ac
+++ configure.ac
@@ -133,11 +133,11 @@ AC_CHECK_PROGS([DOXYGEN],[doxygen])
 test "${enable_api_doc}" = "yes" -a -z "${DOXYGEN}" && AC_MSG_ERROR([doxygen is required for api doc])
 
 if test "${WIN32}" != "yes"; then
-	AC_CHECK_LIB(
-		[dl],
+	AC_SEARCH_LIBS(
 		[dlopen],
+		[dl],
 		,
-		[AC_MSG_ERROR([libdl required])]
+		[AC_MSG_ERROR([dlopen required])]
 	)
 	AC_CHECK_FUNCS([__register_atfork],,)
 fi
--- configure.ac.orig	2016-01-07 10:55:33.987034000 +0100
+++ configure.ac	2016-01-07 10:55:53.925242000 +0100
@@ -159,7 +159,7 @@
 	)]
 )
 
-pkgconfigdir="\$(libdir)/pkgconfig"
+pkgconfigdir="\$(prefix)/libdata/pkgconfig"
 
 AC_SUBST([pkgconfigdir])
 AC_SUBST([apidocdir])

Lines 9-11 Link Here

(-)security/libp11/pkg-plist (+1 lines)
9	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.c	9	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.c
10	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/decrypt.c	10	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/decrypt.c
11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getrandom.c	11	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getrandom.c
		12	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rawrsasign.c

Return to bug 206002

Lines 2-11 Link Here

(-)security/libp11/Makefile (-12 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libp11	4	PORTNAME= libp11
5	PORTVERSION= 0.2.8	5	PORTVERSION= 0.3.0
6	PORTREVISION= 2
7	CATEGORIES= security devel	6	CATEGORIES= security devel
8	MASTER_SITES= SF/opensc/${PORTNAME}	7	MASTER_SITES= https://github.com/OpenSC/${PORTNAME}/archive/
9		8
10	MAINTAINER= ale@FreeBSD.org	9	MAINTAINER= ale@FreeBSD.org
11	COMMENT= Small layer on top of PKCS\#11 API	10	COMMENT= Small layer on top of PKCS\#11 API
Lines 18-43 Link Here
18		17
19	USE_OPENSSL= yes	18	USE_OPENSSL= yes
20	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
21	USES= libtool pkgconfig	20	USES= autoreconf libtool pkgconfig
22	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
		22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
23		23
24	CONFIGURE_ENV= LTLIB_CFLAGS="-I${LOCALBASE}/include" \	24	CONFIGURE_ENV= LTLIB_CFLAGS="-I${LOCALBASE}/include" \
25	LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \	25	LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" \
26	OPENSSL_CFLAGS="-I${OPENSSLINC}" \	26	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
27	OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"	27	OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
28		28
29	PORTDOCS= *	29	PORTDOCS= *
30		30
31	DOCS_CONFIGURE_ON= --enable-doc	31	post-configure:
32
33	post-patch:
34	@${REINPLACE_CMD} 's\|(libdir)/pkgconfig\|(prefix)/libdata/pkgconfig\|' \
35	${WRKSRC}/configure
36	@${REINPLACE_CMD} 's\|install-data-am: install-apidocDATA install-dist_docDATA\|install-data-am: install-dist_docDATA\|' \	32	@${REINPLACE_CMD} 's\|install-data-am: install-apidocDATA install-dist_docDATA\|install-data-am: install-dist_docDATA\|' \
37	${WRKSRC}/doc/Makefile.in	33	${WRKSRC}/doc/Makefile
38		34
39	post-install-EXAMPLES-on:	35	post-install-EXAMPLES-on:
40	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	36	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
41	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}	37	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR}
		38	${INSTALL_DATA} ${WRKSRC}/examples/Makefile ${STAGEDIR}${EXAMPLESDIR}
		39	${INSTALL_DATA} ${WRKSRC}/examples/README ${STAGEDIR}${EXAMPLESDIR}
42		40
43	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Line 0 Link Here

(-)security/libp11/files/patch-configure.ac (+30 lines)
	1	diff --git configure.ac configure.ac
	2	index b437122..6491280 100644
	3	--- configure.ac
	4	+++ configure.ac
	5	@@ -133,11 +133,11 @@ AC_CHECK_PROGS([DOXYGEN],[doxygen])
	6	test "${enable_api_doc}" = "yes" -a -z "${DOXYGEN}" && AC_MSG_ERROR([doxygen is required for api doc])
	7
	8	if test "${WIN32}" != "yes"; then
	9	- AC_CHECK_LIB(
	10	- [dl],
	11	+ AC_SEARCH_LIBS(
	12	[dlopen],
	13	+ [dl],
	14	,
	15	- [AC_MSG_ERROR([libdl required])]
	16	+ [AC_MSG_ERROR([dlopen required])]
	17	)
	18	AC_CHECK_FUNCS([__register_atfork],,)
	19	fi
	20	--- configure.ac.orig 2016-01-07 10:55:33.987034000 +0100
	21	+++ configure.ac 2016-01-07 10:55:53.925242000 +0100
	22	@@ -159,7 +159,7 @@
	23	)]
	24	)
	25
	26	-pkgconfigdir="\$(libdir)/pkgconfig"
	27	+pkgconfigdir="\$(prefix)/libdata/pkgconfig"
	28
	29	AC_SUBST([pkgconfigdir])
	30	AC_SUBST([apidocdir])