From owner-svn-ports-all@FreeBSD.ORG  Fri Feb 14 13:20:27 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CF5E6D23;
 Fri, 14 Feb 2014 13:20:27 +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 A08C916C1;
 Fri, 14 Feb 2014 13:20:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EDKRgO044720;
 Fri, 14 Feb 2014 13:20:27 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EDKR0s044419;
 Fri, 14 Feb 2014 13:20:27 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201402141320.s1EDKR0s044419@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 14 Feb 2014 13:20:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r344202 - in head/x11-fm/qtfm: . files
X-SVN-Group: ports-head
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: Fri, 14 Feb 2014 13:20:27 -0000

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 @@
  }
  
  //---------------------------------------------------------------------------