CVS commit: pkgsrc/x11/motif

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Dec 22 09:42:41 UTC 2018

Modified Files:
        pkgsrc/x11/motif: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/motif/patches: patch-Makefile.in
Removed Files:
        pkgsrc/x11/motif/patches: patch-Makefile.am patch-acinclude.m4
            patch-autogen.sh patch-configure.ac patch-lib_Xm_XmP.h

Log Message:
motif: update to 2.3.8.

This is a bug fix release.

* Fixed bug 1660: TextField leaves a residual cursor shadow on focus lose
* Fixed bug 1659: Many cases of typos in horizontal/vertical conditions in the code
* Fixed bug 1658: motif does crash on OpenSuse Leap 42.2
* Fixed bug 1656: TabStack with tabSelectColor and Right causes BadMatch Error
* Fixed bug 1625: Open Motif build fails due to weak aliases on Darwin with cl
* Fixed bug 1655: Motif 2.3.6 and 2.3.4 do not work with XQuartz 2.7.9 and later
* Fixed bug 1652: Add support for more Cyrillic locales
* Fixed bug 1650: Memory leak in DataF.c
* Fixed bug 1651: motif-2.3.5 tarball contains lib/Xm/Xm.h file generated by configure
* Fixed bug 1665: Closing open menus with mouse click disables keyboard shortcut


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/motif/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/motif/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/motif/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/motif/patches/patch-Makefile.am \
    pkgsrc/x11/motif/patches/patch-acinclude.m4 \
    pkgsrc/x11/motif/patches/patch-autogen.sh \
    pkgsrc/x11/motif/patches/patch-lib_Xm_XmP.h
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/motif/patches/patch-Makefile.in
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/motif/patches/patch-configure.ac

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

Modified files:

Index: pkgsrc/x11/motif/Makefile
diff -u pkgsrc/x11/motif/Makefile:1.13 pkgsrc/x11/motif/Makefile:1.14
--- pkgsrc/x11/motif/Makefile:1.13      Mon Mar 12 11:15:54 2018
+++ pkgsrc/x11/motif/Makefile   Sat Dec 22 09:42:41 2018
@@ -1,28 +1,21 @@
-# $NetBSD: Makefile,v 1.13 2018/03/12 11:15:54 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/12/22 09:42:41 wiz Exp $
 
-PKGVER=                2.3.4
-PKGREVISION=   8
-DISTNAME=      motif-${PKGVER}-src
-PKGNAME=       motif-${PKGVER}
-CATEGORIES=    x11
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=motif/}
-EXTRACT_SUFX=  .tgz
+DISTNAME=              motif-2.3.8
+CATEGORIES=            x11
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=motif/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://motif.ics.com/
 COMMENT=               LGPLed Motif toolkit for the X Window System
 LICENSE=               gnu-lgpl-v2.1
 
-WRKSRC=                        ${WRKDIR}/motif-${PKGVER}
-
 .include "../../mk/bsd.prefs.mk"
 
 CONFLICTS+=            lesstif-[0-9]* openmotif-[0-9]*
 
 USE_LIBTOOL=           yes
-USE_TOOLS+=            flex gmake tbl pkg-config automake yacc
+USE_TOOLS+=            flex gmake tbl pkg-config yacc
 GNU_CONFIGURE=         yes
-MAKE_JOBS_SAFE=                no # PR 37233
 
 CFLAGS.SunOS+=         -Dsun
 
@@ -34,13 +27,13 @@ SUBST_SED.man_rename=               -e 's: Core.3: XC
 SUBST_SED.man_rename+=         -e 's: Object.3: XObject.3:g'
 SUBST_SED.man_rename+=         -e 's: Shell.3: XShell.3:g'
 
-CONFIGURE_ARGS+= \
-               --enable-jpeg --enable-png \
-               --with-libjpeg-includes=${JPEGBASE}/include \
-               --with-libjpeg-lib=${JPEGBASE}/lib \
-               --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \
-               --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib \
-               --x-libraries=${X11BASE}/lib
+CONFIGURE_ARGS+= --enable-jpeg
+CONFIGURE_ARGS+= --enable-png
+CONFIGURE_ARGS+= --with-libjpeg-includes=${JPEGBASE}/include
+CONFIGURE_ARGS+= --with-libjpeg-lib=${JPEGBASE}/lib
+CONFIGURE_ARGS+= --with-libpng-includes=${BUILDLINK_PREFIX.png}/include
+CONFIGURE_ARGS+= --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib
+CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
 
 CONFIGURE_ARGS+= --disable-printing
 
@@ -73,7 +66,6 @@ post-patch:
                        $${manpage} > $${manpage}.fixed;                \
                ${MV} -f $${manpage}.fixed $${manpage};                 \
        done;                                                           \
-       ${CP} -f man4/mwmrc.4 man5/mwmrc.5
        set -e; \
        cd ${WRKSRC}/doc/man/man3;                                      \
        for name in Core Object Shell; do                               \
@@ -88,9 +80,6 @@ post-patch:
        done
        ${ECHO} "#include <X11/Xos_r.h>" > ${WRKSRC}/lib/Xm/Xmos_r.h
 
-pre-configure:
-       set -e; cd ${WRKSRC} ; sh ./autogen.sh
-
 # Filter the manpages through tbl.
 post-build:
        set -e; \

Index: pkgsrc/x11/motif/PLIST
diff -u pkgsrc/x11/motif/PLIST:1.2 pkgsrc/x11/motif/PLIST:1.3
--- pkgsrc/x11/motif/PLIST:1.2  Tue Dec 29 06:07:40 2015
+++ pkgsrc/x11/motif/PLIST      Sat Dec 22 09:42:41 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/12/29 06:07:40 dholland Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/12/22 09:42:41 wiz Exp $
 bin/mwm
 bin/uil
 bin/xmbind
@@ -975,7 +975,7 @@ man/man3/XmVaCreateToggleButton.3
 man/man3/XmVaCreateToggleButtonGadget.3
 man/man3/XmWidgetGetBaselines.3
 man/man3/XmWidgetGetDisplayRect.3
+man/man4/mwmrc.4
 man/man5/Traits.5
 man/man5/UIL.5
 man/man5/WML.5
-man/man5/mwmrc.5

Index: pkgsrc/x11/motif/distinfo
diff -u pkgsrc/x11/motif/distinfo:1.7 pkgsrc/x11/motif/distinfo:1.8
--- pkgsrc/x11/motif/distinfo:1.7       Wed Nov  4 03:28:49 2015
+++ pkgsrc/x11/motif/distinfo   Sat Dec 22 09:42:41 2018
@@ -1,22 +1,18 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 03:28:49 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/12/22 09:42:41 wiz Exp $
 
-SHA1 (motif-2.3.4-src.tgz) = 49ecfe2a0939232ca78ce318d938044e7f751b6d
-RMD160 (motif-2.3.4-src.tgz) = 96e1ed3c5b99d420e3e2e4eae1b5590961191a33
-SHA512 (motif-2.3.4-src.tgz) = fb1033caa68f25b93282fa6700d5b7856be217b3651072d86e7c93a747df5b31219230998eb93deae22a8fa698e816b1a30e52b3ae88ae1c01c1f0aac59a2af2
-Size (motif-2.3.4-src.tgz) = 9527040 bytes
-SHA1 (patch-Makefile.am) = 3185b240e3d6a60d3c04fa90fafe1af020de6a15
-SHA1 (patch-acinclude.m4) = 71ee2d26411be9d195b22f74a328af8c1fcb5aab
-SHA1 (patch-autogen.sh) = b334bec55c0a4aa5f27470cc4ff6401d08419a30
+SHA1 (motif-2.3.8.tar.gz) = ca9d8d67544434c5883d8d0fb684a48f8b0108bd
+RMD160 (motif-2.3.8.tar.gz) = a4c10db68d880d3096c97cc1c995351616a90a57
+SHA512 (motif-2.3.8.tar.gz) = 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
+Size (motif-2.3.8.tar.gz) = 5704328 bytes
+SHA1 (patch-Makefile.in) = 9f4573cd47989a821ea616df53da924766fe3d39
 SHA1 (patch-clients_uil_UilDB.c) = 781b52e915e667eeb02359a51cfeefdb9556c4dd
 SHA1 (patch-clients_uil_UilDefI.h) = 6447a306809e65b4993d79e14a989a01aed2e0bc
 SHA1 (patch-clients_uil_UilDiags.c) = 39ac8307219b435baf3d1bf829809fcb6536b1a9
-SHA1 (patch-configure.ac) = a5bcdcf09478b23c4d5352c35c4a9cb64c2c0d73
 SHA1 (patch-doc_man_man3_Makefile.am) = b396f5e1235834f507a415c62b0efaa939943f1d
 SHA1 (patch-doc_man_man4_Makefile.am) = 154071494cf54a65e2e266861c81771a14156cae
 SHA1 (patch-doc_man_man5_Makefile.am) = 2f6e0cc239faf53e3391aef9da3def934023928e
 SHA1 (patch-lib_Xm_Scale.c) = d78669a3332ab9d7dd140a1a1d9532e065573c7b
 SHA1 (patch-lib_Xm_TextF.c) = 1bd1801d708ff2c832c131c9954b3bbfd444ed42
-SHA1 (patch-lib_Xm_XmP.h) = 31bd398e48286b013e991889f0adeaafb817de58
 SHA1 (patch-lib_Xm_Xmfuncs.h) = fef6a642988a8024da0bff00cdc40dc485695e2b
 SHA1 (patch-lib_Xm_Xmos.c) = 88af3627fad7c9ec40db0e8aca47e9617fe8c53b
 SHA1 (patch-lib_Xm_XpmI.h) = b27e0156bc2dd990a4d9642186b1638276054314

Added files:

Index: pkgsrc/x11/motif/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/x11/motif/patches/patch-Makefile.in:1.1
--- /dev/null   Sat Dec 22 09:42:41 2018
+++ pkgsrc/x11/motif/patches/patch-Makefile.in  Sat Dec 22 09:42:41 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.in,v 1.1 2018/12/22 09:42:41 wiz Exp $
+
+Do not build demos.
+
+--- Makefile.in.orig   2017-12-05 12:49:57.000000000 +0000
++++ Makefile.in
+@@ -390,8 +390,7 @@ SUBDIRS = bindings bitmaps \
+              include \
+              tools \
+              clients \
+-             doc \
+-             demos
++             doc
+ 
+ AUTOMAKE_OPTIONS = 1.4
+ ACLOCAL_AMFLAGS = -I .