Fri Mar 11 07:20:45 2011 UTC ()
Fix building on Mac OS X; added LICENCE


(adam)
diff -r1.37 -r1.38 pkgsrc/security/dirmngr/Makefile
diff -r1.17 -r1.18 pkgsrc/security/dirmngr/distinfo
diff -r0 -r1.1 pkgsrc/security/dirmngr/patches/patch-doc_Makefile.in
cvs diff -r1.37 -r1.38 pkgsrc/security/dirmngr/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/dirmngr/Attic/Makefile 2011/01/05 07:28:19 1.37
+++ pkgsrc/security/dirmngr/Attic/Makefile 2011/03/11 07:20:45 1.38
@@ -1,47 +1,44 @@ @@ -1,47 +1,44 @@
1# $NetBSD: Makefile,v 1.37 2011/01/05 07:28:19 adam Exp $ 1# $NetBSD: Makefile,v 1.38 2011/03/11 07:20:45 adam Exp $
2# 
3 2
4DISTNAME= dirmngr-1.1.0 3DISTNAME= dirmngr-1.1.0
5CATEGORIES= security 4CATEGORIES= security
6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/dirmngr/ 5MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/dirmngr/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= shannonjr@NetBSD.org 8MAINTAINER= shannonjr@NetBSD.org
10HOMEPAGE= http://www.gnupg.org/aegypten2/ 9HOMEPAGE= http://www.gnupg.org/aegypten2/
11COMMENT= X509 certificate and CRL downloader 10COMMENT= X509 certificate and CRL downloader
 11LICENSE= gnu-gpl-v2
12 12
13DIRMNGR_USER?= dirmngr 13DIRMNGR_USER?= dirmngr
14DIRMNGR_GROUP?= dirmngr 14DIRMNGR_GROUP?= dirmngr
15PKG_GROUPS= ${DIRMNGR_GROUP} 15PKG_GROUPS= ${DIRMNGR_GROUP}
16PKG_USERS= ${DIRMNGR_USER}:${DIRMNGR_GROUP} 16PKG_USERS= ${DIRMNGR_USER}:${DIRMNGR_GROUP}
17PKG_GROUPS_VARS+= DIRMNGR_GROUP 17PKG_GROUPS_VARS+= DIRMNGR_GROUP
18PKG_USERS_VARS+= DIRMNGR_USER 18PKG_USERS_VARS+= DIRMNGR_USER
19 19
20BUILD_DEFS+= VARBASE 20BUILD_DEFS+= VARBASE
21 21
22PKG_HOME.${DIRMNGR_USER}= ${VARBASE}/dirmngr 22PKG_HOME.${DIRMNGR_USER}= ${VARBASE}/dirmngr
23 23
24GNU_CONFIGURE= yes 24USE_TOOLS+= autoconf automake gawk gettext
25USE_TOOLS+= gawk 
26#USE_TOOLS+= gmake 25#USE_TOOLS+= gmake
27USE_TOOLS+= autoconf 
28USE_TOOLS+= automake 
29USE_TOOLS+= gettext 
30USE_LIBTOOL= yes 26USE_LIBTOOL= yes
31USE_PKGLOCALEDIR= yes 27USE_PKGLOCALEDIR= yes
32RCD_SCRIPTS= dirmngr 28RCD_SCRIPTS= dirmngr
33INFO_FILES= YES 29INFO_FILES= yes
34 30
 31GNU_CONFIGURE= yes
35CONFIGURE_ARGS+= --localstatedir=${VARBASE} 32CONFIGURE_ARGS+= --localstatedir=${VARBASE}
36CONFIGURE_ARGS+= --sharedstatedir=${VARBASE} 33CONFIGURE_ARGS+= --sharedstatedir=${VARBASE}
37CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 34CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
38CONFIGURE_ARGS+= --datadir=${PREFIX}/libdata 35CONFIGURE_ARGS+= --datadir=${PREFIX}/libdata
39CONFIGURE_ENV+= BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client} 36CONFIGURE_ENV+= BUILDLINK_PREFIX_openldap-client=${BUILDLINK_PREFIX.openldap-client}
40 37
41FILES_SUBST+= VARBASE=${VARBASE} 38FILES_SUBST+= VARBASE=${VARBASE}
42FILES_SUBST+= PREFIX=${PREFIX} 39FILES_SUBST+= PREFIX=${PREFIX}
43FILES_SUBST+= SYSCONFDIR=${SYSCONFDIR} 40FILES_SUBST+= SYSCONFDIR=${SYSCONFDIR}
44FILES_SUBST+= DIRMNGR_USER=${DIRMNGR_USER} 41FILES_SUBST+= DIRMNGR_USER=${DIRMNGR_USER}
45FILES_SUBST+= DIRMNGR_GROUP=${DIRMNGR_GROUP} 42FILES_SUBST+= DIRMNGR_GROUP=${DIRMNGR_GROUP}
46FILES_SUBST+= DIRMNGR_PATH=${DIRMNGR_PATH:Q} 43FILES_SUBST+= DIRMNGR_PATH=${DIRMNGR_PATH:Q}
47 44
cvs diff -r1.17 -r1.18 pkgsrc/security/dirmngr/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/security/dirmngr/Attic/distinfo 2011/01/05 07:28:19 1.17
+++ pkgsrc/security/dirmngr/Attic/distinfo 2011/03/11 07:20:45 1.18
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.17 2011/01/05 07:28:19 adam Exp $ 1$NetBSD: distinfo,v 1.18 2011/03/11 07:20:45 adam Exp $
2 2
3SHA1 (dirmngr-1.1.0.tar.bz2) = a7a7d1432db9edad2783ea1bce761a8106464165 3SHA1 (dirmngr-1.1.0.tar.bz2) = a7a7d1432db9edad2783ea1bce761a8106464165
4RMD160 (dirmngr-1.1.0.tar.bz2) = 2f67ad8668cf4aa4a2ec2c1fa857d9225ec01a65 4RMD160 (dirmngr-1.1.0.tar.bz2) = 2f67ad8668cf4aa4a2ec2c1fa857d9225ec01a65
5Size (dirmngr-1.1.0.tar.bz2) = 556406 bytes 5Size (dirmngr-1.1.0.tar.bz2) = 556406 bytes
6SHA1 (patch-aa) = bbc030ab815f6fbbcc440768c3a73ab0f74ba2f0 6SHA1 (patch-aa) = bbc030ab815f6fbbcc440768c3a73ab0f74ba2f0
7SHA1 (patch-ab) = d28f1d4a2062e2207d02d9989e7e708f7a44acc0 7SHA1 (patch-ab) = d28f1d4a2062e2207d02d9989e7e708f7a44acc0
8SHA1 (patch-ac) = 1f611619771e9c5258037e2f97855e9a9513a135 8SHA1 (patch-ac) = 1f611619771e9c5258037e2f97855e9a9513a135
9SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4 9SHA1 (patch-ad) = 94c789bd308208c147a24f05b371602ec74185f4
10SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26 10SHA1 (patch-ae) = 3d77aff4b2ee779106dee329f3a6cd5b8f332e26
11SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837 11SHA1 (patch-af) = b6ae3b526e344ca63af1babb9eb6707b90edc837
12SHA1 (patch-ag) = a08f7c82ed32e72f52a69baa64e97a86cbe8fa70 12SHA1 (patch-ag) = a08f7c82ed32e72f52a69baa64e97a86cbe8fa70
 13SHA1 (patch-doc_Makefile.in) = 61f166b39ca7365e02b9d6510487c5c2d9e61f08
File Added: pkgsrc/security/dirmngr/patches/Attic/patch-doc_Makefile.in
$NetBSD: patch-doc_Makefile.in,v 1.1 2011/03/11 07:20:45 adam Exp $

Pass CFLAGS and fix building e.g. with -isysroot on Mac OS X.

--- doc/Makefile.in.orig	2011-03-11 07:15:50.000000000 +0000
+++ doc/Makefile.in
@@ -850,7 +850,7 @@ uninstall-man: uninstall-man1
 
 
 yat2m: yat2m.c
-	$(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c
+	$(CC_FOR_BUILD) $(CFLAGS) -o $@ $(srcdir)/yat2m.c
 
 yat2m-stamp: $(myman_sources)
 	@rm -f yat2m-stamp.tmp