[Midnightbsd-cvs] mports [15531] trunk/devel/qmake4: qmake4 bug fix

[laffer1 at midnightbsd.org]

Revision: 15531
          http://svnweb.midnightbsd.org/mports/?rev=15531
Author:   laffer1
Date:     2013-09-26 19:38:21 -0400 (Thu, 26 Sep 2013)
Log Message:
-----------
qmake4 bug fix

Modified Paths:
--------------
    trunk/devel/qmake4/Makefile

Added Paths:
-----------
    trunk/devel/qmake4/files/patch-mkspecs__features__unix__gdb_dwarf_index.prf

Modified: trunk/devel/qmake4/Makefile
===================================================================
--- trunk/devel/qmake4/Makefile	2013-09-26 23:27:09 UTC (rev 15530)
+++ trunk/devel/qmake4/Makefile	2013-09-26 23:38:21 UTC (rev 15531)
@@ -2,11 +2,13 @@
 
 PORTNAME=	qmake
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The build utility of the Qt project
+
 LICENSE=	gpl3
 
 EXTENSIONS=	qt
@@ -19,9 +21,26 @@
 
 FAKE_OPTS=	trueprefix
 
-MAKE_JOBS_SAFE=	yes
 TODAY_CMD=	/bin/date +%Y-%m-%d
 
+EXTRACT_AFTER_ARGS= \
+	'${DISTNAME}/mkspecs' \
+	'${DISTNAME}/include/*/*' \
+	'${DISTNAME}/src/*/*.h' \
+	'${DISTNAME}/qmake' \
+	'${DISTNAME}/src/corelib/tools' \
+	'${DISTNAME}/src/corelib/io' \
+	'${DISTNAME}/src/corelib/global' \
+	'${DISTNAME}/src/corelib/plugin' \
+	'${DISTNAME}/src/corelib/kernel' \
+	'${DISTNAME}/src/corelib/codecs' \
+	'${DISTNAME}/src/corelib/xml' \
+	'${DISTNAME}/src/3rdparty/md4' \
+	'${DISTNAME}/src/3rdparty/md5' \
+	'${DISTNAME}/src/3rdparty/sha1' \
+	'${DISTNAME}/tools/shared/symbian' \
+	'${DISTNAME}/tools/shared/windows'
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
@@ -33,6 +52,7 @@
 	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
 
 # FIXME: This is ugly
+	@${RM} ${WRKSRC}/../mkspecs/features/unix/*.orig
 	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++/*.orig
 	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++46/*.orig
 

Added: trunk/devel/qmake4/files/patch-mkspecs__features__unix__gdb_dwarf_index.prf
===================================================================
--- trunk/devel/qmake4/files/patch-mkspecs__features__unix__gdb_dwarf_index.prf	                        (rev 0)
+++ trunk/devel/qmake4/files/patch-mkspecs__features__unix__gdb_dwarf_index.prf	2013-09-26 23:38:21 UTC (rev 15531)
@@ -0,0 +1,36 @@
+From fdecdc39399994d2c0309005922590e2f106bbef Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco at FreeBSD.org>
+Date: Sun, 11 Aug 2013 15:08:48 +0300
+Subject: [PATCH] gdb_dwarf_index: Use a sed call that's more POSIX-compliant.
+
+sed versions other than the GNU one often default to being POSIX-compliant,
+in which case "+" (with and without escaping) is always an ordinary
+character.
+
+Achieve the same functionality in a way that works with both GNU and BSD
+seds by using "xx*" insted of "x\+".
+
+Cherry-picked from qtbase/faea8d1056e4b034404febd0ef44a00e7784018d.
+
+Change-Id: I462e070992ff214a7261d45c208f2e5f3e962e8f
+Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at digia.com>
+---
+ mkspecs/features/unix/gdb_dwarf_index.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf
+index e3f79cd..84b4e18 100644
+--- ../mkspecs/features/unix/gdb_dwarf_index.prf
++++ ../mkspecs/features/unix/gdb_dwarf_index.prf
+@@ -9,7 +9,7 @@
+     }
+ 
+     QMAKE_GDB_INDEX += \
+-      test \$\$(gdb --version | sed -e \'s,[^0-9]\\+\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \
++      test \$\$(gdb --version | sed -e \'s,[^0-9][^0-9]*\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \
+       gdb --nx --batch --quiet -ex \'set confirm off\' -ex \"save gdb-index $$QMAKE_GDB_DIR\" -ex quit \'$(TARGET)\'  && \
+       test -f $(TARGET).gdb-index && \
+       $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \
+-- 
+1.8.3.4
+