diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index c9cac605226..208b9b4f4ff 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 1999/06/14 06:23:23 brad Exp $ +# $OpenBSD: Makefile,v 1.25 1999/06/23 00:09:23 marc Exp $ # $FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp $ DISTNAME= lesstif-0.88.1 @@ -15,7 +15,8 @@ USE_X11= yes SEPARATE_BUILD= concurrent GNU_CONFIGURE= yes CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static --disable-debug --enable-build-12 +CONFIGURE_ARGS+= --enable-static --disable-debug --enable-build-12 \ + --disable-build-20 --with-editres .if defined(HAVE_MOTIF) IS_INTERACTIVE= yes @@ -38,4 +39,16 @@ pre-install: esac) .endif +# link the 1.2 motif libraries from $(prefix)/LessTif/Motif1.2/lib +# to $(prefix)/lib (where OpenBSD looks for them) and then run +# ldconfig to update the library cache +# +post-install: +.for lib in libMrm.a libMrm.so.1.2 libXm.a libXm.so.1.2 + if [ "x${NO_SHARED_LIBS}" = "x" ]; then \ + ${LN} -sf ${PREFIX}/LessTif/Motif1.2/lib/lib/${lib} ${PREFIX}/lib; \ + ${LDCONFIG} -m ${PREFIX}/lib; \ + fi +.endfor + .include diff --git a/x11/lesstif/pkg/PLIST b/x11/lesstif/pkg/PLIST index 4a48a845358..bf67ac5addc 100644 --- a/x11/lesstif/pkg/PLIST +++ b/x11/lesstif/pkg/PLIST @@ -9,14 +9,11 @@ lib/X11/mwm/system.mwmrc lib/X11/mwm/alt.map lib/X11/mwm/README lib/libXm.so.1.2 -lib/libXm.so lib/libXm.la lib/libXm.a lib/libMrm.so.1.2 -lib/libMrm.so lib/libMrm.la lib/libMrm.a -@exec /sbin/ldconfig -m %B include/Xm include/Mrm man/man1/mwm.1 @@ -78,6 +75,8 @@ man/man3/XmTextField.3 man/man3/XmToggleButton.3 man/man3/XmToggleButtonGadget.3 man/man3/XmWorld.3 +man/man3/XmVendorShell.3 +man/man3/VendorShell.3 man/man3/XtConfigureObject.3 man/man3/XtDestroyWidget.3 man/man3/XtManageChild.3 @@ -223,153 +222,6 @@ LessTif/Motif1.2/lib/libXm.a LessTif/Motif1.2/lib/libMrm.so.1.2 LessTif/Motif1.2/lib/libMrm.la LessTif/Motif1.2/lib/libMrm.a -LessTif/Motif2.0/include/Xm/Xm.h -LessTif/Motif2.0/include/Xm/ArrowB.h -LessTif/Motif2.0/include/Xm/ArrowBG.h -LessTif/Motif2.0/include/Xm/ArrowBGP.h -LessTif/Motif2.0/include/Xm/ArrowBP.h -LessTif/Motif2.0/include/Xm/AtomMgr.h -LessTif/Motif2.0/include/Xm/BaseClassP.h -LessTif/Motif2.0/include/Xm/BulletinB.h -LessTif/Motif2.0/include/Xm/BulletinBP.h -LessTif/Motif2.0/include/Xm/CacheP.h -LessTif/Motif2.0/include/Xm/CascadeB.h -LessTif/Motif2.0/include/Xm/CascadeBG.h -LessTif/Motif2.0/include/Xm/CascadeBGP.h -LessTif/Motif2.0/include/Xm/CascadeBP.h -LessTif/Motif2.0/include/Xm/Command.h -LessTif/Motif2.0/include/Xm/CommandP.h -LessTif/Motif2.0/include/Xm/CutPaste.h -LessTif/Motif2.0/include/Xm/CutPasteP.h -LessTif/Motif2.0/include/Xm/DesktopP.h -LessTif/Motif2.0/include/Xm/DialogS.h -LessTif/Motif2.0/include/Xm/DialogSEP.h -LessTif/Motif2.0/include/Xm/DialogSP.h -LessTif/Motif2.0/include/Xm/Display.h -LessTif/Motif2.0/include/Xm/DisplayP.h -LessTif/Motif2.0/include/Xm/DragC.h -LessTif/Motif2.0/include/Xm/DragCP.h -LessTif/Motif2.0/include/Xm/DragDrop.h -LessTif/Motif2.0/include/Xm/DragIcon.h -LessTif/Motif2.0/include/Xm/DragIconP.h -LessTif/Motif2.0/include/Xm/DragOverS.h -LessTif/Motif2.0/include/Xm/DragOverSP.h -LessTif/Motif2.0/include/Xm/DrawP.h -LessTif/Motif2.0/include/Xm/DrawingA.h -LessTif/Motif2.0/include/Xm/DrawingAP.h -LessTif/Motif2.0/include/Xm/DrawnB.h -LessTif/Motif2.0/include/Xm/DrawnBP.h -LessTif/Motif2.0/include/Xm/DropSMgr.h -LessTif/Motif2.0/include/Xm/DropSMgrP.h -LessTif/Motif2.0/include/Xm/DropTrans.h -LessTif/Motif2.0/include/Xm/DropTransP.h -LessTif/Motif2.0/include/Xm/ExtObjectP.h -LessTif/Motif2.0/include/Xm/FileSB.h -LessTif/Motif2.0/include/Xm/FileSBP.h -LessTif/Motif2.0/include/Xm/Form.h -LessTif/Motif2.0/include/Xm/FormP.h -LessTif/Motif2.0/include/Xm/Frame.h -LessTif/Motif2.0/include/Xm/FrameP.h -LessTif/Motif2.0/include/Xm/GadgetP.h -LessTif/Motif2.0/include/Xm/Label.h -LessTif/Motif2.0/include/Xm/LabelG.h -LessTif/Motif2.0/include/Xm/LabelGP.h -LessTif/Motif2.0/include/Xm/LabelP.h -LessTif/Motif2.0/include/Xm/List.h -LessTif/Motif2.0/include/Xm/ListP.h -LessTif/Motif2.0/include/Xm/MainW.h -LessTif/Motif2.0/include/Xm/MainWP.h -LessTif/Motif2.0/include/Xm/ManagerP.h -LessTif/Motif2.0/include/Xm/MenuShell.h -LessTif/Motif2.0/include/Xm/MenuShellP.h -LessTif/Motif2.0/include/Xm/MenuUtilP.h -LessTif/Motif2.0/include/Xm/MessageB.h -LessTif/Motif2.0/include/Xm/MessageBP.h -LessTif/Motif2.0/include/Xm/MwmUtil.h -LessTif/Motif2.0/include/Xm/PanedW.h -LessTif/Motif2.0/include/Xm/PanedWP.h -LessTif/Motif2.0/include/Xm/PrimitiveP.h -LessTif/Motif2.0/include/Xm/Protocols.h -LessTif/Motif2.0/include/Xm/ProtocolsP.h -LessTif/Motif2.0/include/Xm/PushB.h -LessTif/Motif2.0/include/Xm/PushBG.h -LessTif/Motif2.0/include/Xm/PushBGP.h -LessTif/Motif2.0/include/Xm/PushBP.h -LessTif/Motif2.0/include/Xm/RCUtilsP.h -LessTif/Motif2.0/include/Xm/RepType.h -LessTif/Motif2.0/include/Xm/RowColumn.h -LessTif/Motif2.0/include/Xm/SashP.h -LessTif/Motif2.0/include/Xm/RowColumnP.h -LessTif/Motif2.0/include/Xm/Scale.h -LessTif/Motif2.0/include/Xm/ScaleP.h -LessTif/Motif2.0/include/Xm/Screen.h -LessTif/Motif2.0/include/Xm/ScreenP.h -LessTif/Motif2.0/include/Xm/ScrollBar.h -LessTif/Motif2.0/include/Xm/ScrollBarP.h -LessTif/Motif2.0/include/Xm/ScrolledW.h -LessTif/Motif2.0/include/Xm/ScrolledWP.h -LessTif/Motif2.0/include/Xm/SelectioB.h -LessTif/Motif2.0/include/Xm/SelectioBP.h -LessTif/Motif2.0/include/Xm/SeparatoG.h -LessTif/Motif2.0/include/Xm/SeparatoGP.h -LessTif/Motif2.0/include/Xm/Separator.h -LessTif/Motif2.0/include/Xm/SeparatorP.h -LessTif/Motif2.0/include/Xm/ShellEP.h -LessTif/Motif2.0/include/Xm/TearOffBP.h -LessTif/Motif2.0/include/Xm/TearOffP.h -LessTif/Motif2.0/include/Xm/Text.h -LessTif/Motif2.0/include/Xm/TextF.h -LessTif/Motif2.0/include/Xm/TextFP.h -LessTif/Motif2.0/include/Xm/TextFSelP.h -LessTif/Motif2.0/include/Xm/TextInP.h -LessTif/Motif2.0/include/Xm/TextOutP.h -LessTif/Motif2.0/include/Xm/TextP.h -LessTif/Motif2.0/include/Xm/TextSelP.h -LessTif/Motif2.0/include/Xm/TextStrSoP.h -LessTif/Motif2.0/include/Xm/ToggleB.h -LessTif/Motif2.0/include/Xm/ToggleBG.h -LessTif/Motif2.0/include/Xm/ToggleBGP.h -LessTif/Motif2.0/include/Xm/ToggleBP.h -LessTif/Motif2.0/include/Xm/TransltnsP.h -LessTif/Motif2.0/include/Xm/VaSimpleP.h -LessTif/Motif2.0/include/Xm/VendorS.h -LessTif/Motif2.0/include/Xm/VendorSEP.h -LessTif/Motif2.0/include/Xm/VendorSP.h -LessTif/Motif2.0/include/Xm/VirtKeys.h -LessTif/Motif2.0/include/Xm/VirtKeysP.h -LessTif/Motif2.0/include/Xm/WorldP.h -LessTif/Motif2.0/include/Xm/XmP.h -LessTif/Motif2.0/include/Xm/XmosP.h -LessTif/Motif2.0/include/Xm/AccTextT.h -LessTif/Motif2.0/include/Xm/ActivatableT.h -LessTif/Motif2.0/include/Xm/CSText.h -LessTif/Motif2.0/include/Xm/ComboBox.h -LessTif/Motif2.0/include/Xm/ComboBoxP.h -LessTif/Motif2.0/include/Xm/Container.h -LessTif/Motif2.0/include/Xm/ContainerT.h -LessTif/Motif2.0/include/Xm/Gadget.h -LessTif/Motif2.0/include/Xm/GrabShell.h -LessTif/Motif2.0/include/Xm/GrabShellP.h -LessTif/Motif2.0/include/Xm/IconG.h -LessTif/Motif2.0/include/Xm/IconGP.h -LessTif/Motif2.0/include/Xm/LayoutT.h -LessTif/Motif2.0/include/Xm/Manager.h -LessTif/Motif2.0/include/Xm/NavigatorT.h -LessTif/Motif2.0/include/Xm/Notebook.h -LessTif/Motif2.0/include/Xm/NotebookP.h -LessTif/Motif2.0/include/Xm/Primitive.h -LessTif/Motif2.0/include/Xm/ScrollFrameT.h -LessTif/Motif2.0/include/Xm/SpinB.h -LessTif/Motif2.0/include/Xm/SpinBP.h -LessTif/Motif2.0/include/Xm/TraitP.h -LessTif/Motif2.0/include/Xm/Transfer.h -LessTif/Motif2.0/include/Xm/TransferP.h -LessTif/Motif2.0/include/Xm/XmStrDefs.h -LessTif/Motif2.0/include/Xm/XmAll.h -LessTif/Motif2.0/include/Mrm/MrmAppl.h -LessTif/Motif2.0/include/Mrm/MrmDecls.h -LessTif/Motif2.0/include/Mrm/MrmPrivate.h -LessTif/Motif2.0/include/Mrm/MrmPublic.h LessTif/FAQ share/LessTif/doc/html/images/hungry.gif share/LessTif/doc/html/images/lesstif-realsmall.gif @@ -417,10 +269,6 @@ share/LessTif/TODO @dirrm LessTif/Motif1.2/include @dirrm LessTif/Motif1.2/lib @dirrm LessTif/Motif1.2/ -@dirrm LessTif/Motif2.0/include/Xm -@dirrm LessTif/Motif2.0/include/Mrm -@dirrm LessTif/Motif2.0/include -@dirrm LessTif/Motif2.0 @dirrm LessTif @dirrm share/LessTif/doc/html/imgs @dirrm share/LessTif/doc/html/images @@ -429,6 +277,4 @@ share/LessTif/TODO @dirrm share/LessTif @dirrm lib/X11/mwm @dirrm lib/X11/lesstif - - - +@exec /sbin/ldconfig -m %B diff --git a/x11/lesstif/pkg/PLIST.noshared b/x11/lesstif/pkg/PLIST.noshared index 08410b80824..2c26e251427 100644 --- a/x11/lesstif/pkg/PLIST.noshared +++ b/x11/lesstif/pkg/PLIST.noshared @@ -73,6 +73,8 @@ man/man3/XmTextField.3 man/man3/XmToggleButton.3 man/man3/XmToggleButtonGadget.3 man/man3/XmWorld.3 +man/man3/XmVendorShell.3 +man/man3/VendorShell.3 man/man3/XtConfigureObject.3 man/man3/XtDestroyWidget.3 man/man3/XtManageChild.3 @@ -216,153 +218,6 @@ LessTif/Motif1.2/lib/libXm.la LessTif/Motif1.2/lib/libXm.a LessTif/Motif1.2/lib/libMrm.la LessTif/Motif1.2/lib/libMrm.a -LessTif/Motif2.0/include/Xm/Xm.h -LessTif/Motif2.0/include/Xm/ArrowB.h -LessTif/Motif2.0/include/Xm/ArrowBG.h -LessTif/Motif2.0/include/Xm/ArrowBGP.h -LessTif/Motif2.0/include/Xm/ArrowBP.h -LessTif/Motif2.0/include/Xm/AtomMgr.h -LessTif/Motif2.0/include/Xm/BaseClassP.h -LessTif/Motif2.0/include/Xm/BulletinB.h -LessTif/Motif2.0/include/Xm/BulletinBP.h -LessTif/Motif2.0/include/Xm/CacheP.h -LessTif/Motif2.0/include/Xm/CascadeB.h -LessTif/Motif2.0/include/Xm/CascadeBG.h -LessTif/Motif2.0/include/Xm/CascadeBGP.h -LessTif/Motif2.0/include/Xm/CascadeBP.h -LessTif/Motif2.0/include/Xm/Command.h -LessTif/Motif2.0/include/Xm/CommandP.h -LessTif/Motif2.0/include/Xm/CutPaste.h -LessTif/Motif2.0/include/Xm/CutPasteP.h -LessTif/Motif2.0/include/Xm/DesktopP.h -LessTif/Motif2.0/include/Xm/DialogS.h -LessTif/Motif2.0/include/Xm/DialogSEP.h -LessTif/Motif2.0/include/Xm/DialogSP.h -LessTif/Motif2.0/include/Xm/Display.h -LessTif/Motif2.0/include/Xm/DisplayP.h -LessTif/Motif2.0/include/Xm/DragC.h -LessTif/Motif2.0/include/Xm/DragCP.h -LessTif/Motif2.0/include/Xm/DragDrop.h -LessTif/Motif2.0/include/Xm/DragIcon.h -LessTif/Motif2.0/include/Xm/DragIconP.h -LessTif/Motif2.0/include/Xm/DragOverS.h -LessTif/Motif2.0/include/Xm/DragOverSP.h -LessTif/Motif2.0/include/Xm/DrawP.h -LessTif/Motif2.0/include/Xm/DrawingA.h -LessTif/Motif2.0/include/Xm/DrawingAP.h -LessTif/Motif2.0/include/Xm/DrawnB.h -LessTif/Motif2.0/include/Xm/DrawnBP.h -LessTif/Motif2.0/include/Xm/DropSMgr.h -LessTif/Motif2.0/include/Xm/DropSMgrP.h -LessTif/Motif2.0/include/Xm/DropTrans.h -LessTif/Motif2.0/include/Xm/DropTransP.h -LessTif/Motif2.0/include/Xm/ExtObjectP.h -LessTif/Motif2.0/include/Xm/FileSB.h -LessTif/Motif2.0/include/Xm/FileSBP.h -LessTif/Motif2.0/include/Xm/Form.h -LessTif/Motif2.0/include/Xm/FormP.h -LessTif/Motif2.0/include/Xm/Frame.h -LessTif/Motif2.0/include/Xm/FrameP.h -LessTif/Motif2.0/include/Xm/GadgetP.h -LessTif/Motif2.0/include/Xm/Label.h -LessTif/Motif2.0/include/Xm/LabelG.h -LessTif/Motif2.0/include/Xm/LabelGP.h -LessTif/Motif2.0/include/Xm/LabelP.h -LessTif/Motif2.0/include/Xm/List.h -LessTif/Motif2.0/include/Xm/ListP.h -LessTif/Motif2.0/include/Xm/MainW.h -LessTif/Motif2.0/include/Xm/MainWP.h -LessTif/Motif2.0/include/Xm/ManagerP.h -LessTif/Motif2.0/include/Xm/MenuShell.h -LessTif/Motif2.0/include/Xm/MenuShellP.h -LessTif/Motif2.0/include/Xm/MenuUtilP.h -LessTif/Motif2.0/include/Xm/MessageB.h -LessTif/Motif2.0/include/Xm/MessageBP.h -LessTif/Motif2.0/include/Xm/MwmUtil.h -LessTif/Motif2.0/include/Xm/PanedW.h -LessTif/Motif2.0/include/Xm/PanedWP.h -LessTif/Motif2.0/include/Xm/PrimitiveP.h -LessTif/Motif2.0/include/Xm/Protocols.h -LessTif/Motif2.0/include/Xm/ProtocolsP.h -LessTif/Motif2.0/include/Xm/PushB.h -LessTif/Motif2.0/include/Xm/PushBG.h -LessTif/Motif2.0/include/Xm/PushBGP.h -LessTif/Motif2.0/include/Xm/PushBP.h -LessTif/Motif2.0/include/Xm/RCUtilsP.h -LessTif/Motif2.0/include/Xm/RepType.h -LessTif/Motif2.0/include/Xm/RowColumn.h -LessTif/Motif2.0/include/Xm/SashP.h -LessTif/Motif2.0/include/Xm/RowColumnP.h -LessTif/Motif2.0/include/Xm/Scale.h -LessTif/Motif2.0/include/Xm/ScaleP.h -LessTif/Motif2.0/include/Xm/Screen.h -LessTif/Motif2.0/include/Xm/ScreenP.h -LessTif/Motif2.0/include/Xm/ScrollBar.h -LessTif/Motif2.0/include/Xm/ScrollBarP.h -LessTif/Motif2.0/include/Xm/ScrolledW.h -LessTif/Motif2.0/include/Xm/ScrolledWP.h -LessTif/Motif2.0/include/Xm/SelectioB.h -LessTif/Motif2.0/include/Xm/SelectioBP.h -LessTif/Motif2.0/include/Xm/SeparatoG.h -LessTif/Motif2.0/include/Xm/SeparatoGP.h -LessTif/Motif2.0/include/Xm/Separator.h -LessTif/Motif2.0/include/Xm/SeparatorP.h -LessTif/Motif2.0/include/Xm/ShellEP.h -LessTif/Motif2.0/include/Xm/TearOffBP.h -LessTif/Motif2.0/include/Xm/TearOffP.h -LessTif/Motif2.0/include/Xm/Text.h -LessTif/Motif2.0/include/Xm/TextF.h -LessTif/Motif2.0/include/Xm/TextFP.h -LessTif/Motif2.0/include/Xm/TextFSelP.h -LessTif/Motif2.0/include/Xm/TextInP.h -LessTif/Motif2.0/include/Xm/TextOutP.h -LessTif/Motif2.0/include/Xm/TextP.h -LessTif/Motif2.0/include/Xm/TextSelP.h -LessTif/Motif2.0/include/Xm/TextStrSoP.h -LessTif/Motif2.0/include/Xm/ToggleB.h -LessTif/Motif2.0/include/Xm/ToggleBG.h -LessTif/Motif2.0/include/Xm/ToggleBGP.h -LessTif/Motif2.0/include/Xm/ToggleBP.h -LessTif/Motif2.0/include/Xm/TransltnsP.h -LessTif/Motif2.0/include/Xm/VaSimpleP.h -LessTif/Motif2.0/include/Xm/VendorS.h -LessTif/Motif2.0/include/Xm/VendorSEP.h -LessTif/Motif2.0/include/Xm/VendorSP.h -LessTif/Motif2.0/include/Xm/VirtKeys.h -LessTif/Motif2.0/include/Xm/VirtKeysP.h -LessTif/Motif2.0/include/Xm/WorldP.h -LessTif/Motif2.0/include/Xm/XmP.h -LessTif/Motif2.0/include/Xm/XmosP.h -LessTif/Motif2.0/include/Xm/AccTextT.h -LessTif/Motif2.0/include/Xm/ActivatableT.h -LessTif/Motif2.0/include/Xm/CSText.h -LessTif/Motif2.0/include/Xm/ComboBox.h -LessTif/Motif2.0/include/Xm/ComboBoxP.h -LessTif/Motif2.0/include/Xm/Container.h -LessTif/Motif2.0/include/Xm/ContainerT.h -LessTif/Motif2.0/include/Xm/Gadget.h -LessTif/Motif2.0/include/Xm/GrabShell.h -LessTif/Motif2.0/include/Xm/GrabShellP.h -LessTif/Motif2.0/include/Xm/IconG.h -LessTif/Motif2.0/include/Xm/IconGP.h -LessTif/Motif2.0/include/Xm/LayoutT.h -LessTif/Motif2.0/include/Xm/Manager.h -LessTif/Motif2.0/include/Xm/NavigatorT.h -LessTif/Motif2.0/include/Xm/Notebook.h -LessTif/Motif2.0/include/Xm/NotebookP.h -LessTif/Motif2.0/include/Xm/Primitive.h -LessTif/Motif2.0/include/Xm/ScrollFrameT.h -LessTif/Motif2.0/include/Xm/SpinB.h -LessTif/Motif2.0/include/Xm/SpinBP.h -LessTif/Motif2.0/include/Xm/TraitP.h -LessTif/Motif2.0/include/Xm/Transfer.h -LessTif/Motif2.0/include/Xm/TransferP.h -LessTif/Motif2.0/include/Xm/XmStrDefs.h -LessTif/Motif2.0/include/Xm/XmAll.h -LessTif/Motif2.0/include/Mrm/MrmAppl.h -LessTif/Motif2.0/include/Mrm/MrmDecls.h -LessTif/Motif2.0/include/Mrm/MrmPrivate.h -LessTif/Motif2.0/include/Mrm/MrmPublic.h LessTif/FAQ share/LessTif/doc/html/images/hungry.gif share/LessTif/doc/html/images/lesstif-realsmall.gif @@ -410,10 +265,6 @@ share/LessTif/TODO @dirrm LessTif/Motif1.2/include @dirrm LessTif/Motif1.2/lib @dirrm LessTif/Motif1.2/ -@dirrm LessTif/Motif2.0/include/Xm -@dirrm LessTif/Motif2.0/include/Mrm -@dirrm LessTif/Motif2.0/include -@dirrm LessTif/Motif2.0 @dirrm LessTif @dirrm share/LessTif/doc/html/imgs @dirrm share/LessTif/doc/html/images @@ -422,6 +273,4 @@ share/LessTif/TODO @dirrm share/LessTif @dirrm lib/X11/mwm @dirrm lib/X11/lesstif - - - +@exec /sbin/ldconfig -m %B