CVS commit: pkgsrc/x11/qt5-qtbase

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Mar 19 15:21:54 UTC 2020

Modified Files:
        pkgsrc/x11/qt5-qtbase: Makefile

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

Should help with Qt5DBus.pc symlink not being created.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/x11/qt5-qtbase/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.92 pkgsrc/x11/qt5-qtbase/Makefile:1.93
--- pkgsrc/x11/qt5-qtbase/Makefile:1.92 Wed Mar 18 21:48:03 2020
+++ pkgsrc/x11/qt5-qtbase/Makefile      Thu Mar 19 15:21:54 2020
@@ -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 @@ pre-configure:
        ${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 @@ post-install:
        ${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"