svn commit: r378174 - in head/cad/qcad: . files

[Michael Reifenberger]

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:
+     /*