Re: qmake -query QT_INSTALL_CONFIGURATION

["Kamil Rytarowski" <n54%gmx.com@localhost>]

me wrote:
> 
> I'm going to prepare a patch for qt4 and qt5 (qt3 doesn't handle it) to
> set QT_INSTALL_CONFIGURATION to ${PKG_SYSCONFDIR}/xdg Is someone against
> this change? It take a while as qt4 and qt5 are heavy to manage,
> thankfully this change looks trivial.
> 

Done. I have prepared the mentioned patches. They are verified to work.

$ /usr/pkg/qt4/bin/qmake -query QT_INSTALL_CONFIGURATION
/usr/pkg/etc/xdg

$ /usr/pkg/qt5/bin/qmake -query QT_INSTALL_CONFIGURATION
/usr/pkg/etc/xdg

Please review and apply.

I'm not aware of any possible fallouts.

Index: qt4-libs/Makefile.common
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/x11/qt4-libs/Makefile.common,v
retrieving revision 1.38
diff -u -r1.38 Makefile.common
--- qt4-libs/Makefile.common	28 Aug 2014 10:58:19 -0000	1.38
+++ qt4-libs/Makefile.common	26 May 2015 23:02:36 -0000
@@ -37,6 +37,7 @@
 CONFIGURE_ARGS+=	-prefix "${QTPREFIX}"
 CONFIGURE_ARGS+=	${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
 CONFIGURE_ARGS+=	-opensource -confirm-license
+CONFIGURE_ARGS+=	-sysconfdir "${PKG_SYSCONFDIR}/xdg"
 OPSYSVARS+=		CONFIGURE_ARGS
 
 .include "../../mk/bsd.prefs.mk"



Index: Makefile
===================================================================
RCS file: /public/netbsd-rsync/pkgsrc/x11/qt5-qtbase/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile	27 Apr 2015 10:38:04 -0000	1.22
+++ Makefile	26 May 2015 23:29:12 -0000
@@ -17,6 +17,7 @@
 CONFIGURE_ARGS+=	-prefix "${QTPREFIX}"
 CONFIGURE_ARGS+=	${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
 CONFIGURE_ARGS+=	-opensource -confirm-license
+CONFIGURE_ARGS+=	-sysconfdir "${PKG_SYSCONFDIR}/xdg"
 CONFIGURE_ARGS+=	-accessibility
 CONFIGURE_ARGS+=	-fontconfig
 CONFIGURE_ARGS+=	-icu