pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/xosview
Module Name: pkgsrc
Committed By: rillig
Date: Sun May 24 11:24:19 UTC 2020
Modified Files:
pkgsrc/sysutils/xosview: Makefile PLIST distinfo
Added Files:
pkgsrc/sysutils/xosview/patches: patch-bsd_kernel.cc
Removed Files:
pkgsrc/sysutils/xosview/patches: patch-aa patch-ab patch-ac patch-ad
patch-ae patch-af patch-configure patch-linux_lmstemp.cc
patch-sunos5_diskmeter.cc
Log Message:
sysutils/xosview: update to 1.22
This gets rid of a few uncommented and unclear patches. The upstream
code has changed a lot, therefore the pkgsrc patches have all been
dropped.
Upstream changes are unknown since the CHANGES file mentions 1.9 as the
latest version.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/sysutils/xosview/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/xosview/PLIST
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/xosview/distinfo
cvs rdiff -u -r1.20 -r0 pkgsrc/sysutils/xosview/patches/patch-aa
cvs rdiff -u -r1.13 -r0 pkgsrc/sysutils/xosview/patches/patch-ab
cvs rdiff -u -r1.8 -r0 pkgsrc/sysutils/xosview/patches/patch-ac \
pkgsrc/sysutils/xosview/patches/patch-ad
cvs rdiff -u -r1.12 -r0 pkgsrc/sysutils/xosview/patches/patch-ae
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/xosview/patches/patch-af
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xosview/patches/patch-bsd_kernel.cc
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/xosview/patches/patch-configure \
pkgsrc/sysutils/xosview/patches/patch-linux_lmstemp.cc \
pkgsrc/sysutils/xosview/patches/patch-sunos5_diskmeter.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/xosview/Makefile
diff -u pkgsrc/sysutils/xosview/Makefile:1.75 pkgsrc/sysutils/xosview/Makefile:1.76
--- pkgsrc/sysutils/xosview/Makefile:1.75 Sun Jan 26 17:32:12 2020
+++ pkgsrc/sysutils/xosview/Makefile Sun May 24 11:24:19 2020
@@ -1,39 +1,46 @@
-# $NetBSD: Makefile,v 1.75 2020/01/26 17:32:12 rillig Exp $
+# $NetBSD: Makefile,v 1.76 2020/05/24 11:24:19 rillig Exp $
-DISTNAME= xosview-1.8.3
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xosview/}
+DISTNAME= xosview-1.22
+CATEGORIES= sysutils x11
+MASTER_SITES= ${MASTER_SITE_GITHUB:=hills/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.pogo.org.uk/~mark/xosview/
COMMENT= X11 graphical display of OS statistics
-USE_LANGUAGES= c gnu++03
+USE_TOOLS+= gmake
+USE_LANGUAGES= c gnu++03
-HAS_CONFIGURE= YES
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
-CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
-
-INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man1
-INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-INSTALL_MAKE_FLAGS+= PREFIX_TO_USE=${DESTDIR}${PREFIX}
+AUTO_MKDIRS= yes
.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == Linux
+MAKE_FLAGS+= PLATFORM=linux
+.elif ${OPSYS} == IRIX
+MAKE_FLAGS+= PLATFORM=irix65
+.elif ${OPSYS:M*BSD} || ${OPSYS} == DragonFly
+MAKE_FLAGS+= PLATFORM=bsd
+.elif ${OPSYS} == SunOS
+MAKE_FLAGS+= PLATFORM=sunos5
+.else
+MAKE_FLAGS+= PLATFORM=gnu
+.endif
+
+BUILD_TARGET= xosview
+MAKE_ENV+= LDLIBS=${LIBS:Q}
+MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}
+LIBS.NetBSD+= -lkvm -lprop
+LIBS.SunOS+= -lsocket -lnsl
+CPPFLAGS.SunOS+= -I${X11BASE}/include
+ICON_THEMES= yes
+
.if ${OPSYS} == "NetBSD"
. if !defined(UVM) && exists(/usr/include/uvm/uvm.h)
CFLAGS+= -DUVM
UVM= yes
BUILD_DEFS+= UVM
. endif
-.elif ${OPSYS} == "SunOS"
-USE_TOOLS+= gmake
-CPPFLAGS+= -I${X11BASE}/include
-LIBS+= -lsocket -lnsl
-.elif ${OPSYS} == "Linux"
-USE_TOOLS+= gmake
.endif
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
@@ -41,16 +48,9 @@ USE_TOOLS+= gmake
SPECIAL_PERMS+= bin/xosview ${REAL_ROOT_USER} kmem 2555
.endif
-SUBST_CLASSES+= unpriv
-SUBST_STAGE.unpriv= pre-configure
-SUBST_FILES.unpriv= config/Makefile.top.in
-SUBST_SED.unpriv= -e s,@INSTALL_ARGS@,,
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= post-configure
-SUBST_MESSAGE.paths= Fixing manpage path.
-SUBST_FILES.paths= Makefile
-SUBST_SED.paths= -e s,share/man/man1,${PKGMANDIR}/man1,
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/Xdefaults ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XOsview
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/sysutils/xosview/PLIST
diff -u pkgsrc/sysutils/xosview/PLIST:1.2 pkgsrc/sysutils/xosview/PLIST:1.3
--- pkgsrc/sysutils/xosview/PLIST:1.2 Fri Jun 12 19:09:38 2009
+++ pkgsrc/sysutils/xosview/PLIST Sun May 24 11:24:19 2020
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/12 19:09:38 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/05/24 11:24:19 rillig Exp $
bin/xosview
lib/X11/app-defaults/XOsview
man/man1/xosview.1
+share/applications/xosview.desktop
+share/icons/hicolor/32x32/apps/xosview.png
Index: pkgsrc/sysutils/xosview/distinfo
diff -u pkgsrc/sysutils/xosview/distinfo:1.29 pkgsrc/sysutils/xosview/distinfo:1.30
--- pkgsrc/sysutils/xosview/distinfo:1.29 Sat Feb 22 13:10:22 2020
+++ pkgsrc/sysutils/xosview/distinfo Sun May 24 11:24:19 2020
@@ -1,15 +1,7 @@
-$NetBSD: distinfo,v 1.29 2020/02/22 13:10:22 pgoyette Exp $
+$NetBSD: distinfo,v 1.30 2020/05/24 11:24:19 rillig Exp $
-SHA1 (xosview-1.8.3.tar.gz) = 420fd0620ff9fb9ba83fc833eeb8b872414e377e
-RMD160 (xosview-1.8.3.tar.gz) = 595e812dee686ccaa5d95eb537782679d752271b
-SHA512 (xosview-1.8.3.tar.gz) = 196dc66f4a20c6cd9663f82e613f0039ee09cfe565867dc68e3c29b8dc6be4037ad26f10a8a7f36e9b80fb5ab406592a30254840b473861be836e44503fd94a5
-Size (xosview-1.8.3.tar.gz) = 259793 bytes
-SHA1 (patch-aa) = 7d24ba9b1caab1968bb49ba1da4d850fcf615b08
-SHA1 (patch-ab) = 2bc4ca0772c931dc208edb99158e7f7ae7261b3b
-SHA1 (patch-ac) = 3e9073c4ccd7e08d29a76b08f2ed0c7f9f9d9ede
-SHA1 (patch-ad) = 02ae8395e200e5cbf8d6339eced33fe5aa421d38
-SHA1 (patch-ae) = 6ff69eeffd40ec4ee3686f2069fd46853f346fff
-SHA1 (patch-af) = c556f02c7d8297968a78eb087f413f9472371c54
-SHA1 (patch-configure) = 903afa94aeee2d687f0341c08bca7b163849249d
-SHA1 (patch-linux_lmstemp.cc) = d46c27884963901d0e5f5bed7cc880dc7fddc01c
-SHA1 (patch-sunos5_diskmeter.cc) = 99e119cb645c9982f2a116950ac2ffe84eeff1d4
+SHA1 (xosview-1.22.tar.gz) = 47bf5fe6f61ac828bc7707abec0c1e4bb8da9e13
+RMD160 (xosview-1.22.tar.gz) = 217ec543afee8b77bb36ad639c872a5af3b660a6
+SHA512 (xosview-1.22.tar.gz) = 40e668ff1d142b6986ea5d50475d4c82523c62269d328d2f6001c651808d9b5194ccd6f144fd0ff791110302c91688126aca5762d6645d9dbc3819cd15df343b
+Size (xosview-1.22.tar.gz) = 147492 bytes
+SHA1 (patch-bsd_kernel.cc) = 78a1ff699c2ef3da1b312d97ad1ce5591ca0df72
Added files:
Index: pkgsrc/sysutils/xosview/patches/patch-bsd_kernel.cc
diff -u /dev/null pkgsrc/sysutils/xosview/patches/patch-bsd_kernel.cc:1.1
--- /dev/null Sun May 24 11:24:19 2020
+++ pkgsrc/sysutils/xosview/patches/patch-bsd_kernel.cc Sun May 24 11:24:19 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-bsd_kernel.cc,v 1.1 2020/05/24 11:24:19 rillig Exp $
+
+Don't fail for unprivileged users.
+
+--- bsd/kernel.cc.orig 2020-02-22 19:33:08.000000000 +0000
++++ bsd/kernel.cc
+@@ -219,8 +219,10 @@ OpenKDIfNeeded() {
+ * that kernel file. Otherwise, use the default kernel, by
+ * specifying NULL. */
+ if ((kd = kvm_openfiles((kernelFileName[0] ? kernelFileName : NULL),
+- NULL, NULL, O_RDONLY, errstring)) == NULL)
+- err(EX_OSFILE, "OpenKDIfNeeded(): %s", errstring);
++ NULL, NULL, O_RDONLY, errstring)) == NULL) {
++ warn("OpenKDIfNeeded(): %s", errstring);
++ return;
++ }
+
+ // Parenthetical note: FreeBSD kvm_openfiles() uses getbootfile() to get
+ // the correct kernel file if the 1st arg is NULL. As far as I can see,
Home |
Main Index |
Thread Index |
Old Index