From a52c45b4d5a1b3ac27c3eaf122f19bc06876a675 Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 9 Jan 2014 11:46:46 +0000 Subject: Avoid linking statically on SunOS. --- security/chkrootkit/Makefile | 7 +------ shells/rssh/Makefile | 8 +++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile index 1874dcc77cc..7c532a137d8 100644 --- a/security/chkrootkit/Makefile +++ b/security/chkrootkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2013/06/16 10:11:58 shattered Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/09 11:49:00 jperkin Exp $ # DISTNAME= chkrootkit-0.49 @@ -40,11 +40,6 @@ PROGRAMS+= check_wtmpx PLIST.wtmpx= yes CFLAGS+= -DSOLARIS2 LDFLAGS+= -lsocket -. if empty(CC_VERSION:Mgcc-*) -MAKE_ENV+= STATIC="-B static" -. else -MAKE_ENV+= STATIC="-static" -. endif .else MAKE_ENV+= STATIC="-static" .endif diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile index 83f12c02e9d..103db6ab000 100644 --- a/shells/rssh/Makefile +++ b/shells/rssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2013/02/28 19:33:02 darcy Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/09 11:46:46 jperkin Exp $ DISTNAME= rssh-2.3.4 PKGREVISION= 1 @@ -46,6 +46,12 @@ CONFIGURE_ARGS+= --with-rdist=${RSSH_RDIST_PATH:Q} CONFIGURE_ARGS+= --with-rsync=${RSSH_RSYNC_PATH:Q} .endif +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --disable-static +.endif + post-install: ${INSTALL_DATA} ${WRKSRC}/rssh.conf.default ${DESTDIR}${EGDIR}/rssh.conf -- cgit v1.2.3