pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/dropbear Use the xauth builtin.mk to find the...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b3546d928e5e
branches:  trunk
changeset: 632072:b3546d928e5e
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Mar 14 22:40:17 2014 +0000

description:
Use the xauth builtin.mk to find the location on the target system.

Just use the security/libtomcrypt/buildlink3.mk now the
BUILDLINK_API_DEPENDS has been updated.

diffstat:

 security/dropbear/Makefile |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (32 lines):

diff -r 54c34387964e -r b3546d928e5e security/dropbear/Makefile
--- a/security/dropbear/Makefile        Fri Mar 14 22:38:39 2014 +0000
+++ b/security/dropbear/Makefile        Fri Mar 14 22:40:17 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/01/31 17:32:19 agc Exp $
+# $NetBSD: Makefile,v 1.31 2014/03/14 22:40:17 agc Exp $
 
 DISTNAME=      dropbear-2013.62
 CATEGORIES=    security
@@ -41,12 +41,9 @@
 # used by dbscp
 CPPFLAGS+=             -D_PATH_SSH_PROGRAM="\"${PREFIX}/bin/dbclient\""
 
-# XXX use base xauth if present, otherwise _ass_ume pkgsrc. better than nothing
-.if exists(${X11BASE}/bin/xauth)
-CPPFLAGS+=-DXAUTH_COMMAND="\"${X11BASE}/bin/xauth\""
-.else
-CPPFLAGS+=-DXAUTH_COMMAND="\"${X11PREFIX}/bin/xauth\""
-.endif
+.include "../../x11/xauth/builtin.mk"
+
+CPPFLAGS+=             -DXAUTH_COMMAND="\"${XAUTHBASE}/bin/xauth\""
 
 CFLAGS.NetBSD+=                -DHAVE_NETINET_IN_SYSTM_H
 
@@ -59,6 +56,5 @@
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../math/ltm/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libtomcrypt+= libtomcrypt>=1.17nb2
 .include "../../security/libtomcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index