pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase qt5-qtbase: move include options.mk to ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/36961e81f094
branches:  trunk
changeset: 425135:36961e81f094
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Mar 19 15:21:54 2020 +0000

description:
qt5-qtbase: move include options.mk to before post-install is declared

Should help with Qt5DBus.pc symlink not being created.

diffstat:

 x11/qt5-qtbase/Makefile |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r dc63eb30cf3c -r 36961e81f094 x11/qt5-qtbase/Makefile
--- a/x11/qt5-qtbase/Makefile   Thu Mar 19 14:37:10 2020 +0000
+++ b/x11/qt5-qtbase/Makefile   Thu Mar 19 15:21:54 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2020/03/18 21:48:03 tnn Exp $
+# $NetBSD: Makefile,v 1.93 2020/03/19 15:21:54 tnn Exp $
 
 DISTNAME=      qtbase-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qtbase-${QTVERSION}
@@ -201,6 +201,8 @@
        ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
        ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_post.prf
 
+.include "options.mk"
+
 post-install:
 .for i in ${PC_FILES}
        cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
@@ -220,7 +222,6 @@
        ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES1}.1 \
                ${DESTDIR}${PREFIX}/${BROKEN_FILES1}
 
-.include "options.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"



Home | Main Index | Thread Index | Old Index