pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ksysguard: remove unneeded dependencies



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sat Mar 6 17:11:53 2021 +1300
Changeset:	1db17e45d6a145e76808a9289284c96329dd9625

Modified Files:
	ksysguard/Makefile
	ksysguard/PLIST
	ksysguard/distinfo
	ksysguard/patches/patch-plugins_process_network_helper_Packet.cpp
Removed Files:
	ksysguard/TODO

Log Message:
ksysguard: remove unneeded dependencies

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1db17e45d6a145e76808a9289284c96329dd9625

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

diffstat:
 ksysguard/Makefile                                        | 15 +++++++--------
 ksysguard/PLIST                                           |  5 ++++-
 ksysguard/TODO                                            |  2 --
 ksysguard/distinfo                                        |  2 +-
 .../patch-plugins_process_network_helper_Packet.cpp       |  9 +++++++--
 5 files changed, 19 insertions(+), 14 deletions(-)

diffs:
diff --git a/ksysguard/Makefile b/ksysguard/Makefile
index 18524fcf73..e443d4717c 100644
--- a/ksysguard/Makefile
+++ b/ksysguard/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	ksysguard-${PLASMAVER}
-PKGREVISION=	1
 CATEGORIES=	x11
 
 HOMEPAGE=	https://userbase.kde.org/KSysGuard
@@ -10,15 +9,18 @@ LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
 
 .include "../../meta-pkgs/kde/plasma5.mk"
 
-CONFLICTS+=	kde-workspace4-[0-9]*
-
 BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge pkg-config
 
 CFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
-# ksysguardd/NetBSD/netdev.c and apm.c dont like the standard setting
+# For the moment dont find libpcap as NetBSD9 doesn't have
+# pcap/sll.h 
+CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_libpcap:BOOL=TRUE
+#.if !exists(/usr/include/pcap/sll.h)
+#PREFER.libpcap=	pkgsrc
+#.endif
 
 SUBST_CLASSES+=		xdg
 SUBST_STAGE.xdg=	pre-configure
@@ -32,11 +34,8 @@ CONF_FILES+=	${PREFIX}/share/examples/ksysguard/ksysguarddrc \
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/knewstuff/buildlink3.mk"
+#.include "../../net/libpcap/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../wip/libksysguard/buildlink3.mk"
-.include "../../net/libpcap/buildlink3.mk"
-.include "../../lang/python27/buildlink3.mk"
-.include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.include "../../meta-pkgs/kf5/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ksysguard/PLIST b/ksysguard/PLIST
index 5a3ec9279a..a4a77a5c6d 100644
--- a/ksysguard/PLIST
+++ b/ksysguard/PLIST
@@ -2,6 +2,7 @@
 bin/ksysguard
 bin/ksysguardd
 lib/libkdeinit5_ksysguard.so
+qt5/plugins/ksysguard/process/ksysguard_plugin_nvidia.so
 share/applications/org.kde.ksysguard.desktop
 share/doc/HTML/ca/ksysguard/index.cache.bz2
 share/doc/HTML/ca/ksysguard/index.docbook
@@ -11,6 +12,8 @@ share/doc/HTML/en/ksysguard/index.cache.bz2
 share/doc/HTML/en/ksysguard/index.docbook
 share/doc/HTML/et/ksysguard/index.cache.bz2
 share/doc/HTML/et/ksysguard/index.docbook
+share/doc/HTML/id/ksysguard/index.cache.bz2
+share/doc/HTML/id/ksysguard/index.docbook
 share/doc/HTML/it/ksysguard/index.cache.bz2
 share/doc/HTML/it/ksysguard/index.docbook
 share/doc/HTML/nl/ksysguard/index.cache.bz2
@@ -42,6 +45,7 @@ share/ksysguard/SystemLoad2.sgrd
 share/kxmlgui5/ksysguard/ksysguardui.rc
 share/locale/af/LC_MESSAGES/ksysguard.mo
 share/locale/ar/LC_MESSAGES/ksysguard.mo
+share/locale/ast/LC_MESSAGES/ksysguard.mo
 share/locale/be/LC_MESSAGES/ksysguard.mo
 share/locale/be@latin/LC_MESSAGES/ksysguard.mo
 share/locale/bg/LC_MESSAGES/ksysguard.mo
@@ -98,7 +102,6 @@ share/locale/ne/LC_MESSAGES/ksysguard.mo
 share/locale/nl/LC_MESSAGES/ksysguard.mo
 share/locale/nn/LC_MESSAGES/ksysguard.mo
 share/locale/oc/LC_MESSAGES/ksysguard.mo
-share/locale/or/LC_MESSAGES/ksysguard.mo
 share/locale/pa/LC_MESSAGES/ksysguard.mo
 share/locale/pl/LC_MESSAGES/ksysguard.mo
 share/locale/pt/LC_MESSAGES/ksysguard.mo
diff --git a/ksysguard/TODO b/ksysguard/TODO
deleted file mode 100644
index 9f9ad665e6..0000000000
--- a/ksysguard/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-=========
-need to generate meta-pkgs/kf5 buildlink3
diff --git a/ksysguard/distinfo b/ksysguard/distinfo
index 5777e439cf..947503ddf3 100644
--- a/ksysguard/distinfo
+++ b/ksysguard/distinfo
@@ -13,4 +13,4 @@ SHA1 (patch-ksysguardd_NetBSD_Memory.c) = 0752eca6966424e5b7e56cef96d6868268ba6d
 SHA1 (patch-ksysguardd_NetBSD_Memory.h) = 7fe2f05789d6166a982785ae155e36d7ed1cdcd1
 SHA1 (patch-ksysguardd_NetBSD_ProcessList.c) = ab4158bcbc23210dd75e8b9bcceeff552bdc56b6
 SHA1 (patch-ksysguardd_Solaris_LoadAvg.c) = 4d21e99fd3e183cc20560ccdb08451c858536ec9
-SHA1 (patch-plugins_process_network_helper_Packet.cpp) = c86f695f485f96c55f6ac9f04996c21c67245fab
+SHA1 (patch-plugins_process_network_helper_Packet.cpp) = deec13fdd09a30c4166e1be23ee107fd004a174e
diff --git a/ksysguard/patches/patch-plugins_process_network_helper_Packet.cpp b/ksysguard/patches/patch-plugins_process_network_helper_Packet.cpp
index 28c5982b1f..5690a3a65c 100644
--- a/ksysguard/patches/patch-plugins_process_network_helper_Packet.cpp
+++ b/ksysguard/patches/patch-plugins_process_network_helper_Packet.cpp
@@ -1,13 +1,18 @@
 $NetBSD$
 
+BSD's use if_ether.h
+
 --- plugins/process/network/helper/Packet.cpp.orig	2020-05-05 14:44:00.000000000 +0000
 +++ plugins/process/network/helper/Packet.cpp
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,11 @@
  
  #include <sys/types.h>
  #include <arpa/inet.h>
--#include <net/ethernet.h>
++#ifdef __linux__
+ #include <net/ethernet.h>
++#else
 +#include <net/if_ether.h>
++#endif
  #include <netinet/in.h>
  #include <netinet/ip.h>
  #include <netinet/ip6.h>


Home | Main Index | Thread Index | Old Index