Replace gettext module with ordinary dependency.

Fix the gnutls tests without requiring gsed.
ok ajacoutot@
This commit is contained in:
naddy 2016-04-08 11:16:15 +00:00
parent 213c347c5f
commit 069bf0c677
2 changed files with 11 additions and 12 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.119 2016/03/11 20:28:30 naddy Exp $
# $OpenBSD: Makefile,v 1.120 2016/04/08 11:16:15 naddy Exp $
COMMENT= GNU Transport Layer Security library
V= 3.4.10
DISTNAME= gnutls-${V}
REVISION= 0
EXTRACT_SUFX= .tar.xz
CATEGORIES= security
@ -18,15 +19,14 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# LGPLv2.1+ - GPLv3+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c ffi gmp hogweed idn m nettle p11-kit pthread stdc++
WANTLIB += c ffi gmp hogweed iconv idn intl m nettle p11-kit pthread stdc++
WANTLIB += tasn1 z
MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v${V:R}/ \
http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/gnutls/v${V:R}/
MODULES= devel/gettext
LIB_DEPENDS= devel/libidn \
LIB_DEPENDS= devel/gettext \
devel/libidn \
security/libtasn1 \
security/libnettle \
security/p11-kit>=0.23.2
@ -64,9 +64,8 @@ post-install:
# warning: implicit declaration of function 'kill'
# error: 'SIGTERM' undeclared (first use in this function)
TEST_DEPENDS += textproc/gsed
pre-test:
gsed -Ei 's,#include <stdlib.h>,&\n#include <signal.h>,' \
perl -i -pe 's,#include <stdlib.h>,$$&\n#include <signal.h>,' \
${WRKSRC}/tests/*.c
.include <bsd.port.mk>

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.44 2016/03/18 21:38:25 naddy Exp $
# $OpenBSD: Makefile,v 1.45 2016/04/08 11:16:15 naddy Exp $
PORTROACH= limitw:1,even
COMMENT= library for loading and enumurating of PKCS\#11 modules
DISTNAME= p11-kit-0.23.2
REVISION= 0
CATEGORIES= security
@ -17,13 +18,12 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c ffi pthread tasn1
WANTLIB += c ffi iconv intl pthread tasn1
MASTER_SITES= ${HOMEPAGE}releases/
MODULES= devel/gettext
LIB_DEPENDS= devel/libffi \
LIB_DEPENDS= devel/gettext \
devel/libffi \
security/libtasn1
CONFIGURE_STYLE=gnu