Mon Apr 28 14:21:27 2008 UTC ()
Re: pkg/38508 (gnupg2 won't build)
Builds without 'enable-maintainer-mode' being set


(shannonjr)
diff -r1.19 -r1.20 pkgsrc/security/gnupg2/Makefile
cvs diff -r1.19 -r1.20 pkgsrc/security/gnupg2/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gnupg2/Makefile 2008/01/18 05:09:37 1.19
+++ pkgsrc/security/gnupg2/Makefile 2008/04/28 14:21:27 1.20
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.19 2008/01/18 05:09:37 tnn Exp $ 1# $NetBSD: Makefile,v 1.20 2008/04/28 14:21:27 shannonjr Exp $
2# 2#
3 3
4DISTNAME= gnupg-2.0.7 4DISTNAME= gnupg-2.0.7
5PKGREVISION= 2 5PKGREVISION= 3
6PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} 6PKGNAME= ${DISTNAME:S/gnupg/gnupg2/}
7CATEGORIES= security 7CATEGORIES= security
8MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ 8MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 10DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
11DISTFILES+= pth-2.0.7.tar.gz 11DISTFILES+= pth-2.0.7.tar.gz
12SITES.pth-2.0.7.tar.gz= ${MASTER_SITE_GNU:=pth/} 12SITES.pth-2.0.7.tar.gz= ${MASTER_SITE_GNU:=pth/}
13DISTFILES+= libassuan-1.0.3.tar.bz2 13DISTFILES+= libassuan-1.0.3.tar.bz2
14SITES.libassuan-1.0.3.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/ 14SITES.libassuan-1.0.3.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/
15 15
16MAINTAINER= shannonjr@NetBSD.org 16MAINTAINER= shannonjr@NetBSD.org
17HOMEPAGE= http://www.gnupg.org/ 17HOMEPAGE= http://www.gnupg.org/
18COMMENT= GNUpg with OpenPGP and S/MIME capabilities 18COMMENT= GNUpg with OpenPGP and S/MIME capabilities
@@ -47,27 +47,27 @@ TEST_TARGET= check @@ -47,27 +47,27 @@ TEST_TARGET= check
47 47
48.include "options.mk" 48.include "options.mk"
49 49
50# We are building a static pth library and linking against it 50# We are building a static pth library and linking against it
51# While this is not very satisfying, gpgme hangs in its gpgsm tests 51# While this is not very satisfying, gpgme hangs in its gpgsm tests
52# if we depend on the shared (pkgsrc) pth library 52# if we depend on the shared (pkgsrc) pth library
53# We are also building libassuan here to get libassuan-pth. 53# We are also building libassuan here to get libassuan-pth.
54pre-configure: 54pre-configure:
55 cd ${WRKDIR}/pth-2.0.7 && \ 55 cd ${WRKDIR}/pth-2.0.7 && \
56 ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && \ 56 ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && \
57 ${MAKE} install 57 ${MAKE} install
58 cd ${WRKDIR}/libassuan-1.0.3 && \ 58 cd ${WRKDIR}/libassuan-1.0.3 && \
59 ${SETENV} ${CONFIGURE_ENV} ./autogen.sh && \ 59 ${SETENV} ${CONFIGURE_ENV} ./autogen.sh && \
60 ${SETENV} ${CONFIGURE_ENV} ./configure --enable-maintainer-mode --prefix=${WRKDIR}/libassuan --with-pth-prefix=${WRKDIR}/pth && \ 60 ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${WRKDIR}/libassuan --with-pth-prefix=${WRKDIR}/pth && \
61 ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install 61 ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install
62 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh 62 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh
63 63
64BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.4 64BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.4
65BUILDLINK_API_DEPENDS.libksba+= libksba>=1.0.2 65BUILDLINK_API_DEPENDS.libksba+= libksba>=1.0.2
66 66
67.include "../../databases/openldap-client/buildlink3.mk" 67.include "../../databases/openldap-client/buildlink3.mk"
68.include "../../converters/libiconv/buildlink3.mk" 68.include "../../converters/libiconv/buildlink3.mk"
69.include "../../devel/gettext-lib/buildlink3.mk" 69.include "../../devel/gettext-lib/buildlink3.mk"
70.include "../../devel/zlib/buildlink3.mk" 70.include "../../devel/zlib/buildlink3.mk"
71.include "../../security/libgcrypt/buildlink3.mk" 71.include "../../security/libgcrypt/buildlink3.mk"
72.include "../../security/libgpg-error/buildlink3.mk" 72.include "../../security/libgpg-error/buildlink3.mk"
73.include "../../security/libksba/buildlink3.mk" 73.include "../../security/libksba/buildlink3.mk"