ports/186672: [PATCH] x11-fm/qtfm: fix build on 10.x

[Dmitry Marakasov]

>Number:         186672
>Category:       ports
>Synopsis:       [PATCH] x11-fm/qtfm: fix build on 10.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 12 03:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Fix build on 10.x by adding missing include for close()
- Fix stripping WRT staging

Port maintainer (lichray at gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- qtfm-5.5.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 343836)
+++ Makefile	(working copy)
@@ -17,8 +17,6 @@
 USE_QT4=	gui network moc_build rcc_build \
 		imageformats_run
 
-STRIP_FILES=	bin/qtfm
-
 post-patch:
 	@cd ${WRKSRC} && \
 		${REINPLACE_CMD} -e s@/usr/@${PREFIX}/@g \
@@ -29,6 +27,6 @@
 		icondlg.cpp mainwindow.cpp mymodel.cpp
 
 post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qtfm
 
 .include <bsd.port.mk>
Index: files/patch-src_bookmarks.cpp
===================================================================
--- files/patch-src_bookmarks.cpp	(revision 343836)
+++ files/patch-src_bookmarks.cpp	(working copy)
@@ -1,6 +1,6 @@
---- src/bookmarks.cpp.orig	2012-07-11 18:10:56.065528820 -0500
-+++ src/bookmarks.cpp	2012-07-11 18:19:42.041677562 -0500
-@@ -22,6 +22,11 @@
+--- src/bookmarks.cpp.orig	2014-02-12 05:22:32.988231816 +0400
++++ src/bookmarks.cpp	2014-02-12 05:22:53.244712591 +0400
+@@ -22,6 +22,13 @@
  #ifndef BOOKMARKS_CPP
  #define BOOKMARKS_CPP
  
@@ -9,10 +9,12 @@
 +#include <sys/mount.h>
 +#endif
 +
++#include <unistd.h>
++
  #include <QtGui>
  #include "bookmarkmodel.h"
  #include "icondlg.h"
-@@ -80,44 +85,74 @@ void MainWindow::mountWatcherTriggered()
+@@ -80,44 +87,74 @@
  }
  
  //---------------------------------------------------------------------------
--- qtfm-5.5.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: