Mon Aug 20 06:01:26 2018 UTC ()
gnutls: Fix path to bash in installed files.

Bump PKGREVISION.


(wiz)
diff -r1.186 -r1.187 pkgsrc/security/gnutls/Makefile
cvs diff -r1.186 -r1.187 pkgsrc/security/gnutls/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gnutls/Makefile 2018/08/19 09:16:01 1.186
+++ pkgsrc/security/gnutls/Makefile 2018/08/20 06:01:25 1.187
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: Makefile,v 1.186 2018/08/19 09:16:01 wiz Exp $ 1# $NetBSD: Makefile,v 1.187 2018/08/20 06:01:25 wiz Exp $
2 2
3DISTNAME= gnutls-3.6.3 3DISTNAME= gnutls-3.6.3
 4PKGREVISION= 1
4CATEGORIES= security devel 5CATEGORIES= security devel
5MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/ 6MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnutls.org/ 10HOMEPAGE= http://www.gnutls.org/
10COMMENT= GNU Transport Layer Security library 11COMMENT= GNU Transport Layer Security library
11LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1 12LICENSE= gnu-gpl-v3 AND gnu-lgpl-v2.1
12 13
13USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 15USE_LIBTOOL= yes
15USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
16USE_TOOLS+= gmake gsed perl pkg-config bash:build 17USE_TOOLS+= gmake gsed perl pkg-config bash
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
18# this library duplicates (and conflicts with) openssl 19# this library duplicates (and conflicts with) openssl
19CONFIGURE_ARGS+= --disable-openssl-compatibility 20CONFIGURE_ARGS+= --disable-openssl-compatibility
20CONFIGURE_ARGS+= --disable-guile 21CONFIGURE_ARGS+= --disable-guile
21CONFIGURE_ARGS+= --disable-libdane 22CONFIGURE_ARGS+= --disable-libdane
22CONFIGURE_ARGS+= --without-tpm 23CONFIGURE_ARGS+= --without-tpm
23CONFIGURE_ARGS+= --disable-valgrind-tests 24CONFIGURE_ARGS+= --disable-valgrind-tests
24CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext} 25CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
25CONFIGURE_ARGS+= --enable-local-libopts 26CONFIGURE_ARGS+= --enable-local-libopts
26# Assembler support is broken for SunOS in 3.2.9. 27# Assembler support is broken for SunOS in 3.2.9.
27CONFIGURE_ARGS.SunOS+= --disable-hardware-acceleration 28CONFIGURE_ARGS.SunOS+= --disable-hardware-acceleration
28CONFIGURE_ARGS.FreeBSD+= ac_cv_type_max_align_t=yes 29CONFIGURE_ARGS.FreeBSD+= ac_cv_type_max_align_t=yes
29 30
@@ -46,26 +47,32 @@ REPLACE_BASH+= tests/ocsp-tests/ocsp-tl @@ -46,26 +47,32 @@ REPLACE_BASH+= tests/ocsp-tests/ocsp-tl
46REPLACE_BASH+= tests/starttls.sh 47REPLACE_BASH+= tests/starttls.sh
47REPLACE_BASH+= tests/suite/cbc-record-check.sh 48REPLACE_BASH+= tests/suite/cbc-record-check.sh
48REPLACE_BASH+= tests/suite/testcompat-main-openssl 49REPLACE_BASH+= tests/suite/testcompat-main-openssl
49REPLACE_BASH+= tests/suite/testcompat-main-polarssl 50REPLACE_BASH+= tests/suite/testcompat-main-polarssl
50 51
51REPLACE_PERL+= doc/scripts/gdoc doc/scripts/sort2.pl 52REPLACE_PERL+= doc/scripts/gdoc doc/scripts/sort2.pl
52 53
53PKGCONFIG_OVERRIDE= lib/gnutls.pc.in 54PKGCONFIG_OVERRIDE= lib/gnutls.pc.in
54PKGCONFIG_OVERRIDE+= libdane/gnutls-dane.pc.in 55PKGCONFIG_OVERRIDE+= libdane/gnutls-dane.pc.in
55 56
56MAKE_ENV+= RM=${RM:Q} 57MAKE_ENV+= RM=${RM:Q}
57MAKE_ENV+= TZ=UTC 58MAKE_ENV+= TZ=UTC
58 59
 60SUBST_CLASSES+= shell
 61SUBST_SED.shell+= -e 's,define POSIX_SHELL .*,define POSIX_SHELL "'${TOOLS_PATH.bash}'",'
 62SUBST_STAGE.shell= post-configure
 63SUBST_FILES.shell+= config.h
 64SUBST_MESSAGE.shell= Fixing path to bash.
 65
59EGDIR= ${PREFIX}/share/examples/gnutls 66EGDIR= ${PREFIX}/share/examples/gnutls
60 67
61INSTALLATION_DIRS= ${EGDIR} include/gnutls 68INSTALLATION_DIRS= ${EGDIR} include/gnutls
62 69
63post-install: 70post-install:
64 cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${DESTDIR}${EGDIR} 71 cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${DESTDIR}${EGDIR}
65 72
66.include "../../archivers/lzo/buildlink3.mk" 73.include "../../archivers/lzo/buildlink3.mk"
67.include "../../converters/libiconv/buildlink3.mk" 74.include "../../converters/libiconv/buildlink3.mk"
68.include "../../devel/gettext-lib/buildlink3.mk" 75.include "../../devel/gettext-lib/buildlink3.mk"
69BUILDLINK_API_DEPENDS.gmp+= gmp>=5.0 76BUILDLINK_API_DEPENDS.gmp+= gmp>=5.0
70.include "../../devel/gmp/buildlink3.mk" 77.include "../../devel/gmp/buildlink3.mk"
71.include "../../devel/libcfg+/buildlink3.mk" 78.include "../../devel/libcfg+/buildlink3.mk"