From owner-svn-ports-head@FreeBSD.ORG  Fri Jan 30 17:20:21 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B6BA0D8B;
 Fri, 30 Jan 2015 17:20:21 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A3518BB3;
 Fri, 30 Jan 2015 17:20:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0UHKL90052485;
 Fri, 30 Jan 2015 17:20:21 GMT (envelope-from mr@FreeBSD.org)
Received: (from mr@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0UHKLTX052483;
 Fri, 30 Jan 2015 17:20:21 GMT (envelope-from mr@FreeBSD.org)
Message-Id: <201501301720.t0UHKLTX052483@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: mr set sender to mr@FreeBSD.org
 using -f
From: Michael Reifenberger <mr@FreeBSD.org>
Date: Fri, 30 Jan 2015 17:20:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r378174 - in head/cad/qcad: . 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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2015 17:20:21 -0000

Author: mr
Date: Fri Jan 30 17:20:20 2015
New Revision: 378174
URL: https://svnweb.freebsd.org/changeset/ports/378174
QAT: https://qat.redports.org/buildarchive/r378174/

Log:
  Add datadir to search path.
  
  PR:		197140

Added:
  head/cad/qcad/files/patch-src_core_RS.cpp   (contents, props changed)
Modified:
  head/cad/qcad/Makefile

Modified: head/cad/qcad/Makefile
==============================================================================
--- head/cad/qcad/Makefile	Fri Jan 30 17:18:34 2015	(r378173)
+++ head/cad/qcad/Makefile	Fri Jan 30 17:20:20 2015	(r378174)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qcad
 PORTVERSION=	3.7.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	http://github.com/${PORTNAME}/${PORTNAME}/archive/${DISTNAME}.tar.gz?dummy=/	\
 		https://github.com/${PORTNAME}/${PORTNAME}/archive/${DISTNAME}.tar.gz?dummy=/
@@ -50,6 +50,8 @@ QSCRIPTS=	bbox dwg2bmp dwg2pdf dwg2svg
 
 pre-configure:
 	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|"	\
+		${WRKSRC}/src/core/RS.cpp
+	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|"	\
 		${WRKSRC}/src/core/RSettings.cpp
 
 # Temporary hack for Qt 4.8.6 support while upstream does not add proper

Added: head/cad/qcad/files/patch-src_core_RS.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/qcad/files/patch-src_core_RS.cpp	Fri Jan 30 17:20:20 2015	(r378174)
@@ -0,0 +1,11 @@
+--- src/core/RS.cpp.orig	2015-01-30 18:11:57.235513076 +0100
++++ src/core/RS.cpp	2015-01-30 18:12:23.988630795 +0100
+@@ -119,4 +119,8 @@
+     */
+ 
++#ifdef Q_OS_FREEBSD
++    dirList.append("%%DATADIR%%/" + subDirectory);
++#endif
++
+     // Individual directories:
+     /*