CVS commit: pkgsrc/devel/kde-dev-scripts

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Nov 25 10:07:31 UTC 2019

Modified Files:
        pkgsrc/devel/kde-dev-scripts: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/kde-dev-scripts/patches: patch-uncrustify-kf5

Log Message:
kde-dev-scripts: update to 19.08.3   qt5/kf5 version


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/kde-dev-scripts/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/kde-dev-scripts/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/kde-dev-scripts/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/kde-dev-scripts/patches/patch-uncrustify-kf5

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

Modified files:

Index: pkgsrc/devel/kde-dev-scripts/Makefile
diff -u pkgsrc/devel/kde-dev-scripts/Makefile:1.26 pkgsrc/devel/kde-dev-scripts/Makefile:1.27
--- pkgsrc/devel/kde-dev-scripts/Makefile:1.26  Thu Aug 22 12:23:01 2019
+++ pkgsrc/devel/kde-dev-scripts/Makefile       Mon Nov 25 10:07:31 2019
@@ -1,11 +1,17 @@
-# $NetBSD: Makefile,v 1.26 2019/08/22 12:23:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/25 10:07:31 markd Exp $
 
-DISTNAME=      kde-dev-scripts-${_KDE_VERSION}
-PKGREVISION=   15
+DISTNAME=      kde-dev-scripts-${KAPPSVER}
 CATEGORIES=    devel
+
+HOMEPAGE=      https://kde.org/applications/development/
 COMMENT=       Scripts useful during development of KDE software
+LICENSE=       gnu-gpl-v2 AND gnu-fdl-v1.2
+
+.include "../../meta-pkgs/kde/applications.mk"
 
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+BUILD_DEPENDS+=        kdoctools>=${KF5VER}:../../devel/kdoctools
+
+USE_TOOLS+=    msgmerge bash:run perl:run
 
 REPLACE_BASH+= \
        create_makefile \
@@ -42,6 +48,7 @@ REPLACE_PERL+= \
        svnlastchange
 
 REPLACE_PYTHON+= \
+       grantlee_strings_extractor.py \
        kde-systemsettings-tree.py \
        kde_generate_export_header \
        kdelnk2desktop.py \
@@ -53,13 +60,6 @@ REPLACE_SH+= \
        build-progress.sh \
        cvsaddcurrentdir
 
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
-
-USE_TOOLS+=    gmake bash:run
-
-.include "../../meta-pkgs/kde4/kde4.mk"
-
 .include "../../lang/python/application.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/kde-dev-scripts/PLIST
diff -u pkgsrc/devel/kde-dev-scripts/PLIST:1.2 pkgsrc/devel/kde-dev-scripts/PLIST:1.3
--- pkgsrc/devel/kde-dev-scripts/PLIST:1.2      Fri Nov 14 08:03:30 2014
+++ pkgsrc/devel/kde-dev-scripts/PLIST  Mon Nov 25 10:07:31 2019
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2014/11/14 08:03:30 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/11/25 10:07:31 markd Exp $
 bin/adddebug
 bin/build-progress.sh
+bin/c++-copy-class-and-file
+bin/c++-rename-class-and-file
 bin/cheatmake
 bin/colorsvn
 bin/create_cvsignore
@@ -26,6 +28,7 @@ bin/findmissingcrystal
 bin/fix-include.sh
 bin/fixkdeincludes
 bin/fixuifiles
+bin/grantlee_strings_extractor.py
 bin/includemocs
 bin/kde-systemsettings-tree.py
 bin/kde_generate_export_header
@@ -53,8 +56,133 @@ bin/svnlastchange
 bin/svnlastlog
 bin/svnrevertlast
 bin/svnversions
+bin/uncrustify-kf5
 bin/wcgrep
 bin/zonetab2pot.py
+man/ca/man1/adddebug.1
+man/ca/man1/cheatmake.1
+man/ca/man1/create_cvsignore.1
+man/ca/man1/create_makefile.1
+man/ca/man1/create_makefiles.1
+man/ca/man1/cvscheck.1
+man/ca/man1/cvslastchange.1
+man/ca/man1/cvslastlog.1
+man/ca/man1/cvsrevertlast.1
+man/ca/man1/cxxmetric.1
+man/ca/man1/extend_dmalloc.1
+man/ca/man1/extractrc.1
+man/ca/man1/fixincludes.1
+man/ca/man1/pruneemptydirs.1
+man/ca/man1/qtdoc.1
+man/ca/man1/reportview.1
+man/ca/man1/transxx.1
+man/ca/man1/zonetab2pot.py.1
+man/da/man1/adddebug.1
+man/da/man1/cheatmake.1
+man/da/man1/create_cvsignore.1
+man/da/man1/create_makefiles.1
+man/da/man1/cvscheck.1
+man/da/man1/cvslastchange.1
+man/da/man1/cvslastlog.1
+man/da/man1/cvsrevertlast.1
+man/da/man1/cxxmetric.1
+man/da/man1/extend_dmalloc.1
+man/da/man1/extractrc.1
+man/da/man1/fixincludes.1
+man/da/man1/pruneemptydirs.1
+man/da/man1/qtdoc.1
+man/da/man1/reportview.1
+man/da/man1/zonetab2pot.py.1
+man/de/man1/adddebug.1
+man/de/man1/cheatmake.1
+man/de/man1/create_cvsignore.1
+man/de/man1/create_makefile.1
+man/de/man1/create_makefiles.1
+man/de/man1/cvscheck.1
+man/de/man1/cvslastchange.1
+man/de/man1/cvslastlog.1
+man/de/man1/cvsrevertlast.1
+man/de/man1/cxxmetric.1
+man/de/man1/extend_dmalloc.1
+man/de/man1/extractrc.1
+man/de/man1/fixincludes.1
+man/de/man1/pruneemptydirs.1
+man/de/man1/qtdoc.1
+man/de/man1/reportview.1
+man/de/man1/transxx.1
+man/de/man1/zonetab2pot.py.1
+man/es/man1/adddebug.1
+man/es/man1/cheatmake.1
+man/es/man1/create_cvsignore.1
+man/es/man1/create_makefile.1
+man/es/man1/create_makefiles.1
+man/es/man1/cvscheck.1
+man/es/man1/cvslastchange.1
+man/es/man1/cvslastlog.1
+man/es/man1/cvsrevertlast.1
+man/es/man1/cxxmetric.1
+man/es/man1/extend_dmalloc.1
+man/es/man1/extractrc.1
+man/es/man1/fixincludes.1
+man/es/man1/pruneemptydirs.1
+man/es/man1/qtdoc.1
+man/es/man1/reportview.1
+man/es/man1/transxx.1
+man/es/man1/zonetab2pot.py.1
+man/et/man1/qtdoc.1
+man/fr/man1/adddebug.1
+man/fr/man1/cheatmake.1
+man/fr/man1/create_cvsignore.1
+man/fr/man1/create_makefile.1
+man/fr/man1/create_makefiles.1
+man/fr/man1/cvscheck.1
+man/fr/man1/cvslastchange.1
+man/fr/man1/cvslastlog.1
+man/fr/man1/cvsrevertlast.1
+man/fr/man1/cxxmetric.1
+man/fr/man1/extend_dmalloc.1
+man/fr/man1/extractrc.1
+man/fr/man1/fixincludes.1
+man/fr/man1/pruneemptydirs.1
+man/fr/man1/qtdoc.1
+man/fr/man1/reportview.1
+man/fr/man1/transxx.1
+man/fr/man1/zonetab2pot.py.1
+man/gl/man1/adddebug.1
+man/gl/man1/cheatmake.1
+man/gl/man1/create_cvsignore.1
+man/gl/man1/create_makefiles.1
+man/gl/man1/cvscheck.1
+man/gl/man1/cvslastchange.1
+man/gl/man1/cvslastlog.1
+man/gl/man1/cvsrevertlast.1
+man/gl/man1/cxxmetric.1
+man/gl/man1/extend_dmalloc.1
+man/gl/man1/extractrc.1
+man/gl/man1/fixincludes.1
+man/gl/man1/pruneemptydirs.1
+man/gl/man1/qtdoc.1
+man/gl/man1/reportview.1
+man/gl/man1/transxx.1
+man/gl/man1/zonetab2pot.py.1
+man/it/man1/adddebug.1
+man/it/man1/cheatmake.1
+man/it/man1/create_cvsignore.1
+man/it/man1/create_makefile.1
+man/it/man1/create_makefiles.1
+man/it/man1/cvscheck.1
+man/it/man1/cvslastchange.1
+man/it/man1/cvslastlog.1
+man/it/man1/cvsrevertlast.1
+man/it/man1/cxxmetric.1
+man/it/man1/extend_dmalloc.1
+man/it/man1/extractrc.1
+man/it/man1/fixincludes.1
+man/it/man1/pruneemptydirs.1
+man/it/man1/qtdoc.1
+man/it/man1/reportview.1
+man/it/man1/transxx.1
+man/it/man1/zonetab2pot.py.1
 man/man1/adddebug.1
 man/man1/cheatmake.1
 man/man1/create_cvsignore.1
@@ -73,3 +201,95 @@ man/man1/qtdoc.1
 man/man1/reportview.1
 man/man1/transxx.1
 man/man1/zonetab2pot.py.1
+man/nl/man1/adddebug.1
+man/nl/man1/cheatmake.1
+man/nl/man1/create_cvsignore.1
+man/nl/man1/create_makefile.1
+man/nl/man1/create_makefiles.1
+man/nl/man1/cvscheck.1
+man/nl/man1/cvslastchange.1
+man/nl/man1/cvslastlog.1
+man/nl/man1/cvsrevertlast.1
+man/nl/man1/cxxmetric.1
+man/nl/man1/extend_dmalloc.1
+man/nl/man1/extractrc.1
+man/nl/man1/fixincludes.1
+man/nl/man1/pruneemptydirs.1
+man/nl/man1/qtdoc.1
+man/nl/man1/reportview.1
+man/nl/man1/transxx.1
+man/nl/man1/zonetab2pot.py.1
+man/pt/man1/adddebug.1
+man/pt/man1/cheatmake.1
+man/pt/man1/create_cvsignore.1
+man/pt/man1/create_makefile.1
+man/pt/man1/create_makefiles.1
+man/pt/man1/cvscheck.1
+man/pt/man1/cvslastchange.1
+man/pt/man1/cvslastlog.1
+man/pt/man1/cvsrevertlast.1
+man/pt/man1/cxxmetric.1
+man/pt/man1/extend_dmalloc.1
+man/pt/man1/extractrc.1
+man/pt/man1/fixincludes.1
+man/pt/man1/pruneemptydirs.1
+man/pt/man1/qtdoc.1
+man/pt/man1/reportview.1
+man/pt/man1/transxx.1
+man/pt/man1/zonetab2pot.py.1
+man/pt_BR/man1/adddebug.1
+man/pt_BR/man1/cheatmake.1
+man/pt_BR/man1/create_cvsignore.1
+man/pt_BR/man1/create_makefile.1
+man/pt_BR/man1/create_makefiles.1
+man/pt_BR/man1/cvscheck.1
+man/pt_BR/man1/cvslastchange.1
+man/pt_BR/man1/cvslastlog.1
+man/pt_BR/man1/cvsrevertlast.1
+man/pt_BR/man1/cxxmetric.1
+man/pt_BR/man1/extend_dmalloc.1
+man/pt_BR/man1/extractrc.1
+man/pt_BR/man1/fixincludes.1
+man/pt_BR/man1/pruneemptydirs.1
+man/pt_BR/man1/qtdoc.1
+man/pt_BR/man1/reportview.1
+man/pt_BR/man1/transxx.1
+man/pt_BR/man1/zonetab2pot.py.1
+man/sv/man1/adddebug.1
+man/sv/man1/cheatmake.1
+man/sv/man1/create_cvsignore.1
+man/sv/man1/create_makefile.1
+man/sv/man1/create_makefiles.1
+man/sv/man1/cvscheck.1
+man/sv/man1/cvslastchange.1
+man/sv/man1/cvslastlog.1
+man/sv/man1/cvsrevertlast.1
+man/sv/man1/cxxmetric.1
+man/sv/man1/extend_dmalloc.1
+man/sv/man1/extractrc.1
+man/sv/man1/fixincludes.1
+man/sv/man1/pruneemptydirs.1
+man/sv/man1/qtdoc.1
+man/sv/man1/reportview.1
+man/sv/man1/transxx.1
+man/sv/man1/zonetab2pot.py.1
+man/uk/man1/adddebug.1
+man/uk/man1/cheatmake.1
+man/uk/man1/create_cvsignore.1
+man/uk/man1/create_makefile.1
+man/uk/man1/create_makefiles.1
+man/uk/man1/cvscheck.1
+man/uk/man1/cvslastchange.1
+man/uk/man1/cvslastlog.1
+man/uk/man1/cvsrevertlast.1
+man/uk/man1/cxxmetric.1
+man/uk/man1/extend_dmalloc.1
+man/uk/man1/extractrc.1
+man/uk/man1/fixincludes.1
+man/uk/man1/pruneemptydirs.1
+man/uk/man1/qtdoc.1
+man/uk/man1/reportview.1
+man/uk/man1/transxx.1
+man/uk/man1/zonetab2pot.py.1
+share/uncrustify/uncrustify-kf5.cfg
+share/uncrustify/uncrustify-qt.cfg

Index: pkgsrc/devel/kde-dev-scripts/distinfo
diff -u pkgsrc/devel/kde-dev-scripts/distinfo:1.4 pkgsrc/devel/kde-dev-scripts/distinfo:1.5
--- pkgsrc/devel/kde-dev-scripts/distinfo:1.4   Tue Nov  3 03:27:36 2015
+++ pkgsrc/devel/kde-dev-scripts/distinfo       Mon Nov 25 10:07:31 2019
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 03:27:36 agc Exp $
+$NetBSD: distinfo,v 1.5 2019/11/25 10:07:31 markd Exp $
 
-SHA1 (kde-dev-scripts-4.14.3.tar.xz) = d52bc1ef596f886a9ee4ac9e665d4130e4b72a00
-RMD160 (kde-dev-scripts-4.14.3.tar.xz) = 3d4f504ef03775e244bed3acb9f1ab3a4b575f4d
-SHA512 (kde-dev-scripts-4.14.3.tar.xz) = e849196febc4a6af9211fcafbd81cc2a763339c5b71b8e5aeae2ae5be8961a911301cadd838ef9add4f9e6d27cf9af863ce1bffc09c666e18acb1c97a223d072
-Size (kde-dev-scripts-4.14.3.tar.xz) = 280672 bytes
+SHA1 (kde-dev-scripts-19.08.3.tar.xz) = 5342900f815e01c43aa05b36d6c73c644aecd9a0
+RMD160 (kde-dev-scripts-19.08.3.tar.xz) = 1eb577da1e877b8555725e5e169ecc3755067e18
+SHA512 (kde-dev-scripts-19.08.3.tar.xz) = 3e041422830d1a6a9ed70e86875e9a1b10fbdff3a2189d0a8554899a007e9700e1791f88e0701426f7a8d49da89341283db7f72686acced5fc5b26e7301d191d
+Size (kde-dev-scripts-19.08.3.tar.xz) = 378160 bytes
 SHA1 (patch-cvsaddcurrentdir) = d86b706c848e845bb54364af7d619a6637265d97
+SHA1 (patch-uncrustify-kf5) = 5b8e246c84da3a83662858b5a976c3d052018d87

Added files:

Index: pkgsrc/devel/kde-dev-scripts/patches/patch-uncrustify-kf5
diff -u /dev/null pkgsrc/devel/kde-dev-scripts/patches/patch-uncrustify-kf5:1.1
--- /dev/null   Mon Nov 25 10:07:31 2019
+++ pkgsrc/devel/kde-dev-scripts/patches/patch-uncrustify-kf5   Mon Nov 25 10:07:31 2019
@@ -0,0 +1,37 @@
+$NetBSD: patch-uncrustify-kf5,v 1.1 2019/11/25 10:07:31 markd Exp $
+
+fix test ==
+
+--- uncrustify-kf5.orig        2019-11-25 09:27:21.260113613 +0000
++++ uncrustify-kf5
+@@ -53,14 +53,14 @@ if [ -z "$files" ]; then
+   exit 0
+ fi
+ 
+-if test -z "$QT_NORMALIZE_TOOL" && test "$ignore_connects" == "0"; then
++if test -z "$QT_NORMALIZE_TOOL" && test "$ignore_connects" = "0"; then
+   echo "Please export QT_NORMALIZE_TOOL=<qt5>/qtrepotools/util/normalize/normalize"
+   exit 1
+ fi
+ 
+ cfg=uncrustify.cfg
+ if ! test -f "$cfg"; then
+-  if test "$qt" == "1"; then
++  if test "$qt" = "1"; then
+     cfgfile=uncrustify-qt.cfg
+   else
+     cfgfile=uncrustify-kf5.cfg
+@@ -120,11 +120,11 @@ perl - $files <<EOF
+ EOF
+ 
+ # Normalize signals/slots
+-if test -n "$QT_NORMALIZE_TOOL" && test "$ignore_connects" == "1"; then
++if test -n "$QT_NORMALIZE_TOOL" && test "$ignore_connects" = "1"; then
+   $QT_NORMALIZE_TOOL --modify .
+ fi
+ 
+-if test "$commit" == "1"; then
++if test "$commit" = "1"; then
+   git commit -q -a -m "Code reformatted using kde-dev-scripts/`basename $0`"
+ fi
+