Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2013 16:44:02 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
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
Message-ID:  <201312171644.rBHGi2GD051241@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312171644.rBHGi2GD051241>