CVS commit: pkgsrc/x11/kde-runtime4

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Nov 30 21:39:08 UTC 2019

Modified Files:
        pkgsrc/x11/kde-runtime4: Makefile PLIST

Log Message:
kde-runtime4: disable building khelpcenter


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/x11/kde-runtime4/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/kde-runtime4/PLIST

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

Modified files:

Index: pkgsrc/x11/kde-runtime4/Makefile
diff -u pkgsrc/x11/kde-runtime4/Makefile:1.104 pkgsrc/x11/kde-runtime4/Makefile:1.105
--- pkgsrc/x11/kde-runtime4/Makefile:1.104      Sat Sep 28 13:01:37 2019
+++ pkgsrc/x11/kde-runtime4/Makefile    Sat Nov 30 21:39:08 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.104 2019/09/28 13:01:37 mef Exp $
+# $NetBSD: Makefile,v 1.105 2019/11/30 21:39:08 markd Exp $
 
 DISTNAME=      kde-runtime-15.12.0
 PKGNAME=       ${DISTNAME:S/-1/4-1/}
-PKGREVISION=   37
+PKGREVISION=   38
 CATEGORIES=    x11
 COMMENT=       Runtime requirements for the KDE integrated X11 desktop
 MASTER_SITES=  ${MASTER_SITE_KDE:=applications/15.12.0/src/}
@@ -11,6 +11,8 @@ MASTER_SITES= ${MASTER_SITE_KDE:=applica
 
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 CMAKE_ARGS+=   -DWITH_LibSSH:BOOL=OFF
+CMAKE_ARGS+=   -DBUILD_khelpcenter=OFF
+
 .include "../../mk/bsd.prefs.mk"
 CMAKE_ARGS+=   -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
 .if ${OPSYS} == "Darwin"
@@ -19,7 +21,7 @@ CMAKE_ARGS+=  -DLIBLZMA_LIBRARY:FILEPATH=
 CMAKE_ARGS+=   -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
 .endif
 
-DEPENDS+=      htdig>=3.2.0:../../www/htdig
+#DEPENDS+=     htdig>=3.2.0:../../www/htdig
 DEPENDS+=      oxygen-icons-[0-9]*:../../graphics/oxygen-icons
 
 USE_TOOLS+=            gmake
@@ -44,11 +46,11 @@ PLIST.polkit=       yes
 PLIST.x11=     yes
 .endif
 
-SUBST_CLASSES+=                htdig
-SUBST_STAGE.htdig=     pre-configure
-SUBST_MESSAGE.htdig=   Fix htdig paths.
-SUBST_FILES.htdig=     khelpcenter/searchhandlers/khc_htsearch.pl
-SUBST_SED.htdig=       -e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
+#SUBST_CLASSES+=               htdig
+#SUBST_STAGE.htdig=    pre-configure
+#SUBST_MESSAGE.htdig=  Fix htdig paths.
+#SUBST_FILES.htdig=    khelpcenter/searchhandlers/khc_htsearch.pl
+#SUBST_SED.htdig=      -e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
 
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     kioslave/info/kde-info2html.conf

Index: pkgsrc/x11/kde-runtime4/PLIST
diff -u pkgsrc/x11/kde-runtime4/PLIST:1.10 pkgsrc/x11/kde-runtime4/PLIST:1.11
--- pkgsrc/x11/kde-runtime4/PLIST:1.10  Wed Jan 17 19:07:37 2018
+++ pkgsrc/x11/kde-runtime4/PLIST       Sat Nov 30 21:39:08 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2018/01/17 19:07:37 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2019/11/30 21:39:08 markd Exp $
 bin/kcmshell4
 bin/kde-cp
 bin/kde-mv
@@ -9,7 +9,6 @@ bin/kdebugdialog
 bin/keditfiletype
 bin/kfile4
 bin/kglobalaccel
-bin/khelpcenter
 bin/khotnewstuff-upload
 bin/khotnewstuff4
 bin/kiconfinder
@@ -173,11 +172,6 @@ lib/kde4/libexec/kdeeject
 lib/kde4/libexec/kdesu
 ${PLIST.x11}lib/kde4/libexec/kdesud
 lib/kde4/libexec/kdontchangethehostname
-lib/kde4/libexec/khc_docbookdig.pl
-lib/kde4/libexec/khc_htdig.pl
-lib/kde4/libexec/khc_htsearch.pl
-lib/kde4/libexec/khc_indexbuilder
-lib/kde4/libexec/khc_mansearch.pl
 lib/kde4/libexec/kioexec
 lib/kde4/libexec/knetattach
 lib/kde4/libkmanpart.so
@@ -251,7 +245,6 @@ lib/kde4/windowsexethumbnail.so
 lib/kde4/windowsimagethumbnail.so
 lib/libkdeinit4_kcmshell4.so
 lib/libkdeinit4_kglobalaccel.so
-lib/libkdeinit4_khelpcenter.so
 lib/libkdeinit4_kuiserver.so
 lib/libkdeinit4_kwalletd.so
 lib/libknotifyplugin.so
@@ -264,10 +257,8 @@ lib/libmolletnetwork.so.${KDELIBSVER}
 man/man1/kdesu.1
 man/man1/plasmapkg.1
 ${PLIST.polkit}share/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
-share/applications/kde4/Help.desktop
 share/applications/kde4/knetattach.desktop
 share/dbus-1/interfaces/org.kde.KTimeZoned.xml
-share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
 share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml
 share/dbus-1/services/org.kde.knotify.service
 share/dbus-1/services/org.kde.kuiserver.service
@@ -781,38 +772,6 @@ share/kde/apps/kconf_update/kuriikwsfilt
 share/kde/apps/kconf_update/kwallet-4.13.upd
 share/kde/apps/kde/kde.notifyrc
 share/kde/apps/kglobalaccel/kglobalaccel.notifyrc
-share/kde/apps/khelpcenter/glossary.html.in
-share/kde/apps/khelpcenter/glossary.xslt
-share/kde/apps/khelpcenter/index.html.in
-share/kde/apps/khelpcenter/khelpcenterui.rc
-share/kde/apps/khelpcenter/plugins/Applications/.directory
-share/kde/apps/khelpcenter/plugins/Manpages/.directory
-share/kde/apps/khelpcenter/plugins/Manpages/man1.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/man2.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/man3.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/man4.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/man5.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/man6.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/man7.desktop
-share/kde/apps/khelpcenter/plugins/Manpages/man8.desktop
-share/kde/apps/khelpcenter/plugins/Scrollkeeper/.directory
-share/kde/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
-share/kde/apps/khelpcenter/plugins/browsercontrolmodules.desktop
-share/kde/apps/khelpcenter/plugins/filemanagercontrolmodules.desktop
-share/kde/apps/khelpcenter/plugins/fundamentals.desktop
-share/kde/apps/khelpcenter/plugins/info.desktop
-share/kde/apps/khelpcenter/plugins/kcontrolmodules.desktop
-share/kde/apps/khelpcenter/plugins/kicmodules.desktop
-share/kde/apps/khelpcenter/plugins/kioslaves.desktop
-share/kde/apps/khelpcenter/plugins/konquerorcontrolmodules.desktop
-share/kde/apps/khelpcenter/plugins/onlinehelp.desktop
-share/kde/apps/khelpcenter/plugins/othercontrolmodules.desktop
-share/kde/apps/khelpcenter/plugins/plasma.desktop
-share/kde/apps/khelpcenter/searchhandlers/docbook.desktop
-share/kde/apps/khelpcenter/searchhandlers/htdig.desktop
-share/kde/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
-share/kde/apps/khelpcenter/searchhandlers/man.desktop
-share/kde/apps/khelpcenter/table-of-contents.xslt
 share/kde/apps/kio_bookmarks/kio_bookmarks.css
 share/kde/apps/kio_desktop/DesktopLinks/Home.desktop
 share/kde/apps/kio_desktop/directory.desktop
@@ -834,7 +793,6 @@ share/kde/apps/phonon/phonon.notifyrc
 share/kde/apps/remoteview/network.desktop
 ${PLIST.smb}share/kde/apps/remoteview/smb-network.desktop
 share/kde/config.kcfg/jpegcreatorsettings.kcfg
-share/kde/config.kcfg/khelpcenter.kcfg
 share/kde/config/emoticons.knsrc
 share/kde/config/icons.knsrc
 share/kde/config/khotnewstuff.knsrc
@@ -887,7 +845,6 @@ share/kde4/services/kded/remotedirnotify
 share/kde4/services/kded/solidautoeject.desktop
 share/kde4/services/kded/soliduiserver.desktop
 share/kde4/services/kglobalaccel.desktop
-share/kde4/services/khelpcenter.desktop
 share/kde4/services/kmanpart.desktop
 share/kde4/services/knotify4.desktop
 share/kde4/services/kshorturifilter.desktop