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

9 files changed, 36 insertions, 165 deletions

diff --git a/x11/motif/Makefile b/x11/motif/Makefile
index 1803c77e789..8e777c6c9d4 100644
--- a/x11/motif/Makefile
+++ b/x11/motif/Makefile
@@ -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
 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: XCore.3:g'
 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; \
diff --git a/x11/motif/PLIST b/x11/motif/PLIST
index 03c83b62cce..9e12ceb8e19 100644
--- a/x11/motif/PLIST
+++ b/x11/motif/PLIST
@@ -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
diff --git a/x11/motif/distinfo b/x11/motif/distinfo
index d007abd71e5..d44791d0b09 100644
--- a/x11/motif/distinfo
+++ b/x11/motif/distinfo
@@ -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
diff --git a/x11/motif/patches/patch-Makefile.am b/x11/motif/patches/patch-Makefile.am
deleted file mode 100644
index 6b03414db38..00000000000
--- a/x11/motif/patches/patch-Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.am,v 1.1 2012/11/10 17:10:10 ryoon Exp $
-
-* Do not build demo
-
---- Makefile.am.orig	2012-10-22 14:50:38.000000000 +0000
-+++ Makefile.am
-@@ -28,7 +28,7 @@ SUBDIRS	= bindings bitmaps \
-              include \
-              tools \
-              clients \
--             doc \
--             demos
-+             doc
-+
- AUTOMAKE_OPTIONS = 1.4
- ACLOCAL_AMFLAGS = -I .
diff --git a/x11/motif/patches/patch-Makefile.in b/x11/motif/patches/patch-Makefile.in
new file mode 100644
index 00000000000..db75a9aa57a
--- /dev/null
+++ b/x11/motif/patches/patch-Makefile.in
@@ -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 .
diff --git a/x11/motif/patches/patch-acinclude.m4 b/x11/motif/patches/patch-acinclude.m4
deleted file mode 100644
index efe8698a5ba..00000000000
--- a/x11/motif/patches/patch-acinclude.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-acinclude.m4,v 1.1 2013/09/08 07:23:56 ryoon Exp $
-
-* Fix build under OS X 10.8.4 with clang.
-  http://bugs.motifzone.net/show_bug.cgi?id=1625
-
---- acinclude.m4.orig	2012-10-22 14:50:39.000000000 +0000
-+++ acinclude.m4
-@@ -3,6 +3,7 @@ dnl This file provides the following mac
- dnl
- dnl     LT_LIB_XTHREADS
- dnl	AM_FUNC_VOID_SPRINTF
-+dnl	WEAK_ALIAS_SUPPORT
- dnl
- 
- dnl This should be the canonical approach to check for XTHREADS.
-@@ -57,6 +58,22 @@ if test $ac_cv_func_void_sprintf = no; t
- fi
- ])
- 
-+dnl This tests whether weak aliases are supported.
-+AC_DEFUN([WEAK_ALIAS_SUPPORT],
-+[AC_CACHE_CHECK(whether weak aliases are supported, ac_cv_weak_alias_support,
-+[AC_TRY_COMPILE([
-+int get_value(int *value) {
-+  return *value;
-+}
-+int get_value_alias(int *high) __attribute__((__weak__,alias("get_value")));
-+],
-+[],
-+ac_cv_weak_alias_support=yes,
-+ac_cv_weak_alias_support=no)])
-+if test $ac_cv_weak_alias_support = no; then
-+  AC_DEFINE(NO_WEAK_ALIASES,1,[Define if weak aliases are not supported])
-+fi
-+])
- 
- dnl
- dnl End of special macros.
diff --git a/x11/motif/patches/patch-autogen.sh b/x11/motif/patches/patch-autogen.sh
deleted file mode 100644
index e3c5b114729..00000000000
--- a/x11/motif/patches/patch-autogen.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-autogen.sh,v 1.1 2014/11/27 13:30:04 joerg Exp $
-
---- autogen.sh.orig	2014-11-26 13:30:56.000000000 +0000
-+++ autogen.sh
-@@ -12,13 +12,3 @@ aclocal -I .
- autoconf
- autoheader
- automake --foreign  --include-deps --add-missing
--
--if test -z "$*"; then
--        echo "I am going to run ./configure with no arguments - if you wish "
--        echo "to pass any to it, please specify them on the $0 command line."
--fi
--
--cd "$THEDIR"
--
--$srcdir/configure "$@"
--
diff --git a/x11/motif/patches/patch-configure.ac b/x11/motif/patches/patch-configure.ac
deleted file mode 100644
index 1d1d8c81433..00000000000
--- a/x11/motif/patches/patch-configure.ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.3 2013/10/20 17:46:16 joerg Exp $
-
-* Second part: fix build under OS X 10.8.4 with clang.
-  http://bugs.motifzone.net/show_bug.cgi?id=1625
-
---- configure.ac.orig	2012-10-22 14:50:39.000000000 +0000
-+++ configure.ac
-@@ -31,12 +31,11 @@ dnl Override a default in libtool.
- dnl
- dnl AC_DISABLE_STATIC
- 
--AM_CONFIG_HEADER(include/config.h lib/Xm/Xm.h)
-+AC_CONFIG_HEADERS(include/config.h lib/Xm/Xm.h)
- 
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
--AM_PROG_CC_STDC
- AM_PROG_LIBTOOL
- 
- AC_EXEEXT
-@@ -110,6 +109,7 @@ AC_TYPE_SIZE_T
- AC_HEADER_TIME
- AC_STRUCT_TM
- AC_TYPE_UID_T
-+WEAK_ALIAS_SUPPORT
- 
- dnl Checks for library functions.
- AC_FUNC_ALLOCA
-@@ -164,9 +164,6 @@ fi
- if test x$GCC = xyes
- then
-     CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
--    if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
--        CFLAGS="$CFLAGS -fno-tree-ter"
--    fi
- fi
- AC_DEFINE(NO_OL_COMPAT, 1, "No OL Compatability")
- 
diff --git a/x11/motif/patches/patch-lib_Xm_XmP.h b/x11/motif/patches/patch-lib_Xm_XmP.h
deleted file mode 100644
index e66d0c89f28..00000000000
--- a/x11/motif/patches/patch-lib_Xm_XmP.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-lib_Xm_XmP.h,v 1.1 2013/09/08 07:23:56 ryoon Exp $
-
-* Fix build under OS X 10.8.4 with clang.
-  http://bugs.motifzone.net/show_bug.cgi?id=1625
-
---- lib/Xm/XmP.h.orig	2012-10-22 14:50:35.000000000 +0000
-+++ lib/Xm/XmP.h
-@@ -1444,7 +1444,11 @@ extern void _XmDestroyParentCallback( 
- 
- #if __GNUC__
- #  define XM_DEPRECATED  __attribute__((__deprecated__))
-+#  ifdef NO_WEAK_ALIASES
-+#    define XM_ALIAS(sym)
-+#  else
- #  define XM_ALIAS(sym)  __attribute__((__weak__,alias(#sym)))
-+#  endif
- #else
- #  define XM_DEPRECATED
- #  define XM_ALIAS(sym)