Thu Jan 6 08:55:37 2011 UTC ()
Fixes PR#44324.

* On DragonFly, rmd160.h exists and required functions are defined there,
  but not in any library, so ignore it.
* On DragonFly and FreeBSD, MD5 and MD4 functions are in libmd.


(obache)
diff -r1.23 -r1.24 pkgsrc/security/skey/Makefile
diff -r1.9 -r1.10 pkgsrc/security/skey/buildlink3.mk
cvs diff -r1.23 -r1.24 pkgsrc/security/skey/Makefile (expand / switch to unified diff)

--- pkgsrc/security/skey/Makefile 2009/01/19 12:00:03 1.23
+++ pkgsrc/security/skey/Makefile 2011/01/06 08:55:37 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.23 2009/01/19 12:00:03 obache Exp $ 1# $NetBSD: Makefile,v 1.24 2011/01/06 08:55:37 obache Exp $
2# 2#
3 3
4DISTNAME= skey-1.1.5 4DISTNAME= skey-1.1.5
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= http://www.sparc.spb.su/solaris/skey/ 7MASTER_SITES= http://www.sparc.spb.su/solaris/skey/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= ${MASTER_SITES} 11HOMEPAGE= ${MASTER_SITES}
12COMMENT= Port of OpenBSD s/key implementation 12COMMENT= Port of OpenBSD s/key implementation
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
@@ -21,18 +21,25 @@ CONF_FILES+= ${PREFIX}/share/examples/s @@ -21,18 +21,25 @@ CONF_FILES+= ${PREFIX}/share/examples/s
21 21
22REPLACE_PERL= skeyprune.pl 22REPLACE_PERL= skeyprune.pl
23 23
24INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 24INSTALLATION_DIRS= bin include lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28# PR#40434 28# PR#40434
29.if ${OPSYS} == "SunOS" 29.if ${OPSYS} == "SunOS"
30CONFIGURE_ENV+= ac_cv_header_md4_h=no 30CONFIGURE_ENV+= ac_cv_header_md4_h=no
31CONFIGURE_ENV+= ac_cv_header_sha1_h=no 31CONFIGURE_ENV+= ac_cv_header_sha1_h=no
32BUILDLINK_TRANSFORM+= l:crypt:md5:crypt 32BUILDLINK_TRANSFORM+= l:crypt:md5:crypt
33.endif 33.endif
 34# PR#44324
 35.if ${OPSYS} == "DragonFly"
 36CONFIGURE_ENV+= ac_cv_header_rmd160_h=no
 37.endif
 38.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
 39BUILDLINK_TRANSFORM+= l:crypt:md:crypt
 40.endif
34 41
35post-install: 42post-install:
36 ${RANLIB} ${DESTDIR}${PREFIX}/lib/libskey.a 43 ${RANLIB} ${DESTDIR}${PREFIX}/lib/libskey.a
37 44
38.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/security/skey/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/skey/buildlink3.mk 2009/03/20 19:25:22 1.9
+++ pkgsrc/security/skey/buildlink3.mk 2011/01/06 08:55:37 1.10
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:22 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2011/01/06 08:55:37 obache Exp $
2 2
3BUILDLINK_TREE+= skey 3BUILDLINK_TREE+= skey
4 4
5.if !defined(SKEY_BUILDLINK3_MK) 5.if !defined(SKEY_BUILDLINK3_MK)
6SKEY_BUILDLINK3_MK:= 6SKEY_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.skey+= skey>=1.1.5 8BUILDLINK_API_DEPENDS.skey+= skey>=1.1.5
9BUILDLINK_ABI_DEPENDS.skey?= skey>=1.1.5nb2 9BUILDLINK_ABI_DEPENDS.skey?= skey>=1.1.5nb2
10BUILDLINK_PKGSRCDIR.skey?= ../../security/skey 10BUILDLINK_PKGSRCDIR.skey?= ../../security/skey
11BUILDLINK_DEPMETHOD.skey?= build 11BUILDLINK_DEPMETHOD.skey?= build
12 12
13.include "../../mk/bsd.fast.prefs.mk" 13.include "../../mk/bsd.fast.prefs.mk"
14 14
15# PR#40434 15# PR#40434
16.if ${OPSYS} == "SunOS" 16.if ${OPSYS} == "SunOS"
17BUILDLINK_TRANSFORM+= l:skey:skey:md5 17BUILDLINK_TRANSFORM+= l:skey:skey:md5
 18# PR#44324
 19.elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
 20BUILDLINK_TRANSFORM+= l:skey:skey:md
18.endif 21.endif
19.endif # SKEY_BUILDLINK3_MK 22.endif # SKEY_BUILDLINK3_MK
20 23
21BUILDLINK_TREE+= -skey 24BUILDLINK_TREE+= -skey