From owner-svn-ports-all@FreeBSD.ORG  Tue Dec 17 16:44:03 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 18B8BBBC;
 Tue, 17 Dec 2013 16:44:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 042FC15D6;
 Tue, 17 Dec 2013 16:44:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHGi2mr051242;
 Tue, 17 Dec 2013 16:44:02 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHGi2GD051241;
 Tue, 17 Dec 2013 16:44:02 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201312171644.rBHGi2GD051241@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Tue, 17 Dec 2013 16:44:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r336742 - branches/2014Q1/security/ssh_askpass_gtk2
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Dec 2013 16:44:03 -0000

Author: madpilot
Date: Tue Dec 17 16:44:02 2013
New Revision: 336742
URL: http://svnweb.freebsd.org/changeset/ports/336742

Log:
  MFH: r336735
  
      - Fix build on 10 and head due to new ld behavior
      - Stagify
  
      PR:			ports/184926
      Submitted by:	me
      Approved by:	arved (maintainer, via email)
  
  Approved by:	portmgr (bapt)

Modified:
  branches/2014Q1/security/ssh_askpass_gtk2/Makefile   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/security/ssh_askpass_gtk2/Makefile
==============================================================================
--- branches/2014Q1/security/ssh_askpass_gtk2/Makefile	Tue Dec 17 16:28:50 2013	(r336741)
+++ branches/2014Q1/security/ssh_askpass_gtk2/Makefile	Tue Dec 17 16:44:02 2013	(r336742)
@@ -19,12 +19,12 @@ USES=		pkgconfig
 
 PLIST_FILES=	bin/ssh-askpass-fullscreen
 
-NO_STAGE=	yes
 post-patch:
-	${REINPLACE_CMD} -e "s,gcc,${CC}," ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e "s,gcc,${CC}," \
+		-e "/${CC}/s,$$, -lX11," ${WRKSRC}/Makefile
 
 do-install:
 	cd ${WRKSRC};\
-	${INSTALL_PROGRAM} ssh-askpass-fullscreen ${PREFIX}/bin/ssh-askpass-fullscreen;\
+	${INSTALL_PROGRAM} ssh-askpass-fullscreen ${STAGEDIR}${PREFIX}/bin/ssh-askpass-fullscreen
 
 .include <bsd.port.mk>