pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11 xview*: explicitly require font-sun-misc for corre...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3eab2af0d60a
branches:  trunk
changeset: 377122:3eab2af0d60a
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Sun Apr 17 01:44:23 2022 +0000

description:
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.

diffstat:

 x11/xview-clients/Makefile  |  4 ++--
 x11/xview-lib/Makefile      |  6 ++++--
 x11/xview-lib/buildlink3.mk |  4 ++--
 x11/xview/DESCR             |  5 ++++-
 x11/xview/Makefile          |  6 +++---
 5 files changed, 15 insertions(+), 10 deletions(-)

diffs (91 lines):

diff -r d0522303fba7 -r 3eab2af0d60a x11/xview-clients/Makefile
--- a/x11/xview-clients/Makefile        Sun Apr 17 00:26:14 2022 +0000
+++ b/x11/xview-clients/Makefile        Sun Apr 17 01:44:23 2022 +0000
@@ -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}
 
diff -r d0522303fba7 -r 3eab2af0d60a x11/xview-lib/Makefile
--- a/x11/xview-lib/Makefile    Sun Apr 17 00:26:14 2022 +0000
+++ b/x11/xview-lib/Makefile    Sun Apr 17 01:44:23 2022 +0000
@@ -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 @@
 
 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
diff -r d0522303fba7 -r 3eab2af0d60a x11/xview-lib/buildlink3.mk
--- a/x11/xview-lib/buildlink3.mk       Sun Apr 17 00:26:14 2022 +0000
+++ b/x11/xview-lib/buildlink3.mk       Sun Apr 17 01:44:23 2022 +0000
@@ -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 @@
 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"
diff -r d0522303fba7 -r 3eab2af0d60a x11/xview/DESCR
--- a/x11/xview/DESCR   Sun Apr 17 00:26:14 2022 +0000
+++ b/x11/xview/DESCR   Sun Apr 17 01:44:23 2022 +0000
@@ -12,4 +12,7 @@
 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.
diff -r d0522303fba7 -r 3eab2af0d60a x11/xview/Makefile
--- a/x11/xview/Makefile        Sun Apr 17 00:26:14 2022 +0000
+++ b/x11/xview/Makefile        Sun Apr 17 01:44:23 2022 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index