xosview: Update to 1.23

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Dec 3 13:30:51 2021 +0100
Changeset:	898b0d25963512ecc88059e29368bf809b48b60b

Modified Files:
	xosview/DESCR
	xosview/Makefile
	xosview/PLIST
	xosview/distinfo

Log Message:
xosview: Update to 1.23

Patch removed (merged upstream).

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

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

diffstat:
 xosview/DESCR    |  3 +++
 xosview/Makefile | 54 +++++++++++++++++++++++++++++++-----------------------
 xosview/PLIST    |  4 +++-
 xosview/distinfo |  9 +++++----
 4 files changed, 42 insertions(+), 28 deletions(-)

diffs:
diff --git a/xosview/DESCR b/xosview/DESCR
index cc23700df7..12728f8bcf 100644
--- a/xosview/DESCR
+++ b/xosview/DESCR
@@ -1,3 +1,6 @@
 xosview (or XOsview, or XOSView, take your pick!) is an application
 originally developed by Mike Romberg for Linux.  It can be summarized
 as a graphical performance meter.
+
+Author: Mike Romberg <romberg%fsl.noaa.gov@localhost>
+(the 1.x branch is maintained by Mark Hills)
diff --git a/xosview/Makefile b/xosview/Makefile
index c2179da4e6..17f4f6720b 100644
--- a/xosview/Makefile
+++ b/xosview/Makefile
@@ -1,49 +1,57 @@
-# $NetBSD: Makefile,v 1.1 2015/05/03 18:48:58 bsiegert Exp $
+# $NetBSD$
 
-DISTNAME=	xosview-1.16
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.pogo.org.uk/~mark/xosview/releases/
+DISTNAME=	xosview-1.23
+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_X11BASE=	yes
-USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
-BUILD_TARGET=	xosview
+USE_LANGUAGES=	c gnu++03
 
-# FIXME
-MAKE_FLAGS+=	PLATFORM=bsd
-
-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.FreeBSD+=		-lkvm -ldevstat
+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"
-CPPFLAGS+=	-I${X11BASE}/include
-LIBS+=		-lsocket -lnsl
 .endif
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || \
-    ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD" || \
-    ${OPSYS} == "DragonFly"
+    ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
 SPECIAL_PERMS+=	bin/xosview ${REAL_ROOT_USER} kmem 2555
 .endif
 
-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"
diff --git a/xosview/PLIST b/xosview/PLIST
index 88e93afc05..3cb7d10ad0 100644
--- a/xosview/PLIST
+++ b/xosview/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2015/05/03 18:48:58 bsiegert 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
diff --git a/xosview/distinfo b/xosview/distinfo
index 5eeba57830..02d63ebc72 100644
--- a/xosview/distinfo
+++ b/xosview/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2015/05/03 18:48:58 bsiegert Exp $
+$NetBSD$
 
-RMD160 (xosview-1.16.tar.gz) = 2c83ed089931a5bec452eaa3251ed29212f415e7
-SHA512 (xosview-1.16.tar.gz) = f83cddebd260a5468110418172623d1367a50eeb69cdce63bff8e93a1908a2d6d860978f7d96eac700e238b270984df1802788400080ccd27ad76c964534e1c2
-Size (xosview-1.16.tar.gz) = 137097 bytes
+SHA1 (xosview-1.23.tar.gz) = 6866f562cf10f1b77e541626e9f6352259a56f6e
+RMD160 (xosview-1.23.tar.gz) = b4befaa7fad99b9411dea21fe80ccebdd1612003
+SHA512 (xosview-1.23.tar.gz) = b4313ff6473c7f1f89ba2cc9b8828cc25c7ab010a5f5c9b7602def77dbfdcbb5b0da57826919deb7be9000f6e1b5ed3801b2ad54c661b7d7bbc6c30f24f1a1a6
+Size (xosview-1.23.tar.gz) = 147356 bytes