Add a patch fixing compilation on NetBSD-7.99.3/amd64 by extending the

libtool usage.

Remove unnecessary install rule.

From Niclas Rosenvik.

3 files changed, 39 insertions, 6 deletions

diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile
index 4443bc40b4d..ab3efc23d1f 100644
--- a/x11/qt5-qtbase/Makefile
+++ b/x11/qt5-qtbase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/12/30 17:23:45 adam Exp $
+# $NetBSD: Makefile,v 1.16 2015/01/01 21:05:13 wiz Exp $
 
 DISTNAME=	qtbase-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtbase-${QTVERSION}
@@ -153,10 +153,6 @@ post-configure:
 	cd ${WRKSRC} && ./bin/qmake -o Makefile
 
 post-install:
-.for prog in moc qdoc rcc uic
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-		${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
-.endfor
 .for i in ${PC_FILES}
 	cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
 	ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo
index 5acef8ac0bb..403501b4e5d 100644
--- a/x11/qt5-qtbase/distinfo
+++ b/x11/qt5-qtbase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2014/12/30 17:23:45 adam Exp $
+$NetBSD: distinfo,v 1.14 2015/01/01 21:05:13 wiz Exp $
 
 SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd
 RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909
@@ -7,6 +7,7 @@ SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e728706
 SHA1 (patch-configure) = f8b7c04737473af372165d1b8b48891b8e2b446c
 SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177
 SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39
+SHA1 (patch-mkspecs_features_simd.prf) = 3dea0d38e2791bdcae589bef38f2cce29a4c5b6c
 SHA1 (patch-qmake_Makefile.unix) = d07bfa160af94d06546865662bc2049a789fffec
 SHA1 (patch-qmake_generators_makefile.cpp) = 9db55a0a64183b9bff830af185ea1eb7c59d296a
 SHA1 (patch-qmake_generators_unix_unixmake.cpp) = 8b8f1b6b34c06f50fb1c20c8c13220a7b4b46989
diff --git a/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf b/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf
new file mode 100644
index 00000000000..90eaf749f4d
--- /dev/null
+++ b/x11/qt5-qtbase/patches/patch-mkspecs_features_simd.prf
@@ -0,0 +1,36 @@
+$NetBSD: patch-mkspecs_features_simd.prf,v 1.1 2015/01/01 21:05:13 wiz Exp $
+* Use libtool 
+--- mkspecs/features/simd.prf.orig	2014-12-05 16:24:38.000000000 +0000
++++ mkspecs/features/simd.prf
+@@ -33,12 +33,12 @@ defineTest(addSimdCompiler) {
+             export(SOURCES)
+         } else {
+             # We need special compiler flags
+-            $${name}_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
++            $${name}_compiler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CXX -c $(CXXFLAGS) $$cflags $(INCPATH) ${QMAKE_FILE_IN}
+             msvc: $${name}_compiler.commands += -Fo${QMAKE_FILE_OUT}
+-            else: $${name}_compiler.commands += -o ${QMAKE_FILE_OUT}
++            else: $${name}_compiler.commands += -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
+ 
+             $${name}_compiler.dependency_type = TYPE_C
+-            $${name}_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++            $${name}_compiler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
+             $${name}_compiler.input = $$sources_var
+             $${name}_compiler.variable_out = OBJECTS
+             $${name}_compiler.name = compiling[$${name}] ${QMAKE_FILE_IN}
+@@ -62,12 +62,12 @@ defineTest(addSimdCompiler) {
+             SOURCES += $$eval($$asm_var)
+             export(SOURCES)
+         } else {
+-            $${name}_assembler.commands = $$QMAKE_CC -c $(CFLAGS)
++            $${name}_assembler.commands = $(LIBTOOL) --silent --mode=compile $$QMAKE_CC -c $(CFLAGS)
+             !contains(QT_CPU_FEATURES, $${name}): $${name}_assembler.commands += $$cflags
+             clang:no_clang_integrated_as: $${name}_assembler.commands += -fno-integrated-as
+-            $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++            $${name}_assembler.commands += $(INCPATH) ${QMAKE_FILE_IN} -o $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
+             $${name}_assembler.dependency_type = TYPE_C
+-            $${name}_assembler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++            $${name}_assembler.output = $$OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
+             $${name}_assembler.input = $$asm_var
+             $${name}_assembler.variable_out = OBJECTS
+             $${name}_assembler.name = assembling[$${name}] ${QMAKE_FILE_IN}