Update to version 2.2.3.

PR:		65721
Submitted by:	KATO Tsuguru <tkato@prontomail.com>, deischen

6 files changed, 37 insertions, 73 deletions

diff --git a/x11-toolkits/open-motif/files/patch-Makefile.in b/x11-toolkits/open-motif/files/patch-Makefile.in
index e64ceb3ca654..ba164ee45ec4 100644
--- a/x11-toolkits/open-motif/files/patch-Makefile.in
+++ b/x11-toolkits/open-motif/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu Feb 14 23:15:46 2002
-+++ Makefile.in	Tue Sep  3 23:22:53 2002
-@@ -118,7 +118,7 @@
-              tools \
-              clients \
-              doc \
--             demos
-+             $(DEMOS)
+--- Makefile.in.orig	Tue Apr  6 13:50:25 2004
++++ Makefile.in	Thu Jul 29 21:14:05 2004
+@@ -101,7 +101,7 @@
+ MAINTAINERCLEANFILES = Makefile.in              configure libtool              config.guess              config.sub              config.log              ltconfig ltmain.sh              aclocal.m4              config.h.in              install-sh              missing mkinstalldirs
+ 
+ 
+-SUBDIRS = bindings bitmaps              config              localized              lib              include              tools              clients              doc              demos
++SUBDIRS = bindings bitmaps              config              localized              lib              include              tools              clients              doc              $(DEMOS)
  
  AUTOMAKE_OPTIONS = 1.4
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/x11-toolkits/open-motif/files/patch-clients::mwm::Makefile.in b/x11-toolkits/open-motif/files/patch-clients::mwm::Makefile.in
index 81ad052e8f2d..00534f284859 100644
--- a/x11-toolkits/open-motif/files/patch-clients::mwm::Makefile.in
+++ b/x11-toolkits/open-motif/files/patch-clients::mwm::Makefile.in
@@ -1,10 +1,11 @@
---- clients/mwm/Makefile.in.orig	Wed Oct 16 09:52:28 2002
-+++ clients/mwm/Makefile.in	Wed Oct 16 09:53:14 2002
-@@ -104,6 +104,7 @@
-            -DCDE_INSTALLATION_TOP=\"@CDE_INSTALLATION_TOP@\" \
-            -DCDE_CONFIGURATION_TOP=\"@CD_CONFIGURATION_TOP@\" \
-            -DBITMAPDIR=\"@INCDIR@/bitmaps\" \
-+           -DLIBDIR=\"@LIBDIR@\" \
-            -I$(srcdir)/../../lib ${X_CFLAGS}
+--- clients/mwm/Makefile.in.orig	Tue Apr  6 13:50:25 2004
++++ clients/mwm/Makefile.in	Thu Jul 29 21:16:47 2004
+@@ -104,7 +104,7 @@
+ bin_PROGRAMS = mwm
+ mwm_LDADD = ./WmWsmLib/libWsm.a ../../lib/Xm/libXm.la 
  
+-INCLUDES = -DLARGECURSORS -DR2_COMPAT -DUNMAP_ON_RESTART            -DCDE_INSTALLATION_TOP=\"@CDE_INSTALLATION_TOP@\"            -DCDE_CONFIGURATION_TOP=\"@CDE_CONFIGURATION_TOP@\"            -DBITMAPDIR=\"@INCDIR@/bitmaps\"            -I$(srcdir)/../../lib ${X_CFLAGS}
++INCLUDES = -DLARGECURSORS -DR2_COMPAT -DUNMAP_ON_RESTART            -DCDE_INSTALLATION_TOP=\"@CDE_INSTALLATION_TOP@\"            -DCDE_CONFIGURATION_TOP=\"@CDE_CONFIGURATION_TOP@\"            -DBITMAPDIR=\"@INCDIR@/bitmaps\"  -DLIBDIR=\"@LIBDIR@\"          -I$(srcdir)/../../lib ${X_CFLAGS}
  
+ 
+ SRCS1 = WmCDInfo.c	WmCDecor.c	WmCEvent.c 	WmCPlace.c	WmColormap.c	WmError.c 	WmEvent.c	WmFeedback.c		WmFunction.c	WmGraphics.c	WmIDecor.c 	WmIPlace.c	WmIconBox.c		WmKeyFocus.c	WmMain.c	WmManage.c 	WmProperty.c	WmResCvt.c 	WmResParse.c	WmResource.c	WmSignal.c	            	WmWinConf.c	WmWinInfo.c	WmWinList.c	WmWinState.c 	WmWsm.c		WmXSMP.c	version.c WmCmd.c WmImage.c WmInitWs.c WmMenu.c WmProtocol.c
diff --git a/x11-toolkits/open-motif/files/patch-demos::programs::Makefile.in b/x11-toolkits/open-motif/files/patch-demos::programs::Makefile.in
index 3b8815528135..b35114bbaae2 100644
--- a/x11-toolkits/open-motif/files/patch-demos::programs::Makefile.in
+++ b/x11-toolkits/open-motif/files/patch-demos::programs::Makefile.in
@@ -1,10 +1,11 @@
---- demos/programs/Makefile.in.orig	Thu Feb 14 23:15:54 2002
-+++ demos/programs/Makefile.in	Sat Sep  7 06:25:09 2002
-@@ -90,7 +90,6 @@
- YACC = @YACC@
- 
- SUBDIRS = airport \
--         animate \
-          drag_and_drop \
-          draw \
-          earth \
+--- demos/programs/Makefile.in.orig	Tue Apr  6 13:50:30 2004
++++ demos/programs/Makefile.in	Thu Jul 29 21:19:05 2004
+@@ -93,7 +93,7 @@
+ 
+ MAINTAINERCLEANFILES = Makefile.in
+ 
+-SUBDIRS = airport          animate          drag_and_drop          draw          earth          filemanager          fileview          getsubres          hellomotif          i18ninput          panner          periodic          piano          popups          sampler2_0          setdate          Exm          todo          workspace          hellomotifi18n          tooltips          ButtonBox          Column          FontSel          Outline          TabStack          Tree          ColorSel          DropDown          MultiList          IconB          Paned          pixmaps
++SUBDIRS = airport          animate          drag_and_drop          draw          earth          filemanager          fileview          getsubres          hellomotif          i18ninput          panner          periodic          piano          popups          sampler2_0          setdate          todo          workspace          hellomotifi18n          tooltips          ButtonBox          Column          FontSel          Outline          TabStack          Tree          ColorSel          DropDown          MultiList          IconB          Paned          pixmaps
+ 
+ 
+ EXTRA_DIST = Imakefile
diff --git a/x11-toolkits/open-motif/files/patch-doc::man::man5::Makefile.in b/x11-toolkits/open-motif/files/patch-doc::man::man5::Makefile.in
index becc3c256495..c9cc843184fa 100644
--- a/x11-toolkits/open-motif/files/patch-doc::man::man5::Makefile.in
+++ b/x11-toolkits/open-motif/files/patch-doc::man::man5::Makefile.in
@@ -1,12 +1,11 @@
---- doc/man/man5/Makefile.in.orig	Tue Sep  3 05:33:49 2002
-+++ doc/man/man5/Makefile.in	Tue Sep  3 22:58:47 2002
-@@ -94,7 +94,8 @@
- man_MANS = \
-     Traits.5 \
-     UIL.5 \
--    WML.5
-+    WML.5 \
-+    mwmrc.5
+--- doc/man/man5/Makefile.in.orig	Tue Apr  6 13:50:28 2004
++++ doc/man/man5/Makefile.in	Thu Jul 29 21:21:55 2004
+@@ -95,7 +95,7 @@
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
+-man_MANS =      Traits.5     UIL.5     WML.5
++man_MANS =      Traits.5     UIL.5     WML.5      mwmrc.5
  
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../include/config.h
diff --git a/x11-toolkits/open-motif/files/patch-ltmain.sh b/x11-toolkits/open-motif/files/patch-ltmain.sh
index f6b86b592909..00ef12d96673 100644
--- a/x11-toolkits/open-motif/files/patch-ltmain.sh
+++ b/x11-toolkits/open-motif/files/patch-ltmain.sh
@@ -1,32 +1,6 @@
 --- ltmain.sh.orig	Wed Jan 23 10:32:07 2002
 +++ ltmain.sh	Wed Sep  4 03:36:57 2002
-@@ -1043,14 +1043,14 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd*|*-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd*|*-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2441,7 +2441,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd*|*-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4210,10 +4210,12 @@
+@@ -4365,10 +4365,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/x11-toolkits/open-motif/files/patch-tools::wml::Makefile.in b/x11-toolkits/open-motif/files/patch-tools::wml::Makefile.in
deleted file mode 100644
index 37b1c96a673a..000000000000
--- a/x11-toolkits/open-motif/files/patch-tools::wml::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/wml/Makefile.in.orig	Thu Feb 14 23:15:49 2002
-+++ tools/wml/Makefile.in	Wed Sep 18 07:49:28 2002
-@@ -121,7 +121,7 @@
- 
- wmldbcreate_LDADD = ../../lib/Xm/libXm.la
- 
--INCLUDES = ${X_CFLAGS} -I$(srcdir)/../../lib -I$(srcdir)/../../include
-+INCLUDES = -I$(srcdir)/../../lib -I$(srcdir)/../../include $(X_CFLAGS)
- 
- noinst_LIBRARIES = libwml.a
- libwml_a_SOURCES = wmlparse.y wml.c wmloutkey.c wmlouth.c wmloutmm.c wmloutp1.c wmlresolve.c wmlsynbld.c wmlutils.c