CVS commit: pkgsrc/x11/lesstif

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Tue Feb 20 10:53:31 UTC 2018

Modified Files:
        pkgsrc/x11/lesstif: Makefile distinfo
Added Files:
        pkgsrc/x11/lesstif/patches: patch-include_Motif-2.1_Xm_XmAll.h

Log Message:
Don't include Xm/Print.h into Xm/All.h.

Xm/Print.h requires headers from libXp (which is dead, gone, not lamented)
and thus doesn't compile. Anything that specifically uses it is broken, as
is anything that assumes Xm/All.h will include it; but things that just use
Xm/All.h should not fail.

Such things include xpdf's configure script (PR 50039).

It isn't obvious to me why this package installs header files it
clearly never runs through the compiler, but for now at least that's
somebody else's problem.

PKGREVISION -> 6


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/x11/lesstif/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/lesstif/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/lesstif/patches/patch-include_Motif-2.1_Xm_XmAll.h

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

Modified files:

Index: pkgsrc/x11/lesstif/Makefile
diff -u pkgsrc/x11/lesstif/Makefile:1.104 pkgsrc/x11/lesstif/Makefile:1.105
--- pkgsrc/x11/lesstif/Makefile:1.104   Sat Jul  4 16:18:42 2015
+++ pkgsrc/x11/lesstif/Makefile Tue Feb 20 10:53:30 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2015/07/04 16:18:42 joerg Exp $
+# $NetBSD: Makefile,v 1.105 2018/02/20 10:53:30 dholland Exp $
 
 DISTNAME=      lesstif-0.95.2
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=lesstif/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/x11/lesstif/distinfo
diff -u pkgsrc/x11/lesstif/distinfo:1.18 pkgsrc/x11/lesstif/distinfo:1.19
--- pkgsrc/x11/lesstif/distinfo:1.18    Wed Nov  4 03:28:44 2015
+++ pkgsrc/x11/lesstif/distinfo Tue Feb 20 10:53:30 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2015/11/04 03:28:44 agc Exp $
+$NetBSD: distinfo,v 1.19 2018/02/20 10:53:30 dholland Exp $
 
 SHA1 (lesstif-0.95.2.tar.bz2) = b894e544d529a235a6a665d48ca94a465f44a4e5
 RMD160 (lesstif-0.95.2.tar.bz2) = 643fd81b70b6e8617803ddc4350272ca89b4a71f
@@ -13,3 +13,4 @@ SHA1 (patch-aq) = a238d0be4d69d16e964651
 SHA1 (patch-ar) = e4aefbc8c31bece408185d6bd9266f11d6852f7c
 SHA1 (patch-bm) = b32febe539b375a0ea8adfddeec01588927f9046
 SHA1 (patch-bn) = f96d95358a76db1a371bfc3ea7a3ba6b9d1d536f
+SHA1 (patch-include_Motif-2.1_Xm_XmAll.h) = c1d6ba9b36151ab01f6751916f38357c8f1929e6

Added files:

Index: pkgsrc/x11/lesstif/patches/patch-include_Motif-2.1_Xm_XmAll.h
diff -u /dev/null pkgsrc/x11/lesstif/patches/patch-include_Motif-2.1_Xm_XmAll.h:1.1
--- /dev/null   Tue Feb 20 10:53:31 2018
+++ pkgsrc/x11/lesstif/patches/patch-include_Motif-2.1_Xm_XmAll.h       Tue Feb 20 10:53:30 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-include_Motif-2.1_Xm_XmAll.h,v 1.1 2018/02/20 10:53:30 dholland Exp $
+
+Don't include Xm/Print.h in Xm/XmAll.h, because it requires headers from
+libXp that do not exist any longer.
+
+For some reason leaving this in does not make the lesstif build fail;
+it only causes failures for (some) users of lesstif.
+
+
+--- include/Motif-2.1/Xm/XmAll.h~      2002-04-26 20:33:00.000000000 +0000
++++ include/Motif-2.1/Xm/XmAll.h
+@@ -76,12 +76,12 @@
+ #include <Xm/Manager.h>
+ #include <Xm/Notebook.h>
+ #include <Xm/Primitive.h>
+-#include <Xm/Print.h>
++/*#include <Xm/Print.h>*/
+ #include <Xm/SpinB.h>
+ #include <Xm/Transfer.h>
+ 
+ /* 2.1 stuff */
+-#include <Xm/Print.h>
++/*#include <Xm/Print.h>*/
+ #include <Xm/SSpinB.h>
+ 
+ #endif /* _XM_XMALL_H */