svn commit: r344202 - in head/x11-fm/qtfm: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Feb 14 13:20:26 2014
New Revision: 344202
URL: http://svnweb.freebsd.org/changeset/ports/344202
QAT: https://qat.redports.org/buildarchive/r344202/

Log:
  - Fix build on 10.x
  - Fix stripping with regard to staging
  
  PR:		186672
  Submitted by:	amdmi3
  Approved by:	anoine (portmgr)

Modified:
  head/x11-fm/qtfm/Makefile
  head/x11-fm/qtfm/files/patch-src_bookmarks.cpp

Modified: head/x11-fm/qtfm/Makefile
==============================================================================
--- head/x11-fm/qtfm/Makefile	Fri Feb 14 13:13:33 2014	(r344201)
+++ head/x11-fm/qtfm/Makefile	Fri Feb 14 13:20:26 2014	(r344202)
@@ -17,8 +17,6 @@ DOS2UNIX_REGEX=	.*\.(h|cpp)
 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 @@ post-patch:
 		icondlg.cpp mainwindow.cpp mymodel.cpp
 
 post-install:
-	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qtfm
 
 .include <bsd.port.mk>

Modified: head/x11-fm/qtfm/files/patch-src_bookmarks.cpp
==============================================================================
--- head/x11-fm/qtfm/files/patch-src_bookmarks.cpp	Fri Feb 14 13:13:33 2014	(r344201)
+++ head/x11-fm/qtfm/files/patch-src_bookmarks.cpp	Fri Feb 14 13:20:26 2014	(r344202)
@@ -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 @@
  }
  
  //---------------------------------------------------------------------------