Date: Sun, 16 Sep 2001 12:54:46 +0300 From: Peter Pentchev <roam@ringlet.net> To: Kris Kennaway <kris@obsecurity.org> Cc: "David W. Chapman Jr." <dwcjr@FreeBSD.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: ports/security/ssh2 pkg-plist Message-ID: <20010916125446.A513@ringworld.oblivion.bg> In-Reply-To: <20010914195142.A56820@xor.obsecurity.org>; from kris@obsecurity.org on Fri, Sep 14, 2001 at 07:51:42PM -0700 References: <200109141351.f8EDpRX81320@freefall.freebsd.org> <20010914195142.A56820@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Sep 14, 2001 at 07:51:42PM -0700, Kris Kennaway wrote:
> On Fri, Sep 14, 2001 at 06:51:27AM -0700, David W. Chapman Jr. wrote:
> > dwcjr 2001/09/14 06:51:27 PDT
> >
> > Modified files:
> > security/ssh2 pkg-plist
> > Log:
> > Remove extra file from pkg-plist to fix package building
>
> This is incorrect, because that file will be built if X is installed
> on the system.
OK, how about the attached patch, which copies the WITH/WITHOUT_X11
check from the security/ssh port, and then adds plist handling?
G'luck,
Peter
--
I am not the subject of this sentence.
Index: ports/security/ssh2/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/ssh2/Makefile,v
retrieving revision 1.102
diff -u -r1.102 Makefile
--- ports/security/ssh2/Makefile 2001/02/17 01:40:35 1.102
+++ ports/security/ssh2/Makefile 2001/09/16 09:43:21
@@ -36,6 +36,16 @@
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
+# Include extra files if X11 is installed
+.if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \
+ && !defined(WITHOUT_X11))
+USE_XLIB= yes
+PLIST_SUB+= WITH_X=""
+.else
+CONFIGURE_ARGS+= --without-x
+PLIST_SUB+= WITH_X="@comment "
+.endif
+
MAN1= scp.1 sftp.1 scp2.1 sftp2.1 sshregex.1 ssh-probe2.1 ssh-dummy-shell.1 \
ssh-pubkeymgr.1 ssh2.1 ssh-chrootmgr.1 ssh-agent.1 ssh-keygen.1 \
ssh-add.1 ssh-add2.1 ssh-agent2.1 ssh-keygen2.1
Index: ports/security/ssh2/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/security/ssh2/pkg-plist,v
retrieving revision 1.19
diff -u -r1.19 pkg-plist
--- ports/security/ssh2/pkg-plist 2001/09/14 13:51:27 1.19
+++ ports/security/ssh2/pkg-plist 2001/09/16 09:43:21
@@ -14,6 +14,7 @@
bin/ssh-agent
bin/ssh-add
bin/ssh-askpass
+%%WITH_X%%bin/ssh-askpass2
bin/ssh-keygen
bin/scp
bin/sftp
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010916125446.A513>