CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Wed, 7 Feb 2018 15:35:10 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Feb  7 15:35:10 UTC 2018

Modified Files:
        pkgsrc/archivers/karchive: Makefile
        pkgsrc/devel/kio: Makefile
        pkgsrc/devel/kitemmodels: Makefile
        pkgsrc/devel/kservice: Makefile
        pkgsrc/graphics/prison: Makefile
        pkgsrc/misc/attica-qt5: Makefile
        pkgsrc/net/knewstuff: Makefile
        pkgsrc/sysutils/kdbusaddons: Makefile
        pkgsrc/sysutils/kfilemetadata5: Makefile
        pkgsrc/textproc/sonnet: Makefile
        pkgsrc/textproc/syntax-highlighting: Makefile
        pkgsrc/www/khtml: Makefile
        pkgsrc/x11/kdelibs4support: Makefile
        pkgsrc/x11/kxmlgui: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/karchive/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/kio/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/kitemmodels/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/kservice/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/prison/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/attica-qt5/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/knewstuff/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/kdbusaddons/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/sysutils/kfilemetadata5/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/sonnet/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/syntax-highlighting/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/khtml/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/kdelibs4support/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/kxmlgui/Makefile

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

Modified files:

Index: pkgsrc/archivers/karchive/Makefile
diff -u pkgsrc/archivers/karchive/Makefile:1.11 pkgsrc/archivers/karchive/Makefile:1.12
--- pkgsrc/archivers/karchive/Makefile:1.11     Tue Jan 30 07:29:55 2018
+++ pkgsrc/archivers/karchive/Makefile  Wed Feb  7 15:35:09 2018
@@ -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 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2.1
 .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:'

Index: pkgsrc/devel/kio/Makefile
diff -u pkgsrc/devel/kio/Makefile:1.19 pkgsrc/devel/kio/Makefile:1.20
--- pkgsrc/devel/kio/Makefile:1.19      Tue Jan 30 08:47:11 2018
+++ pkgsrc/devel/kio/Makefile   Wed Feb  7 15:35:09 2018
@@ -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 @@ LICENSE=      gnu-lgpl-v2.1
 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

Index: pkgsrc/devel/kitemmodels/Makefile
diff -u pkgsrc/devel/kitemmodels/Makefile:1.17 pkgsrc/devel/kitemmodels/Makefile:1.18
--- pkgsrc/devel/kitemmodels/Makefile:1.17      Tue Jan 30 06:27:18 2018
+++ pkgsrc/devel/kitemmodels/Makefile   Wed Feb  7 15:35:09 2018
@@ -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 @@ LICENSE=      gnu-lgpl-v2.1
 .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:'

Index: pkgsrc/devel/kservice/Makefile
diff -u pkgsrc/devel/kservice/Makefile:1.11 pkgsrc/devel/kservice/Makefile:1.12
--- pkgsrc/devel/kservice/Makefile:1.11 Tue Jan 30 08:58:47 2018
+++ pkgsrc/devel/kservice/Makefile      Wed Feb  7 15:35:09 2018
@@ -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 @@ BUILD_DEPENDS+=       kdoctools>=${KF5VER}:../
 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:'

Index: pkgsrc/graphics/prison/Makefile
diff -u pkgsrc/graphics/prison/Makefile:1.1 pkgsrc/graphics/prison/Makefile:1.2
--- pkgsrc/graphics/prison/Makefile:1.1 Thu Feb  1 18:49:59 2018
+++ pkgsrc/graphics/prison/Makefile     Wed Feb  7 15:35:10 2018
@@ -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 @@ BUILD_DEPENDS+=       kdoctools>=5.19.0:../../
 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:'

Index: pkgsrc/misc/attica-qt5/Makefile
diff -u pkgsrc/misc/attica-qt5/Makefile:1.11 pkgsrc/misc/attica-qt5/Makefile:1.12
--- pkgsrc/misc/attica-qt5/Makefile:1.11        Tue Jan 30 07:52:36 2018
+++ pkgsrc/misc/attica-qt5/Makefile     Wed Feb  7 15:35:09 2018
@@ -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 @@ LICENSE=      gnu-lgpl-v2.1
 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:'

Index: pkgsrc/net/knewstuff/Makefile
diff -u pkgsrc/net/knewstuff/Makefile:1.19 pkgsrc/net/knewstuff/Makefile:1.20
--- pkgsrc/net/knewstuff/Makefile:1.19  Tue Jan 30 07:43:23 2018
+++ pkgsrc/net/knewstuff/Makefile       Wed Feb  7 15:35:09 2018
@@ -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 @@ LICENSE=      gnu-lgpl-v2.1
 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:'

Index: pkgsrc/sysutils/kdbusaddons/Makefile
diff -u pkgsrc/sysutils/kdbusaddons/Makefile:1.17 pkgsrc/sysutils/kdbusaddons/Makefile:1.18
--- pkgsrc/sysutils/kdbusaddons/Makefile:1.17   Tue Jan 30 05:24:41 2018
+++ pkgsrc/sysutils/kdbusaddons/Makefile        Wed Feb  7 15:35:09 2018
@@ -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 @@ LICENSE=      gnu-lgpl-v2.1
 .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:'

Index: pkgsrc/sysutils/kfilemetadata5/Makefile
diff -u pkgsrc/sysutils/kfilemetadata5/Makefile:1.24 pkgsrc/sysutils/kfilemetadata5/Makefile:1.25
--- pkgsrc/sysutils/kfilemetadata5/Makefile:1.24        Tue Jan 30 07:03:48 2018
+++ pkgsrc/sysutils/kfilemetadata5/Makefile     Wed Feb  7 15:35:09 2018
@@ -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 @@ USE_TOOLS+=   msgmerge pkg-config
 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:'

Index: pkgsrc/textproc/sonnet/Makefile
diff -u pkgsrc/textproc/sonnet/Makefile:1.18 pkgsrc/textproc/sonnet/Makefile:1.19
--- pkgsrc/textproc/sonnet/Makefile:1.18        Tue Jan 30 08:04:59 2018
+++ pkgsrc/textproc/sonnet/Makefile     Wed Feb  7 15:35:10 2018
@@ -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 @@ LICENSE=      gnu-lgpl-v2.1
 .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:'

Index: pkgsrc/textproc/syntax-highlighting/Makefile
diff -u pkgsrc/textproc/syntax-highlighting/Makefile:1.5 pkgsrc/textproc/syntax-highlighting/Makefile:1.6
--- pkgsrc/textproc/syntax-highlighting/Makefile:1.5    Tue Jan 30 07:58:50 2018
+++ pkgsrc/textproc/syntax-highlighting/Makefile        Wed Feb  7 15:35:10 2018
@@ -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 @@ LICENSE=      gnu-lgpl-v2.1
 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:'

Index: pkgsrc/www/khtml/Makefile
diff -u pkgsrc/www/khtml/Makefile:1.17 pkgsrc/www/khtml/Makefile:1.18
--- pkgsrc/www/khtml/Makefile:1.17      Tue Jan 30 09:24:25 2018
+++ pkgsrc/www/khtml/Makefile   Wed Feb  7 15:35:09 2018
@@ -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_FILES.fix-moc+= _KDE_build/src/kmu
 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:'

Index: pkgsrc/x11/kdelibs4support/Makefile
diff -u pkgsrc/x11/kdelibs4support/Makefile:1.19 pkgsrc/x11/kdelibs4support/Makefile:1.20
--- pkgsrc/x11/kdelibs4support/Makefile:1.19    Tue Jan 30 09:10:59 2018
+++ pkgsrc/x11/kdelibs4support/Makefile Wed Feb  7 15:35:10 2018
@@ -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 @@ USE_TOOLS+=   perl:run pkg-config msgfmt
 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

Index: pkgsrc/x11/kxmlgui/Makefile
diff -u pkgsrc/x11/kxmlgui/Makefile:1.10 pkgsrc/x11/kxmlgui/Makefile:1.11
--- pkgsrc/x11/kxmlgui/Makefile:1.10    Tue Jan 30 08:17:10 2018
+++ pkgsrc/x11/kxmlgui/Makefile Wed Feb  7 15:35:10 2018
@@ -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 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2.1
 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:'

Prev by Date: CVS commit: pkgsrc/graphics/py-matplotlib
Next by Date: CVS commit: pkgsrc/x11/kconfigwidgets
Previous by Thread: CVS commit: pkgsrc/graphics/py-matplotlib
Next by Thread: CVS commit: pkgsrc/x11/kconfigwidgets
Indexes:

Home | Main Index | Thread Index | Old Index