[pkgsrc/trunk]: pkgsrc kde: SUBST_STAGE should be pre-configure, not post-patch.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/87a35193f8d7
branches:  trunk
changeset: 375268:87a35193f8d7
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Feb 07 15:35:09 2018 +0000

description:
kde: SUBST_STAGE should be pre-configure, not post-patch.

Performing substitutions during *-patch phases makes it impossible to
generate patches via mkpatches without introducing substitution noise.

diffstat:

 archivers/karchive/Makefile           |  4 ++--
 devel/kio/Makefile                    |  4 ++--
 devel/kitemmodels/Makefile            |  4 ++--
 devel/kservice/Makefile               |  4 ++--
 graphics/prison/Makefile              |  4 ++--
 misc/attica-qt5/Makefile              |  4 ++--
 net/knewstuff/Makefile                |  4 ++--
 sysutils/kdbusaddons/Makefile         |  4 ++--
 sysutils/kfilemetadata5/Makefile      |  4 ++--
 textproc/sonnet/Makefile              |  4 ++--
 textproc/syntax-highlighting/Makefile |  4 ++--
 www/khtml/Makefile                    |  4 ++--
 x11/kdelibs4support/Makefile          |  4 ++--
 x11/kxmlgui/Makefile                  |  4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diffs (252 lines):

diff -r 5e549ad214ad -r 87a35193f8d7 archivers/karchive/Makefile
--- a/archivers/karchive/Makefile       Wed Feb 07 12:33:24 2018 +0000
+++ b/archivers/karchive/Makefile       Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/01/30 07:29:55 markd Exp $
+# $NetBSD: Makefile,v 1.12 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      karchive-${KF5VER}
 PKGREVISION=   2
@@ -11,7 +11,7 @@
 .include "../../meta-pkgs/kf5/Makefile.common"
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 devel/kio/Makefile
--- a/devel/kio/Makefile        Wed Feb 07 12:33:24 2018 +0000
+++ b/devel/kio/Makefile        Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/01/30 08:47:11 markd Exp $
+# $NetBSD: Makefile,v 1.20 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      kio-${KF5VER}
 PKGREVISION=   2
@@ -13,7 +13,7 @@
 USE_TOOLS+=    msgmerge
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       src/core/CMakeLists.txt
 SUBST_FILES.xdg+=      src/urifilters/shorturi/CMakeLists.txt
diff -r 5e549ad214ad -r 87a35193f8d7 devel/kitemmodels/Makefile
--- a/devel/kitemmodels/Makefile        Wed Feb 07 12:33:24 2018 +0000
+++ b/devel/kitemmodels/Makefile        Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/01/30 06:27:18 markd Exp $
+# $NetBSD: Makefile,v 1.18 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      kitemmodels-${KF5VER}
 PKGREVISION=   3
@@ -11,7 +11,7 @@
 .include "../../meta-pkgs/kf5/Makefile.common"
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 devel/kservice/Makefile
--- a/devel/kservice/Makefile   Wed Feb 07 12:33:24 2018 +0000
+++ b/devel/kservice/Makefile   Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/01/30 08:58:47 markd Exp $
+# $NetBSD: Makefile,v 1.12 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      kservice-${KF5VER}
 PKGREVISION=   1
@@ -15,7 +15,7 @@
 USE_TOOLS+=    bison flex msgmerge
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       src/CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_SYSCONFDIR}/xdg/menus:{KDE_INSTALL_DATAROOTDIR}/examples/kservice:'
diff -r 5e549ad214ad -r 87a35193f8d7 graphics/prison/Makefile
--- a/graphics/prison/Makefile  Wed Feb 07 12:33:24 2018 +0000
+++ b/graphics/prison/Makefile  Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/02/01 18:49:59 markd Exp $
+# $NetBSD: Makefile,v 1.2 2018/02/07 15:35:10 jperkin Exp $
 
 DISTNAME=      prison-${KF5VER}
 CATEGORIES=    graphics
@@ -14,7 +14,7 @@
 USE_TOOLS+=    pkg-config
 
 #SUBST_CLASSES+=               xdg
-#SUBST_STAGE.xdg=      post-patch
+#SUBST_STAGE.xdg=      pre-configure
 #SUBST_MESSAGE.xdg=    Install via examples dir.
 #SUBST_FILES.xdg=      CMakeLists.txt
 #SUBST_SED.xdg=                -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 misc/attica-qt5/Makefile
--- a/misc/attica-qt5/Makefile  Wed Feb 07 12:33:24 2018 +0000
+++ b/misc/attica-qt5/Makefile  Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/01/30 07:52:36 markd Exp $
+# $NetBSD: Makefile,v 1.12 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      attica-${KF5VER}
 PKGNAME=       ${DISTNAME:S/-/-qt5-/}
@@ -14,7 +14,7 @@
 PKGCONFIG_OVERRIDE+=   src/cmake/libKF5Attica.pc.cmake
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 net/knewstuff/Makefile
--- a/net/knewstuff/Makefile    Wed Feb 07 12:33:24 2018 +0000
+++ b/net/knewstuff/Makefile    Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/01/30 07:43:23 markd Exp $
+# $NetBSD: Makefile,v 1.20 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      knewstuff-${KF5VER}
 PKGREVISION=   3
@@ -13,7 +13,7 @@
 USE_TOOLS+=    msgmerge
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 sysutils/kdbusaddons/Makefile
--- a/sysutils/kdbusaddons/Makefile     Wed Feb 07 12:33:24 2018 +0000
+++ b/sysutils/kdbusaddons/Makefile     Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/01/30 05:24:41 markd Exp $
+# $NetBSD: Makefile,v 1.18 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      kdbusaddons-${KF5VER}
 PKGREVISION=   3
@@ -11,7 +11,7 @@
 .include "../../meta-pkgs/kf5/Makefile.common"
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 sysutils/kfilemetadata5/Makefile
--- a/sysutils/kfilemetadata5/Makefile  Wed Feb 07 12:33:24 2018 +0000
+++ b/sysutils/kfilemetadata5/Makefile  Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2018/01/30 07:03:48 markd Exp $
+# $NetBSD: Makefile,v 1.25 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      kfilemetadata-${KF5VER}
 PKGNAME=       ${DISTNAME:S/-/5-/}
@@ -16,7 +16,7 @@
 DEPENDS+=      catdoc-[0-9]*:../../textproc/catdoc
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 textproc/sonnet/Makefile
--- a/textproc/sonnet/Makefile  Wed Feb 07 12:33:24 2018 +0000
+++ b/textproc/sonnet/Makefile  Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/01/30 08:04:59 markd Exp $
+# $NetBSD: Makefile,v 1.19 2018/02/07 15:35:10 jperkin Exp $
 
 DISTNAME=      sonnet-${KF5VER}
 PKGREVISION=   3
@@ -11,7 +11,7 @@
 .include "../../meta-pkgs/kf5/Makefile.common"
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 textproc/syntax-highlighting/Makefile
--- a/textproc/syntax-highlighting/Makefile     Wed Feb 07 12:33:24 2018 +0000
+++ b/textproc/syntax-highlighting/Makefile     Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/01/30 07:58:50 markd Exp $
+# $NetBSD: Makefile,v 1.6 2018/02/07 15:35:10 jperkin Exp $
 
 DISTNAME=      syntax-highlighting-${KF5VER}
 PKGREVISION=   3
@@ -13,7 +13,7 @@
 USE_TOOLS+=    perl
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 www/khtml/Makefile
--- a/www/khtml/Makefile        Wed Feb 07 12:33:24 2018 +0000
+++ b/www/khtml/Makefile        Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/01/30 09:24:25 markd Exp $
+# $NetBSD: Makefile,v 1.18 2018/02/07 15:35:09 jperkin Exp $
 
 DISTNAME=      khtml-${KF5VER}
 PKGREVISION=   2
@@ -23,7 +23,7 @@
 SUBST_SED.fix-moc=     -e 's,;${PREFIX}/include;,;,g'
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       src/CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg:'
diff -r 5e549ad214ad -r 87a35193f8d7 x11/kdelibs4support/Makefile
--- a/x11/kdelibs4support/Makefile      Wed Feb 07 12:33:24 2018 +0000
+++ b/x11/kdelibs4support/Makefile      Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/01/30 09:10:59 markd Exp $
+# $NetBSD: Makefile,v 1.20 2018/02/07 15:35:10 jperkin Exp $
 
 DISTNAME=      kdelibs4support-${KF5VER}
 PKGREVISION=   2
@@ -21,7 +21,7 @@
 REPLACE_PERL+= src/kio/fileshareset
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       src/CMakeLists.txt
 SUBST_FILES.xdg+=      src/kssl/kssl/CMakeLists.txt
diff -r 5e549ad214ad -r 87a35193f8d7 x11/kxmlgui/Makefile
--- a/x11/kxmlgui/Makefile      Wed Feb 07 12:33:24 2018 +0000
+++ b/x11/kxmlgui/Makefile      Wed Feb 07 15:35:09 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/01/30 08:17:10 markd Exp $
+# $NetBSD: Makefile,v 1.11 2018/02/07 15:35:10 jperkin Exp $
 
 DISTNAME=      kxmlgui-${KF5VER}
 PKGREVISION=   1
@@ -13,7 +13,7 @@
 USE_TOOLS+=    msgmerge
 
 SUBST_CLASSES+=                xdg
-SUBST_STAGE.xdg=       post-patch
+SUBST_STAGE.xdg=       pre-configure
 SUBST_MESSAGE.xdg=     Install via examples dir.
 SUBST_FILES.xdg=       src/CMakeLists.txt
 SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}/ui:{KDE_INSTALL_DATAROOTDIR}/examples/kxmlgui:'