From 7e495ad3445c9fcfec5226cb6c91b546930d965f Mon Sep 17 00:00:00 2001 From: Tim Hentenaar Date: Fri, 17 Apr 2026 19:04:48 -0400 Subject: [PATCH] x11/openmotif: Obsolete this in favor of x11/motif --- x11/openmotif/Portfile | 66 +------------------ .../files/clang-unsupported-cflags.patch | 12 ---- x11/openmotif/files/include-stdlib.patch | 59 ----------------- x11/openmotif/files/patch-lib-xm-vendor.diff | 59 ----------------- x11/openmotif/files/wcs-functions.patch | 11 ---- 5 files changed, 3 insertions(+), 204 deletions(-) delete mode 100644 x11/openmotif/files/clang-unsupported-cflags.patch delete mode 100644 x11/openmotif/files/include-stdlib.patch delete mode 100644 x11/openmotif/files/patch-lib-xm-vendor.diff delete mode 100644 x11/openmotif/files/wcs-functions.patch diff --git a/x11/openmotif/Portfile b/x11/openmotif/Portfile index 618186ca989..876384deaee 100644 --- a/x11/openmotif/Portfile +++ b/x11/openmotif/Portfile @@ -1,72 +1,12 @@ # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 PortSystem 1.0 +PortGroup obsolete 1.0 +replaced_by motif name openmotif version 2.3.8 -revision 5 +revision 6 categories x11 -license LGPL -maintainers nomaintainer -description The Open Motif toolkit for X11 - -long_description This is The Open Group's full version of the Motif user \ - interface component toolkit based on the original OSF sources. - homepage https://motif.ics.com/ -master_sites sourceforge:project/motif/Motif%20${version}%20Source%20Code -distname motif-${version} -checksums rmd160 a4c10db68d880d3096c97cc1c995351616a90a57 \ - sha256 859b723666eeac7df018209d66045c9853b50b4218cecadb794e2359619ebce7 \ - size 5704328 - -depends_build port:pkgconfig \ - port:xbitmaps \ - port:bison \ - port:flex - -depends_lib path:include/turbojpeg.h:libjpeg-turbo \ - port:fontconfig \ - port:freetype \ - port:libpng \ - port:libiconv \ - port:Xft2 \ - port:xorg-libice \ - port:xorg-libsm \ - port:xorg-libX11 \ - port:xorg-libXext \ - port:xorg-libXmu \ - port:xorg-libXp \ - port:xorg-libXt \ - port:xrender - -patchfiles wcs-functions.patch \ - include-stdlib.patch \ - patch-lib-xm-vendor.diff - -# See https://trac.macports.org/ticket/42847 -if {[string match "*clang*" ${configure.compiler}]} { - patchfiles-append clang-unsupported-cflags.patch - - # error: incompatible function pointer types passing 'void (char *)' - # to parameter of type 'void (*)(String) __attribute__((noreturn))' - # XtSetErrorHandler (WmXtErrorHandler) - # But adding this flag unconditionally breaks build with gcc-4.2. - configure.cflags-append -Wno-error=incompatible-function-pointer-types -} - -configure.args --enable-xft \ - --enable-jpeg \ - --enable-png \ - --x-includes=${prefix}/include \ - --x-libraries=${prefix}/lib - -configure.env "YACC=${prefix}/bin/bison -y" - -post-destroot { - set docdir ${prefix}/share/doc/${name} - xinstall -d ${destroot}${docdir} - xinstall -m 0644 -W ${worksrcpath} BUGREPORT COPYING ChangeLog \ - README RELNOTES TODO ${destroot}${docdir} -} diff --git a/x11/openmotif/files/clang-unsupported-cflags.patch b/x11/openmotif/files/clang-unsupported-cflags.patch deleted file mode 100644 index c3ae36aa56c..00000000000 --- a/x11/openmotif/files/clang-unsupported-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.orig 2017-12-05 23:49:56.000000000 +1100 -+++ configure 2018-01-02 13:49:42.000000000 +1100 -@@ -14840,9 +14840,6 @@ - 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 - - $as_echo "#define NO_OL_COMPAT 1" >>confdefs.h diff --git a/x11/openmotif/files/include-stdlib.patch b/x11/openmotif/files/include-stdlib.patch deleted file mode 100644 index 61cb6b27fdf..00000000000 --- a/x11/openmotif/files/include-stdlib.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- ./demos/unsupported/xmform/xmform.c.orig 2016-03-16 02:10:08.000000000 +0000 -+++ ./demos/unsupported/xmform/xmform.c 2020-09-03 10:45:32.000000000 +0100 -@@ -50,6 +50,7 @@ - xmform*bottomShadowColor: black - ***-------------------------------------------------------------------*/ - -+#include - #include - #include - #include - - - -See https://sourceforge.net/p/motif/code/merge-requests/2/ -and https://sourceforge.net/p/motif/code/merge-requests/3/ - -# Commented out acinclude.m4 patch to avoid the build trying to run aclocal-1.15 -#--- acinclude.m4.orig -#+++ acinclude.m4 -#@@ -18,6 +18,9 @@ -# CFLAGS="$X_CFLAGS $CFLAGS" -# CPPFLAGS="$X_CFLAGS $CPPFLAGS" -# AC_TRY_RUN([ -#+#ifdef HAVE_STDLIB_H -#+#include -#+#endif -# #include -# int main() { -# Boolean brc; -#@@ -50,7 +53,7 @@ -# AC_DEFUN([AM_FUNC_VOID_SPRINTF], -# [AC_CACHE_CHECK(whether sprintf returns void, ac_cv_func_void_sprintf, -# [AC_TRY_RUN([#include -#-int sprintf(); main() { exit(sprintf(".")); }], -#+int main() { char buf[1]; int i = sprintf(buf, ""); return 0; } -# ac_cv_func_void_sprintf=no, ac_cv_func_void_sprintf=yes, ac_cv_func_void_sprintf=yes)]) -# if test $ac_cv_func_void_sprintf = no; then -# AC_DEFINE(VOID_SPRINTF,1, ---- configure.orig -+++ configure -@@ -13172,6 +13172,9 @@ - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -+#ifdef HAVE_STDLIB_H -+#include -+#endif - #include - int main() { - Boolean brc; -@@ -14655,7 +14658,7 @@ - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include --int sprintf(); main() { exit(sprintf(".")); } -+int main() { char buf[1]; int i = sprintf(buf, ""); return 0; } - _ACEOF - if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_void_sprintf=no diff --git a/x11/openmotif/files/patch-lib-xm-vendor.diff b/x11/openmotif/files/patch-lib-xm-vendor.diff deleted file mode 100644 index fdfc75d60a8..00000000000 --- a/x11/openmotif/files/patch-lib-xm-vendor.diff +++ /dev/null @@ -1,59 +0,0 @@ -Required to override libXt symbols when using two-level namespace. ---- lib/Xm/VendorS.c.orig 2017-08-31 07:12:38 -+++ lib/Xm/VendorS.c 2024-05-23 00:06:39 -@@ -48,10 +48,6 @@ - #include - #include /* for bzero */ - #include --#if defined(__APPLE__) --#include --#include --#endif - #include "BaseClassI.h" - #include "CallbackI.h" - #include "ExtObjectI.h" -@@ -295,24 +291,6 @@ - - static Display * _XmDisplayHandle = NULL ; - static XtErrorMsgHandler previousWarningHandler = NULL; -- -- --#if defined(__APPLE__) --/* Hack necessary to handle Apple two-level namespaces */ --extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */ --extern VendorShellClassRec xmVendorShellClassRec; --#define vendorShellClassRec xmVendorShellClassRec -- --__attribute__((constructor)) --static void __VendorShellHack(void) --{ -- vendorShellWidgetClass = (WidgetClass)(&xmVendorShellClassRec); -- transientShellWidgetClass->core_class.superclass = vendorShellWidgetClass; -- topLevelShellWidgetClass->core_class.superclass = vendorShellWidgetClass; -- xmGrabShellWidgetClass->core_class.superclass = vendorShellWidgetClass; -- xmDragOverShellWidgetClass->core_class.superclass = vendorShellWidgetClass; --} --#endif - - - /*************************************************************************** -@@ -475,6 +453,9 @@ - GetValuesPosthook, /* get_values_posthook */ - }; - -+#if defined(__APPLE__) -+__attribute__((weak)) -+#endif - externaldef(vendorshellclassrec) - VendorShellClassRec vendorShellClassRec = { - { -@@ -529,6 +510,9 @@ - } - }; - -+#if defined(__APPLE__) -+__attribute__((weak)) -+#endif - externaldef(vendorshellwidgetclass) WidgetClass - vendorShellWidgetClass = (WidgetClass) (&vendorShellClassRec); - diff --git a/x11/openmotif/files/wcs-functions.patch b/x11/openmotif/files/wcs-functions.patch deleted file mode 100644 index bb73faca731..00000000000 --- a/x11/openmotif/files/wcs-functions.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Xm/TextF.c.orig 2017-08-22 01:27:47.000000000 +0100 -+++ lib/Xm/TextF.c 2020-09-03 10:19:13.000000000 +0100 -@@ -82,7 +82,7 @@ - #define FIX_1409 - - #if (defined(__FreeBSD__) && (__FreeBSD__ < 4)) || \ -- (defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__)) -+ (defined(__NetBSD__) || defined(__OpenBSD__)) - /* - * Modification by Integrated Computer Solutions, Inc. May 2000 - *