Revised cmake-trinty usage

- stage 1 - enable compatibility with existing build tree

Apps/abakus/abakus.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/amarok/amarok.SlackBuild

@@ -69,7 +69,7 @@ cd_builddir_fn
 ## Build aKode-engine?
 [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE="ON"
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/codeine/codeine.SlackBuild

@@ -43,7 +43,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/dolphin/dolphin.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/filelight/filelight.SlackBuild

@@ -44,7 +44,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild

@@ -48,7 +48,7 @@ chown_fn
 cd_builddir_fn
 
 ## BONOBO will be included in the build if installed
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/gwenview-i18n/gwenview-i18n.SlackBuild

@@ -78,7 +78,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/k3b-i18n/k3b-i18n.SlackBuild

@@ -66,7 +66,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_COMPILER=$COMPILER \
     -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
     -DCMAKE_BUILD_TYPE=Release \

Apps/k3b/k3b.SlackBuild

@@ -347,7 +347,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kaffeine/kaffeine.SlackBuild

@@ -46,7 +46,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kbfx/kbfx.SlackBuild

@@ -49,7 +49,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kbookreader/kbookreader.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kdbg/kdbg.SlackBuild

@@ -104,7 +104,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kdbusnotification/kdbusnotification.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kile/kile.SlackBuild

@@ -46,7 +46,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kkbswitch/kkbswitch.SlackBuild

@@ -47,7 +47,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/klamav/klamav.SlackBuild

@@ -127,7 +127,7 @@ cd_builddir_fn
 
 ! pkg-config sqlite3 && EMB_SQL="ON"
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/knemo/knemo.SlackBuild

@@ -51,7 +51,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/knetstats/knetstats.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/knights/knights.SlackBuild

@@ -64,7 +64,7 @@ chown_fn
 cd_builddir_fn
 
 ## BUILD_EXTRA_THEME is a 14.1.0 option and will be ignored for 14.0.n builds
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/knmap/knmap.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kompose/kompose.SlackBuild

@@ -44,7 +44,7 @@ chown_fn
 cd_builddir_fn
 
 pkg-config xdamage && pkg-config xcomposite && XCOMP="ON"
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kplayer/kplayer.SlackBuild

@@ -59,7 +59,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kscope/kscope.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/ksensors/ksensors.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kshutdown/kshutdown.SlackBuild

@@ -43,7 +43,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kvkbd/kvkbd.SlackBuild

@@ -216,7 +216,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/kvpnc/kvpnc.SlackBuild

@@ -43,7 +43,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/potracegui/potracegui.SlackBuild

@@ -45,7 +45,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/rosegarden/rosegarden.SlackBuild

@@ -73,7 +73,7 @@ pkg-config jack && JACK="ON"
 # Check for DSSI aka "Dizzy"
 pkg-config dssi && DSSI="ON"
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild

@@ -47,7 +47,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/tdeio-locate/tdeio-locate.SlackBuild

@@ -46,7 +46,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/tdepowersave/tdepowersave.SlackBuild

@@ -67,7 +67,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/tdesudo/tdesudo.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/tdmtheme/tdmtheme.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn 
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/twin-style-crystal/twin-style-crystal.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/twin-style-suse2/twin-style-suse2.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Apps/yakuake/yakuake.SlackBuild

@@ -42,7 +42,7 @@ chown_fn
 
 cd_builddir_fn 
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

BUILD-TDE.sh

@@ -273,14 +273,14 @@ EXVAL=$?
 "
 \Zb\Z2PgDn/PgUp to scroll\Zn
 
-$(xzless Core/tde-i18n/langcodes.xz | tr "\n" X | sed 's|X|\\n|g;s|Latn\t|Latn|g')
+$(xzless Core/tde-i18n/langcodes.xz | sed 's| \t|\t|')
 " \
 26 75
 [[ $EXVAL == 0 ]] && dialog --cr-wrap --no-shadow --colors --no-collapse --ok-label "Return" --msgbox \
 "
 \Zb\Z2PgDn/PgUp to scroll\Zn
 
-$(xzless Core/tde-i18n/langcodes.xz |sed 's|\t\+|\t|g'|cut -f 1,3-| tr "\n" X | sed 's|X|\\n|g;s|\t|\t\t|g;s|cyrillic\t|cyrillic|g;s|Latn\t|Latn|g')
+$(xzless Core/tde-i18n/langcodes.xz | sed 's| \t|\t|' | colrm 17 40 )
 " \
 26 75
 done

Core/tde-i18n/tde-i18n.SlackBuild

@@ -99,7 +99,10 @@ chown_fn
 mkdir -p $PRGNAM-$lang/build
 cd $PRGNAM-$lang/build
 
-cmake ${G_NINJA:-} \
+## The path to the TDE cmake modules is added for 14.0.x[aka 14.0.13+] & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories
+CMAKE_OPTS=-DCMAKE_MODULE_PATH=$PWD/../cmake/modules
+
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \
@@ -120,10 +123,8 @@ make_fn
 
 mkdir_install_fn
 
-# extract the name of the language from the source text - a bit messy but there is no standard format
+Lang=$(xzgrep ^"$lang " $SB_SRCDIR/langcodes.xz |colrm 1 16|cut -f1)
-Lang=$(grep Language-Team: $TMP_BUILD/tmp-$PRGNAM/$PRGNAM*/tde-i18n-$lang/messages/tdebase/*.po|sort -k2 | sed -e 's|Team: |\n|' -e 's| <|\n|' -e 's|akh\\n"|akh|' -e 's|an S|#|' | grep "[A-Z][a-z][a-z]*$"|head -n 1)
+Lang_en=$(xzgrep ^"$lang " $SB_SRCDIR/langcodes.xz |colrm 1 40)
-[[ "$lang" == "pt" ]] && Lang="Portuguese"
-[[ "$lang" == "fy" ]] && Lang="Frisian"
 
 doinst_sh_fn
 
@@ -137,7 +138,7 @@ echo "
              |-----handy-ruler------------------------------------------------------|
 $PRGNAM-$lang: tde-i18n-$lang
 $PRGNAM-$lang:
-$PRGNAM-$lang: Language support for TDE: $Lang
+$PRGNAM-$lang: Language support for TDE: $Lang [$Lang_en]
 $PRGNAM-$lang:
 $PRGNAM-$lang:
 $PRGNAM-$lang:

Core/tdeaccessibility/tdeaccessibility.SlackBuild

@@ -42,7 +42,7 @@ cd_builddir_fn
 AKODE=OFF && [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE=ON
 FREEVERB=OFF && [[ -s $INSTALL_TDE/include/arts/artsmodules.h ]] && FREEVERB=ON
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdeaddons/tdeaddons.SlackBuild

@@ -60,7 +60,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdeadmin/tdeadmin.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn 
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdeartwork/tdeartwork.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdebase/tdebase.SlackBuild

@@ -132,7 +132,10 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+## Add man pages for development builds
+[[ $TDEVERSION != 14.0.12 ]] && MAN_PAGES=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
+
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \
@@ -142,6 +145,7 @@ cmake ${G_NINJA:-} \
     -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+    ${MAN_PAGES:-} \
     -DWITH_ARTS="ON" \
     -DWITH_ELFICON="OFF" \
     -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
@@ -232,6 +236,8 @@ make_fn
 
 installdocs_fn
 
+[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn
+
 strip_fn
 
 ##############################################################################

Core/tdeedu/tdeedu.SlackBuild

@@ -249,7 +249,7 @@ cd_builddir_fn
 ## kig python scripting support
 [[ $(ls -1 /usr/lib$LIBDIRSUFFIX/libboost_python*.so) ]] && KIG_PS="ON"
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdegames/tdegames.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdegraphics/tdegraphics.SlackBuild

@@ -97,7 +97,7 @@ cd_builddir_fn
 
 # If imlib is installed, include Kuickshow:
 pkg-config imlib && KUICKSHOW=ON
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdelibs/tdelibs.SlackBuild

@@ -165,7 +165,7 @@ sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLi
 are 14.1.0 options and will be ignored by 14.0.n builds
 comment
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdemultimedia/tdemultimedia.SlackBuild

@@ -42,7 +42,7 @@ cd_builddir_fn
 ## akode is required for ARTS_AKODE plugin & JUK
 [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && aRts_AKODE=ON && JUK=ON
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdenetwork/tdenetwork.SlackBuild

@@ -61,7 +61,7 @@ cd_builddir_fn
 # If speex is installed, include it in the build for jingle
 [[ -s /usr/include/speex/speex.h ]] && SPX="ON"
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdepim/tdepim.SlackBuild

@@ -45,7 +45,7 @@ cd_builddir_fn
 # If libcarddav is installed, include it in the build for korganizer
 [[ -s $INSTALL_TDE/include/libcarddav/carddav.h ]] 2>/dev/null && LCARDDAV="ON"
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdesdk/tdesdk.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdetoys/tdetoys.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdeutils/tdeutils.SlackBuild

@@ -55,7 +55,7 @@ cd_builddir_fn
 
 ## TDEFileReplace has been moved from tdewebdev for R14.1.0
 [[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdevelop/tdevelop.SlackBuild

@@ -43,7 +43,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Core/tdewebdev/tdewebdev.SlackBuild

@@ -52,7 +52,7 @@ sed -i "s|/opt/trinity|$INSTALL_TDE|" ../doc/man/*/*.1
 ## which defaults to $INSTALL_TDE/lib
 ## TDEFileReplace has been moved to tdeutils for R14.1.0
 [[ $TDEVERSION != 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/akode/akode.SlackBuild

@@ -213,7 +213,7 @@ chown_fn
 cd_builddir_fn
 
 ## see README for cmake options
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/arts/arts.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/avahi-tqt/avahi-tqt.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/dbus-tqt/dbus-tqt.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
     -DCMAKE_BUILD_TYPE=Release \

Deps/libart-lgpl/libart-lgpl.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/libcaldav/libcaldav.SlackBuild

@@ -40,7 +40,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/libcarddav/libcarddav.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/tqca/tqca.SlackBuild

@@ -39,7 +39,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Deps/tqtinterface/tqtinterface.SlackBuild

@@ -40,7 +40,7 @@ chown_fn
 cd_builddir_fn
 
 [[ $TDEVERSION == 14.1.0 ]] && QTINC_PFX=T
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Libs/libkdcraw/libkdcraw.SlackBuild

@@ -132,7 +132,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Libs/libkexiv2/libkexiv2.SlackBuild

@@ -40,7 +40,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

Libs/libkipi/libkipi.SlackBuild

@@ -43,7 +43,7 @@ chown_fn
 
 cd_builddir_fn
 
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
     -DCMAKE_C_COMPILER=$COMPILER \

get-source.sh

@@ -307,6 +307,10 @@ echo # if this fails, SlackBuild will fail from [3]
 ## [3] finally, cd into source directory
 #
 cd $PRGNAM*
+
+## For cmake builds - the path to the TDE cmake modules
+## Added for 14.0.x[aka 14.0.13+] & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories
+export CMAKE_OPTS=-DCMAKE_MODULE_PATH=$PWD/cmake/modules
 }
 
 listdocs_fn ()