Thu May 5 20:07:37 2016 UTC ()
Don't attempt to build "keyanalyze" and friends. We don't install those
programs anyway and it breaks the build under at least Mac OS X.
After this change we also don't need various "auto*" tools during
the build phase.


(tron)
diff -r1.39 -r1.40 pkgsrc/security/caff/Makefile
diff -r1.27 -r1.28 pkgsrc/security/caff/distinfo
diff -r0 -r1.1 pkgsrc/security/caff/patches/patch-Makefile
cvs diff -r1.39 -r1.40 pkgsrc/security/caff/Makefile (expand / switch to unified diff)

--- pkgsrc/security/caff/Makefile 2016/05/05 11:15:57 1.39
+++ pkgsrc/security/caff/Makefile 2016/05/05 20:07:36 1.40
@@ -1,55 +1,51 @@ @@ -1,55 +1,51 @@
1# $NetBSD: Makefile,v 1.39 2016/05/05 11:15:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.40 2016/05/05 20:07:36 tron Exp $
2 2
3VERSION= 2.3 3VERSION= 2.3
4DISTNAME= signing-party_${VERSION}.orig 4DISTNAME= signing-party_${VERSION}.orig
5PKGNAME= caff-${VERSION} 5PKGNAME= caff-${VERSION}
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/s/signing-party/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/s/signing-party/}
8 8
9MAINTAINER= tonio@NetBSD.org 9MAINTAINER= tonio@NetBSD.org
10HOMEPAGE= http://pgp-tools.alioth.debian.org/ 10HOMEPAGE= http://pgp-tools.alioth.debian.org/
11COMMENT= Various GnuPG related tools 11COMMENT= Various GnuPG related tools
12LICENSE= gnu-gpl-v2 AND modified-bsd 12LICENSE= gnu-gpl-v2 AND modified-bsd
13 13
14#WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//} 14#WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/:S/.orig//}
15WRKSRC= ${WRKDIR} 15WRKSRC= ${WRKDIR}
16 16
17USE_TOOLS+= gmake pod2man 17USE_TOOLS+= gmake pod2man
18USE_TOOLS+= perl:run 18USE_TOOLS+= perl:run
19USE_TOOLS+= autoconf automake autoreconf 
20 19
21DEPENDS+= gnupg>=1.3.92:../../security/gnupg 20DEPENDS+= gnupg>=1.3.92:../../security/gnupg
22DEPENDS+= p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template 21DEPENDS+= p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
23DEPENDS+= p5-Net-IDN-Encode-[0-9]*:../../textproc/p5-Net-IDN-Encode 22DEPENDS+= p5-Net-IDN-Encode-[0-9]*:../../textproc/p5-Net-IDN-Encode
24DEPENDS+= p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools 23DEPENDS+= p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
25DEPENDS+= p5-GnuPG-Interface-[0-9]*:../../security/p5-GnuPG-Interface 24DEPENDS+= p5-GnuPG-Interface-[0-9]*:../../security/p5-GnuPG-Interface
26DEPENDS+= dialog>=1.0:../../misc/dialog 25DEPENDS+= dialog>=1.0:../../misc/dialog
27 26
28REPLACE_PERL+= caff/caff caff/pgp-fixkey caff/pgp-clean \ 27REPLACE_PERL+= caff/caff caff/pgp-fixkey caff/pgp-clean \
29 gpg-key2ps/gpg-key2ps gpgsigs/gpgsigs \ 28 gpg-key2ps/gpg-key2ps gpgsigs/gpgsigs \
30 gpglist/gpglist keylookup/keylookup 29 gpglist/gpglist keylookup/keylookup
31 30
32SUBST_CLASSES+= paths 31SUBST_CLASSES+= paths
33SUBST_MESSAGE.paths= Fixing hardcoded paths. 32SUBST_MESSAGE.paths= Fixing hardcoded paths.
34SUBST_STAGE.paths= pre-configure 33SUBST_STAGE.paths= pre-configure
35SUBST_FILES.paths= caff/caff keylookup/keylookup.1 34SUBST_FILES.paths= caff/caff keylookup/keylookup.1
36SUBST_SED.paths= -e 's,/usr/,${PREFIX}/,g' 35SUBST_SED.paths= -e 's,/usr/,${PREFIX}/,g'
37 36
38INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/caff share/examples/caff 37INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/caff share/examples/caff
39 38
40pre-build: 
41 cd ${WRKSRC}/keyanalyze/pgpring && touch NEWS README AUTHORS ChangeLog && autoreconf -fiv 
42 
43do-install: 39do-install:
44 ${INSTALL_SCRIPT} ${WRKSRC}/caff/caff ${DESTDIR}${PREFIX}/bin 40 ${INSTALL_SCRIPT} ${WRKSRC}/caff/caff ${DESTDIR}${PREFIX}/bin
45 ${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-fixkey ${DESTDIR}${PREFIX}/bin 41 ${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-fixkey ${DESTDIR}${PREFIX}/bin
46 ${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-clean ${DESTDIR}${PREFIX}/bin 42 ${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-clean ${DESTDIR}${PREFIX}/bin
47 ${INSTALL_SCRIPT} ${WRKSRC}/gpg-key2ps/gpg-key2ps ${DESTDIR}${PREFIX}/bin 43 ${INSTALL_SCRIPT} ${WRKSRC}/gpg-key2ps/gpg-key2ps ${DESTDIR}${PREFIX}/bin
48 ${INSTALL_SCRIPT} ${WRKSRC}/gpgsigs/gpgsigs ${DESTDIR}${PREFIX}/bin 44 ${INSTALL_SCRIPT} ${WRKSRC}/gpgsigs/gpgsigs ${DESTDIR}${PREFIX}/bin
49 ${INSTALL_SCRIPT} ${WRKSRC}/gpglist/gpglist ${DESTDIR}${PREFIX}/bin 45 ${INSTALL_SCRIPT} ${WRKSRC}/gpglist/gpglist ${DESTDIR}${PREFIX}/bin
50 ${INSTALL_SCRIPT} ${WRKSRC}/keylookup/keylookup ${DESTDIR}${PREFIX}/bin 46 ${INSTALL_SCRIPT} ${WRKSRC}/keylookup/keylookup ${DESTDIR}${PREFIX}/bin
51 ${INSTALL_SCRIPT} ${WRKSRC}/gpg-mailkeys/gpg-mailkeys ${DESTDIR}${PREFIX}/bin 47 ${INSTALL_SCRIPT} ${WRKSRC}/gpg-mailkeys/gpg-mailkeys ${DESTDIR}${PREFIX}/bin
52 ${INSTALL_MAN} ${WRKSRC}/caff/caff.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 48 ${INSTALL_MAN} ${WRKSRC}/caff/caff.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
53 ${INSTALL_MAN} ${WRKSRC}/caff/pgp-fixkey.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 49 ${INSTALL_MAN} ${WRKSRC}/caff/pgp-fixkey.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
54 ${INSTALL_MAN} ${WRKSRC}/caff/pgp-clean.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 50 ${INSTALL_MAN} ${WRKSRC}/caff/pgp-clean.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
55 ${INSTALL_MAN} ${WRKSRC}/gpg-key2ps/gpg-key2ps.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 51 ${INSTALL_MAN} ${WRKSRC}/gpg-key2ps/gpg-key2ps.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
cvs diff -r1.27 -r1.28 pkgsrc/security/caff/distinfo (expand / switch to unified diff)

--- pkgsrc/security/caff/distinfo 2016/05/05 11:15:57 1.27
+++ pkgsrc/security/caff/distinfo 2016/05/05 20:07:36 1.28
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.27 2016/05/05 11:15:57 wiz Exp $ 1$NetBSD: distinfo,v 1.28 2016/05/05 20:07:36 tron Exp $
2 2
3SHA1 (signing-party_2.3.orig.tar.gz) = eb65e32668e0b3fccd8c5e4d73b2aa66761a7e86 3SHA1 (signing-party_2.3.orig.tar.gz) = eb65e32668e0b3fccd8c5e4d73b2aa66761a7e86
4RMD160 (signing-party_2.3.orig.tar.gz) = b87a56883d8e93632e4973e73ae1d40a476a80b7 4RMD160 (signing-party_2.3.orig.tar.gz) = b87a56883d8e93632e4973e73ae1d40a476a80b7
5SHA512 (signing-party_2.3.orig.tar.gz) = 5c901a491a4349fd0ab92aa7358c78da141f4616572140f5a4d22f6ba7152e877d5d9734fa0b26477e7c9a49bd972b1fc3047a115f4fd868969387df572fd231 5SHA512 (signing-party_2.3.orig.tar.gz) = 5c901a491a4349fd0ab92aa7358c78da141f4616572140f5a4d22f6ba7152e877d5d9734fa0b26477e7c9a49bd972b1fc3047a115f4fd868969387df572fd231
6Size (signing-party_2.3.orig.tar.gz) = 196864 bytes 6Size (signing-party_2.3.orig.tar.gz) = 196864 bytes
 7SHA1 (patch-Makefile) = 728bb40fa8be2f0ac63254f2e86b37ee9fa1199f
File Added: pkgsrc/security/caff/patches/patch-Makefile
$NetBSD: patch-Makefile,v 1.1 2016/05/05 20:07:37 tron Exp $

Don't attempt to build "keyanalyze" and related utilties. They don't build
on systems without SHA1 hash functions in the system library and we don't
install them in the first place.

--- Makefile.orig	2016-04-25 23:06:10.000000000 +0100
+++ Makefile	2016-05-05 21:02:55.000000000 +0100
@@ -1,4 +1,4 @@
-DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keyanalyze keylookup \
+DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keylookup \
      sig2dot springgraph gpgwrap gpgdir keyart gpg-key2latex
 VERSION=$(shell dpkg-parsechangelog 2>&1 | perl -ne 'print $$1 if /^Version: ([^-]*)/')
 DEBVERSION=$(shell dpkg-parsechangelog 2>&1 | perl -ne 'print $$1 if /^Version: (.*)/')