ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

lesstiff: reimported

Browse Source 
Thanks to Mike VanRoy for pointing out that it was missing.
This commit is contained in:
Antti Nykanen 2007-05-20 02:48:18 +03:00
parent 67d311841e
commit 053457adc5
5 changed files with 373 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287
lesstif/.footprint Normal file
View File

@ -0,0 +1,287 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/motif-config
-rwxr-xr-x root/root usr/bin/mxmkmf
-rwxr-xr-x root/root usr/bin/uil
-rwxr-xr-x root/root usr/bin/xmbind
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/Dt/
-rw-r--r-- root/root usr/include/Dt/Print.h
drwxr-xr-x root/root usr/include/Mrm/
-rw-r--r-- root/root usr/include/Mrm/MrmAppl.h
-rw-r--r-- root/root usr/include/Mrm/MrmDecls.h
-rw-r--r-- root/root usr/include/Mrm/MrmPrivate.h
-rw-r--r-- root/root usr/include/Mrm/MrmPublic.h
drwxr-xr-x root/root usr/include/Xm/
-rw-r--r-- root/root usr/include/Xm/AccTextT.h
-rw-r--r-- root/root usr/include/Xm/ActivatableT.h
-rw-r--r-- root/root usr/include/Xm/ArrowB.h
-rw-r--r-- root/root usr/include/Xm/ArrowBG.h
-rw-r--r-- root/root usr/include/Xm/ArrowBGP.h
-rw-r--r-- root/root usr/include/Xm/ArrowBP.h
-rw-r--r-- root/root usr/include/Xm/AtomMgr.h
-rw-r--r-- root/root usr/include/Xm/BaseClassP.h
-rw-r--r-- root/root usr/include/Xm/BulletinB.h
-rw-r--r-- root/root usr/include/Xm/BulletinBP.h
-rw-r--r-- root/root usr/include/Xm/CacheP.h
-rw-r--r-- root/root usr/include/Xm/CareVisualT.h
-rw-r--r-- root/root usr/include/Xm/CascadeB.h
-rw-r--r-- root/root usr/include/Xm/CascadeBG.h
-rw-r--r-- root/root usr/include/Xm/CascadeBGP.h
-rw-r--r-- root/root usr/include/Xm/CascadeBP.h
-rw-r--r-- root/root usr/include/Xm/ColorObjP.h
-rw-r--r-- root/root usr/include/Xm/ComboBox.h
-rw-r--r-- root/root usr/include/Xm/ComboBoxP.h
-rw-r--r-- root/root usr/include/Xm/Command.h
-rw-r--r-- root/root usr/include/Xm/CommandP.h
-rw-r--r-- root/root usr/include/Xm/ContItemT.h
-rw-r--r-- root/root usr/include/Xm/Container.h
-rw-r--r-- root/root usr/include/Xm/ContainerP.h
-rw-r--r-- root/root usr/include/Xm/ContainerT.h
-rw-r--r-- root/root usr/include/Xm/CutPaste.h
-rw-r--r-- root/root usr/include/Xm/CutPasteP.h
-rw-r--r-- root/root usr/include/Xm/DesktopP.h
-rw-r--r-- root/root usr/include/Xm/DialogS.h
-rw-r--r-- root/root usr/include/Xm/DialogSEP.h
-rw-r--r-- root/root usr/include/Xm/DialogSP.h
-rw-r--r-- root/root usr/include/Xm/DialogSavvyT.h
-rw-r--r-- root/root usr/include/Xm/Display.h
-rw-r--r-- root/root usr/include/Xm/DisplayP.h
-rw-r--r-- root/root usr/include/Xm/DragC.h
-rw-r--r-- root/root usr/include/Xm/DragCP.h
-rw-r--r-- root/root usr/include/Xm/DragDrop.h
-rw-r--r-- root/root usr/include/Xm/DragIcon.h
-rw-r--r-- root/root usr/include/Xm/DragIconP.h
-rw-r--r-- root/root usr/include/Xm/DragOverS.h
-rw-r--r-- root/root usr/include/Xm/DragOverSP.h
-rw-r--r-- root/root usr/include/Xm/DrawP.h
-rw-r--r-- root/root usr/include/Xm/DrawingA.h
-rw-r--r-- root/root usr/include/Xm/DrawingAP.h
-rw-r--r-- root/root usr/include/Xm/DrawnB.h
-rw-r--r-- root/root usr/include/Xm/DrawnBP.h
-rw-r--r-- root/root usr/include/Xm/DropSMgr.h
-rw-r--r-- root/root usr/include/Xm/DropSMgrP.h
-rw-r--r-- root/root usr/include/Xm/DropTrans.h
-rw-r--r-- root/root usr/include/Xm/DropTransP.h
-rw-r--r-- root/root usr/include/Xm/ExtObjectP.h
-rw-r--r-- root/root usr/include/Xm/FileSB.h
-rw-r--r-- root/root usr/include/Xm/FileSBP.h
-rw-r--r-- root/root usr/include/Xm/Form.h
-rw-r--r-- root/root usr/include/Xm/FormP.h
-rw-r--r-- root/root usr/include/Xm/Frame.h
-rw-r--r-- root/root usr/include/Xm/FrameP.h
-rw-r--r-- root/root usr/include/Xm/Gadget.h
-rw-r--r-- root/root usr/include/Xm/GadgetP.h
-rw-r--r-- root/root usr/include/Xm/GrabShell.h
-rw-r--r-- root/root usr/include/Xm/GrabShellP.h
-rw-r--r-- root/root usr/include/Xm/IconG.h
-rw-r--r-- root/root usr/include/Xm/IconGP.h
-rw-r--r-- root/root usr/include/Xm/IconH.h
-rw-r--r-- root/root usr/include/Xm/JoinSideT.h
-rw-r--r-- root/root usr/include/Xm/Label.h
-rw-r--r-- root/root usr/include/Xm/LabelG.h
-rw-r--r-- root/root usr/include/Xm/LabelGP.h
-rw-r--r-- root/root usr/include/Xm/LabelP.h
-rw-r--r-- root/root usr/include/Xm/LayoutT.h
-rw-r--r-- root/root usr/include/Xm/List.h
-rw-r--r-- root/root usr/include/Xm/ListP.h
-rw-r--r-- root/root usr/include/Xm/MainW.h
-rw-r--r-- root/root usr/include/Xm/MainWP.h
-rw-r--r-- root/root usr/include/Xm/Manager.h
-rw-r--r-- root/root usr/include/Xm/ManagerP.h
-rw-r--r-- root/root usr/include/Xm/MenuShell.h
-rw-r--r-- root/root usr/include/Xm/MenuShellP.h
-rw-r--r-- root/root usr/include/Xm/MenuT.h
-rw-r--r-- root/root usr/include/Xm/MenuUtilP.h
-rw-r--r-- root/root usr/include/Xm/MessageB.h
-rw-r--r-- root/root usr/include/Xm/MessageBP.h
-rw-r--r-- root/root usr/include/Xm/MwmUtil.h
-rw-r--r-- root/root usr/include/Xm/NavigatorT.h
-rw-r--r-- root/root usr/include/Xm/Notebook.h
-rw-r--r-- root/root usr/include/Xm/NotebookP.h
-rw-r--r-- root/root usr/include/Xm/PanedW.h
-rw-r--r-- root/root usr/include/Xm/PanedWP.h
-rw-r--r-- root/root usr/include/Xm/Primitive.h
-rw-r--r-- root/root usr/include/Xm/PrimitiveP.h
-rw-r--r-- root/root usr/include/Xm/Print.h
-rw-r--r-- root/root usr/include/Xm/PrintSP.h
-rw-r--r-- root/root usr/include/Xm/Protocols.h
-rw-r--r-- root/root usr/include/Xm/ProtocolsP.h
-rw-r--r-- root/root usr/include/Xm/PushB.h
-rw-r--r-- root/root usr/include/Xm/PushBG.h
-rw-r--r-- root/root usr/include/Xm/PushBGP.h
-rw-r--r-- root/root usr/include/Xm/PushBP.h
-rw-r--r-- root/root usr/include/Xm/RCUtilsP.h
-rw-r--r-- root/root usr/include/Xm/RepType.h
-rw-r--r-- root/root usr/include/Xm/RowColumn.h
-rw-r--r-- root/root usr/include/Xm/RowColumnP.h
-rw-r--r-- root/root usr/include/Xm/SSpinB.h
-rw-r--r-- root/root usr/include/Xm/SSpinBP.h
-rw-r--r-- root/root usr/include/Xm/SashP.h
-rw-r--r-- root/root usr/include/Xm/Scale.h
-rw-r--r-- root/root usr/include/Xm/ScaleP.h
-rw-r--r-- root/root usr/include/Xm/Screen.h
-rw-r--r-- root/root usr/include/Xm/ScreenP.h
-rw-r--r-- root/root usr/include/Xm/ScrollBar.h
-rw-r--r-- root/root usr/include/Xm/ScrollBarP.h
-rw-r--r-- root/root usr/include/Xm/ScrollFrameT.h
-rw-r--r-- root/root usr/include/Xm/ScrolledW.h
-rw-r--r-- root/root usr/include/Xm/ScrolledWP.h
-rw-r--r-- root/root usr/include/Xm/SelectioB.h
-rw-r--r-- root/root usr/include/Xm/SelectioBP.h
-rw-r--r-- root/root usr/include/Xm/SeparatoG.h
-rw-r--r-- root/root usr/include/Xm/SeparatoGP.h
-rw-r--r-- root/root usr/include/Xm/Separator.h
-rw-r--r-- root/root usr/include/Xm/SeparatorP.h
-rw-r--r-- root/root usr/include/Xm/ShellEP.h
-rw-r--r-- root/root usr/include/Xm/SpecRenderT.h
-rw-r--r-- root/root usr/include/Xm/SpinB.h
-rw-r--r-- root/root usr/include/Xm/SpinBP.h
-rw-r--r-- root/root usr/include/Xm/TakesDefT.h
-rw-r--r-- root/root usr/include/Xm/TearOffBP.h
-rw-r--r-- root/root usr/include/Xm/TearOffP.h
-rw-r--r-- root/root usr/include/Xm/Text.h
-rw-r--r-- root/root usr/include/Xm/TextF.h
-rw-r--r-- root/root usr/include/Xm/TextFP.h
-rw-r--r-- root/root usr/include/Xm/TextFSelP.h
-rw-r--r-- root/root usr/include/Xm/TextInP.h
-rw-r--r-- root/root usr/include/Xm/TextOutP.h
-rw-r--r-- root/root usr/include/Xm/TextP.h
-rw-r--r-- root/root usr/include/Xm/TextSelP.h
-rw-r--r-- root/root usr/include/Xm/TextStrSoP.h
-rw-r--r-- root/root usr/include/Xm/ToggleB.h
-rw-r--r-- root/root usr/include/Xm/ToggleBG.h
-rw-r--r-- root/root usr/include/Xm/ToggleBGP.h
-rw-r--r-- root/root usr/include/Xm/ToggleBP.h
-rw-r--r-- root/root usr/include/Xm/TraitP.h
-rw-r--r-- root/root usr/include/Xm/Transfer.h
-rw-r--r-- root/root usr/include/Xm/TransferP.h
-rw-r--r-- root/root usr/include/Xm/TransferT.h
-rw-r--r-- root/root usr/include/Xm/TransltnsP.h
-rw-r--r-- root/root usr/include/Xm/TxtPropCv.h
-rw-r--r-- root/root usr/include/Xm/VaSimpleP.h
-rw-r--r-- root/root usr/include/Xm/VendorS.h
-rw-r--r-- root/root usr/include/Xm/VendorSEP.h
-rw-r--r-- root/root usr/include/Xm/VendorSP.h
-rw-r--r-- root/root usr/include/Xm/VirtKeys.h
-rw-r--r-- root/root usr/include/Xm/VirtKeysP.h
-rw-r--r-- root/root usr/include/Xm/WorldP.h
-rw-r--r-- root/root usr/include/Xm/Xm.h
-rw-r--r-- root/root usr/include/Xm/XmAll.h
-rw-r--r-- root/root usr/include/Xm/XmIm.h
-rw-r--r-- root/root usr/include/Xm/XmP.h
-rw-r--r-- root/root usr/include/Xm/XmStrDefs.h
-rw-r--r-- root/root usr/include/Xm/XmosP.h
-rw-r--r-- root/root usr/include/Xm/XpmP.h
drwxr-xr-x root/root usr/include/uil/
-rw-r--r-- root/root usr/include/uil/Uil.h
-rw-r--r-- root/root usr/include/uil/UilDBDef.h
-rw-r--r-- root/root usr/include/uil/UilDef.h
-rw-r--r-- root/root usr/include/uil/UilSymDef.h
-rw-r--r-- root/root usr/include/uil/UilSymGl.h
-rw-r--r-- root/root usr/include/uil/XmAppl.uil
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/LessTif/
drwxr-xr-x root/root usr/lib/LessTif/config/
-rw-r--r-- root/root usr/lib/LessTif/config/LessTif.rules
-rw-r--r-- root/root usr/lib/LessTif/config/LessTif.tmpl
-rw-r--r-- root/root usr/lib/LessTif/config/host.def
drwxr-xr-x root/root usr/lib/X11/
-rwxr-xr-x root/root usr/lib/libDtPrint.la
lrwxrwxrwx root/root usr/lib/libDtPrint.so -> libDtPrint.so.1.0.0
lrwxrwxrwx root/root usr/lib/libDtPrint.so.1 -> libDtPrint.so.1.0.0
-rwxr-xr-x root/root usr/lib/libDtPrint.so.1.0.0
-rwxr-xr-x root/root usr/lib/libMrm.la
lrwxrwxrwx root/root usr/lib/libMrm.so -> libMrm.so.2.0.1
lrwxrwxrwx root/root usr/lib/libMrm.so.2 -> libMrm.so.2.0.1
-rwxr-xr-x root/root usr/lib/libMrm.so.2.0.1
-rwxr-xr-x root/root usr/lib/libUil.la
lrwxrwxrwx root/root usr/lib/libUil.so -> libUil.so.2.0.1
lrwxrwxrwx root/root usr/lib/libUil.so.2 -> libUil.so.2.0.1
-rwxr-xr-x root/root usr/lib/libUil.so.2.0.1
-rwxr-xr-x root/root usr/lib/libXm.la
lrwxrwxrwx root/root usr/lib/libXm.so -> libXm.so.2.0.1
lrwxrwxrwx root/root usr/lib/libXm.so.2 -> libXm.so.2.0.1
-rwxr-xr-x root/root usr/lib/libXm.so.2.0.1
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/lesstif.1.gz
-rw-r--r-- root/root usr/man/man1/ltversion.1.gz
-rw-r--r-- root/root usr/man/man1/uil.1.gz
-rw-r--r-- root/root usr/man/man1/xmbind.1.gz
drwxr-xr-x root/root usr/man/man3/
-rw-r--r-- root/root usr/man/man3/ApplicationShell.3.gz
-rw-r--r-- root/root usr/man/man3/Composite.3.gz
-rw-r--r-- root/root usr/man/man3/Constraint.3.gz
-rw-r--r-- root/root usr/man/man3/Core.3.gz
-rw-r--r-- root/root usr/man/man3/LessTifInternals.3.gz
-rw-r--r-- root/root usr/man/man3/Object.3.gz
-rw-r--r-- root/root usr/man/man3/OverrideShell.3.gz
-rw-r--r-- root/root usr/man/man3/Rect.3.gz
-rw-r--r-- root/root usr/man/man3/Shell.3.gz
-rw-r--r-- root/root usr/man/man3/TopLevelShell.3.gz
-rw-r--r-- root/root usr/man/man3/TransientShell.3.gz
-rw-r--r-- root/root usr/man/man3/UnNamedObj.3.gz
-rw-r--r-- root/root usr/man/man3/VendorShell.3.gz
-rw-r--r-- root/root usr/man/man3/WmShell.3.gz
-rw-r--r-- root/root usr/man/man3/XmArrowButton.3.gz
-rw-r--r-- root/root usr/man/man3/XmArrowButtonGadget.3.gz
-rw-r--r-- root/root usr/man/man3/XmBulletinBoard.3.gz
-rw-r--r-- root/root usr/man/man3/XmCascadeButton.3.gz
-rw-r--r-- root/root usr/man/man3/XmCascadeButtonGadget.3.gz
-rw-r--r-- root/root usr/man/man3/XmClipboard.3.gz
-rw-r--r-- root/root usr/man/man3/XmComboBox.3.gz
-rw-r--r-- root/root usr/man/man3/XmCommand.3.gz
-rw-r--r-- root/root usr/man/man3/XmDesktop.3.gz
-rw-r--r-- root/root usr/man/man3/XmDialogShell.3.gz
-rw-r--r-- root/root usr/man/man3/XmDialogShellExt.3.gz
-rw-r--r-- root/root usr/man/man3/XmDisplay.3.gz
-rw-r--r-- root/root usr/man/man3/XmDragContext.3.gz
-rw-r--r-- root/root usr/man/man3/XmDragIcon.3.gz
-rw-r--r-- root/root usr/man/man3/XmDragOverShell.3.gz
-rw-r--r-- root/root usr/man/man3/XmDrawingArea.3.gz
-rw-r--r-- root/root usr/man/man3/XmDrawnButton.3.gz
-rw-r--r-- root/root usr/man/man3/XmDropSiteManager.3.gz
-rw-r--r-- root/root usr/man/man3/XmDropTransfer.3.gz
-rw-r--r-- root/root usr/man/man3/XmFileSelectionBox.3.gz
-rw-r--r-- root/root usr/man/man3/XmForm.3.gz
-rw-r--r-- root/root usr/man/man3/XmFrame.3.gz
-rw-r--r-- root/root usr/man/man3/XmGadget.3.gz
-rw-r--r-- root/root usr/man/man3/XmGrabShell.3.gz
-rw-r--r-- root/root usr/man/man3/XmIconGadget.3.gz
-rw-r--r-- root/root usr/man/man3/XmLabel.3.gz
-rw-r--r-- root/root usr/man/man3/XmLabelGadget.3.gz
-rw-r--r-- root/root usr/man/man3/XmList.3.gz
-rw-r--r-- root/root usr/man/man3/XmMainWindow.3.gz
-rw-r--r-- root/root usr/man/man3/XmManager.3.gz
-rw-r--r-- root/root usr/man/man3/XmMenuShell.3.gz
-rw-r--r-- root/root usr/man/man3/XmMessageBox.3.gz
-rw-r--r-- root/root usr/man/man3/XmNotebook.3.gz
-rw-r--r-- root/root usr/man/man3/XmPanedWindow.3.gz
-rw-r--r-- root/root usr/man/man3/XmPrimitive.3.gz
-rw-r--r-- root/root usr/man/man3/XmProtocol.3.gz
-rw-r--r-- root/root usr/man/man3/XmPushButton.3.gz
-rw-r--r-- root/root usr/man/man3/XmPushButtonGadget.3.gz
-rw-r--r-- root/root usr/man/man3/XmRowColumn.3.gz
-rw-r--r-- root/root usr/man/man3/XmSash.3.gz
-rw-r--r-- root/root usr/man/man3/XmScale.3.gz
-rw-r--r-- root/root usr/man/man3/XmScreen.3.gz
-rw-r--r-- root/root usr/man/man3/XmScrollBar.3.gz
-rw-r--r-- root/root usr/man/man3/XmScrolledWindow.3.gz
-rw-r--r-- root/root usr/man/man3/XmSelectionBox.3.gz
-rw-r--r-- root/root usr/man/man3/XmSeparator.3.gz
-rw-r--r-- root/root usr/man/man3/XmSeparatorGadget.3.gz
-rw-r--r-- root/root usr/man/man3/XmSpinBox.3.gz
-rw-r--r-- root/root usr/man/man3/XmString.3.gz
-rw-r--r-- root/root usr/man/man3/XmTearOffButton.3.gz
-rw-r--r-- root/root usr/man/man3/XmText.3.gz
-rw-r--r-- root/root usr/man/man3/XmTextField.3.gz
-rw-r--r-- root/root usr/man/man3/XmToggleButton.3.gz
-rw-r--r-- root/root usr/man/man3/XmToggleButtonGadget.3.gz
-rw-r--r-- root/root usr/man/man3/XmVendorShell.3.gz
-rw-r--r-- root/root usr/man/man3/XmWorld.3.gz
drwxr-xr-x root/root usr/man/man5/
-rw-r--r-- root/root usr/man/man5/VirtualBindings.5.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/aclocal/
-rw-r--r-- root/root usr/share/aclocal/ac_find_motif.m4

3
lesstif/.md5sum Normal file
View File

@ -0,0 +1,3 @@
4f0720e1597631fc31c2b14d7346e74a lesstif-0.95.0-libxpm.patch
42adb1b2da3652c3fec182c9188ebfb2 lesstif-0.95.0-vendorsp.patch
ab895165c149d7f95843c7584b1c7ad4 lesstif-0.95.0.tar.bz2

28
lesstif/Pkgfile Normal file
View File

@ -0,0 +1,28 @@
# Description: A free replacement for Motif
# URL: http://www.lesstif.org/
# Maintainer: Antti Nykanen, aon at iki dot fi
# Depends on: xorg
name=lesstif
version=0.95.0
release=1
source=(http://dl.sf.net/lesstif/lesstif-$version.tar.bz2
lesstif-$version-libxpm.patch
lesstif-$version-vendorsp.patch)
build() {
cd lesstif-$version
patch -p0 -i $SRC/lesstif-$version-libxpm.patch
patch -p0 -i $SRC/lesstif-$version-vendorsp.patch
./configure \
--prefix=/usr \
--enable-nonstandard-conversions \
--disable-debug \
--with-editres \
--with-xdnd
make
make DESTDIR=$PKG install
rm -rf $PKG/usr/LessTif $PKG/usr/bin/mwm \
$PKG/usr/lib/X11/{app-defaults,mwm} \
$PKG/usr/man/man{1/mwm.1,5/mwmrc.5}
}

38
lesstif/lesstif-0.95.0-libxpm.patch Normal file
View File

@ -0,0 +1,38 @@
--- lib/Xm-2.1/Xpmscan.c.orig 2005-03-02 17:00:16.415070960 +0100
+++ lib/Xm-2.1/Xpmscan.c 2005-03-02 17:01:38.949709879 +0100
@@ -672,8 +672,8 @@
char *dst;
unsigned int *iptr;
char *data;
- unsigned int x, y, i;
- int bits, depth, ibu, ibpp, offset;
+ unsigned int x, y;
+ int bits, depth, ibu, ibpp, offset, i;
unsigned long lbt;
Pixel pixel, px;
@@ -684,6 +684,9 @@
ibpp = image->bits_per_pixel;
offset = image->xoffset;
+ if (image->bitmap_unit < 0)
+ return (XpmNoMemory);
+
if ((image->bits_per_pixel | image->depth) == 1) {
ibu = image->bitmap_unit;
for (y = 0; y < height; y++)
--- lib/Xm-2.1/Xpmcreate.c.orig 2005-03-02 17:02:00.626412844 +0100
+++ lib/Xm-2.1/Xpmcreate.c 2005-03-02 17:02:35.183562480 +0100
@@ -1265,10 +1265,10 @@
register char *src;
register char *dst;
register unsigned int *iptr;
- register unsigned int x, y, i;
+ register unsigned int x, y;
register char *data;
Pixel pixel, px;
- int nbytes, depth, ibu, ibpp;
+ int nbytes, depth, ibu, ibpp, i;
data = image->data;
iptr = pixelindex;

17
lesstif/lesstif-0.95.0-vendorsp.patch Normal file
View File

@ -0,0 +1,17 @@
--- include/Motif-2.1/Xm/VendorSP.h~ 2007-05-20 01:41:58.258974348 +0300
+++ include/Motif-2.1/Xm/VendorSP.h 2007-05-20 01:42:22.353298608 +0300
@@ -28,12 +28,13 @@
#include <Xm/XmP.h>
#include <Xm/VendorS.h>
-#include <X11/ShellP.h>
#ifdef __cplusplus
extern "C" {
#endif
+#include <X11/ShellP.h>
+
XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
Cardinal numResources,
WidgetClass filterClass,