Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_165015986329340"
MIME-Version: 1.0
Date: Sun, 17 Apr 2022 01:44:23 +0000
From: "David H. Gutteridge" <gutteridge@netbsd.org>
Subject: CVS commit: pkgsrc/x11
To: pkgsrc-changes@NetBSD.org
Reply-To: gutteridge@netbsd.org
Message-Id: <20220417014424.04389FB19@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_165015986329340
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Sun Apr 17 01:44:23 UTC 2022

Modified Files:
	pkgsrc/x11/xview: DESCR Makefile
	pkgsrc/x11/xview-clients: Makefile
	pkgsrc/x11/xview-lib: Makefile buildlink3.mk

Log Message:
xview*: explicitly require font-sun-misc for correct operation

Without the expected fonts, fundamental graphical content like icons
goes missing, and the X server may fail to start, at that.

XXX I tested on NetBSD 9.2_STABLE amd64 and i386. On amd64, this
crashes the X server for me, while it works fine on i386. The package
was already marked not for Alpha, so that may be a clue that it's not
64-bit clean in general, though some of the original commentary about
Alpha sounded quite specific.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xview/DESCR
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/xview/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/xview-clients/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/xview-lib/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xview-lib/buildlink3.mk

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


--_----------=_165015986329340
Content-Disposition: inline
Content-Length: 3780
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/xview/DESCR
diff -u pkgsrc/x11/xview/DESCR:1.2 pkgsrc/x11/xview/DESCR:1.3
--- pkgsrc/x11/xview/DESCR:1.2	Tue May  6 17:43:15 2003
+++ pkgsrc/x11/xview/DESCR	Sun Apr 17 01:44:23 2022
@@ -12,4 +12,7 @@ Programmer's Interface (API) that is str
 This package does not contain anything by itself -- it is a "meta-package"
 that depends on other XView packages.  Its sole purpose is to require
 dependencies so users can install this package only and have all the XView
-stuff pulled in by the port/package dependency mechanism.
+stuff pulled in by the package dependency mechanism.
+
+Note that fonts from fonts/font-sun-misc must be in your X server's font
+path in order for any XView clients to be usable.

Index: pkgsrc/x11/xview/Makefile
diff -u pkgsrc/x11/xview/Makefile:1.25 pkgsrc/x11/xview/Makefile:1.26
--- pkgsrc/x11/xview/Makefile:1.25	Sat Jul  4 16:18:44 2015
+++ pkgsrc/x11/xview/Makefile	Sun Apr 17 01:44:23 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2015/07/04 16:18:44 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2022/04/17 01:44:23 gutteridge Exp $
 #
 
 DISTNAME=	xview3.2p1-X11R6
 PKGNAME=	xview-3.2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -14,7 +14,7 @@ COMMENT=	OpenLook Toolkit meta-package
 META_PACKAGE=		# empty
 
 DEPENDS+=	xview-config>=3.2.1:../../x11/xview-config
-DEPENDS+=	xview-lib>=3.2.1:../../x11/xview-lib
+DEPENDS+=	xview-lib>=3.2.1nb11:../../x11/xview-lib
 DEPENDS+=	xview-clients>=3.2.1:../../x11/xview-clients
 
 NOT_FOR_PLATFORM=	*-*-alpha       # broken va_arg handling in xview-lib

Index: pkgsrc/x11/xview-clients/Makefile
diff -u pkgsrc/x11/xview-clients/Makefile:1.39 pkgsrc/x11/xview-clients/Makefile:1.40
--- pkgsrc/x11/xview-clients/Makefile:1.39	Thu May 23 19:23:24 2019
+++ pkgsrc/x11/xview-clients/Makefile	Sun Apr 17 01:44:23 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2019/05/23 19:23:24 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2022/04/17 01:44:23 gutteridge Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-clients-3.2.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 

Index: pkgsrc/x11/xview-lib/Makefile
diff -u pkgsrc/x11/xview-lib/Makefile:1.43 pkgsrc/x11/xview-lib/Makefile:1.44
--- pkgsrc/x11/xview-lib/Makefile:1.43	Sat Nov  6 13:55:04 2021
+++ pkgsrc/x11/xview-lib/Makefile	Sun Apr 17 01:44:23 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2021/11/06 13:55:04 mef Exp $
+# $NetBSD: Makefile,v 1.44 2022/04/17 01:44:23 gutteridge Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-lib-3.2.1
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -11,6 +11,8 @@ COMMENT=		OpenLook Toolkit libs, include
 
 MAKE_JOBS_SAFE=		no
 
+# Not functional without fundamental images from font-sun-misc.
+DEPENDS+=		font-sun-misc>=1.0.3:../../fonts/font-sun-misc
 DEPENDS+=		xview-config>=3.2.1nb6:../../x11/xview-config
 
 LICENSE=		sun-openlook-license

Index: pkgsrc/x11/xview-lib/buildlink3.mk
diff -u pkgsrc/x11/xview-lib/buildlink3.mk:1.12 pkgsrc/x11/xview-lib/buildlink3.mk:1.13
--- pkgsrc/x11/xview-lib/buildlink3.mk:1.12	Sun Jan  7 13:04:44 2018
+++ pkgsrc/x11/xview-lib/buildlink3.mk	Sun Apr 17 01:44:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:44 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2022/04/17 01:44:23 gutteridge Exp $
 
 BUILDLINK_TREE+=	xview-lib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xview-lib
 XVIEW_LIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xview-lib+=	xview-lib>=3.2.1
-BUILDLINK_ABI_DEPENDS.xview-lib+=	xview-lib>=3.2.1nb8
+BUILDLINK_ABI_DEPENDS.xview-lib+=	xview-lib>=3.2.1nb11
 BUILDLINK_PKGSRCDIR.xview-lib?=		../../x11/xview-lib
 
 .include "../../x11/libX11/buildlink3.mk"


--_----------=_165015986329340--