[pkgsrc/trunk]: pkgsrc/sysutils/xfm Add a distfile patch to handle pervasive ...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0200e88ef02
branches:  trunk
changeset: 325799:e0200e88ef02
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Nov 26 06:52:22 2018 +0000

description:
Add a distfile patch to handle pervasive LP64 problems.
Also include assorted cleanup: don't use sprintf, don't use getwd,
fix some 32-bit file size truncations I noticed, use standard
functions and headers, etc.

patch-ac has been rolled into the distfile patch, but (for now anyway)
not the others.

Use tradcpp to produce the app-defaults file (and an install script)
as otherwise these were getting mangled.

PR 52739.

This makes it no longer segfault calling XtVaSetValues() on all LP64
platforms. But, unfortunately, for me it's still crashing, and I'm out
of available time to chase the problem further.

The symptom is that it crashes with a bad font pointer in the
Initialize code of its TextField widget, which seems to be because
something overwrites some X resource strings with garbage so the font
doesn't get set. I think. This seems to be happening from inside libXt.

Disabling libXaw3d (which there isn't a straightforward pkgsrc hook
for) makes it run, or at least start, so I think it's a net
improvement.

diffstat:

 sysutils/xfm/Makefile         |   9 ++++++++-
 sysutils/xfm/distinfo         |   7 +++++--
 sysutils/xfm/patches/patch-ac |  16 ----------------
 3 files changed, 13 insertions(+), 19 deletions(-)

diffs (77 lines):

diff -r 5b15db1ac822 -r e0200e88ef02 sysutils/xfm/Makefile
--- a/sysutils/xfm/Makefile     Sun Nov 25 23:46:37 2018 +0000
+++ b/sysutils/xfm/Makefile     Mon Nov 26 06:52:22 2018 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.19 2015/10/14 20:17:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/11/26 06:52:22 dholland Exp $
 
 DISTNAME=      xfm-1.4.3
 PKGREVISION=   4
 CATEGORIES=    sysutils x11
 MASTER_SITES=  http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 
+PATCHFILES=    xfm-jumbo-patch-20181125.gz
+PATCH_SITES=   http://www.NetBSD.org/~dholland/patchkits/xfm/
+PATCH_DIST_STRIP= -p1
+
 MAINTAINER=    rxg%NetBSD.org@localhost
 HOMEPAGE=      http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
 COMMENT=       The X File Manager
@@ -13,6 +17,7 @@
 BUILD_TARGET+= all xfm.install.script Xfm.ad
 
 USE_IMAKE=     YES
+IMAKEOPTS=     -DCppCmd=tradcpp
 # does not directly support Xaw3d
 .PHONY: buildlink-Xaw3d-inc-hack
 pre-configure: buildlink-Xaw3d-inc-hack
@@ -21,6 +26,8 @@
        cd ${BUILDLINK_DIR}/include/X11 && ln -s Xaw3d Xaw
 #BUILDLINK_TRANSFORM+=           l:Xaw:Xaw3d
 
+TOOL_DEPENDS+= tradcpp>=0.5.2:../../devel/tradcpp
+
 .include "../../x11/libXaw3d/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5b15db1ac822 -r e0200e88ef02 sysutils/xfm/distinfo
--- a/sysutils/xfm/distinfo     Sun Nov 25 23:46:37 2018 +0000
+++ b/sysutils/xfm/distinfo     Mon Nov 26 06:52:22 2018 +0000
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:32:41 agc Exp $
+$NetBSD: distinfo,v 1.9 2018/11/26 06:52:22 dholland Exp $
 
 SHA1 (xfm-1.4.3.tar.gz) = 8d6235bb63e04491cc99603144b52884866b39e2
 RMD160 (xfm-1.4.3.tar.gz) = b06c562b467e5085e5ecdd4273b64d554415ce69
 SHA512 (xfm-1.4.3.tar.gz) = 8d81a50c474712745d1d1fe6e84d772fd2faba6db31bec2bade799923d9455d772cd1b7cc68bd8014e0ab9f2840117ead0eb959945f800e13a62824d82c8955d
 Size (xfm-1.4.3.tar.gz) = 420962 bytes
+SHA1 (xfm-jumbo-patch-20181125.gz) = def1eb43063dcdf5f2c885410f083573e4d1cd83
+RMD160 (xfm-jumbo-patch-20181125.gz) = 0d6c70e6b3925050166d4bb48335e8a3e76a6891
+SHA512 (xfm-jumbo-patch-20181125.gz) = 2e09e55dbbd99006b1e4e134b9c4749f3ee743c699cf346c2b9625ef69b3d338bfd268697fc63038b9d3b55de60365e7c8d148f9ae4309d8fb614b8bf3653105
+Size (xfm-jumbo-patch-20181125.gz) = 25181 bytes
 SHA1 (patch-aa) = 24ce4e78b18356db98ed2588f8da48380e1efd20
 SHA1 (patch-ab) = b8c1cff37974fee67272e1f7befe345654ceb819
-SHA1 (patch-ac) = 40a32177cc5b64a49a51ea9c77062bfdc77da75d
 SHA1 (patch-ad) = 64709ecb67e91d8677545a7af54fa205079a77fd
 SHA1 (patch-ae) = 9e2a79a0a7becdca8bcdb30da457ef7b25ccd22d
 SHA1 (patch-af) = 075d38b00064ef6a853e62268e07a0432b1a7710
diff -r 5b15db1ac822 -r e0200e88ef02 sysutils/xfm/patches/patch-ac
--- a/sysutils/xfm/patches/patch-ac     Sun Nov 25 23:46:37 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $
-
---- src/FmErrors.c.orig        Tue Aug  1 09:19:16 2000
-+++ src/FmErrors.c     Tue Aug  1 09:20:09 2000
-@@ -21,11 +21,6 @@
- 
- #define LABEL_WIDTH 300
- 
--/* Uggh ...... */
--#ifndef linux
--extern char *sys_errlist[];
--#endif
--
- /*-----------------------------------------------------------------------------
-   STAIC DATA
- -----------------------------------------------------------------------------*/