Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Sep 2002 14:34:11 -0700 (PDT)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/42491: Update port: x11-toolkits/open-motif to 2.2.2 (fix ports/36026)
Message-ID:  <200209062134.g86LYBUs006712@www.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         42491
>Category:       ports
>Synopsis:       Update port: x11-toolkits/open-motif to 2.2.2 (fix ports/36026)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 06 14:40:03 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
Update port: x11-toolkits/open-motif to 2.2.2 (fix ports/36026)
- Update to version 2.2.2

New file:
files/Makefile.man
files/patch-Makefile.in
files/patch-demos::programs::Makefile.in
files/patch-doc::man::Makefile.in
files/patch-doc::man::man5::Makefile.in
files/patch-ltmain.sh

Remove file:
files/doc.imk
files/host.def
files/patch-FreeBSD.cf
files/patch-Mrm-Imakefile
files/patch-Xm-Imakefile
files/patch-XmIm.c
files/patch-buildings-Imakefile
files/patch-cf-Imakefile
files/patch-config-cf-Imake.tmpl
files/patch-imake-Imakefile
files/patch-makedepend-Imakefile
files/patch-man-Imakefile
files/patch-man5-Imakefile
files/patch-uil-Imakefile
files/patch-util-Imakefile
files/pkg-message

This PR supersedes following PR.
[2002/03/17] ports/36026  steve    Update port: x11-toolkits/open-motif to 2.2.1

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/x11-toolkits/open-motif/Makefile x11-toolkits/open-motif/Makefile
--- /usr/ports/x11-toolkits/open-motif/Makefile	Fri Jul 26 19:20:59 2002
+++ x11-toolkits/open-motif/Makefile	Thu Sep  5 21:51:32 2002
@@ -7,703 +7,127 @@
 #
 
 PORTNAME=	open-motif
-PORTVERSION=	2.1.30
-PORTREVISION=	3
+PORTVERSION=	2.2.2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R${PORTVERSION}/tars/  \
-		ftp://ftp.opengroup.org/pub/openmotif/R${PORTVERSION}/tars/  \
-		ftp://ftp.kddlabs.co.jp/X11/openmotif/R${PORTVERSION}/tars/
-DISTNAME=	openmotif${PORTVERSION}
-
-PATCH_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R${PORTVERSION}/fixes/ \
-		ftp://ftp.opengroup.org/pub/openmotif/R${PORTVERSION}/fixes/  \
-		ftp://ftp.kddlabs.co.jp/X11/openmotif/R${PORTVERSION}/fixes/
-PATCHFILES=	patch1 patch2 patch3 patch4 patch5
-PATCH_DIST_STRIP=	-p1
+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
+DIST_SUBDIR=	openmotif
 
 MAINTAINER=	steve@FreeBSD.org
 
-USE_IMAKE=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI"
+INSTALLS_SHLIB=	yes
+
+DEMOS_SRC=	${WRKSRC}/demos/programs
 
 .include <bsd.port.pre.mk>
 
 .if ${XFREE86_VERSION} >= 4
 RUN_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
-.else
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .endif
 
-DIST_SUBDIR=	openmotif
-WRKSRC=		${WRKDIR}/motif
-MAKE_ENV+=	LANG=C
-XMKMF=		${MAKE} Makefile.boot
-ALL_TARGET=	VerifyOS Everything
-XFREE86_HTML_MAN=	no
-
 # User config option: Build and install Motif demos
-.if defined(NO_OPENMOTIF_DEMOS)
-PLIST_SUB+=		MOTIF_DEMOS="@comment "
+.if defined(WITHOUT_OPENMOTIF_DEMOS)
+PLIST_SUB+=	MOTIF_DEMOS="@comment "
 .else
-PLIST_SUB+=		MOTIF_DEMOS=""
+MAKE_ENV+=	DEMOS="demos"
+PLIST_SUB+=	MOTIF_DEMOS=""
 .endif
 
-MAN1=	mwm.1 \
-	uil.1 \
-	xmbind.1
-.if !defined(NO_OPENMOTIF_DEMOS)
-MAN1+=	DNDDemo.1 \
-	draw.1 \
-	earth.1 \
-	exm_in_c.1 \
-	exm_in_uil.1 \
-	filemanager.1 \
-	getsubres.1 \
-	helloint.1 \
-	i18ninput.1 \
-	periodic.1 \
-	piano.1 \
-	sampler2_0.1 \
-	setDate.1 \
-	simpleDemo.1 \
-	simpledrop.1 \
-	todo.1 \
-	autopopups.1 \
-	combo_box.1 \
-	container.1 \
-	notebook.1 \
-	spin_box.1 \
-	tic_mark.1 \
-	xmanimate.1
-.endif
-
-MAN1DONT=\
-	animate.1 \
-	panner.1 \
-	wsm.1
-
-MAN3=	ApplicationShell.3 \
-	Composite.3 \
-	Constraint.3 \
-	Core.3 \
-	MrmCloseHierarchy.3 \
-	MrmFetchBitmapLiteral.3 \
-	MrmFetchColorLiteral.3 \
-	MrmFetchIconLiteral.3 \
-	MrmFetchLiteral.3 \
-	MrmFetchSetValues.3 \
-	MrmFetchWidget.3 \
-	MrmFetchWidgetOverride.3 \
-	MrmInitialize.3 \
-	MrmOpenHierarchy.3 \
-	MrmOpenHierarchyFromBuffer.3 \
-	MrmOpenHierarchyPerDisplay.3 \
-	MrmRegisterClass.3 \
-	MrmRegisterNames.3 \
-	MrmRegisterNamesInHierarchy.3 \
-	Object.3 \
-	OverrideShell.3 \
-	RectObj.3 \
-	Shell.3 \
-	TopLevelShell.3 \
-	TransientShell.3 \
-	Uil.3 \
-	UilDumpSymbolTable.3 \
-	VendorShell.3 \
-	VirtualBindings.3 \
-	WMShell.3 \
-	XmActivateProtocol.3 \
-	XmActivateWMProtocol.3 \
-	XmAddProtocolCallback.3 \
-	XmAddProtocols.3 \
-	XmAddTabGroup.3 \
-	XmAddToPostFromList.3 \
-	XmAddWMProtocolCallback.3 \
-	XmAddWMProtocols.3 \
-	XmArrowButton.3 \
-	XmArrowButtonGadget.3 \
-	XmBulletinBoard.3 \
-	XmCascadeButton.3 \
-	XmCascadeButtonGadget.3 \
-	XmCascadeButtonGadgetHighlight.3 \
-	XmCascadeButtonHighlight.3 \
-	XmChangeColor.3 \
-	XmClipboardCancelCopy.3 \
-	XmClipboardCopy.3 \
-	XmClipboardCopyByName.3 \
-	XmClipboardEndCopy.3 \
-	XmClipboardEndRetrieve.3 \
-	XmClipboardInquireCount.3 \
-	XmClipboardInquireFormat.3 \
-	XmClipboardInquireLength.3 \
-	XmClipboardInquirePendingItems.3 \
-	XmClipboardLock.3 \
-	XmClipboardRegisterFormat.3 \
-	XmClipboardRetrieve.3 \
-	XmClipboardStartCopy.3 \
-	XmClipboardStartRetrieve.3 \
-	XmClipboardUndoCopy.3 \
-	XmClipboardUnlock.3 \
-	XmClipboardWithdrawFormat.3 \
-	XmComboBox.3 \
-	XmComboBoxAddItem.3 \
-	XmComboBoxDeletePos.3 \
-	XmComboBoxSelectItem.3 \
-	XmComboBoxSetItem.3 \
-	XmComboBoxUpdate.3 \
-	XmCommand.3 \
-	XmCommandAppendValue.3 \
-	XmCommandError.3 \
-	XmCommandGetChild.3 \
-	XmCommandSetValue.3 \
-	XmContainer.3 \
-	XmContainerCopy.3 \
-	XmContainerCopyLink.3 \
-	XmContainerCut.3 \
-	XmContainerGetItemChildren.3 \
-	XmContainerPaste.3 \
-	XmContainerPasteLink.3 \
-	XmContainerRelayout.3 \
-	XmContainerReorder.3 \
-	XmConvertStringToUnits.3 \
-	XmConvertUnits.3 \
-	XmCreateArrowButton.3 \
-	XmCreateArrowButtonGadget.3 \
-	XmCreateBulletinBoard.3 \
-	XmCreateBulletinBoardDialog.3 \
-	XmCreateCascadeButton.3 \
-	XmCreateCascadeButtonGadget.3 \
-	XmCreateComboBox.3 \
-	XmCreateCommand.3 \
-	XmCreateCommandDialog.3 \
-	XmCreateContainer.3 \
-	XmCreateDialogShell.3 \
-	XmCreateDragIcon.3 \
-	XmCreateDrawingArea.3 \
-	XmCreateDrawnButton.3 \
-	XmCreateDropDownComboBox.3 \
-	XmCreateDropDownList.3 \
-	XmCreateErrorDialog.3 \
-	XmCreateFileSelectionBox.3 \
-	XmCreateFileSelectionDialog.3 \
-	XmCreateForm.3 \
-	XmCreateFormDialog.3 \
-	XmCreateFrame.3 \
-	XmCreateIconGadget.3 \
-	XmCreateInformationDialog.3 \
-	XmCreateLabel.3 \
-	XmCreateLabelGadget.3 \
-	XmCreateList.3 \
-	XmCreateMainWindow.3 \
-	XmCreateMenuBar.3 \
-	XmCreateMenuShell.3 \
-	XmCreateMessageBox.3 \
-	XmCreateMessageDialog.3 \
-	XmCreateNotebook.3 \
-	XmCreateOptionMenu.3 \
-	XmCreatePanedWindow.3 \
-	XmCreatePopupMenu.3 \
-	XmCreatePromptDialog.3 \
-	XmCreatePulldownMenu.3 \
-	XmCreatePushButton.3 \
-	XmCreatePushButtonGadget.3 \
-	XmCreateQuestionDialog.3 \
-	XmCreateRadioBox.3 \
-	XmCreateRowColumn.3 \
-	XmCreateScale.3 \
-	XmCreateScrollBar.3 \
-	XmCreateScrolledList.3 \
-	XmCreateScrolledText.3 \
-	XmCreateScrolledWindow.3 \
-	XmCreateSelectionBox.3 \
-	XmCreateSelectionDialog.3 \
-	XmCreateSeparator.3 \
-	XmCreateSeparatorGadget.3 \
-	XmCreateSimpleCheckBox.3 \
-	XmCreateSimpleMenuBar.3 \
-	XmCreateSimpleOptionMenu.3 \
-	XmCreateSimplePopupMenu.3 \
-	XmCreateSimplePulldownMenu.3 \
-	XmCreateSimpleRadioBox.3 \
-	XmCreateSimpleSpinBox.3 \
-	XmCreateSpinBox.3 \
-	XmCreateTemplateDialog.3 \
-	XmCreateText.3 \
-	XmCreateTextField.3 \
-	XmCreateToggleButton.3 \
-	XmCreateToggleButtonGadget.3 \
-	XmCreateWarningDialog.3 \
-	XmCreateWorkArea.3 \
-	XmCreateWorkingDialog.3 \
-	XmCvtByteStreamToXmString.3 \
-	XmCvtCTToXmString.3 \
-	XmCvtStringToUnitType.3 \
-	XmCvtTextPropertyToXmStringTable.3 \
-	XmCvtXmStringTableToTextProperty.3 \
-	XmCvtXmStringToByteStream.3 \
-	XmCvtXmStringToCT.3 \
-	XmDeactivateProtocol.3 \
-	XmDeactivateWMProtocol.3 \
-	XmDestroyPixmap.3 \
-	XmDialogShell.3 \
-	XmDirection.3 \
-	XmDirectionMatch.3 \
-	XmDirectionMatchPartial.3 \
-	XmDirectionToStringDirection.3 \
-	XmDisplay.3 \
-	XmDragCancel.3 \
-	XmDragContext.3 \
-	XmDragIcon.3 \
-	XmDragStart.3 \
-	XmDrawingArea.3 \
-	XmDrawnButton.3 \
-	XmDropSite.3 \
-	XmDropSiteConfigureStackingOrder.3 \
-	XmDropSiteEndUpdate.3 \
-	XmDropSiteQueryStackingOrder.3 \
-	XmDropSiteRegister.3 \
-	XmDropSiteRegistered.3 \
-	XmDropSiteRetrieve.3 \
-	XmDropSiteStartUpdate.3 \
-	XmDropSiteUnregister.3 \
-	XmDropSiteUpdate.3 \
-	XmDropTransfer.3 \
-	XmDropTransferAdd.3 \
-	XmDropTransferStart.3 \
-	XmFileSelectionBox.3 \
-	XmFileSelectionBoxGetChild.3 \
-	XmFileSelectionDoSearch.3 \
-	XmFontList.3 \
-	XmFontListAdd.3 \
-	XmFontListAppendEntry.3 \
-	XmFontListCopy.3 \
-	XmFontListCreate.3 \
-	XmFontListEntryCreate.3 \
-	XmFontListEntryFree.3 \
-	XmFontListEntryGetFont.3 \
-	XmFontListEntryGetTag.3 \
-	XmFontListEntryLoad.3 \
-	XmFontListFree.3 \
-	XmFontListFreeFontContext.3 \
-	XmFontListGetNextFont.3 \
-	XmFontListInitFontContext.3 \
-	XmFontListNextEntry.3 \
-	XmFontListRemoveEntry.3 \
-	XmForm.3 \
-	XmFrame.3 \
-	XmGadget.3 \
-	XmGetAtomName.3 \
-	XmGetColorCalculation.3 \
-	XmGetColors.3 \
-	XmGetDestination.3 \
-	XmGetDragContext.3 \
-	XmGetFocusWidget.3 \
-	XmGetMenuCursor.3 \
-	XmGetPixmap.3 \
-	XmGetPixmapByDepth.3 \
-	XmGetPostedFromWidget.3 \
-	XmGetScaledPixmap.3 \
-	XmGetSecondaryResourceData.3 \
-	XmGetTabGroup.3 \
-	XmGetTearOffControl.3 \
-	XmGetVisibility.3 \
-	XmGetXmDisplay.3 \
-	XmGetXmScreen.3 \
-	XmIconGadget.3 \
-	XmImCloseXIM.3 \
-	XmImFreeXIC.3 \
-	XmImGetXIC.3 \
-	XmImGetXIM.3 \
-	XmImMbLookupString.3 \
-	XmImMbResetIC.3 \
-	XmImRegister.3 \
-	XmImSetFocusValues.3 \
-	XmImSetValues.3 \
-	XmImSetXIC.3 \
-	XmImUnregister.3 \
-	XmImUnsetFocus.3 \
-	XmImVaSetFocusValues.3 \
-	XmImVaSetValues.3 \
-	XmInstallImage.3 \
-	XmInternAtom.3 \
-	XmIsMotifWMRunning.3 \
-	XmIsTraversable.3 \
-	XmLabel.3 \
-	XmLabelGadget.3 \
-	XmList.3 \
-	XmListAddItem.3 \
-	XmListAddItemUnselected.3 \
-	XmListAddItems.3 \
-	XmListAddItemsUnselected.3 \
-	XmListDeleteAllItems.3 \
-	XmListDeleteItem.3 \
-	XmListDeleteItems.3 \
-	XmListDeleteItemsPos.3 \
-	XmListDeletePos.3 \
-	XmListDeletePositions.3 \
-	XmListDeselectAllItems.3 \
-	XmListDeselectItem.3 \
-	XmListDeselectPos.3 \
-	XmListGetKbdItemPos.3 \
-	XmListGetMatchPos.3 \
-	XmListGetSelectedPos.3 \
-	XmListItemExists.3 \
-	XmListItemPos.3 \
-	XmListPosSelected.3 \
-	XmListPosToBounds.3 \
-	XmListReplaceItems.3 \
-	XmListReplaceItemsPos.3 \
-	XmListReplaceItemsPosUnselected.3 \
-	XmListReplaceItemsUnselected.3 \
-	XmListReplacePositions.3 \
-	XmListSelectItem.3 \
-	XmListSelectPos.3 \
-	XmListSetAddMode.3 \
-	XmListSetBottomItem.3 \
-	XmListSetBottomPos.3 \
-	XmListSetHorizPos.3 \
-	XmListSetItem.3 \
-	XmListSetKbdItemPos.3 \
-	XmListSetPos.3 \
-	XmListUpdateSelectedList.3 \
-	XmListYToPos.3 \
-	XmMainWindow.3 \
-	XmMainWindowSep1.3 \
-	XmMainWindowSep2.3 \
-	XmMainWindowSep3.3 \
-	XmMainWindowSetAreas.3 \
-	XmManager.3 \
-	XmMapSegmentEncoding.3 \
-	XmMenuPosition.3 \
-	XmMenuShell.3 \
-	XmMessageBox.3 \
-	XmMessageBoxGetChild.3 \
-	XmNotebook.3 \
-	XmNotebookGetPageInfo.3 \
-	XmObjectAtPoint.3 \
-	XmOptionButtonGadget.3 \
-	XmOptionLabelGadget.3 \
-	XmPanedWindow.3 \
-	XmParseMapping.3 \
-	XmParseMappingCreate.3 \
-	XmParseMappingFree.3 \
-	XmParseMappingGetValues.3 \
-	XmParseMappingSetValues.3 \
-	XmParseTable.3 \
-	XmParseTableFree.3 \
-	XmPrimitive.3 \
-	XmPrintPopupPDM.3 \
-	XmPrintSetup.3 \
-	XmPrintShell.3 \
-	XmPrintToFile.3 \
-	XmProcessTraversal.3 \
-	XmPushButton.3 \
-	XmPushButtonGadget.3 \
-	XmRedisplayWidget.3 \
-	XmRegisterSegmentEncoding.3 \
-	XmRemoveFromPostFromList.3 \
-	XmRemoveProtocolCallback.3 \
-	XmRemoveProtocols.3 \
-	XmRemoveTabGroup.3 \
-	XmRemoveWMProtocolCallback.3 \
-	XmRemoveWMProtocols.3 \
-	XmRenderTable.3 \
-	XmRenderTableAddRenditions.3 \
-	XmRenderTableCopy.3 \
-	XmRenderTableCvtFromProp.3 \
-	XmRenderTableCvtToProp.3 \
-	XmRenderTableFree.3 \
-	XmRenderTableGetRendition.3 \
-	XmRenderTableGetRenditions.3 \
-	XmRenderTableGetTags.3 \
-	XmRenderTableRemoveRenditions.3 \
-	XmRendition.3 \
-	XmRenditionCreate.3 \
-	XmRenditionFree.3 \
-	XmRenditionRetrieve.3 \
-	XmRenditionUpdate.3 \
-	XmRepTypeAddReverse.3 \
-	XmRepTypeGetId.3 \
-	XmRepTypeGetNameList.3 \
-	XmRepTypeGetRecord.3 \
-	XmRepTypeGetRegistered.3 \
-	XmRepTypeInstallTearOffModelConverter.3 \
-	XmRepTypeRegister.3 \
-	XmRepTypeValidValue.3 \
-	XmResolveAllPartOffsets.3 \
-	XmResolvePartOffsets.3 \
-	XmRowColumn.3 \
-	XmScale.3 \
-	XmScaleGetValue.3 \
-	XmScaleSetTicks.3 \
-	XmScaleSetValue.3 \
-	XmScreen.3 \
-	XmScrollBar.3 \
-	XmScrollBarGetValues.3 \
-	XmScrollBarSetValues.3 \
-	XmScrollVisible.3 \
-	XmScrolledWindow.3 \
-	XmScrolledWindowSetAreas.3 \
-	XmSelectionBox.3 \
-	XmSelectionBoxGetChild.3 \
-	XmSeparator.3 \
-	XmSeparatorGadget.3 \
-	XmSetColorCalculation.3 \
-	XmSetFontUnit.3 \
-	XmSetFontUnits.3 \
-	XmSetMenuCursor.3 \
-	XmSetProtocolHooks.3 \
-	XmSetWMProtocolHooks.3 \
-	XmSimpleSpinBox.3 \
-	XmSimpleSpinBoxAddItem.3 \
-	XmSimpleSpinBoxDeletePos.3 \
-	XmSimpleSpinBoxSetItem.3 \
-	XmSpinBox.3 \
-	XmSpinBoxValidatePosition.3 \
-	XmString.3 \
-	XmStringBaseline.3 \
-	XmStringByteCompare.3 \
-	XmStringByteStreamLength.3 \
-	XmStringCompare.3 \
-	XmStringComponentCreate.3 \
-	XmStringComponentType.3 \
-	XmStringConcat.3 \
-	XmStringConcatAndFree.3 \
-	XmStringCopy.3 \
-	XmStringCreate.3 \
-	XmStringCreateLocalized.3 \
-	XmStringCreateLtoR.3 \
-	XmStringCreateSimple.3 \
-	XmStringDirection.3 \
-	XmStringDirectionCreate.3 \
-	XmStringDirectionToDirection.3 \
-	XmStringDraw.3 \
-	XmStringDrawImage.3 \
-	XmStringDrawUnderline.3 \
-	XmStringEmpty.3 \
-	XmStringExtent.3 \
-	XmStringFree.3 \
-	XmStringFreeContext.3 \
-	XmStringGenerate.3 \
-	XmStringGetLtoR.3 \
-	XmStringGetNextComponent.3 \
-	XmStringGetNextSegment.3 \
-	XmStringGetNextTriple.3 \
-	XmStringHasSubstring.3 \
-	XmStringHeight.3 \
-	XmStringInitContext.3 \
-	XmStringIsVoid.3 \
-	XmStringLength.3 \
-	XmStringLineCount.3 \
-	XmStringNConcat.3 \
-	XmStringNCopy.3 \
-	XmStringParseText.3 \
-	XmStringPeekNextComponent.3 \
-	XmStringPeekNextTriple.3 \
-	XmStringPutRendition.3 \
-	XmStringSegmentCreate.3 \
-	XmStringSeparatorCreate.3 \
-	XmStringTable.3 \
-	XmStringTableParseStringArray.3 \
-	XmStringTableProposeTablist.3 \
-	XmStringTableToXmString.3 \
-	XmStringTableUnparse.3 \
-	XmStringToXmStringTable.3 \
-	XmStringUnparse.3 \
-	XmStringWidth.3 \
-	XmTab.3 \
-	XmTabCreate.3 \
-	XmTabFree.3 \
-	XmTabGetValues.3 \
-	XmTabList.3 \
-	XmTabListCopy.3 \
-	XmTabListFree.3 \
-	XmTabListGetTab.3 \
-	XmTabListInsertTabs.3 \
-	XmTabListRemoveTabs.3 \
-	XmTabListReplacePositions.3 \
-	XmTabListTabCount.3 \
-	XmTabSetValue.3 \
-	XmTargetsAreCompatible.3 \
-	XmText.3 \
-	XmTextClearSelection.3 \
-	XmTextCopy.3 \
-	XmTextCopyLink.3 \
-	XmTextCut.3 \
-	XmTextDisableRedisplay.3 \
-	XmTextEnableRedisplay.3 \
-	XmTextField.3 \
-	XmTextFieldClearSelection.3 \
-	XmTextFieldCopy.3 \
-	XmTextFieldCopyLink.3 \
-	XmTextFieldCut.3 \
-	XmTextFieldGetBaseline.3 \
-	XmTextFieldGetEditable.3 \
-	XmTextFieldGetInsertionPosition.3 \
-	XmTextFieldGetLastPosition.3 \
-	XmTextFieldGetMaxLength.3 \
-	XmTextFieldGetSelection.3 \
-	XmTextFieldGetSelectionPosition.3 \
-	XmTextFieldGetSelectionWcs.3 \
-	XmTextFieldGetString.3 \
-	XmTextFieldGetStringWcs.3 \
-	XmTextFieldGetSubstring.3 \
-	XmTextFieldGetSubstringWcs.3 \
-	XmTextFieldInsert.3 \
-	XmTextFieldInsertWcs.3 \
-	XmTextFieldPaste.3 \
-	XmTextFieldPasteLink.3 \
-	XmTextFieldPosToXY.3 \
-	XmTextFieldRemove.3 \
-	XmTextFieldReplace.3 \
-	XmTextFieldReplaceWcs.3 \
-	XmTextFieldSetAddMode.3 \
-	XmTextFieldSetEditable.3 \
-	XmTextFieldSetHighlight.3 \
-	XmTextFieldSetInsertionPosition.3 \
-	XmTextFieldSetMaxLength.3 \
-	XmTextFieldSetSelection.3 \
-	XmTextFieldSetString.3 \
-	XmTextFieldSetStringWcs.3 \
-	XmTextFieldShowPosition.3 \
-	XmTextFieldXYToPos.3 \
-	XmTextFindString.3 \
-	XmTextFindStringWcs.3 \
-	XmTextGetBaseline.3 \
-	XmTextGetCenterline.3 \
-	XmTextGetEditable.3 \
-	XmTextGetInsertionPosition.3 \
-	XmTextGetLastPosition.3 \
-	XmTextGetMaxLength.3 \
-	XmTextGetSelection.3 \
-	XmTextGetSelectionPosition.3 \
-	XmTextGetSelectionWcs.3 \
-	XmTextGetSource.3 \
-	XmTextGetString.3 \
-	XmTextGetStringWcs.3 \
-	XmTextGetSubstring.3 \
-	XmTextGetSubstringWcs.3 \
-	XmTextGetTopCharacter.3 \
-	XmTextInsert.3 \
-	XmTextInsertWcs.3 \
-	XmTextPaste.3 \
-	XmTextPasteLink.3 \
-	XmTextPosToXY.3 \
-	XmTextPosition.3 \
-	XmTextRemove.3 \
-	XmTextReplace.3 \
-	XmTextReplaceWcs.3 \
-	XmTextScroll.3 \
-	XmTextSetAddMode.3 \
-	XmTextSetEditable.3 \
-	XmTextSetHighlight.3 \
-	XmTextSetInsertionPosition.3 \
-	XmTextSetMaxLength.3 \
-	XmTextSetSelection.3 \
-	XmTextSetSource.3 \
-	XmTextSetString.3 \
-	XmTextSetStringWcs.3 \
-	XmTextSetTopCharacter.3 \
-	XmTextShowPosition.3 \
-	XmTextXYToPos.3 \
-	XmToggleButton.3 \
-	XmToggleButtonGadget.3 \
-	XmToggleButtonGadgetGetState.3 \
-	XmToggleButtonGadgetSetState.3 \
-	XmToggleButtonGetState.3 \
-	XmToggleButtonSetState.3 \
-	XmToggleButtonSetValue.3 \
-	XmTrackingEvent.3 \
-	XmTrackingLocate.3 \
-	XmTransferDone.3 \
-	XmTransferSendRequest.3 \
-	XmTransferSetParameters.3 \
-	XmTransferStartRequest.3 \
-	XmTransferValue.3 \
-	XmTranslateKey.3 \
-	XmUninstallImage.3 \
-	XmUpdateDisplay.3 \
-	XmVaCreateSimpleCheckBox.3 \
-	XmVaCreateSimpleMenuBar.3 \
-	XmVaCreateSimpleOptionMenu.3 \
-	XmVaCreateSimplePopupMenu.3 \
-	XmVaCreateSimplePulldownMenu.3 \
-	XmVaCreateSimpleRadioBox.3 \
-	XmWidgetGetBaselines.3 \
-	XmWidgetGetDisplayRect.3
-
-MAN5=	Traits.5 UIL.5 WML.5 mwmrc.5
+.include "${.CURDIR}/Makefile.man"
 
 post-patch:
+	@${FIND} ${DEMOS_SRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|^install-data-am: |install-data-am: # |g'
 # fix sections
-	@cd ${WRKSRC}/doc/man/man1 && ${PERL} -pi.orig -e "s|user cmd|1|" *.1
-	@cd ${WRKSRC}/doc/man/man3 && ${PERL} -pi.orig \
-	    -e "s|library call|3|" *.3
+	@${REINPLACE_CMD} -e 's|user cmd|1|' ${WRKSRC}/doc/man/man1/*.1
+	@${REINPLACE_CMD} -e 's|library call|3|' ${WRKSRC}/doc/man/man3/*.3
 # mwmrc is not a kernel interface!!
-	@cd ${WRKSRC}/doc/man/man4 && ${PERL} -pi.orig \
-	    -e "s|special file|5|" *.4  && mv mwmrc.4 ../man5/mwmrc.5
-	@cd ${WRKSRC}/doc/man/man5 && ${PERL} -pi.orig \
-	    -e "s|file formats|5|" *.5
-
-pre-configure:
-	-@if [ -d ${WRKSRC}/imports/x11/lib/X11 ]; then \
-		: ; \
-	else \
-		${MKDIR} ${WRKSRC}/imports/x11/lib/X11/; \
-		${LN} -s ${X11BASE}/bin ${WRKSRC}/imports/x11/; \
-		${LN} -s ${X11BASE}/include ${WRKSRC}/imports/x11/; \
-		${LN} -s ${X11BASE}/lib/* ${WRKSRC}/imports/x11/lib/; \
-		${LN} -s ${X11BASE}/lib/X11/* ${WRKSRC}/imports/x11/lib/X11/; \
-		${RM} -f ${WRKSRC}/imports/x11/lib/X11/config; \
-		${LN} -s ${WRKSRC}/config/cf ${WRKSRC}/imports/x11/lib/X11/config; \
-	fi
-.if defined(NO_OPENMOTIF_DEMOS)
-	${CHMOD} +w ${WRKSRC}/config/cf/host.def
-	@echo "#define BuildMotifDemos		NO" >>${WRKSRC}/config/cf/host.def
-.endif
-
-post-configure:
-	@${CP} ${X11BASE}/bin/imake ${WRKSRC}/config/imake/
-	cd ${WRKSRC} && ${MAKE} imake.bootstrap
-
-post-install: share-doc share-guides share-examples
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-.for dir in Mrm Xm
-	cd ${WRKSRC}/lib/${dir} && ${INSTALL_DATA} *I.h ${PREFIX}/include/${dir}
+	@cd ${WRKSRC}/doc/man && ${CP} -f man4/mwmrc.4 man5/mwmrc.5
+	@${REINPLACE_CMD} -e 's|special file|5| ; \
+		 s|file formats|5|' ${WRKSRC}/doc/man/man5/*.5
+
+post-install:
+.if !defined(WITHOUT_OPENMOTIF_DEMOS)
+#
+	${INSTALL_DATA} ${DEMOS_SRC}/Combo2/Combo.ad \
+		${PREFIX}/lib/X11/app-defaults/Combo
+	${INSTALL_DATA} ${DEMOS_SRC}/filemanager/XmdFilemanager.ad \
+		${PREFIX}/lib/X11/app-defaults/XmdFilemanager
+	${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}/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
+	${INSTALL_DATA} ${DEMOS_SRC}/${i}/${i}.help \
+		${PREFIX}/lib/X11/help/${i}.help
+.endfor
+#
+	@${MKDIR} ${PREFIX}/lib/X11/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 \
+		${PREFIX}/lib/X11/uid/periodic.uid
+	@${MKDIR} ${PREFIX}/lib/X11/uid/C/uid
+	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/C/uid/l_strings.uid \
+		${PREFIX}/lib/X11/uid/C/uid/l_strings.uid
+	@${MKDIR} ${PREFIX}/lib/X11/uid/english/uid
+	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/english/uid/l_strings.uid \
+		${PREFIX}/lib/X11/uid/english/uid/l_strings.uid
+	@${MKDIR} ${PREFIX}/lib/X11/uid/french/uid
+	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/french/uid/l_strings.uid \
+		${PREFIX}/lib/X11/uid/french/uid/l_strings.uid
+	@${MKDIR} ${PREFIX}/lib/X11/uid/hebrew/uid
+	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/hebrew/uid/l_strings.uid \
+		${PREFIX}/lib/X11/uid/hebrew/uid/l_strings.uid
+	@${MKDIR} ${PREFIX}/lib/X11/uid/japanese/uid
+	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/japanese/uid/l_strings.uid \
+		${PREFIX}/lib/X11/uid/japanese/uid/l_strings.uid
+	@${MKDIR} ${PREFIX}/lib/X11/uid/swedish/uid
+	${INSTALL_DATA} ${DEMOS_SRC}/hellomotifi18n/swedish/uid/l_strings.uid \
+		${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
+.endfor
+	${INSTALL_MAN} ${DEMOS_SRC}/popups/autopopups.man \
+		${MANPREFIX}/man/man1/autopopups.1
+	${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
-
-share-doc:
-	@${MKDIR} ${PREFIX}/share/doc/openmotif/
-	@${INSTALL_DATA} \
-		${WRKSRC}/BUGREPORT \
-		${WRKSRC}/COPYRIGHT.MOTIF \
-		${WRKSRC}/README \
-		${WRKSRC}/RELNOTES \
-		${PREFIX}/share/doc/openmotif/
-.if !defined(NOPORTDOCS)
-	@${INSTALL_DATA} \
-		${WRKSRC}/CLOSEDBUGS \
-		${WRKSRC}/OPENBUGS \
-		${PREFIX}/share/doc/openmotif/
-	@${GZIP_CMD} \
-		${PREFIX}/share/doc/openmotif/CLOSEDBUGS \
-		${PREFIX}/share/doc/openmotif/OPENBUGS
-.endif
-
-share-guides:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/openmotif/guides/
-	@cd ${WRKSRC} && \
-		${CP} -rp doc/ps/* ${PREFIX}/share/doc/openmotif/guides/
+.for i in CLOSEDBUGS OPENBUGS
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${GZIP_CMD} ${DOCSDIR}/${i}
+.endfor
 .endif
-
-share-examples:
-#	@${MKDIR} ${PREFIX}/share/examples/openmotif/demos/
-#	@cd ${WRKSRC}/demos && make clean
-#	@find ${WRKSRC}/demos -name \*.orig -delete
-#	@cd ${WRKSRC} && \
-#		${CP} -rp demos/doc/programGuide/* \
-#			  ${PREFIX}/share/examples/openmotif/demos/
-	@${RM} -rf ${PREFIX}/share/examples/openmotif/demos
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/x11-toolkits/open-motif/Makefile.man x11-toolkits/open-motif/Makefile.man
--- /usr/ports/x11-toolkits/open-motif/Makefile.man	Thu Jan  1 09:00:00 1970
+++ x11-toolkits/open-motif/Makefile.man	Thu Sep  5 21:25:37 2002
@@ -0,0 +1,581 @@
+MAN1= \
+	mwm.1 \
+	uil.1 \
+	xmbind.1
+.if !defined(WITHOUT_OPENMOTIF_DEMOS)
+MAN1+= \
+	autopopups.1 \
+	earth.1 \
+	filemanager.1 \
+	getsubres.1 \
+	i18ninput.1 \
+	panner.1 \
+	piano.1 \
+	sampler2_0.1 \
+	setDate.1 \
+	todo.1
+.endif
+MAN3= \
+	ApplicationShell.3 \
+	Composite.3 \
+	Constraint.3 \
+	Core.3 \
+	MrmCloseHierarchy.3 \
+	MrmFetchBitmapLiteral.3 \
+	MrmFetchColorLiteral.3 \
+	MrmFetchIconLiteral.3 \
+	MrmFetchLiteral.3 \
+	MrmFetchSetValues.3 \
+	MrmFetchWidget.3 \
+	MrmFetchWidgetOverride.3 \
+	MrmInitialize.3 \
+	MrmOpenHierarchy.3 \
+	MrmOpenHierarchyFromBuffer.3 \
+	MrmOpenHierarchyPerDisplay.3 \
+	MrmRegisterClass.3 \
+	MrmRegisterNames.3 \
+	MrmRegisterNamesInHierarchy.3 \
+	Object.3 \
+	OverrideShell.3 \
+	RectObj.3 \
+	Shell.3 \
+	TopLevelShell.3 \
+	TransientShell.3 \
+	Uil.3 \
+	UilDumpSymbolTable.3 \
+	VendorShell.3 \
+	VirtualBindings.3 \
+	WMShell.3 \
+	XmActivateProtocol.3 \
+	XmActivateWMProtocol.3 \
+	XmAddProtocolCallback.3 \
+	XmAddProtocols.3 \
+	XmAddTabGroup.3 \
+	XmAddToPostFromList.3 \
+	XmAddWMProtocolCallback.3 \
+	XmAddWMProtocols.3 \
+	XmArrowButton.3 \
+	XmArrowButtonGadget.3 \
+	XmBulletinBoard.3 \
+	XmButtonBox.3 \
+	XmCascadeButton.3 \
+	XmCascadeButtonGadget.3 \
+	XmCascadeButtonGadgetHighlight.3 \
+	XmCascadeButtonHighlight.3 \
+	XmChangeColor.3 \
+	XmClipboardCancelCopy.3 \
+	XmClipboardCopy.3 \
+	XmClipboardCopyByName.3 \
+	XmClipboardEndCopy.3 \
+	XmClipboardEndRetrieve.3 \
+	XmClipboardInquireCount.3 \
+	XmClipboardInquireFormat.3 \
+	XmClipboardInquireLength.3 \
+	XmClipboardInquirePendingItems.3 \
+	XmClipboardLock.3 \
+	XmClipboardRegisterFormat.3 \
+	XmClipboardRetrieve.3 \
+	XmClipboardStartCopy.3 \
+	XmClipboardStartRetrieve.3 \
+	XmClipboardUndoCopy.3 \
+	XmClipboardUnlock.3 \
+	XmClipboardWithdrawFormat.3 \
+	XmColorSelector.3 \
+	XmComboBox.3 \
+	XmComboBoxAddItem.3 \
+	XmComboBoxDeletePos.3 \
+	XmComboBoxSelectItem.3 \
+	XmComboBoxSetItem.3 \
+	XmComboBoxUpdate.3 \
+	XmCommand.3 \
+	XmCommandAppendValue.3 \
+	XmCommandError.3 \
+	XmCommandGetChild.3 \
+	XmCommandSetValue.3 \
+	XmContainer.3 \
+	XmContainerCopy.3 \
+	XmContainerCopyLink.3 \
+	XmContainerCut.3 \
+	XmContainerGetItemChildren.3 \
+	XmContainerPaste.3 \
+	XmContainerPasteLink.3 \
+	XmContainerRelayout.3 \
+	XmContainerReorder.3 \
+	XmConvertStringToUnits.3 \
+	XmConvertUnits.3 \
+	XmCreateArrowButton.3 \
+	XmCreateArrowButtonGadget.3 \
+	XmCreateBulletinBoard.3 \
+	XmCreateBulletinBoardDialog.3 \
+	XmCreateCascadeButton.3 \
+	XmCreateCascadeButtonGadget.3 \
+	XmCreateComboBox.3 \
+	XmCreateCommand.3 \
+	XmCreateCommandDialog.3 \
+	XmCreateContainer.3 \
+	XmCreateDialogShell.3 \
+	XmCreateDragIcon.3 \
+	XmCreateDrawingArea.3 \
+	XmCreateDrawnButton.3 \
+	XmCreateDropDownComboBox.3 \
+	XmCreateDropDownList.3 \
+	XmCreateErrorDialog.3 \
+	XmCreateFileSelectionBox.3 \
+	XmCreateFileSelectionDialog.3 \
+	XmCreateForm.3 \
+	XmCreateFormDialog.3 \
+	XmCreateFrame.3 \
+	XmCreateIconGadget.3 \
+	XmCreateInformationDialog.3 \
+	XmCreateLabel.3 \
+	XmCreateLabelGadget.3 \
+	XmCreateList.3 \
+	XmCreateMainWindow.3 \
+	XmCreateMenuBar.3 \
+	XmCreateMenuShell.3 \
+	XmCreateMessageBox.3 \
+	XmCreateMessageDialog.3 \
+	XmCreateNotebook.3 \
+	XmCreateOptionMenu.3 \
+	XmCreatePanedWindow.3 \
+	XmCreatePopupMenu.3 \
+	XmCreatePromptDialog.3 \
+	XmCreatePulldownMenu.3 \
+	XmCreatePushButton.3 \
+	XmCreatePushButtonGadget.3 \
+	XmCreateQuestionDialog.3 \
+	XmCreateRadioBox.3 \
+	XmCreateRowColumn.3 \
+	XmCreateScale.3 \
+	XmCreateScrollBar.3 \
+	XmCreateScrolledList.3 \
+	XmCreateScrolledText.3 \
+	XmCreateScrolledWindow.3 \
+	XmCreateSelectionBox.3 \
+	XmCreateSelectionDialog.3 \
+	XmCreateSeparator.3 \
+	XmCreateSeparatorGadget.3 \
+	XmCreateSimpleCheckBox.3 \
+	XmCreateSimpleMenuBar.3 \
+	XmCreateSimpleOptionMenu.3 \
+	XmCreateSimplePopupMenu.3 \
+	XmCreateSimplePulldownMenu.3 \
+	XmCreateSimpleRadioBox.3 \
+	XmCreateSimpleSpinBox.3 \
+	XmCreateSpinBox.3 \
+	XmCreateTemplateDialog.3 \
+	XmCreateText.3 \
+	XmCreateTextField.3 \
+	XmCreateToggleButton.3 \
+	XmCreateToggleButtonGadget.3 \
+	XmCreateWarningDialog.3 \
+	XmCreateWorkArea.3 \
+	XmCreateWorkingDialog.3 \
+	XmCvtByteStreamToXmString.3 \
+	XmCvtCTToXmString.3 \
+	XmCvtStringToUnitType.3 \
+	XmCvtTextPropertyToXmStringTable.3 \
+	XmCvtXmStringTableToTextProperty.3 \
+	XmCvtXmStringToByteStream.3 \
+	XmCvtXmStringToCT.3 \
+	XmDeactivateProtocol.3 \
+	XmDeactivateWMProtocol.3 \
+	XmDestroyPixmap.3 \
+	XmDialogShell.3 \
+	XmDirection.3 \
+	XmDirectionMatch.3 \
+	XmDirectionMatchPartial.3 \
+	XmDirectionToStringDirection.3 \
+	XmDisplay.3 \
+	XmDragCancel.3 \
+	XmDragContext.3 \
+	XmDragIcon.3 \
+	XmDragStart.3 \
+	XmDrawingArea.3 \
+	XmDrawnButton.3 \
+	XmDropSite.3 \
+	XmDropSiteConfigureStackingOrder.3 \
+	XmDropSiteEndUpdate.3 \
+	XmDropSiteQueryStackingOrder.3 \
+	XmDropSiteRegister.3 \
+	XmDropSiteRegistered.3 \
+	XmDropSiteRetrieve.3 \
+	XmDropSiteStartUpdate.3 \
+	XmDropSiteUnregister.3 \
+	XmDropSiteUpdate.3 \
+	XmDropTransfer.3 \
+	XmDropTransferAdd.3 \
+	XmDropTransferStart.3 \
+	XmExt18List.3 \
+	XmFileSelectionBox.3 \
+	XmFileSelectionBoxGetChild.3 \
+	XmFileSelectionDoSearch.3 \
+	XmFontList.3 \
+	XmFontListAdd.3 \
+	XmFontListAppendEntry.3 \
+	XmFontListCopy.3 \
+	XmFontListCreate.3 \
+	XmFontListEntryCreate.3 \
+	XmFontListEntryFree.3 \
+	XmFontListEntryGetFont.3 \
+	XmFontListEntryGetTag.3 \
+	XmFontListEntryLoad.3 \
+	XmFontListFree.3 \
+	XmFontListFreeFontContext.3 \
+	XmFontListGetNextFont.3 \
+	XmFontListInitFontContext.3 \
+	XmFontListNextEntry.3 \
+	XmFontListRemoveEntry.3 \
+	XmFontSelector.3 \
+	XmForm.3 \
+	XmFrame.3 \
+	XmGadget.3 \
+	XmGetAtomName.3 \
+	XmGetColorCalculation.3 \
+	XmGetColors.3 \
+	XmGetDestination.3 \
+	XmGetDragContext.3 \
+	XmGetFocusWidget.3 \
+	XmGetMenuCursor.3 \
+	XmGetPixmap.3 \
+	XmGetPixmapByDepth.3 \
+	XmGetPostedFromWidget.3 \
+	XmGetScaledPixmap.3 \
+	XmGetSecondaryResourceData.3 \
+	XmGetTabGroup.3 \
+	XmGetTearOffControl.3 \
+	XmGetVisibility.3 \
+	XmGetXmDisplay.3 \
+	XmGetXmScreen.3 \
+	XmIconBox.3 \
+	XmIconButton.3 \
+	XmIconGadget.3 \
+	XmImCloseXIM.3 \
+	XmImFreeXIC.3 \
+	XmImGetXIC.3 \
+	XmImGetXIM.3 \
+	XmImMbLookupString.3 \
+	XmImMbResetIC.3 \
+	XmImRegister.3 \
+	XmImSetFocusValues.3 \
+	XmImSetValues.3 \
+	XmImSetXIC.3 \
+	XmImUnregister.3 \
+	XmImUnsetFocus.3 \
+	XmImVaSetFocusValues.3 \
+	XmImVaSetValues.3 \
+	XmInstallImage.3 \
+	XmInternAtom.3 \
+	XmIsMotifWMRunning.3 \
+	XmIsTraversable.3 \
+	XmLabel.3 \
+	XmLabelGadget.3 \
+	XmList.3 \
+	XmListAddItem.3 \
+	XmListAddItemUnselected.3 \
+	XmListAddItems.3 \
+	XmListAddItemsUnselected.3 \
+	XmListDeleteAllItems.3 \
+	XmListDeleteItem.3 \
+	XmListDeleteItems.3 \
+	XmListDeleteItemsPos.3 \
+	XmListDeletePos.3 \
+	XmListDeletePositions.3 \
+	XmListDeselectAllItems.3 \
+	XmListDeselectItem.3 \
+	XmListDeselectPos.3 \
+	XmListGetKbdItemPos.3 \
+	XmListGetMatchPos.3 \
+	XmListGetSelectedPos.3 \
+	XmListItemExists.3 \
+	XmListItemPos.3 \
+	XmListPosSelected.3 \
+	XmListPosToBounds.3 \
+	XmListReplaceItems.3 \
+	XmListReplaceItemsPos.3 \
+	XmListReplaceItemsPosUnselected.3 \
+	XmListReplaceItemsUnselected.3 \
+	XmListReplacePositions.3 \
+	XmListSelectItem.3 \
+	XmListSelectPos.3 \
+	XmListSetAddMode.3 \
+	XmListSetBottomItem.3 \
+	XmListSetBottomPos.3 \
+	XmListSetHorizPos.3 \
+	XmListSetItem.3 \
+	XmListSetKbdItemPos.3 \
+	XmListSetPos.3 \
+	XmListUpdateSelectedList.3 \
+	XmListYToPos.3 \
+	XmMainWindow.3 \
+	XmMainWindowSep1.3 \
+	XmMainWindowSep2.3 \
+	XmMainWindowSep3.3 \
+	XmMainWindowSetAreas.3 \
+	XmManager.3 \
+	XmMapSegmentEncoding.3 \
+	XmMenuPosition.3 \
+	XmMenuShell.3 \
+	XmMessageBox.3 \
+	XmMessageBoxGetChild.3 \
+	XmNotebook.3 \
+	XmNotebookGetPageInfo.3 \
+	XmObjectAtPoint.3 \
+	XmOptionButtonGadget.3 \
+	XmOptionLabelGadget.3 \
+	XmPanedWindow.3 \
+	XmParseMapping.3 \
+	XmParseMappingCreate.3 \
+	XmParseMappingFree.3 \
+	XmParseMappingGetValues.3 \
+	XmParseMappingSetValues.3 \
+	XmParseTable.3 \
+	XmParseTableFree.3 \
+	XmPrimitive.3 \
+	XmPrintPopupPDM.3 \
+	XmPrintSetup.3 \
+	XmPrintShell.3 \
+	XmPrintToFile.3 \
+	XmProcessTraversal.3 \
+	XmPushButton.3 \
+	XmPushButtonGadget.3 \
+	XmRedisplayWidget.3 \
+	XmRegisterSegmentEncoding.3 \
+	XmRemoveFromPostFromList.3 \
+	XmRemoveProtocolCallback.3 \
+	XmRemoveProtocols.3 \
+	XmRemoveTabGroup.3 \
+	XmRemoveWMProtocolCallback.3 \
+	XmRemoveWMProtocols.3 \
+	XmRenderTable.3 \
+	XmRenderTableAddRenditions.3 \
+	XmRenderTableCopy.3 \
+	XmRenderTableCvtFromProp.3 \
+	XmRenderTableCvtToProp.3 \
+	XmRenderTableFree.3 \
+	XmRenderTableGetRendition.3 \
+	XmRenderTableGetRenditions.3 \
+	XmRenderTableGetTags.3 \
+	XmRenderTableRemoveRenditions.3 \
+	XmRendition.3 \
+	XmRenditionCreate.3 \
+	XmRenditionFree.3 \
+	XmRenditionRetrieve.3 \
+	XmRenditionUpdate.3 \
+	XmRepTypeAddReverse.3 \
+	XmRepTypeGetId.3 \
+	XmRepTypeGetNameList.3 \
+	XmRepTypeGetRecord.3 \
+	XmRepTypeGetRegistered.3 \
+	XmRepTypeInstallTearOffModelConverter.3 \
+	XmRepTypeRegister.3 \
+	XmRepTypeValidValue.3 \
+	XmResolveAllPartOffsets.3 \
+	XmResolvePartOffsets.3 \
+	XmRowColumn.3 \
+	XmScale.3 \
+	XmScaleGetValue.3 \
+	XmScaleSetTicks.3 \
+	XmScaleSetValue.3 \
+	XmScreen.3 \
+	XmScrollBar.3 \
+	XmScrollBarGetValues.3 \
+	XmScrollBarSetValues.3 \
+	XmScrollVisible.3 \
+	XmScrolledWindow.3 \
+	XmScrolledWindowSetAreas.3 \
+	XmSelectionBox.3 \
+	XmSelectionBoxGetChild.3 \
+	XmSeparator.3 \
+	XmSeparatorGadget.3 \
+	XmSetColorCalculation.3 \
+	XmSetFontUnit.3 \
+	XmSetFontUnits.3 \
+	XmSetMenuCursor.3 \
+	XmSetProtocolHooks.3 \
+	XmSetWMProtocolHooks.3 \
+	XmSimpleSpinBox.3 \
+	XmSimpleSpinBoxAddItem.3 \
+	XmSimpleSpinBoxDeletePos.3 \
+	XmSimpleSpinBoxSetItem.3 \
+	XmSlideContext.3 \
+	XmSpinBox.3 \
+	XmSpinBoxValidatePosition.3 \
+	XmString.3 \
+	XmStringBaseline.3 \
+	XmStringByteCompare.3 \
+	XmStringByteStreamLength.3 \
+	XmStringCompare.3 \
+	XmStringComponentCreate.3 \
+	XmStringComponentType.3 \
+	XmStringConcat.3 \
+	XmStringConcatAndFree.3 \
+	XmStringCopy.3 \
+	XmStringCreate.3 \
+	XmStringCreateLocalized.3 \
+	XmStringCreateLtoR.3 \
+	XmStringCreateSimple.3 \
+	XmStringDirection.3 \
+	XmStringDirectionCreate.3 \
+	XmStringDirectionToDirection.3 \
+	XmStringDraw.3 \
+	XmStringDrawImage.3 \
+	XmStringDrawUnderline.3 \
+	XmStringEmpty.3 \
+	XmStringExtent.3 \
+	XmStringFree.3 \
+	XmStringFreeContext.3 \
+	XmStringGenerate.3 \
+	XmStringGetLtoR.3 \
+	XmStringGetNextComponent.3 \
+	XmStringGetNextSegment.3 \
+	XmStringGetNextTriple.3 \
+	XmStringHasSubstring.3 \
+	XmStringHeight.3 \
+	XmStringInitContext.3 \
+	XmStringIsVoid.3 \
+	XmStringLength.3 \
+	XmStringLineCount.3 \
+	XmStringNConcat.3 \
+	XmStringNCopy.3 \
+	XmStringParseText.3 \
+	XmStringPeekNextComponent.3 \
+	XmStringPeekNextTriple.3 \
+	XmStringPutRendition.3 \
+	XmStringSegmentCreate.3 \
+	XmStringSeparatorCreate.3 \
+	XmStringTable.3 \
+	XmStringTableParseStringArray.3 \
+	XmStringTableProposeTablist.3 \
+	XmStringTableToXmString.3 \
+	XmStringTableUnparse.3 \
+	XmStringToXmStringTable.3 \
+	XmStringUnparse.3 \
+	XmStringWidth.3 \
+	XmTab.3 \
+	XmTabCreate.3 \
+	XmTabFree.3 \
+	XmTabGetValues.3 \
+	XmTabList.3 \
+	XmTabListCopy.3 \
+	XmTabListFree.3 \
+	XmTabListGetTab.3 \
+	XmTabListInsertTabs.3 \
+	XmTabListRemoveTabs.3 \
+	XmTabListReplacePositions.3 \
+	XmTabListTabCount.3 \
+	XmTabSetValue.3 \
+	XmTabStack.3 \
+	XmTargetsAreCompatible.3 \
+	XmText.3 \
+	XmTextClearSelection.3 \
+	XmTextCopy.3 \
+	XmTextCopyLink.3 \
+	XmTextCut.3 \
+	XmTextDisableRedisplay.3 \
+	XmTextEnableRedisplay.3 \
+	XmTextField.3 \
+	XmTextFieldClearSelection.3 \
+	XmTextFieldCopy.3 \
+	XmTextFieldCopyLink.3 \
+	XmTextFieldCut.3 \
+	XmTextFieldGetBaseline.3 \
+	XmTextFieldGetEditable.3 \
+	XmTextFieldGetInsertionPosition.3 \
+	XmTextFieldGetLastPosition.3 \
+	XmTextFieldGetMaxLength.3 \
+	XmTextFieldGetSelection.3 \
+	XmTextFieldGetSelectionPosition.3 \
+	XmTextFieldGetSelectionWcs.3 \
+	XmTextFieldGetString.3 \
+	XmTextFieldGetStringWcs.3 \
+	XmTextFieldGetSubstring.3 \
+	XmTextFieldGetSubstringWcs.3 \
+	XmTextFieldInsert.3 \
+	XmTextFieldInsertWcs.3 \
+	XmTextFieldPaste.3 \
+	XmTextFieldPasteLink.3 \
+	XmTextFieldPosToXY.3 \
+	XmTextFieldRemove.3 \
+	XmTextFieldReplace.3 \
+	XmTextFieldReplaceWcs.3 \
+	XmTextFieldSetAddMode.3 \
+	XmTextFieldSetEditable.3 \
+	XmTextFieldSetHighlight.3 \
+	XmTextFieldSetInsertionPosition.3 \
+	XmTextFieldSetMaxLength.3 \
+	XmTextFieldSetSelection.3 \
+	XmTextFieldSetString.3 \
+	XmTextFieldSetStringWcs.3 \
+	XmTextFieldShowPosition.3 \
+	XmTextFieldXYToPos.3 \
+	XmTextFindString.3 \
+	XmTextFindStringWcs.3 \
+	XmTextGetBaseline.3 \
+	XmTextGetCenterline.3 \
+	XmTextGetEditable.3 \
+	XmTextGetInsertionPosition.3 \
+	XmTextGetLastPosition.3 \
+	XmTextGetMaxLength.3 \
+	XmTextGetSelection.3 \
+	XmTextGetSelectionPosition.3 \
+	XmTextGetSelectionWcs.3 \
+	XmTextGetSource.3 \
+	XmTextGetString.3 \
+	XmTextGetStringWcs.3 \
+	XmTextGetSubstring.3 \
+	XmTextGetSubstringWcs.3 \
+	XmTextGetTopCharacter.3 \
+	XmTextInsert.3 \
+	XmTextInsertWcs.3 \
+	XmTextPaste.3 \
+	XmTextPasteLink.3 \
+	XmTextPosToXY.3 \
+	XmTextPosition.3 \
+	XmTextRemove.3 \
+	XmTextReplace.3 \
+	XmTextReplaceWcs.3 \
+	XmTextScroll.3 \
+	XmTextSetAddMode.3 \
+	XmTextSetEditable.3 \
+	XmTextSetHighlight.3 \
+	XmTextSetInsertionPosition.3 \
+	XmTextSetMaxLength.3 \
+	XmTextSetSelection.3 \
+	XmTextSetSource.3 \
+	XmTextSetString.3 \
+	XmTextSetStringWcs.3 \
+	XmTextSetTopCharacter.3 \
+	XmTextShowPosition.3 \
+	XmTextXYToPos.3 \
+	XmToggleButton.3 \
+	XmToggleButtonGadget.3 \
+	XmToggleButtonGadgetGetState.3 \
+	XmToggleButtonGadgetSetState.3 \
+	XmToggleButtonGetState.3 \
+	XmToggleButtonSetState.3 \
+	XmToggleButtonSetValue.3 \
+	XmTrackingEvent.3 \
+	XmTrackingLocate.3 \
+	XmTransferDone.3 \
+	XmTransferSendRequest.3 \
+	XmTransferSetParameters.3 \
+	XmTransferStartRequest.3 \
+	XmTransferValue.3 \
+	XmTranslateKey.3 \
+	XmTree.3 \
+	XmUninstallImage.3 \
+	XmUpdateDisplay.3 \
+	XmVaCreateSimpleCheckBox.3 \
+	XmVaCreateSimpleMenuBar.3 \
+	XmVaCreateSimpleOptionMenu.3 \
+	XmVaCreateSimplePopupMenu.3 \
+	XmVaCreateSimplePulldownMenu.3 \
+	XmVaCreateSimpleRadioBox.3 \
+	XmWidgetGetBaselines.3 \
+	XmWidgetGetDisplayRect.3 
+MAN5= \
+	Traits.5 \
+	UIL.5 \
+	WML.5 \
+	mwmrc.5
diff -urN /usr/ports/x11-toolkits/open-motif/distinfo x11-toolkits/open-motif/distinfo
--- /usr/ports/x11-toolkits/open-motif/distinfo	Wed Jul 19 21:58:56 2000
+++ x11-toolkits/open-motif/distinfo	Mon Sep  2 21:35:22 2002
@@ -1,6 +1 @@
-MD5 (openmotif/openmotif2.1.30.tar.gz) = 14b25d85256ef7f0a1a989b4b612c909
-MD5 (openmotif/patch1) = a05097561c36cebfbce5328d1e5a81e3
-MD5 (openmotif/patch2) = 18c887e5322f419c860f5d3707bfc25b
-MD5 (openmotif/patch3) = 20e65337cc9cfa140e2ff10d5162dc88
-MD5 (openmotif/patch4) = 7bbb64bfc82d2db06f51922be59dda4c
-MD5 (openmotif/patch5) = eda9e4d0d0f2b63087234bb0e789a311
+MD5 (openmotif/openmotif-2.2.2.tgz) = c5953e0fa08f79644e7bef9da218bb4b
diff -urN /usr/ports/x11-toolkits/open-motif/files/doc.imk x11-toolkits/open-motif/files/doc.imk
--- /usr/ports/x11-toolkits/open-motif/files/doc.imk	Wed Jul 19 21:58:56 2000
+++ x11-toolkits/open-motif/files/doc.imk	Thu Jan  1 09:00:00 1970
@@ -1,9 +0,0 @@
-XCOMM $FreeBSD: ports/x11-toolkits/open-motif/files/doc.imk,v 1.1 2000/07/19 12:58:56 obrien Exp $
-
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS = man
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
diff -urN /usr/ports/x11-toolkits/open-motif/files/host.def x11-toolkits/open-motif/files/host.def
--- /usr/ports/x11-toolkits/open-motif/files/host.def	Wed Jul 19 21:58:56 2000
+++ x11-toolkits/open-motif/files/host.def	Thu Jan  1 09:00:00 1970
@@ -1,43 +0,0 @@
-XCOMM site:  $FreeBSD: ports/x11-toolkits/open-motif/files/host.def,v 1.1 2000/07/19 12:58:56 obrien Exp $ host.def
-
-#include <host.def.orig>
-
-#ifdef BeforeVendorCF
-# ifndef HostDEFBefore
-#  define HostDEFBefore
-
-#  ifndef MotifDEFBefore
-#   define MotifDEFBefore
-#   include <motif.def>
-#  endif
-
-#  define LocalConfigFiles host.def motif.def
-
-
-# endif
-#endif
-
-#ifdef AfterVendorCF
-# ifndef HostDEFAfter
-#  define HostDEFAfter
-
-#  undef ProjectRoot
-
-#  ifndef MotifDEFAfter
-#   define MotifDEFAfter
-#   include <motif.def>
-#  endif
-
-#  undef X11ProjectRoot
-
-#  undef ProjectRoot
-#  define ProjectRoot /usr/X11R6
-
-#  undef VirtualBindingsPath
-#  define VirtualBindingsPath Concat(UsrLibDir,/X11/bindings)
-
-#  undef DefaultUserPath
-#  define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/gnu/bin:/usr/local/bin 
-
-# endif
-#endif
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-FreeBSD.cf x11-toolkits/open-motif/files/patch-FreeBSD.cf
--- /usr/ports/x11-toolkits/open-motif/files/patch-FreeBSD.cf	Thu Feb 15 07:21:57 2001
+++ x11-toolkits/open-motif/files/patch-FreeBSD.cf	Thu Jan  1 09:00:00 1970
@@ -1,28 +0,0 @@
---- config/cf/FreeBSD.cf.orig	Sun Feb 11 08:23:51 2001
-+++ config/cf/FreeBSD.cf	Sun Feb 11 08:33:30 2001
-@@ -60,7 +60,7 @@
- #define MkdirHierCmd		mkdir -p
- 
- #define CcCmd			cc
--#define CppCmd			/usr/libexec/cpp
-+#define CppCmd			/usr/bin/cpp
- #define PreProcessCmd		CppCmd
- #define StandardCppDefines	-traditional
- #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
-@@ -333,14 +333,14 @@
- /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
- #ifndef DefaultGcc2i386Opt
- #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2
-+#define DefaultGcc2i386Opt
- #endif
- #endif
- 
- #ifdef i386Architecture
- # define OptimizedCDebugFlags DefaultGcc2i386Opt
- #else
--# define OptimizedCDebugFlags -O2
-+# define OptimizedCDebugFlags
- #endif
- 
- #ifndef PreIncDir
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-Makefile.in x11-toolkits/open-motif/files/patch-Makefile.in
--- /usr/ports/x11-toolkits/open-motif/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
+++ x11-toolkits/open-motif/files/patch-Makefile.in	Tue Sep  3 23:23:04 2002
@@ -0,0 +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)
+ 
+ AUTOMAKE_OPTIONS = 1.4
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-Mrm-Imakefile x11-toolkits/open-motif/files/patch-Mrm-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-Mrm-Imakefile	Mon Sep 18 15:22:50 2000
+++ x11-toolkits/open-motif/files/patch-Mrm-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
---- lib/Mrm/Imakefile.orig	Sun Sep 17 23:11:27 2000
-+++ lib/Mrm/Imakefile	Sun Sep 17 23:12:05 2000
-@@ -36,8 +36,10 @@
- 
- #define DoNormalLib	NormalLibMrm
- #define DoSharedLib	SharedLibMrm
-+#if 0
- #define DoDebugLib	DebugLibMrm
- #define DoProfileLib	ProfileLibMrm
-+#endif
- #define LibName		Mrm
- #define SoRev		SOMRMREV
- #define HasSharedData	NO
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-Xm-Imakefile x11-toolkits/open-motif/files/patch-Xm-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-Xm-Imakefile	Mon Sep 18 15:22:50 2000
+++ x11-toolkits/open-motif/files/patch-Xm-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
---- lib/Xm/Imakefile.orig	Sun Sep 17 23:14:50 2000
-+++ lib/Xm/Imakefile	Sun Sep 17 23:15:01 2000
-@@ -41,8 +41,10 @@
- 
- #define DoNormalLib	NormalLibXm
- #define DoSharedLib	SharedLibXm
-+#if 0
- #define DoDebugLib	DebugLibXm
- #define DoProfileLib	ProfileLibXm
-+#endif
- #define LibName		Xm
- #define SoRev		SOXMREV
- #define HasSharedData	YES
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-XmIm.c x11-toolkits/open-motif/files/patch-XmIm.c
--- /usr/ports/x11-toolkits/open-motif/files/patch-XmIm.c	Fri Jul 26 13:10:23 2002
+++ x11-toolkits/open-motif/files/patch-XmIm.c	Thu Jan  1 09:00:00 1970
@@ -1,49 +0,0 @@
---- lib/Xm/XmIm.c.orig	Fri Sep  7 10:11:01 2001
-+++ lib/Xm/XmIm.c	Sat Sep  8 03:44:14 2001
-@@ -479,6 +479,7 @@
-       im_info->current_widget = w;
-       XtVaGetValues(w, XmNbackground, &bg, NULL);
-       XtVaSetValues(p, XmNbackground, bg, NULL);
-+      ImGeoReq(p);
-       draw_separator(p);
-     }
-   _XmAppUnlock(app);
-@@ -1272,6 +1273,7 @@
-       XtAddEventHandler(p, (EventMask)mask, False, null_proc, NULL);
-     }
-     if (XtIsRealized(p)) {
-+      im_info->current_widget = w;
-       if (XmIsDialogShell(p)) {
- 	for (i = 0; 
- 	     i < ((CompositeWidget)p)->composite.num_children; 
-@@ -1282,7 +1284,6 @@
- 	  }
-       } else
- 	ImGeoReq(p);
--      im_info->current_widget = w;
-     }
-     /* Is this new XIC supposed to be shared? */
-     switch (input_policy)
-@@ -2047,10 +2048,18 @@
- 	  rect_preedit.height = icp->sp_height;
-         } else if ((use_plist = (icp->input_style & XIMPreeditPosition)) != 0)
-         {
--          unsigned int  margin = ((XmPrimitiveWidget)im_info->current_widget)
--                                ->primitive.shadow_thickness
--                            + ((XmPrimitiveWidget)im_info->current_widget)
--                                ->primitive.highlight_thickness;
-+	  unsigned int	margin;
-+	  /*
-+	   * im_info->current_widget eventually contains NULL,
-+	   * for example, when widget having XIC focus is disposed.
-+	   * Thus, we should check this and prevent from touching NULL pointer.
-+	   */
-+	  if (im_info->current_widget == NULL)
-+	    break;
-+          margin = ((XmPrimitiveWidget)im_info->current_widget)
-+	  	  ->primitive.shadow_thickness
-+	      + ((XmPrimitiveWidget)im_info->current_widget)
-+	  	  ->primitive.highlight_thickness;
- 
-           rect_preedit.width = MIN(icp->preedit_width,
-                   XtWidth(im_info->current_widget) - 2*margin);
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-bindings-Imakefile x11-toolkits/open-motif/files/patch-bindings-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-bindings-Imakefile	Wed Jul 19 21:58:56 2000
+++ x11-toolkits/open-motif/files/patch-bindings-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,14 +0,0 @@
---- bindings/Imakefile.orig	Wed May  3 11:12:34 2000
-+++ bindings/Imakefile	Thu May 18 11:02:40 2000
-@@ -37,10 +37,10 @@
- XCOMM HISTORY
- XCOMM 
- XCOMM   $TOG: Imakefile /main/8 1997/07/02 17:51:43 samborn $
--INSTALLFLAGS = $(INSTINCFLAGS)
- 
- FILES = \
- 	xmbind.alias \
-+	CDE \
- 	acorn \
- 	apollo \
- 	dec \
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-cf-Imakefile x11-toolkits/open-motif/files/patch-cf-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-cf-Imakefile	Fri Nov 23 20:35:25 2001
+++ x11-toolkits/open-motif/files/patch-cf-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- config/cf/Imakefile.orig	Fri Nov  2 03:58:47 2001
-+++ config/cf/Imakefile	Fri Nov  2 03:59:06 2001
-@@ -121,8 +121,6 @@
- QNX.cf \
- xfree86.cf
- 
--INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES)
--
- all::
- 
- InstallMultipleDestFlags(install,$(INSTFILES),$(CONFIGDIR),$(INSTDATFLAGS))
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-config-cf-Imake.tmpl x11-toolkits/open-motif/files/patch-config-cf-Imake.tmpl
--- /usr/ports/x11-toolkits/open-motif/files/patch-config-cf-Imake.tmpl	Thu Feb 15 07:21:57 2001
+++ x11-toolkits/open-motif/files/patch-config-cf-Imake.tmpl	Thu Jan  1 09:00:00 1970
@@ -1,11 +0,0 @@
---- config/cf/Imake.tmpl.orig	Sun Feb 11 08:37:29 2001
-+++ config/cf/Imake.tmpl	Sun Feb 11 08:37:48 2001
-@@ -1334,7 +1334,7 @@
-  */
-       ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
--           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+          CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
-          LDPRELIB = LdPreLib
-         LDPOSTLIB = LdPostLib
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-demos::programs::Makefile.in x11-toolkits/open-motif/files/patch-demos::programs::Makefile.in
--- /usr/ports/x11-toolkits/open-motif/files/patch-demos::programs::Makefile.in	Thu Jan  1 09:00:00 1970
+++ x11-toolkits/open-motif/files/patch-demos::programs::Makefile.in	Sat Sep  7 06:25:24 2002
@@ -0,0 +1,10 @@
+--- 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 \
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-doc::man::Makefile.in x11-toolkits/open-motif/files/patch-doc::man::Makefile.in
--- /usr/ports/x11-toolkits/open-motif/files/patch-doc::man::Makefile.in	Thu Jan  1 09:00:00 1970
+++ x11-toolkits/open-motif/files/patch-doc::man::Makefile.in	Tue Sep  3 23:08:59 2002
@@ -0,0 +1,11 @@
+--- doc/man/Makefile.in.orig	Thu Feb 14 23:15:49 2002
++++ doc/man/Makefile.in	Tue Sep  3 23:06:51 2002
+@@ -89,7 +89,7 @@
+ X_XMU = @X_XMU@
+ YACC = @YACC@
+ 
+-SUBDIRS = man1 man3 man4 man5
++SUBDIRS = man1 man3 man5
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../include/config.h
+ CONFIG_CLEAN_FILES = 
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-doc::man::man5::Makefile.in x11-toolkits/open-motif/files/patch-doc::man::man5::Makefile.in
--- /usr/ports/x11-toolkits/open-motif/files/patch-doc::man::man5::Makefile.in	Thu Jan  1 09:00:00 1970
+++ x11-toolkits/open-motif/files/patch-doc::man::man5::Makefile.in	Tue Sep  3 22:59:42 2002
@@ -0,0 +1,12 @@
+--- 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
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../include/config.h
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-imake-Imakefile x11-toolkits/open-motif/files/patch-imake-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-imake-Imakefile	Sat Aug 19 02:42:04 2000
+++ x11-toolkits/open-motif/files/patch-imake-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,19 +0,0 @@
---- config/imake/Imakefile.org	Fri Apr 28 08:04:06 2000
-+++ config/imake/Imakefile	Sat Aug  5 12:50:32 2000
-@@ -1,5 +1,16 @@
- XCOMM $TOG: Imakefile /main/10 1997/04/30 15:39:17 kaleb $
- 
-+#ifdef FreeBSDArchitecture
-+#undef InstallProgram
-+#define InstallProgram(file,dest) /* as nothing */
-+#undef InstallNamedProg
-+#define InstallNamedProg(srcname,dstname,dest) /* as nothing */
-+#undef InstallManPage
-+#define InstallManPage(file,dest) /* as nothing */
-+#undef InstallManPageLong
-+#define InstallManPageLong(srcname,dest,dstname) /* as nothing */
-+#endif
-+
- XCOMM Some compilers generate fatal errors if an -L directory does
- XCOMM not exist.  Since BUILDLIBDIR may not exist yet suppress its use.
-          LDPRELIB =
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-ltmain.sh x11-toolkits/open-motif/files/patch-ltmain.sh
--- /usr/ports/x11-toolkits/open-motif/files/patch-ltmain.sh	Thu Jan  1 09:00:00 1970
+++ x11-toolkits/open-motif/files/patch-ltmain.sh	Wed Sep  4 03:37:05 2002
@@ -0,0 +1,41 @@
+--- 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 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-makedepend-Imakefile x11-toolkits/open-motif/files/patch-makedepend-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-makedepend-Imakefile	Sat Aug 19 02:42:04 2000
+++ x11-toolkits/open-motif/files/patch-makedepend-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,19 +0,0 @@
---- config/makedepend/Imakefile.org	Fri Apr 28 08:04:06 2000
-+++ config/makedepend/Imakefile	Sat Aug  5 12:50:48 2000
-@@ -1,5 +1,16 @@
- XCOMM $TOG: Imakefile /main/27 1997/04/30 15:38:09 kaleb $
- 
-+#ifdef FreeBSDArchitecture
-+#undef InstallProgram
-+#define InstallProgram(file,dest) /* as nothing */
-+#undef InstallNamedProg
-+#define InstallNamedProg(srcname,dstname,dest) /* as nothing */
-+#undef InstallManPage
-+#define InstallManPage(file,dest) /* as nothing */
-+#undef InstallManPageLong
-+#define InstallManPageLong(srcname,dest,dstname) /* as nothing */
-+#endif
-+
-     SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c 
-     OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o 
- 
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-man-Imakefile x11-toolkits/open-motif/files/patch-man-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-man-Imakefile	Wed Jul 19 21:58:56 2000
+++ x11-toolkits/open-motif/files/patch-man-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,7 +0,0 @@
---- doc/man/Imakefile.dist	Wed Jul 19 04:17:33 2000
-+++ doc/man/Imakefile	Wed Jul 19 04:38:47 2000
-@@ -5,3 +5,3 @@
- 
--SUBDIRS = man1 man3 man4 man5
-+SUBDIRS = man1 man3 man5
- 
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-man5-Imakefile x11-toolkits/open-motif/files/patch-man5-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-man5-Imakefile	Wed Jul 19 21:58:56 2000
+++ x11-toolkits/open-motif/files/patch-man5-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,12 +0,0 @@
---- doc/man/man5/Imakefile.orig	Wed Jul 19 04:40:11 2000
-+++ doc/man/man5/Imakefile	Wed Jul 19 05:10:00 2000
-@@ -2,4 +2,4 @@
- 
--MANDIR = $(MISCMANDIR)
--MANSUFFIX = $(MISCMANSUFFIX)
-+MANDIR = $(FILEMANDIR)
-+MANSUFFIX = $(FILEMANSUFFIX)
- 
-@@ -10 +10,2 @@
- InstallMotifManPage(WML,5)
-+InstallMotifManPage(mwmrc,5)
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-uil-Imakefile x11-toolkits/open-motif/files/patch-uil-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-uil-Imakefile	Mon Sep 18 15:22:50 2000
+++ x11-toolkits/open-motif/files/patch-uil-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
---- clients/uil/Imakefile.orig	Sun Sep 17 23:19:36 2000
-+++ clients/uil/Imakefile	Sun Sep 17 23:19:50 2000
-@@ -40,8 +40,10 @@
- 
- #define DoNormalLib	NormalLibUil
- #define DoSharedLib	SharedLibUil
-+#if 0
- #define DoDebugLib	DebugLibUil
- #define DoProfileLib	ProfileLibUil
-+#endif
- #define LibName		Uil
- #define	SoRev		SOUILREV
- #define HasSharedData	NO
diff -urN /usr/ports/x11-toolkits/open-motif/files/patch-util-Imakefile x11-toolkits/open-motif/files/patch-util-Imakefile
--- /usr/ports/x11-toolkits/open-motif/files/patch-util-Imakefile	Wed Jul 19 21:58:56 2000
+++ x11-toolkits/open-motif/files/patch-util-Imakefile	Thu Jan  1 09:00:00 1970
@@ -1,19 +0,0 @@
---- config/util/Imakefile.orig	Fri Apr 28 17:04:07 2000
-+++ config/util/Imakefile	Thu May 18 11:17:19 2000
-@@ -1,4 +1,16 @@
- XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $
-+
-+#ifdef FreeBSDArchitecture
-+#undef InstallProgram
-+#define InstallProgram(file,dest) /* as nothing */
-+#undef InstallNamedProg
-+#define InstallNamedProg(srcname,dstname,dest) /* as nothing */
-+#undef InstallManPage
-+#define InstallManPage(file,dest) /* as nothing */
-+#undef InstallManPageLong
-+#define InstallManPageLong(srcname,dest,dstname) /* as nothing */
-+#endif
-+
- #if UseCCMakeDepend
- MDEP_PROG = makedepend
- #endif
diff -urN /usr/ports/x11-toolkits/open-motif/pkg-message x11-toolkits/open-motif/pkg-message
--- /usr/ports/x11-toolkits/open-motif/pkg-message	Wed Jul 19 21:58:56 2000
+++ x11-toolkits/open-motif/pkg-message	Thu Jan  1 09:00:00 1970
@@ -1,3 +0,0 @@
-
-Make sure to set HAVE_MOTIF=yes in /etc/make.conf
-
diff -urN /usr/ports/x11-toolkits/open-motif/pkg-plist x11-toolkits/open-motif/pkg-plist
--- /usr/ports/x11-toolkits/open-motif/pkg-plist	Fri Nov 23 20:35:26 2001
+++ x11-toolkits/open-motif/pkg-plist	Thu Sep  5 21:32:32 2002
@@ -1,49 +1,40 @@
 @comment $FreeBSD: ports/x11-toolkits/open-motif/pkg-plist,v 1.11 2001/11/23 08:48:03 sf Exp $
 %%MOTIF_DEMOS%%bin/DNDDemo
-%%MOTIF_DEMOS%%bin/UTMXmText
-%%MOTIF_DEMOS%%bin/aicon
 %%MOTIF_DEMOS%%bin/airport
 %%MOTIF_DEMOS%%bin/autopopups
-%%MOTIF_DEMOS%%bin/combo_box
-%%MOTIF_DEMOS%%bin/container
-%%MOTIF_DEMOS%%bin/dainput
-%%MOTIF_DEMOS%%bin/dogs
+%%MOTIF_DEMOS%%bin/bboxdemo
+%%MOTIF_DEMOS%%bin/colordemo
+%%MOTIF_DEMOS%%bin/column
+%%MOTIF_DEMOS%%bin/combo
 %%MOTIF_DEMOS%%bin/draw
 %%MOTIF_DEMOS%%bin/earth
-%%MOTIF_DEMOS%%bin/exm_in_c
-%%MOTIF_DEMOS%%bin/exm_in_uil
+%%MOTIF_DEMOS%%bin/ext18list
 %%MOTIF_DEMOS%%bin/filemanager
 %%MOTIF_DEMOS%%bin/fileview
+%%MOTIF_DEMOS%%bin/fontsel
 %%MOTIF_DEMOS%%bin/getsubres
 %%MOTIF_DEMOS%%bin/helloint
 %%MOTIF_DEMOS%%bin/hellomotif
 %%MOTIF_DEMOS%%bin/i18ninput
-%%MOTIF_DEMOS%%bin/motifshell
+%%MOTIF_DEMOS%%bin/iconbuttondemo
 bin/mwm
-%%MOTIF_DEMOS%%bin/notebook
-%%MOTIF_DEMOS%%bin/onHelp
+%%MOTIF_DEMOS%%bin/outline
+%%MOTIF_DEMOS%%bin/paned
+%%MOTIF_DEMOS%%bin/panner
 %%MOTIF_DEMOS%%bin/periodic
 %%MOTIF_DEMOS%%bin/piano
 %%MOTIF_DEMOS%%bin/sampler2_0
 %%MOTIF_DEMOS%%bin/setDate
-%%MOTIF_DEMOS%%bin/simpleDemo
-%%MOTIF_DEMOS%%bin/simple_drag
-%%MOTIF_DEMOS%%bin/simple_drop
 %%MOTIF_DEMOS%%bin/simpledrop
-%%MOTIF_DEMOS%%bin/spin_box
-%%MOTIF_DEMOS%%bin/tic_mark
+%%MOTIF_DEMOS%%bin/tabstack
 %%MOTIF_DEMOS%%bin/todo
+%%MOTIF_DEMOS%%bin/tooltips
+%%MOTIF_DEMOS%%bin/tree
 bin/uil
-%%MOTIF_DEMOS%%bin/uilsymdump
-%%MOTIF_DEMOS%%bin/xmanimate
-%%MOTIF_DEMOS%%bin/xmapdef
+%%MOTIF_DEMOS%%bin/wsm
 bin/xmbind
-%%MOTIF_DEMOS%%bin/xmfonts
-%%MOTIF_DEMOS%%bin/xmforc
-%%MOTIF_DEMOS%%bin/xmform
 include/Mrm/MrmAppl.h
 include/Mrm/MrmDecls.h
-include/Mrm/MrmMsgI.h
 include/Mrm/MrmPublic.h
 include/Mrm/MrmosI.h
 include/X11/bitmaps/xm_error
@@ -67,106 +58,95 @@
 include/Xm/ArrowBGP.h
 include/Xm/ArrowBP.h
 include/Xm/AtomMgr.h
-include/Xm/BaseClassI.h
 include/Xm/BaseClassP.h
-include/Xm/BitmapsI.h
 include/Xm/BulletinB.h
-include/Xm/BulletinBI.h
 include/Xm/BulletinBP.h
-include/Xm/CacheI.h
+include/Xm/ButtonBox.h
+include/Xm/ButtonBoxP.h
 include/Xm/CacheP.h
-include/Xm/CallbackI.h
 include/Xm/CareVisualT.h
-include/Xm/CareVisualTI.h
 include/Xm/CascadeB.h
 include/Xm/CascadeBG.h
-include/Xm/CascadeBGI.h
 include/Xm/CascadeBGP.h
-include/Xm/CascadeBI.h
 include/Xm/CascadeBP.h
-include/Xm/ClipWindTI.h
 include/Xm/ClipWindowP.h
-include/Xm/CntrbmI.h
-include/Xm/ColorI.h
-include/Xm/ColorObjI.h
 include/Xm/ColorObjP.h
 include/Xm/ColorP.h
+include/Xm/ColorS.h
+include/Xm/ColorSP.h
+include/Xm/Column.h
+include/Xm/ColumnP.h
 include/Xm/ComboBox.h
+include/Xm/ComboBox2.h
+include/Xm/ComboBox2P.h
 include/Xm/ComboBoxP.h
 include/Xm/Command.h
-include/Xm/CommandI.h
 include/Xm/CommandP.h
 include/Xm/ContItemT.h
 include/Xm/Container.h
 include/Xm/ContainerP.h
 include/Xm/ContainerT.h
 include/Xm/CutPaste.h
-include/Xm/CutPasteI.h
+include/Xm/DataF.h
+include/Xm/DataFP.h
+include/Xm/DataFSelP.h
 include/Xm/DesktopP.h
-include/Xm/DestI.h
 include/Xm/DialogS.h
 include/Xm/DialogSEP.h
 include/Xm/DialogSP.h
 include/Xm/DialogSavvyT.h
 include/Xm/Display.h
-include/Xm/DisplayI.h
 include/Xm/DisplayP.h
-include/Xm/DragBSI.h
 include/Xm/DragC.h
-include/Xm/DragCI.h
 include/Xm/DragCP.h
 include/Xm/DragDrop.h
-include/Xm/DragICCI.h
 include/Xm/DragIcon.h
-include/Xm/DragIconI.h
 include/Xm/DragIconP.h
 include/Xm/DragOverS.h
-include/Xm/DragOverSI.h
 include/Xm/DragOverSP.h
-include/Xm/DragUnderI.h
-include/Xm/DrawI.h
 include/Xm/DrawP.h
+include/Xm/DrawUtils.h
 include/Xm/DrawingA.h
-include/Xm/DrawingAI.h
 include/Xm/DrawingAP.h
 include/Xm/DrawnB.h
 include/Xm/DrawnBP.h
 include/Xm/DropSMgr.h
-include/Xm/DropSMgrI.h
 include/Xm/DropSMgrP.h
 include/Xm/DropTrans.h
 include/Xm/DropTransP.h
-include/Xm/ExtObjectI.h
+include/Xm/Ext.h
+include/Xm/Ext18List.h
+include/Xm/Ext18ListP.h
 include/Xm/ExtObjectP.h
+include/Xm/ExtP.h
 include/Xm/FileSB.h
 include/Xm/FileSBP.h
+include/Xm/FontS.h
+include/Xm/FontSP.h
 include/Xm/Form.h
 include/Xm/FormP.h
 include/Xm/Frame.h
 include/Xm/FrameP.h
-include/Xm/GMUtilsI.h
 include/Xm/Gadget.h
-include/Xm/GadgetI.h
 include/Xm/GadgetP.h
-include/Xm/GadgetUtiI.h
-include/Xm/GeoUtilsI.h
 include/Xm/GrabShell.h
 include/Xm/GrabShellP.h
-include/Xm/HashI.h
+include/Xm/Hierarchy.h
+include/Xm/HierarchyP.h
+include/Xm/IconBox.h
+include/Xm/IconBoxP.h
+include/Xm/IconButton.h
+include/Xm/IconButtonP.h
 include/Xm/IconFile.h
 include/Xm/IconFileP.h
 include/Xm/IconG.h
-include/Xm/IconGI.h
 include/Xm/IconGP.h
 include/Xm/IconH.h
 include/Xm/IconHP.h
-include/Xm/ImageCachI.h
 include/Xm/JoinSideT.h
 include/Xm/Label.h
 include/Xm/LabelG.h
-include/Xm/LabelGI.h
 include/Xm/LabelGP.h
-include/Xm/LabelI.h
 include/Xm/LabelP.h
 include/Xm/LayoutT.h
 include/Xm/List.h
@@ -174,58 +154,42 @@
 include/Xm/MainW.h
 include/Xm/MainWP.h
 include/Xm/Manager.h
-include/Xm/ManagerI.h
 include/Xm/ManagerP.h
-include/Xm/MapEventsI.h
-include/Xm/MenuProcI.h
 include/Xm/MenuProcP.h
 include/Xm/MenuShell.h
-include/Xm/MenuShellI.h
 include/Xm/MenuShellP.h
-include/Xm/MenuStateI.h
 include/Xm/MenuStateP.h
 include/Xm/MenuT.h
-include/Xm/MenuUtilI.h
 include/Xm/MenuUtilP.h
 include/Xm/MessageB.h
-include/Xm/MessageBI.h
 include/Xm/MessageBP.h
-include/Xm/MessagesI.h
 include/Xm/MwmUtil.h
 include/Xm/NavigatorT.h
 include/Xm/Notebook.h
 include/Xm/NotebookP.h
+include/Xm/Outline.h
+include/Xm/OutlineP.h
+include/Xm/Paned.h
+include/Xm/PanedP.h
 include/Xm/PanedW.h
 include/Xm/PanedWP.h
-include/Xm/PixConvI.h
+include/Xm/Picture.h
+include/Xm/PictureP.h
 include/Xm/PointInT.h
 include/Xm/Primitive.h
-include/Xm/PrimitiveI.h
 include/Xm/PrimitiveP.h
 include/Xm/Print.h
-include/Xm/PrintSI.h
 include/Xm/PrintSP.h
 include/Xm/Protocols.h
-include/Xm/ProtocolsI.h
 include/Xm/ProtocolsP.h
 include/Xm/PushB.h
 include/Xm/PushBG.h
 include/Xm/PushBGP.h
 include/Xm/PushBP.h
-include/Xm/RCHookI.h
-include/Xm/RCLayoutI.h
 include/Xm/RCLayoutP.h
-include/Xm/RCMenuI.h
 include/Xm/RCMenuP.h
-include/Xm/ReadImageI.h
-include/Xm/RegionI.h
 include/Xm/RepType.h
-include/Xm/RepTypeI.h
-include/Xm/ResConverI.h
-include/Xm/ResEncodI.h
-include/Xm/ResIndI.h
 include/Xm/RowColumn.h
-include/Xm/RowColumnI.h
 include/Xm/RowColumnP.h
 include/Xm/SSpinB.h
 include/Xm/SSpinBP.h
@@ -233,114 +197,85 @@
 include/Xm/Scale.h
 include/Xm/ScaleP.h
 include/Xm/Screen.h
-include/Xm/ScreenI.h
 include/Xm/ScreenP.h
 include/Xm/ScrollBar.h
 include/Xm/ScrollBarP.h
-include/Xm/ScrollFramTI.h
 include/Xm/ScrollFrameT.h
 include/Xm/ScrolledW.h
-include/Xm/ScrolledWI.h
 include/Xm/ScrolledWP.h
 include/Xm/SelectioB.h
-include/Xm/SelectioBI.h
 include/Xm/SelectioBP.h
 include/Xm/SeparatoG.h
-include/Xm/SeparatoGI.h
 include/Xm/SeparatoGP.h
 include/Xm/Separator.h
 include/Xm/SeparatorP.h
 include/Xm/ShellEP.h
+include/Xm/SlideC.h
+include/Xm/SlideCP.h
 include/Xm/SpecRenderT.h
 include/Xm/SpinB.h
 include/Xm/SpinBP.h
-include/Xm/SyntheticI.h
+include/Xm/TabBox.h
+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/TearOffI.h
 include/Xm/TearOffP.h
 include/Xm/Text.h
-include/Xm/TextDIconI.h
 include/Xm/TextF.h
-include/Xm/TextFI.h
 include/Xm/TextFP.h
-include/Xm/TextFSelI.h
 include/Xm/TextFSelP.h
-include/Xm/TextI.h
-include/Xm/TextInI.h
 include/Xm/TextInP.h
-include/Xm/TextOutI.h
 include/Xm/TextOutP.h
 include/Xm/TextP.h
-include/Xm/TextSelI.h
 include/Xm/TextSelP.h
-include/Xm/TextStrSoI.h
 include/Xm/TextStrSoP.h
 include/Xm/ToggleB.h
 include/Xm/ToggleBG.h
-include/Xm/ToggleBGI.h
 include/Xm/ToggleBGP.h
 include/Xm/ToggleBP.h
-include/Xm/TraitI.h
 include/Xm/TraitP.h
 include/Xm/Transfer.h
-include/Xm/TransferI.h
 include/Xm/TransferP.h
 include/Xm/TransferT.h
 include/Xm/TransltnsP.h
-include/Xm/TravActI.h
 include/Xm/TravConT.h
-include/Xm/TraversalI.h
+include/Xm/Tree.h
+include/Xm/TreeP.h
 include/Xm/TxtPropCv.h
 include/Xm/UnhighlightT.h
-include/Xm/UniqueEvnI.h
 include/Xm/UnitTypeT.h
-include/Xm/VaSimpleI.h
 include/Xm/VaSimpleP.h
 include/Xm/VendorS.h
-include/Xm/VendorSEI.h
 include/Xm/VendorSEP.h
-include/Xm/VendorSI.h
 include/Xm/VendorSP.h
 include/Xm/VirtKeys.h
-include/Xm/VirtKeysI.h
 include/Xm/VirtKeysP.h
 include/Xm/Xm.h
 include/Xm/XmAll.h
-include/Xm/XmI.h
 include/Xm/XmIm.h
-include/Xm/XmImI.h
-include/Xm/XmMsgI.h
 include/Xm/XmP.h
-include/Xm/XmRenderTI.h
 include/Xm/XmStrDefs.h
-include/Xm/XmStrDefsI.h
-include/Xm/XmStringI.h
-include/Xm/XmTabListI.h
 include/Xm/Xmfuncs.h
-include/Xm/XmosI.h
 include/Xm/XmosP.h
-include/Xm/XpmI.h
 include/Xm/XpmP.h
-include/Xm/regexpI.h
+include/Xm/xmlist.h
 include/uil/Uil.h
 include/uil/UilDBDef.h
 include/uil/UilDef.h
 include/uil/UilSymDef.h
 include/uil/UilSymGl.h
 include/uil/XmAppl.uil
-%%MOTIF_DEMOS%%lib/X11/app-defaults/Fileview
-lib/X11/app-defaults/Mwm
-%%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/Combo
 %%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/CDE
 lib/X11/bindings/acorn
 lib/X11/bindings/apollo
 lib/X11/bindings/dec
@@ -367,182 +302,54 @@
 lib/X11/bindings/sun_at
 lib/X11/bindings/tek
 lib/X11/bindings/xmbind.alias
-lib/X11/config/Motif.rules.openmotif
-lib/X11/config/Motif.tmpl.openmotif
-%%MOTIF_DEMOS%%lib/X11/help/aicon.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/helpOn.help
 %%MOTIF_DEMOS%%lib/X11/help/i18ninput.help
 %%MOTIF_DEMOS%%lib/X11/help/sampler2_0.help
 %%MOTIF_DEMOS%%lib/X11/help/todo.help
-%%MOTIF_DEMOS%%lib/X11/help/xmanimate.help
-%%MOTIF_DEMOS%%lib/X11/motifshell/help
-%%MOTIF_DEMOS%%lib/X11/motifshell/membership
-%%MOTIF_DEMOS%%lib/X11/motifshell/motif
-%%MOTIF_DEMOS%%lib/X11/motifshell/motifshell.c
-%%MOTIF_DEMOS%%lib/X11/motifshell/principles
-%%MOTIF_DEMOS%%lib/X11/motifshell/research
-%%MOTIF_DEMOS%%lib/X11/motifshell/welcome
 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/dog.uid
-%%MOTIF_DEMOS%%lib/X11/uid/dogs.uid
+%%MOTIF_DEMOS%%lib/X11/uid/English.uid
 %%MOTIF_DEMOS%%lib/X11/uid/english/uid/l_strings.uid
-%%MOTIF_DEMOS%%lib/X11/uid/exm_in_uil.uid
 %%MOTIF_DEMOS%%lib/X11/uid/french/uid/l_strings.uid
 %%MOTIF_DEMOS%%lib/X11/uid/hebrew/uid/l_strings.uid
 %%MOTIF_DEMOS%%lib/X11/uid/helloint.uid
 %%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.2
+lib/libMrm.so.3
 lib/libUil.a
 lib/libUil.so
-lib/libUil.so.2
+lib/libUil.so.3
 lib/libXm.a
 lib/libXm.so
-lib/libXm.so.2
-share/doc/openmotif/BUGREPORT
-%%PORTDOCS%%share/doc/openmotif/CLOSEDBUGS.gz
-share/doc/openmotif/COPYRIGHT.MOTIF
-%%PORTDOCS%%share/doc/openmotif/OPENBUGS.gz
-share/doc/openmotif/README
-share/doc/openmotif/RELNOTES
-%%PORTDOCS%%share/doc/openmotif/guides/README
-%%PORTDOCS%%share/doc/openmotif/guides/mot-cdesgr.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-csgcc.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-gloss.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-mcsg.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch01.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch02.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch03.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch04.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch05.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch06.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch07.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch08.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch09.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch10.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch11.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch12.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch13.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch14.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch15.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch16.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch17.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch18.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch19.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch20.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch21.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch22.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-pg/ch23.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch01.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch02.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch03.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch04.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch05.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch06.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch07.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch08.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch09.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch11.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch12.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ref/ch14.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch01.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch02.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch03.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch04.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch05.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch06.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch07.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch08.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-ug/ch10.ps.Z
-%%PORTDOCS%%share/doc/openmotif/guides/mot-wwg.ps.Z
-@comment	share/examples/openmotif/demos/ch05/Scale/Imakefile
-@comment	share/examples/openmotif/demos/ch05/Scale/README
-@comment	share/examples/openmotif/demos/ch05/Scale/interface.c
-@comment	share/examples/openmotif/demos/ch05/Scale/tic_mark.c
-@comment	share/examples/openmotif/demos/ch05/Scale/tic_mark.man
-@comment	share/examples/openmotif/demos/ch06/combo_box/Imakefile
-@comment	share/examples/openmotif/demos/ch06/combo_box/README
-@comment	share/examples/openmotif/demos/ch06/combo_box/combo_box.c
-@comment	share/examples/openmotif/demos/ch06/combo_box/combo_box.man
-@comment	share/examples/openmotif/demos/ch06/combo_box/interface.c
-@comment	share/examples/openmotif/demos/ch06/spin_box/Imakefile
-@comment	share/examples/openmotif/demos/ch06/spin_box/README
-@comment	share/examples/openmotif/demos/ch06/spin_box/interface.c
-@comment	share/examples/openmotif/demos/ch06/spin_box/spin_box.c
-@comment	share/examples/openmotif/demos/ch06/spin_box/spin_box.man
-@comment	share/examples/openmotif/demos/ch08/Container/Imakefile
-@comment	share/examples/openmotif/demos/ch08/Container/README
-@comment	share/examples/openmotif/demos/ch08/Container/container.c
-@comment	share/examples/openmotif/demos/ch08/Container/container.man
-@comment	share/examples/openmotif/demos/ch08/Container/interface.c
-@comment	share/examples/openmotif/demos/ch08/Notebook/Imakefile
-@comment	share/examples/openmotif/demos/ch08/Notebook/README
-@comment	share/examples/openmotif/demos/ch08/Notebook/interface.c
-@comment	share/examples/openmotif/demos/ch08/Notebook/notebook.c
-@comment	share/examples/openmotif/demos/ch08/Notebook/notebook.man
-@comment	share/examples/openmotif/demos/ch16/Imakefile
-@comment	share/examples/openmotif/demos/ch16/README
-@comment	share/examples/openmotif/demos/ch16/UTMXmText.c
-@comment	share/examples/openmotif/demos/ch16/UTMXmText.man
-@comment	share/examples/openmotif/demos/ch17/simple_drag/Imakefile
-@comment	share/examples/openmotif/demos/ch17/simple_drag/README
-@comment	share/examples/openmotif/demos/ch17/simple_drag/simple_drag.c
-@comment	share/examples/openmotif/demos/ch17/simple_drag/simple_drag.man
-@comment	share/examples/openmotif/demos/ch17/simple_drop/Imakefile
-@comment	share/examples/openmotif/demos/ch17/simple_drop/README
-@comment	share/examples/openmotif/demos/ch17/simple_drop/simple_drop.c
-@comment	share/examples/openmotif/demos/ch17/simple_drop/simple_drop.man
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-%%PORTDOCS%%@dirrm share/doc/openmotif/guides/mot-pg
-%%PORTDOCS%%@dirrm share/doc/openmotif/guides/mot-ref
-%%PORTDOCS%%@dirrm share/doc/openmotif/guides/mot-ug
-%%PORTDOCS%%@dirrm share/doc/openmotif/guides
-@dirrm share/doc/openmotif
-@comment	@dirrm share/examples/openmotif/demos/ch05/Scale
-@comment	@dirrm share/examples/openmotif/demos/ch05
-@comment	@dirrm share/examples/openmotif/demos/ch06/combo_box
-@comment	@dirrm share/examples/openmotif/demos/ch06/spin_box
-@comment	@dirrm share/examples/openmotif/demos/ch06
-@comment	@dirrm share/examples/openmotif/demos/ch08/Container
-@comment	@dirrm share/examples/openmotif/demos/ch08/Notebook
-@comment	@dirrm share/examples/openmotif/demos/ch08
-@comment	@dirrm share/examples/openmotif/demos/ch16
-@comment	@dirrm share/examples/openmotif/demos/ch17/simple_drag
-@comment	@dirrm share/examples/openmotif/demos/ch17/simple_drop
-@comment	@dirrm share/examples/openmotif/demos/ch17
-@comment	@dirrm share/examples/openmotif/demos
-@comment	@dirrm share/examples/openmotif
-@dirrm include/Xm
-@dirrm include/Mrm
-@dirrm include/uil
-@dirrm lib/X11/bindings
-%%MOTIF_DEMOS%%@dirrm lib/X11/help
-%%MOTIF_DEMOS%%@dirrm lib/X11/motifshell
-%%MOTIF_DEMOS%%@dirrm lib/X11/uid/C/uid
-%%MOTIF_DEMOS%%@dirrm lib/X11/uid/C
+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
+%%MOTIF_DEMOS%%@dirrm lib/X11/uid/swedish/uid
+%%MOTIF_DEMOS%%@dirrm lib/X11/uid/swedish
+%%MOTIF_DEMOS%%@dirrm lib/X11/uid/japanese/uid
+%%MOTIF_DEMOS%%@dirrm lib/X11/uid/japanese
+%%MOTIF_DEMOS%%@dirrm lib/X11/uid/hebrew/uid
+%%MOTIF_DEMOS%%@dirrm lib/X11/uid/hebrew
 %%MOTIF_DEMOS%%@dirrm lib/X11/uid/french/uid
 %%MOTIF_DEMOS%%@dirrm lib/X11/uid/french
 %%MOTIF_DEMOS%%@dirrm lib/X11/uid/english/uid
 %%MOTIF_DEMOS%%@dirrm lib/X11/uid/english
-%%MOTIF_DEMOS%%@dirrm lib/X11/uid/hebrew/uid
-%%MOTIF_DEMOS%%@dirrm lib/X11/uid/hebrew
-%%MOTIF_DEMOS%%@dirrm lib/X11/uid/japanese/uid
-%%MOTIF_DEMOS%%@dirrm lib/X11/uid/japanese
-%%MOTIF_DEMOS%%@dirrm lib/X11/uid/swedish/uid
-%%MOTIF_DEMOS%%@dirrm lib/X11/uid/swedish
+%%MOTIF_DEMOS%%@dirrm lib/X11/uid/C/uid
+%%MOTIF_DEMOS%%@dirrm lib/X11/uid/C
 %%MOTIF_DEMOS%%@dirrm lib/X11/uid
+%%MOTIF_DEMOS%%@dirrm lib/X11/help
+@dirrm lib/X11/bindings
+@dirrm include/uil
+@dirrm include/Xm

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209062134.g86LYBUs006712>