4 files changed, 39 insertions, 470 deletions

diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 93dfeb8b2df1..760c42c78220 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
 # New ports collection makefile for:	motif
 # Date created:		5 December 1994
 # Whom:			asami
@@ -5,17 +6,42 @@
 # $FreeBSD$
 #
 
-PORTNAME=	Motif
-PORTVERSION= 	2.1.10
+PORTNAME=	open-motif
+PORTVERSION= 	2.1.30
 CATEGORIES=	x11-toolkits
-DISTFILES=	# empty
+MASTER_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R2.1.30/binaries/metrolink/  \
+		ftp://ftp.opengroup.org/pub/openmotif/R2.1.30/binaries/metrolink/  \
+		ftp://ftp.isca.uiowa.edu/pub/mirrors/openmotif/binaries/metrolink/  \
+		ftp://ftp.kddlabs.co.jp/X11/openmotif/binaries/metrolink/
+DISTNAME=	openmotif-${PORTVERSION}-1_MLI
+EXTRACT_SUFX=	.tgz
 
+ONLY_FOR_ARCHS=	i386
+PREFIX?=	/	# will install into ${PREFIX}/usr/X11R6
 USE_X_PREFIX=	yes
-NO_BUILD=	yes
-NO_INSTALL=	yes
-IS_INTERACTIVE=	yes
-.if !defined(PACKAGE_BUILDING)
-FORBIDDEN=	this is a dummy package for installing Motif dependencies
-.endif
+NO_WRKSUBDIR=	yes
+EXTRACT_ONLY=	# don't exact the tarball
+NO_BUILD=	binary distrubition
+NO_PKG_REGISTER=do-install: target will take care of this
+
+do-install:
+	@pkg_add -f -p ${PREFIX} ${DISTDIR}/${DISTFILES}
+	@${MV} -v ${PKG_DBDIR}/${DISTNAME} ${PKG_DBDIR}/${PKGNAME}
+
+#	shouldn't this be covered by "NO_PKG_REGISTER" ??
+generate-plist:
+	@${DO_NADA}
+
+do-package:
+	@${ECHO_MSG} "===>  Building package for ${PKGNAME}"
+	@if [ -d ${PACKAGES} ]; then \
+		if [ ! -d ${PKGREPOSITORY} ]; then \
+			if ! ${MKDIR} ${PKGREPOSITORY}; then \
+				${ECHO_MSG} ">> Can't create directory ${PKGREPOSITORY}."; \
+				exit 1; \
+			fi; \
+		fi; \
+	fi
+	@${CP} -p ${DISTDIR}/${DISTFILES} ${PKGFILE}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/open-motif/pkg-comment b/x11-toolkits/open-motif/pkg-comment
index 6b9e8c5543be..ee91bcce853d 100644
--- a/x11-toolkits/open-motif/pkg-comment
+++ b/x11-toolkits/open-motif/pkg-comment
@@ -1 +1 @@
-Motif
+Metro Link Open Motif - Runtime libraries and executables
diff --git a/x11-toolkits/open-motif/pkg-descr b/x11-toolkits/open-motif/pkg-descr
index ee8979374e8f..5f96681e7209 100644
--- a/x11-toolkits/open-motif/pkg-descr
+++ b/x11-toolkits/open-motif/pkg-descr
@@ -1,4 +1,3 @@
-A dummy port to create a package of static Motif libs and include
-files to be used as dependencies from other ports.  Note you need
-Motif already installed, and this port won't do anything for you
-unless you are in the business of building packages.
+This is the Metro Link Open Motif 2.1.30 runtime environment.
+It includes the Motif shared libraries, needed to run applications which
+are dynamically linked against Motif, and the Motif Window Manager, `mwm'.
diff --git a/x11-toolkits/open-motif/pkg-plist b/x11-toolkits/open-motif/pkg-plist
deleted file mode 100644
index 09dcb1b4ebfd..000000000000
--- a/x11-toolkits/open-motif/pkg-plist
+++ /dev/null
@@ -1,456 +0,0 @@
-include/Mrm/MrmAppl.h
-include/Mrm/MrmDecls.h
-include/Mrm/MrmPublic.h
-include/Mrm/MrmosI.h
-include/Xm/AccColorT.h
-include/Xm/AccTextT.h
-include/Xm/ActivatableT.h
-include/Xm/ArrowB.h
-include/Xm/ArrowBG.h
-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/CSText.h
-include/Xm/CSTextI.h
-include/Xm/CSTextInP.h
-include/Xm/CSTextOutI.h
-include/Xm/CSTextOutP.h
-include/Xm/CSTextP.h
-include/Xm/CSTextSelI.h
-include/Xm/CSTextSelP.h
-include/Xm/CSTextSrcI.h
-include/Xm/CSTextSrcP.h
-include/Xm/CacheI.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/ClipWindowP.h
-include/Xm/CntrbmI.h
-include/Xm/ColorI.h
-include/Xm/ColorObjI.h
-include/Xm/ColorObjP.h
-include/Xm/ColorP.h
-include/Xm/ComboBox.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/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/DragICC.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/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/ExtObjectP.h
-include/Xm/FileSB.h
-include/Xm/FileSBP.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/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
-include/Xm/ListP.h
-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/PanedW.h
-include/Xm/PanedWP.h
-include/Xm/PixConvI.h
-include/Xm/PointInT.h
-include/Xm/Primitive.h
-include/Xm/PrimitiveI.h
-include/Xm/PrimitiveP.h
-include/Xm/Print.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
-include/Xm/SashP.h
-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/SpecRenderT.h
-include/Xm/SpinB.h
-include/Xm/SpinBP.h
-include/Xm/SyntheticI.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/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/WorldP.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/XmSelectI.h
-include/Xm/XmStrDefs.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/XpmPI.h
-include/bitmaps/xm_error
-include/bitmaps/xm_hour16
-include/bitmaps/xm_hour16m
-include/bitmaps/xm_hour32
-include/bitmaps/xm_hour32m
-include/bitmaps/xm_information
-include/bitmaps/xm_noenter16
-include/bitmaps/xm_noenter16m
-include/bitmaps/xm_noenter32
-include/bitmaps/xm_noenter32m
-include/bitmaps/xm_question
-include/bitmaps/xm_warning
-include/bitmaps/xm_working
-include/uil/Uil.h
-include/uil/UilDBDef.h
-include/uil/UilDef.h
-include/uil/UilSymDef.h
-include/uil/UilSymGl.h
-include/uil/XmAppl.uil
-lib/X11/system.mwmrc
-lib/X11/uid/BBoard.uid
-lib/X11/uid/BBoardDia.uid
-lib/X11/uid/C/uid/C/uid/l_strings.uid
-lib/X11/uid/C/uid/l_strings.uid
-lib/X11/uid/Case.uid
-lib/X11/uid/CloseH.uid
-lib/X11/uid/ColorM1.uid
-lib/X11/uid/English.uid
-lib/X11/uid/EnumVal1.uid
-lib/X11/uid/EnumVal2.uid
-lib/X11/uid/EnumVal3.uid
-lib/X11/uid/EnumVal4.uid
-lib/X11/uid/EnumVal5.uid
-lib/X11/uid/EnumVal6.uid
-lib/X11/uid/FetchCL.uid
-lib/X11/uid/FetchIL.uid
-lib/X11/uid/FetchL.uid
-lib/X11/uid/FetchSV.uid
-lib/X11/uid/FetchW.uid
-lib/X11/uid/FetchWO.uid
-lib/X11/uid/ForRef.uid
-lib/X11/uid/ForRef2.uid
-lib/X11/uid/ForRef3.uid
-lib/X11/uid/ForRef4.uid
-lib/X11/uid/French.uid
-lib/X11/uid/GSyntax1.uid
-lib/X11/uid/GSyntax2.uid
-lib/X11/uid/German.uid
-lib/X11/uid/Minimal.uid
-lib/X11/uid/Names.uid
-lib/X11/uid/NamesU.uid
-lib/X11/uid/OpenH.uid
-lib/X11/uid/OpenHLang/OpenH_evl.uid
-lib/X11/uid/OpenHLang/OpenH_vhev.uid
-lib/X11/uid/OpenH_mf1.uid
-lib/X11/uid/OpenH_mf2.uid
-lib/X11/uid/OpenH_mf3.uid
-lib/X11/uid/OpenH_vh.uid
-lib/X11/uid/OpenH_vhws.uid
-lib/X11/uid/RegisterC.uid
-lib/X11/uid/RegisterN.uid
-lib/X11/uid/ResInd.uid
-lib/X11/uid/animate.uid
-lib/X11/uid/arrowBGad.uid
-lib/X11/uid/arrowBtn.uid
-lib/X11/uid/bitmap.uid
-lib/X11/uid/cascBGad.uid
-lib/X11/uid/cascBtn.uid
-lib/X11/uid/comboBox.uid
-lib/X11/uid/command.uid
-lib/X11/uid/diaShell.uid
-lib/X11/uid/dog.uid
-lib/X11/uid/dogs.uid
-lib/X11/uid/drawArea.uid
-lib/X11/uid/drawnBtn.uid
-lib/X11/uid/english/uid/english/uid/l_strings.uid
-lib/X11/uid/english/uid/l_strings.uid
-lib/X11/uid/errorDia.uid
-lib/X11/uid/exm_in_uil.uid
-lib/X11/uid/form.uid
-lib/X11/uid/formDia.uid
-lib/X11/uid/frame.uid
-lib/X11/uid/french/uid/french/uid/l_strings.uid
-lib/X11/uid/french/uid/l_strings.uid
-lib/X11/uid/fsBox.uid
-lib/X11/uid/fsDia.uid
-lib/X11/uid/hebrew/uid/hebrew/uid/l_strings.uid
-lib/X11/uid/hebrew/uid/l_strings.uid
-lib/X11/uid/helloint.uid
-lib/X11/uid/hellomotif.uid
-lib/X11/uid/icccm.uid
-lib/X11/uid/icon.uid
-lib/X11/uid/iconGad.uid
-lib/X11/uid/infoDia.uid
-lib/X11/uid/japanese/uid/japanese/uid/l_strings.uid
-lib/X11/uid/japanese/uid/l_strings.uid
-lib/X11/uid/label.uid
-lib/X11/uid/labelGad.uid
-lib/X11/uid/listBs.uid
-lib/X11/uid/listEs.uid
-lib/X11/uid/listMs.uid
-lib/X11/uid/listSs.uid
-lib/X11/uid/menuBar.uid
-lib/X11/uid/menuShell.uid
-lib/X11/uid/mesBox.uid
-lib/X11/uid/mesDia.uid
-lib/X11/uid/multi.uid
-lib/X11/uid/optionMenu.uid
-lib/X11/uid/panedWin.uid
-lib/X11/uid/periodic.uid
-lib/X11/uid/plane.uid
-lib/X11/uid/popupMenu.uid
-lib/X11/uid/promptDia.uid
-lib/X11/uid/pulldown.uid
-lib/X11/uid/pulldown2.uid
-lib/X11/uid/pushBGad.uid
-lib/X11/uid/pushBtn.uid
-lib/X11/uid/radioBox.uid
-lib/X11/uid/rowCol.uid
-lib/X11/uid/scaleHorz.uid
-lib/X11/uid/scaleVert.uid
-lib/X11/uid/scrollLis2.uid
-lib/X11/uid/scrollList.uid
-lib/X11/uid/scrollText.uid
-lib/X11/uid/scrollWin.uid
-lib/X11/uid/scrollWin2.uid
-lib/X11/uid/scrollbarH.uid
-lib/X11/uid/scrollbarV.uid
-lib/X11/uid/selectBox.uid
-lib/X11/uid/selectDia.uid
-lib/X11/uid/spinBox.uid
-lib/X11/uid/superman.uid
-lib/X11/uid/swedish/uid/l_strings.uid
-lib/X11/uid/swedish/uid/swedish/uid/l_strings.uid
-lib/X11/uid/templateDia.uid
-lib/X11/uid/textMl.uid
-lib/X11/uid/textSl.uid
-lib/X11/uid/toggleBGad.uid
-lib/X11/uid/toggleBtn.uid
-lib/X11/uid/warningDia.uid
-lib/X11/uid/workingDia.uid
-lib/bindings/acorn
-lib/bindings/apollo
-lib/bindings/dec
-lib/bindings/dg_AViiON
-lib/bindings/doubleclick
-lib/bindings/hal
-lib/bindings/hitachi
-lib/bindings/hp
-lib/bindings/ibm
-lib/bindings/intergraph
-lib/bindings/intergraph17
-lib/bindings/megatek
-lib/bindings/motorola
-lib/bindings/ncr_at
-lib/bindings/ncr_vt
-lib/bindings/pc
-lib/bindings/sgi
-lib/bindings/siemens_9733
-lib/bindings/siemens_wx200
-lib/bindings/sni
-lib/bindings/sni_97801
-lib/bindings/sony
-lib/bindings/sun_mit
-lib/bindings/sun_news
-lib/bindings/tek
-lib/bindings/xmbind.alias
-lib/libACommon.a
-lib/libCreate.a
-lib/libMCommon.a
-lib/libMrm.a
-lib/libScript.a
-lib/libSynth.a
-lib/libText.a
-lib/libUil.a
-lib/libUtil.a
-lib/libVisual.a
-lib/libXm.a