Bug 184926

Summary: security/ssh_askpass_gtk2: Fix build on 10 and head, stagify
Product: Ports & Packages Reporter: Guido Falsi <madpilot>
Component: Individual Port(s)Assignee: Tilman Keskinoz <arved>
Status: Closed FIXED    
Severity: Affects Only Me CC: arved
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Guido Falsi freebsd_committer freebsd_triage 2013-12-17 10:00:00 UTC 
Port is failing on 10 and head due to new ld behavior. -lX11 needs
to be explicitly specified.

While here I also stagified the port.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-17 10:00:07 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->arved

Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184926 

Date: Tue, 17 Dec 2013 14:12:15 +0100
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-17 15:57:55 UTC 
Author: madpilot
Date: Tue Dec 17 15:57:48 2013
New Revision: 336735
URL: http://svnweb.freebsd.org/changeset/ports/336735

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

Modified:
  head/security/ssh_askpass_gtk2/Makefile   (contents, props changed)

Modified: head/security/ssh_askpass_gtk2/Makefile
==============================================================================
--- head/security/ssh_askpass_gtk2/Makefile	Tue Dec 17 15:50:00 2013	(r336734)
+++ head/security/ssh_askpass_gtk2/Makefile	Tue Dec 17 15:57:48 2013	(r336735)
@@ -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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Guido Falsi freebsd_committer freebsd_triage 2013-12-17 15:57:56 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-17 16:44:10 UTC 
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>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"