Update to version 2.2.3.

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

11 files changed, 121 insertions, 118 deletions

diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 0d6af8f6995b..d228d16f6bf4 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -7,15 +7,12 @@
 #
 
 PORTNAME=	open-motif
-PORTVERSION=	2.2.2
-PORTREVISION=	2
+PORTVERSION=	2.2.3
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://openmotif.opengroup.org/pub/%SUBDIR%/ \
-		ftp://ftp.opengroup.org/pub/%SUBDIR%/ \
-		ftp://ftp.kddlabs.co.jp/X11/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openmotif/R${PORTVERSION:R}/tars
-DISTNAME=	openmotif-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://ftp.ics.com/pub/%SUBDIR%/
+MASTER_SITE_SUBDIR=	Products/Motif/om${PORTVERSION}/src
+DISTNAME=	openMotif-${PORTVERSION}
+EXTRACT_SUFX=	.tar.gz
 DIST_SUBDIR=	openmotif
 
 MAINTAINER=	steve@FreeBSD.org
@@ -66,33 +63,50 @@ post-patch:
 
 post-install:
 .if !defined(WITHOUT_OPENMOTIF_DEMOS)
-#
-	${INSTALL_DATA} ${DEMOS_SRC}/Combo2/Combo.ad \
-		${PREFIX}/lib/X11/app-defaults/Combo
+	${INSTALL_DATA} ${DEMOS_SRC}/Column/Column.ad \
+		${PREFIX}/lib/X11/app-defaults/Column
+	${INSTALL_DATA} ${DEMOS_SRC}/DropDown/DropDown.ad \
+		${PREFIX}/lib/X11/app-defaults/DropDown
+	${INSTALL_DATA} ${DEMOS_SRC}/airport/XmdAirport.ad \
+		${PREFIX}/lib/X11/app-defaults/XmdAirport
+	${INSTALL_DATA} ${DEMOS_SRC}/animate/XmdAnimate.ad \
+		${PREFIX}/lib/X11/app-defaults/XmdAnimate
+	${INSTALL_DATA} ${DEMOS_SRC}/draw/XmdDraw.ad \
+		${PREFIX}/lib/X11/app-defaults/XmdDraw
 	${INSTALL_DATA} ${DEMOS_SRC}/filemanager/XmdFilemanager.ad \
 		${PREFIX}/lib/X11/app-defaults/XmdFilemanager
+	${INSTALL_DATA} ${DEMOS_SRC}/fileview/Fileview.ad \
+		${PREFIX}/lib/X11/app-defaults/Fileview
 	${INSTALL_DATA} ${DEMOS_SRC}/i18ninput/XmdI18nInput.ad \
 		${PREFIX}/lib/X11/app-defaults/XmdI18nInput
 	${INSTALL_DATA} ${DEMOS_SRC}/periodic/XmdPeriodic.ad \
 		${PREFIX}/lib/X11/app-defaults/XmdPeriodic
+	${INSTALL_DATA} ${DEMOS_SRC}/sampler2_0/XmdSampler2_0.ad \
+		${PREFIX}/lib/X11/app-defaults/XmdSampler2_0
 	${INSTALL_DATA} ${DEMOS_SRC}/setdate/XmdSetDate.ad \
 		${PREFIX}/lib/X11/app-defaults/XmdSetDate
 	${INSTALL_DATA} ${DEMOS_SRC}/todo/XmdTodo.ad \
 		${PREFIX}/lib/X11/app-defaults/XmdTodo
-#
 	@${MKDIR} ${PREFIX}/lib/X11/help
-.for i in filemanager getsubres i18ninput sampler2_0 todo
+.for i in animate draw filemanager getsubres i18ninput sampler2_0 todo
 	${INSTALL_DATA} ${DEMOS_SRC}/${i}/${i}.help \
 		${PREFIX}/lib/X11/help/${i}.help
 .endfor
-#
 	@${MKDIR} ${PREFIX}/lib/X11/uid
+	${INSTALL_DATA} ${DEMOS_SRC}/animate/dog.uid \
+		${PREFIX}/lib/X11/uid/dog.uid
+	${INSTALL_DATA} ${DEMOS_SRC}/animate/plane.uid \
+		${PREFIX}/lib/X11/uid/plane.uid
+	${INSTALL_DATA} ${DEMOS_SRC}/animate/superman.uid \
+		${PREFIX}/lib/X11/uid/superman.uid
+	${INSTALL_DATA} ${DEMOS_SRC}/animate/xmanimate.uid \
+		${PREFIX}/lib/X11/uid/xmanimate.uid
+	${INSTALL_DATA} ${DEMOS_SRC}/fileview/English.uid \
+		${PREFIX}/lib/X11/uid/English.uid
 	${INSTALL_DATA} ${DEMOS_SRC}/fileview/French.uid \
 		${PREFIX}/lib/X11/uid/French.uid
 	${INSTALL_DATA} ${DEMOS_SRC}/fileview/German.uid \
 		${PREFIX}/lib/X11/uid/German.uid
-	${INSTALL_DATA} ${DEMOS_SRC}/fileview/English.uid \
-		${PREFIX}/lib/X11/uid/English.uid
 	${INSTALL_DATA} ${DEMOS_SRC}/hellomotif/hellomotif.uid \
 		${PREFIX}/lib/X11/uid/hellomotif.uid
 	${INSTALL_DATA} ${DEMOS_SRC}/periodic/periodic.uid \
@@ -117,7 +131,6 @@ post-install:
 		${PREFIX}/lib/X11/uid/swedish/uid/l_strings.uid
 	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/helloint.uid \
 		${PREFIX}/lib/X11/uid
-#
 .for i in earth filemanager getsubres i18ninput panner piano sampler2_0 todo
 	${INSTALL_MAN} ${DEMOS_SRC}/${i}/${i}.man \
 		${MANPREFIX}/man/man1/${i}.1
@@ -127,16 +140,9 @@ post-install:
 	${INSTALL_MAN} ${DEMOS_SRC}/setdate/setDate.man \
 		${MANPREFIX}/man/man1/setDate.1
 .endif
-#
 	@${MKDIR} ${DOCSDIR}
 .for i in BUGREPORT COPYRIGHT.MOTIF README RELNOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.if !defined(NOPORTDOCS)
-.for i in CLOSEDBUGS OPENBUGS
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-	${GZIP_CMD} ${DOCSDIR}/${i}
-.endfor
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/open-motif/Makefile.man b/x11-toolkits/open-motif/Makefile.man
index 66f19cca9f1c..8991cbfb3c68 100644
--- a/x11-toolkits/open-motif/Makefile.man
+++ b/x11-toolkits/open-motif/Makefile.man
@@ -118,6 +118,7 @@ MAN3= \
 	XmCreateDragIcon.3 \
 	XmCreateDrawingArea.3 \
 	XmCreateDrawnButton.3 \
+	XmCreateDropDown.3 \
 	XmCreateDropDownComboBox.3 \
 	XmCreateDropDownList.3 \
 	XmCreateErrorDialog.3 \
@@ -136,6 +137,7 @@ MAN3= \
 	XmCreateMenuShell.3 \
 	XmCreateMessageBox.3 \
 	XmCreateMessageDialog.3 \
+	XmCreateMultiList.3 \
 	XmCreateNotebook.3 \
 	XmCreateOptionMenu.3 \
 	XmCreatePanedWindow.3 \
@@ -195,6 +197,12 @@ MAN3= \
 	XmDragStart.3 \
 	XmDrawingArea.3 \
 	XmDrawnButton.3 \
+	XmDropDown.3 \
+	XmDropDownGetArrow.3 \
+	XmDropDownGetLabel.3 \
+	XmDropDownGetList.3 \
+	XmDropDownGetText.3 \
+	XmDropDownGetValue.3 \
 	XmDropSite.3 \
 	XmDropSiteConfigureStackingOrder.3 \
 	XmDropSiteEndUpdate.3 \
@@ -208,7 +216,6 @@ MAN3= \
 	XmDropTransfer.3 \
 	XmDropTransferAdd.3 \
 	XmDropTransferStart.3 \
-	XmExt18List.3 \
 	XmFileSelectionBox.3 \
 	XmFileSelectionBoxGetChild.3 \
 	XmFileSelectionDoSearch.3 \
@@ -320,6 +327,18 @@ MAN3= \
 	XmMenuShell.3 \
 	XmMessageBox.3 \
 	XmMessageBoxGetChild.3 \
+	XmMultiList.3 \
+	XmMultiListDeselectAllItems.3 \
+	XmMultiListDeselectItem.3 \
+	XmMultiListDeselectItems.3 \
+	XmMultiListDeselectRow.3 \
+	XmMultiListGetSelectedRowArray.3 \
+	XmMultiListGetSelectedRows.3 \
+	XmMultiListMakeRowVisible.3 \
+	XmMultiListSelectAllItems.3 \
+	XmMultiListSelectItems.3 \
+	XmMultiListSelectRow.3 \
+	XmMultiListToggleRow.3 \
 	XmNotebook.3 \
 	XmNotebookGetPageInfo.3 \
 	XmObjectAtPoint.3 \
@@ -575,7 +594,7 @@ MAN3= \
 	XmVaCreateSimplePulldownMenu.3 \
 	XmVaCreateSimpleRadioBox.3 \
 	XmWidgetGetBaselines.3 \
-	XmWidgetGetDisplayRect.3 
+	XmWidgetGetDisplayRect.3
 MAN5= \
 	Traits.5 \
 	UIL.5 \
diff --git a/x11-toolkits/open-motif/distinfo b/x11-toolkits/open-motif/distinfo
index b87d1ac48818..b7a33cf85e28 100644
--- a/x11-toolkits/open-motif/distinfo
+++ b/x11-toolkits/open-motif/distinfo
@@ -1,2 +1,2 @@
-MD5 (openmotif/openmotif-2.2.2.tgz) = c5953e0fa08f79644e7bef9da218bb4b
-SIZE (openmotif/openmotif-2.2.2.tgz) = 5192862
+MD5 (openmotif/openMotif-2.2.3.tar.gz) = 94c96a0f94ee0d5e41d3dba2188b263d
+SIZE (openmotif/openMotif-2.2.3.tar.gz) = 5149785
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
diff --git a/x11-toolkits/open-motif/pkg-descr b/x11-toolkits/open-motif/pkg-descr
index 857656667d72..4bd0c33fa1b6 100644
--- a/x11-toolkits/open-motif/pkg-descr
+++ b/x11-toolkits/open-motif/pkg-descr
@@ -18,10 +18,8 @@ Here is what you might ask.  (excerpted from The Open Group FAQ)
   Motif is made available under the standard Open Group software licenses
   and requires the payment of source code and royalty fees.
   
-Visit http://www.motifzone.org for more information about Motif.
-
 NOTE: Some ports with GNU configure do not know that Motif 2.1 requires -lXp.
 In that case, you need to edit Makefile after configure, or, hack
 configure(.in) before configure.
 
-WWW: http://www.opengroup.org/openmotif/
+WWW: http://www.openmotif.org/
diff --git a/x11-toolkits/open-motif/pkg-plist b/x11-toolkits/open-motif/pkg-plist
index 885e21181904..ca27f418910e 100644
--- a/x11-toolkits/open-motif/pkg-plist
+++ b/x11-toolkits/open-motif/pkg-plist
@@ -5,10 +5,9 @@
 %%MOTIF_DEMOS%%bin/bboxdemo
 %%MOTIF_DEMOS%%bin/colordemo
 %%MOTIF_DEMOS%%bin/column
-%%MOTIF_DEMOS%%bin/combo
 %%MOTIF_DEMOS%%bin/draw
+%%MOTIF_DEMOS%%bin/dropdown
 %%MOTIF_DEMOS%%bin/earth
-%%MOTIF_DEMOS%%bin/ext18list
 %%MOTIF_DEMOS%%bin/filemanager
 %%MOTIF_DEMOS%%bin/fileview
 %%MOTIF_DEMOS%%bin/fontsel
@@ -17,6 +16,7 @@
 %%MOTIF_DEMOS%%bin/hellomotif
 %%MOTIF_DEMOS%%bin/i18ninput
 %%MOTIF_DEMOS%%bin/iconbuttondemo
+%%MOTIF_DEMOS%%bin/multilist
 bin/mwm
 %%MOTIF_DEMOS%%bin/outline
 %%MOTIF_DEMOS%%bin/paned
@@ -32,6 +32,7 @@ bin/mwm
 %%MOTIF_DEMOS%%bin/tree
 bin/uil
 %%MOTIF_DEMOS%%bin/wsm
+%%MOTIF_DEMOS%%bin/xmanimate
 bin/xmbind
 include/Mrm/MrmAppl.h
 include/Mrm/MrmDecls.h
@@ -110,6 +111,8 @@ include/Xm/DrawingA.h
 include/Xm/DrawingAP.h
 include/Xm/DrawnB.h
 include/Xm/DrawnBP.h
+include/Xm/DropDown.h
+include/Xm/DropDownP.h
 include/Xm/DropSMgr.h
 include/Xm/DropSMgrP.h
 include/Xm/DropTrans.h
@@ -163,6 +166,8 @@ include/Xm/MenuT.h
 include/Xm/MenuUtilP.h
 include/Xm/MessageB.h
 include/Xm/MessageBP.h
+include/Xm/MultiList.h
+include/Xm/MultiListP.h
 include/Xm/MwmUtil.h
 include/Xm/NavigatorT.h
 include/Xm/Notebook.h
@@ -220,8 +225,6 @@ include/Xm/TabBoxP.h
 include/Xm/TabList.h
 include/Xm/TabStack.h
 include/Xm/TabStackP.h
-include/Xm/Table.h
-include/Xm/TableP.h
 include/Xm/TakesDefT.h
 include/Xm/TearOffBP.h
 include/Xm/TearOffP.h
@@ -260,8 +263,11 @@ include/Xm/XmAll.h
 include/Xm/XmIm.h
 include/Xm/XmP.h
 include/Xm/XmStrDefs.h
+include/Xm/XmStrDefs22.h
 include/Xm/Xmfuncs.h
 include/Xm/XmosP.h
+include/Xm/Xmos_r.h
+include/Xm/Xmpoll.h
 include/Xm/XpmP.h
 include/Xm/xmlist.h
 include/uil/Uil.h
@@ -270,10 +276,16 @@ include/uil/UilDef.h
 include/uil/UilSymDef.h
 include/uil/UilSymGl.h
 include/uil/XmAppl.uil
-%%MOTIF_DEMOS%%lib/X11/app-defaults/Combo
+%%MOTIF_DEMOS%%lib/X11/app-defaults/Column
+%%MOTIF_DEMOS%%lib/X11/app-defaults/DropDown
+%%MOTIF_DEMOS%%lib/X11/app-defaults/Fileview
+%%MOTIF_DEMOS%%lib/X11/app-defaults/XmdAirport
+%%MOTIF_DEMOS%%lib/X11/app-defaults/XmdAnimate
+%%MOTIF_DEMOS%%lib/X11/app-defaults/XmdDraw
 %%MOTIF_DEMOS%%lib/X11/app-defaults/XmdFilemanager
 %%MOTIF_DEMOS%%lib/X11/app-defaults/XmdI18nInput
 %%MOTIF_DEMOS%%lib/X11/app-defaults/XmdPeriodic
+%%MOTIF_DEMOS%%lib/X11/app-defaults/XmdSampler2_0
 %%MOTIF_DEMOS%%lib/X11/app-defaults/XmdSetDate
 %%MOTIF_DEMOS%%lib/X11/app-defaults/XmdTodo
 lib/X11/bindings/acorn
@@ -302,6 +314,8 @@ lib/X11/bindings/sun
 lib/X11/bindings/sun_at
 lib/X11/bindings/tek
 lib/X11/bindings/xmbind.alias
+%%MOTIF_DEMOS%%lib/X11/help/animate.help
+%%MOTIF_DEMOS%%lib/X11/help/draw.help
 %%MOTIF_DEMOS%%lib/X11/help/filemanager.help
 %%MOTIF_DEMOS%%lib/X11/help/getsubres.help
 %%MOTIF_DEMOS%%lib/X11/help/i18ninput.help
@@ -309,9 +323,10 @@ lib/X11/bindings/xmbind.alias
 %%MOTIF_DEMOS%%lib/X11/help/todo.help
 lib/X11/system.mwmrc
 %%MOTIF_DEMOS%%lib/X11/uid/C/uid/l_strings.uid
+%%MOTIF_DEMOS%%lib/X11/uid/English.uid
 %%MOTIF_DEMOS%%lib/X11/uid/French.uid
 %%MOTIF_DEMOS%%lib/X11/uid/German.uid
-%%MOTIF_DEMOS%%lib/X11/uid/English.uid
+%%MOTIF_DEMOS%%lib/X11/uid/dog.uid
 %%MOTIF_DEMOS%%lib/X11/uid/english/uid/l_strings.uid
 %%MOTIF_DEMOS%%lib/X11/uid/french/uid/l_strings.uid
 %%MOTIF_DEMOS%%lib/X11/uid/hebrew/uid/l_strings.uid
@@ -319,7 +334,10 @@ lib/X11/system.mwmrc
 %%MOTIF_DEMOS%%lib/X11/uid/hellomotif.uid
 %%MOTIF_DEMOS%%lib/X11/uid/japanese/uid/l_strings.uid
 %%MOTIF_DEMOS%%lib/X11/uid/periodic.uid
+%%MOTIF_DEMOS%%lib/X11/uid/plane.uid
+%%MOTIF_DEMOS%%lib/X11/uid/superman.uid
 %%MOTIF_DEMOS%%lib/X11/uid/swedish/uid/l_strings.uid
+%%MOTIF_DEMOS%%lib/X11/uid/xmanimate.uid
 lib/libMrm.a
 lib/libMrm.so
 lib/libMrm.so.3
@@ -329,13 +347,11 @@ lib/libUil.so.3
 lib/libXm.a
 lib/libXm.so
 lib/libXm.so.3
-share/doc/open-motif/BUGREPORT
-%%PORTDOCS%%share/doc/open-motif/CLOSEDBUGS.gz
-share/doc/open-motif/COPYRIGHT.MOTIF
-%%PORTDOCS%%share/doc/open-motif/OPENBUGS.gz
-share/doc/open-motif/README
-share/doc/open-motif/RELNOTES
-@dirrm share/doc/open-motif
+%%DOCSDIR%%/BUGREPORT
+%%DOCSDIR%%/COPYRIGHT.MOTIF
+%%DOCSDIR%%/README
+%%DOCSDIR%%/RELNOTES
+@dirrm %%DOCSDIR%%
 %%MOTIF_DEMOS%%@dirrm lib/X11/uid/swedish/uid
 %%MOTIF_DEMOS%%@dirrm lib/X11/uid/swedish
 %%MOTIF_DEMOS%%@dirrm lib/X11/uid/japanese/uid
@@ -352,5 +368,5 @@ share/doc/open-motif/RELNOTES
 %%MOTIF_DEMOS%%@dirrm lib/X11/help
 @dirrm lib/X11/bindings
 @dirrm include/uil
-@dirrm include/Mrm
 @dirrm include/Xm
+@dirrm include/Mrm