From 6438a6820e664b9c622047cbee199bd356d98118 Mon Sep 17 00:00:00 2001 From: martti Date: Mon, 17 Jan 2005 12:56:13 +0000 Subject: Updated XFce to 4.2.0 Too many changes to list here, please read the Changelog from www.xfce.org (http://www.xfce.org/release_notes/4.2.0_changelog.html) --- sysutils/xfce4-fm/Makefile | 7 +- sysutils/xfce4-fm/PLIST | 324 ++++++++++++++++++++++++---------------- sysutils/xfce4-fm/buildlink3.mk | 4 +- sysutils/xfce4-fm/distinfo | 6 +- 4 files changed, 204 insertions(+), 137 deletions(-) (limited to 'sysutils/xfce4-fm') diff --git a/sysutils/xfce4-fm/Makefile b/sysutils/xfce4-fm/Makefile index fb692420ea8..5118b67fb7f 100644 --- a/sysutils/xfce4-fm/Makefile +++ b/sysutils/xfce4-fm/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2004/10/03 00:18:17 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/01/17 12:56:13 martti Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" DISTNAME= xffm-${XFCE4_VERSION} PKGNAME= xfce4-fm-${XFCE4_VERSION} -PKGREVISION= 1 CATEGORIES= sysutils COMMENT= XFce4 filemanager @@ -12,9 +11,13 @@ MESSAGE_SRC+= ${.CURDIR}/MESSAGE PKGCONFIG_OVERRIDE= src/xffm-1.0.pc.in +CFLAGS+= ${PTHREAD_CFLAGS} +LIBS+= ${PTHREAD_LDFLAGS} + UNLIMIT_RESOURCES+= datasize .include "../../databases/dbh/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/xfce4-mcs-plugins/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfce4-fm/PLIST b/sysutils/xfce4-fm/PLIST index c096aba4988..e58cba2e05f 100644 --- a/sysutils/xfce4-fm/PLIST +++ b/sysutils/xfce4-fm/PLIST @@ -1,53 +1,34 @@ -@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:54 jlam Exp $ -bin/fgr -bin/scramble -bin/xfapps -bin/xfapps4 -bin/xfbook -bin/xfbook4 -bin/xfdiff4 -bin/xffm -bin/xffstab -bin/xffstab4 -bin/xfglob4 -bin/xfsamba4 -bin/xftrash4 -bin/xftree4 -lib/libxffm.la -lib/libxffm_actions.la -lib/libxffm_apps.la -lib/libxffm_book.la -lib/libxffm_calls.la -lib/libxffm_fgr.la -lib/libxffm_fstab.la -lib/libxffm_tubo.la -lib/libxffmsmb.la -lib/pkgconfig/xffm-1.0.pc -lib/xfce4/mcs-plugins/libxffmsettings.la -man/man1/fgr.1 +@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:13 martti Exp $ ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/es_MX/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xffm.mo -${PKGLOCALEDIR}/locale/fa_IR/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/nb_NO/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xffm.mo -${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/pt_PT/LC_MESSAGES/xffm.mo +${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xffm.mo @@ -55,106 +36,189 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xffm.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xffm.mo +bin/fgr +bin/scramble +bin/xfbook +bin/xfbook4 +bin/xfdiff4 +bin/xffm +bin/xffrequent +bin/xffrequent4 +bin/xffstab +bin/xffstab4 +bin/xfglob4 +bin/xfmime-edit +bin/xfrecent +bin/xfrecent4 +bin/xfsamba4 +bin/xftrash4 +bin/xftree4 +lib/libxffm_actions.la +lib/libxffm_basic.la +lib/libxffm_calls.la +lib/libxffm_cpy.la +lib/libxffm_on_demand.la +lib/libxffm_secondary.la +lib/libxffm_tubo.la +lib/pkgconfig/xffm-1.0.pc +lib/xfce4/mcs-plugins/libxffmsettings.la +lib/xfce4/xffm/libxffm_book.la +lib/xfce4/xffm/libxffm_find.la +lib/xfce4/xffm/libxffm_fstab.la +lib/xfce4/xffm/libxffm_prop.la +lib/xfce4/xffm/libxffm_recent.la +lib/xfce4/xffm/libxffm_smb.la +lib/xfce4/xffm/libxffm_trash.la +man/man1/fgr.1 +share/applications/Xfbook.desktop +share/applications/Xfdiff.desktop +share/applications/Xffm.desktop +share/applications/Xffstab.desktop +share/applications/Xfglob.desktop +share/applications/Xfmime_edit.desktop +share/applications/Xfsamba.desktop +share/applications/Xftree.desktop +share/applications/xfce-filemanager-settings.desktop +share/icons/hicolor/48x48/stock/generic/a-apply.png +share/icons/hicolor/48x48/stock/generic/a-clear.png +share/icons/hicolor/48x48/stock/generic/a-convert.png +share/icons/hicolor/48x48/stock/generic/a-info.png +share/icons/hicolor/48x48/stock/generic/a-next.png +share/icons/hicolor/48x48/stock/generic/a-open.png +share/icons/hicolor/48x48/stock/generic/a-pause.png +share/icons/hicolor/48x48/stock/generic/a-prev.png +share/icons/hicolor/48x48/stock/generic/a-question.png +share/icons/hicolor/48x48/stock/generic/a-quit.png +share/icons/hicolor/48x48/stock/generic/a-refresh.png +share/icons/hicolor/48x48/stock/generic/a-stop.png +share/icons/hicolor/48x48/stock/generic/b-book-closed.png +share/icons/hicolor/48x48/stock/generic/b-book-open.png +share/icons/hicolor/48x48/stock/generic/b-find.png +share/icons/hicolor/48x48/stock/generic/b-frequent.png +share/icons/hicolor/48x48/stock/generic/b-fstab.png +share/icons/hicolor/48x48/stock/generic/b-home.png +share/icons/hicolor/48x48/stock/generic/b-network.png +share/icons/hicolor/48x48/stock/generic/b-recent.png +share/icons/hicolor/48x48/stock/generic/b-trash.png +share/icons/hicolor/48x48/stock/generic/b-xffm_icon.png +share/icons/hicolor/48x48/stock/generic/c-gid.png +share/icons/hicolor/48x48/stock/generic/c-mode.png +share/icons/hicolor/48x48/stock/generic/c-name.png +share/icons/hicolor/48x48/stock/generic/c-size.png +share/icons/hicolor/48x48/stock/generic/c-time.png +share/icons/hicolor/48x48/stock/generic/c-uid.png +share/icons/hicolor/48x48/stock/generic/comp1.xpm +share/icons/hicolor/48x48/stock/generic/d-application.png +share/icons/hicolor/48x48/stock/generic/d-audio.png +share/icons/hicolor/48x48/stock/generic/d-bomb.png +share/icons/hicolor/48x48/stock/generic/d-exec.png +share/icons/hicolor/48x48/stock/generic/d-file.png +share/icons/hicolor/48x48/stock/generic/d-help.png +share/icons/hicolor/48x48/stock/generic/d-image.png +share/icons/hicolor/48x48/stock/generic/d-message.png +share/icons/hicolor/48x48/stock/generic/d-model.png +share/icons/hicolor/48x48/stock/generic/d-multipart.png +share/icons/hicolor/48x48/stock/generic/d-no-access.png +share/icons/hicolor/48x48/stock/generic/d-pirate.png +share/icons/hicolor/48x48/stock/generic/d-symlink-broken.png +share/icons/hicolor/48x48/stock/generic/d-symlink.png +share/icons/hicolor/48x48/stock/generic/d-txt.png +share/icons/hicolor/48x48/stock/generic/d-video.png +share/icons/hicolor/48x48/stock/generic/d-waste_basket_empty.png +share/icons/hicolor/48x48/stock/generic/d-waste_basket_full.png +share/icons/hicolor/48x48/stock/generic/d-xfce.png +share/icons/hicolor/48x48/stock/generic/dir-closed.png +share/icons/hicolor/48x48/stock/generic/dir-open.png +share/icons/hicolor/48x48/stock/generic/downarrow.png +share/icons/hicolor/48x48/stock/generic/f-cdrom.png +share/icons/hicolor/48x48/stock/generic/f-disk.png +share/icons/hicolor/48x48/stock/generic/f-dvd.png +share/icons/hicolor/48x48/stock/generic/f-floppy.png +share/icons/hicolor/48x48/stock/generic/f-memory.png +share/icons/hicolor/48x48/stock/generic/f-netdisk.png +share/icons/hicolor/48x48/stock/generic/go-back.png +share/icons/hicolor/48x48/stock/generic/go-forward.png +share/icons/hicolor/48x48/stock/generic/go-home.png +share/icons/hicolor/48x48/stock/generic/go-jump.png +share/icons/hicolor/48x48/stock/generic/go-start.png +share/icons/hicolor/48x48/stock/generic/go-up.png +share/icons/hicolor/48x48/stock/generic/new_win.xpm +share/icons/hicolor/48x48/stock/generic/p-edit.png +share/icons/hicolor/48x48/stock/generic/p-file1.png +share/icons/hicolor/48x48/stock/generic/p-file2.png +share/icons/hicolor/48x48/stock/generic/p-games.png +share/icons/hicolor/48x48/stock/generic/p-man.png +share/icons/hicolor/48x48/stock/generic/p-multimedia.png +share/icons/hicolor/48x48/stock/generic/p-network.png +share/icons/hicolor/48x48/stock/generic/p-newmail.png +share/icons/hicolor/48x48/stock/generic/p-nomail.png +share/icons/hicolor/48x48/stock/generic/p-oldmail.png +share/icons/hicolor/48x48/stock/generic/p-paint.png +share/icons/hicolor/48x48/stock/generic/p-print.png +share/icons/hicolor/48x48/stock/generic/p-schedule.png +share/icons/hicolor/48x48/stock/generic/p-sound.png +share/icons/hicolor/48x48/stock/generic/p-terminal.png +share/icons/hicolor/48x48/stock/generic/p-unknown.png +share/icons/hicolor/48x48/stock/generic/t-exec.png +share/icons/hicolor/48x48/stock/generic/t-find.png +share/icons/hicolor/48x48/stock/generic/t-new-directory.png +share/icons/hicolor/48x48/stock/generic/t-new-file.png +share/icons/hicolor/48x48/stock/generic/t-pastelink.png +share/icons/hicolor/48x48/stock/generic/t-preferences.png +share/icons/hicolor/48x48/stock/generic/t-quit.png +share/icons/hicolor/48x48/stock/generic/t-reload.png +share/icons/hicolor/48x48/stock/generic/t-terminal.png +share/icons/hicolor/48x48/stock/generic/t-xfce-setting-show.png +share/icons/hicolor/48x48/stock/generic/t-xfdiff.png +share/icons/hicolor/48x48/stock/generic/t-xfmime-edit.png +share/icons/hicolor/48x48/stock/generic/t-zoom-in.png +share/icons/hicolor/48x48/stock/generic/t-zoom-out.png +share/icons/hicolor/48x48/stock/generic/t-zoom-view.png +share/icons/hicolor/48x48/stock/generic/ubu_head.jpg +share/icons/hicolor/48x48/stock/generic/xfdiff.png +share/icons/hicolor/48x48/stock/generic/xffm_icon.xpm +share/xfce4/doc/C/images/book_popup.png +share/xfce4/doc/C/images/column_titles_popup.png +share/xfce4/doc/C/images/diagnostics_window.png +share/xfce4/doc/C/images/directory_popup.png +share/xfce4/doc/C/images/directory_popup_unmount.png +share/xfce4/doc/C/images/file_popup.png +share/xfce4/doc/C/images/file_subpopup.png +share/xfce4/doc/C/images/filter_box.png +share/xfce4/doc/C/images/frequent_popup.png +share/xfce4/doc/C/images/fstab_popup_mount.png +share/xfce4/doc/C/images/fstab_popup_unmount.png +share/xfce4/doc/C/images/go_menu.png +share/xfce4/doc/C/images/hide_show_buttons.png +share/xfce4/doc/C/images/icon_title_smartbutton.png +share/xfce4/doc/C/images/main_menu.png +share/xfce4/doc/C/images/mcs-plugin.png +share/xfce4/doc/C/images/netfile_popup.png +share/xfce4/doc/C/images/netshare_popup.png +share/xfce4/doc/C/images/open_menu.png +share/xfce4/doc/C/images/options_menu.png +share/xfce4/doc/C/images/preferences_menu.png +share/xfce4/doc/C/images/recent_popup.png +share/xfce4/doc/C/images/sidebar_filesubmenu.png +share/xfce4/doc/C/images/sidebar_go.png +share/xfce4/doc/C/images/sidebar_multiple_select.png +share/xfce4/doc/C/images/sidebar_open.png +share/xfce4/doc/C/images/sidebar_options.png +share/xfce4/doc/C/images/sidebar_paste.png +share/xfce4/doc/C/images/sidebar_tools.png +share/xfce4/doc/C/images/sort_subpopup.png +share/xfce4/doc/C/images/t_main_menu.png +share/xfce4/doc/C/images/tools_menu.png +share/xfce4/doc/C/images/trash_popup.png +share/xfce4/doc/C/images/xffm_default.png share/xfce4/doc/C/xffm.html -share/xfce4/doc/fr/xffm.html -share/xffm/AUTHORS -share/xffm/applications.xml -share/xffm/pixmaps/comp1.xpm -share/xffm/pixmaps/empty.xpm -share/xffm/pixmaps/network-36.png -share/xffm/pixmaps/network-8.png -share/xffm/pixmaps/network.png -share/xffm/pixmaps/new_win.xpm -share/xffm/pixmaps/no_icons/mime.xml -share/xffm/pixmaps/plain/3floppy_mount.png -share/xffm/pixmaps/plain/3floppy_unmount.png -share/xffm/pixmaps/plain/Jrecycle.png -share/xffm/pixmaps/plain/Jxlock.png -share/xffm/pixmaps/plain/Monitor.png -share/xffm/pixmaps/plain/applications_package.png -share/xffm/pixmaps/plain/arrows2.png -share/xffm/pixmaps/plain/arrup2.png -share/xffm/pixmaps/plain/background.png -share/xffm/pixmaps/plain/binary.png -share/xffm/pixmaps/plain/blockdevice.png -share/xffm/pixmaps/plain/bomb.png -share/xffm/pixmaps/plain/c_src.png -share/xffm/pixmaps/plain/cdrom_mount.png -share/xffm/pixmaps/plain/cdrom_unmount.png -share/xffm/pixmaps/plain/chardevice.png -share/xffm/pixmaps/plain/clamp.png -share/xffm/pixmaps/plain/core.png -share/xffm/pixmaps/plain/document.png -share/xffm/pixmaps/plain/dvi.png -share/xffm/pixmaps/plain/eps.png -share/xffm/pixmaps/plain/exec.png -share/xffm/pixmaps/plain/f_src.png -share/xffm/pixmaps/plain/folder.png -share/xffm/pixmaps/plain/folder_green_open.png -share/xffm/pixmaps/plain/folder_grey_open.png -share/xffm/pixmaps/plain/folder_locked.png -share/xffm/pixmaps/plain/folder_open.png -share/xffm/pixmaps/plain/folder_red.png -share/xffm/pixmaps/plain/folder_violet.png -share/xffm/pixmaps/plain/folder_violet_open.png -share/xffm/pixmaps/plain/folder_zap.png -share/xffm/pixmaps/plain/graphs.png -share/xffm/pixmaps/plain/h_src.png -share/xffm/pixmaps/plain/harddrive_mount.png -share/xffm/pixmaps/plain/harddrive_unmount.png -share/xffm/pixmaps/plain/html.png -share/xffm/pixmaps/plain/image.png -share/xffm/pixmaps/plain/info.png -share/xffm/pixmaps/plain/java_src.png -share/xffm/pixmaps/plain/karm.png -share/xffm/pixmaps/plain/kcmpci.png -share/xffm/pixmaps/plain/kcmprocessor.png -share/xffm/pixmaps/plain/kcmprocessor_mount.png -share/xffm/pixmaps/plain/kfm.png -share/xffm/pixmaps/plain/kfm_fulltrash.png -share/xffm/pixmaps/plain/kfm_trash.png -share/xffm/pixmaps/plain/knu.png -share/xffm/pixmaps/plain/konsole.png -share/xffm/pixmaps/plain/korn.png -share/xffm/pixmaps/plain/library.png -share/xffm/pixmaps/plain/locked_file.png -share/xffm/pixmaps/plain/mag_glass.png -share/xffm/pixmaps/plain/make.png -share/xffm/pixmaps/plain/man.png -share/xffm/pixmaps/plain/mime.xml -share/xffm/pixmaps/plain/misc.png -share/xffm/pixmaps/plain/moc_src.png -share/xffm/pixmaps/plain/network.png -share/xffm/pixmaps/plain/o_src.png -share/xffm/pixmaps/plain/pdf.png -share/xffm/pixmaps/plain/perl.png -share/xffm/pixmaps/plain/pipe.png -share/xffm/pixmaps/plain/postscript.png -share/xffm/pixmaps/plain/printer.png -share/xffm/pixmaps/plain/resource.png -share/xffm/pixmaps/plain/socket.png -share/xffm/pixmaps/plain/sound.png -share/xffm/pixmaps/plain/tex.png -share/xffm/pixmaps/plain/text.png -share/xffm/pixmaps/plain/unknown.png -share/xffm/pixmaps/plain/utilities_package.png -share/xffm/pixmaps/plain/video.png -share/xffm/pixmaps/plain/xman.png -share/xffm/pixmaps/plain/xpaint.png -share/xffm/pixmaps/terminal-12.png -share/xffm/pixmaps/terminal-24.png -share/xffm/pixmaps/terminal.png -share/xffm/pixmaps/types.xml -share/xffm/pixmaps/ubu_head.jpg -share/xffm/pixmaps/waste_basket_empty.png -share/xffm/pixmaps/waste_basket_full.png -share/xffm/pixmaps/xfdiff-24.png -share/xffm/pixmaps/xfdiff.png -share/xffm/pixmaps/xffm_icon-12.png -share/xffm/pixmaps/xffm_icon-24.png -share/xffm/pixmaps/xffm_icon-36.png -share/xffm/pixmaps/xffm_icon.png -share/xffm/pixmaps/xffm_icon.xpm -@dirrm share/xffm/pixmaps/plain -@dirrm share/xffm/pixmaps/no_icons +share/xfce4/xffm/AUTHORS +share/xfce4/xffm/AUTHORS.vi +share/xfce4/xffm/xffm.spec +share/xfce4/xffm/xffm.spec.in @dirrm share/xffm/pixmaps +@dirrm share/xffm +@dirrm share/xfce4/xffm +@dirrm share/icons/hicolor/48x48/stock/generic +@dirrm share/icons/hicolor/48x48/stock +@dirrm lib/xfce4/xffm diff --git a/sysutils/xfce4-fm/buildlink3.mk b/sysutils/xfce4-fm/buildlink3.mk index fecbccb0003..3a80e34624f 100644 --- a/sysutils/xfce4-fm/buildlink3.mk +++ b/sysutils/xfce4-fm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/07/12 08:25:11 martti Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:13 martti Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFCE4_FM_BUILDLINK3_MK:= ${XFCE4_FM_BUILDLINK3_MK}+ @@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxfce4-fm} BUILDLINK_PACKAGES+= xfce4-fm .if !empty(XFCE4_FM_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.xfce4-fm+= xfce4-fm>=4.0.6 +BUILDLINK_DEPENDS.xfce4-fm+= xfce4-fm>=4.2.0 BUILDLINK_PKGSRCDIR.xfce4-fm?= ../../sysutils/xfce4-fm .endif # XFCE4_FM_BUILDLINK3_MK diff --git a/sysutils/xfce4-fm/distinfo b/sysutils/xfce4-fm/distinfo index 474ff6c7f75..da5baffff5c 100644 --- a/sysutils/xfce4-fm/distinfo +++ b/sysutils/xfce4-fm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2004/07/12 08:25:11 martti Exp $ +$NetBSD: distinfo,v 1.8 2005/01/17 12:56:13 martti Exp $ -SHA1 (xffm-4.0.6.tar.gz) = fa76816b1297753e61d6dd491f6baef0ce63153f -Size (xffm-4.0.6.tar.gz) = 1708703 bytes +SHA1 (xffm-4.2.0.tar.gz) = c1e23888e9816ec56e65de0a51e9a34f87f16492 +Size (xffm-4.2.0.tar.gz) = 2974372 bytes -- cgit v1.2.3