diff options
-rw-r--r-- | devel/anjuta-devel/Makefile | 3 | ||||
-rw-r--r-- | devel/anjuta-devel/distinfo | 2 | ||||
-rw-r--r-- | devel/anjuta-devel/files/patch-Makefile.in | 19 | ||||
-rw-r--r-- | devel/anjuta-devel/files/patch-src-Makefile.in | 31 | ||||
-rw-r--r-- | devel/anjuta-devel/pkg-comment | 1 | ||||
-rw-r--r-- | devel/anjuta-devel/pkg-plist | 14 | ||||
-rw-r--r-- | devel/anjuta/Makefile | 3 | ||||
-rw-r--r-- | devel/anjuta/distinfo | 2 | ||||
-rw-r--r-- | devel/anjuta/files/patch-Makefile.in | 19 | ||||
-rw-r--r-- | devel/anjuta/files/patch-src-Makefile.in | 31 | ||||
-rw-r--r-- | devel/anjuta/pkg-comment | 1 | ||||
-rw-r--r-- | devel/anjuta/pkg-plist | 14 |
12 files changed, 78 insertions, 62 deletions
diff --git a/devel/anjuta-devel/Makefile b/devel/anjuta-devel/Makefile index dc22548dd807..4d2ad18cdb68 100644 --- a/devel/anjuta-devel/Makefile +++ b/devel/anjuta-devel/Makefile @@ -6,12 +6,13 @@ # PORTNAME= anjuta -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= anjuta MAINTAINER= gnome@FreeBSD.org +COMMENT= Integrated Development Environment for C and C++ LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla diff --git a/devel/anjuta-devel/distinfo b/devel/anjuta-devel/distinfo index d0eee2b7ac8e..807f4a9309b5 100644 --- a/devel/anjuta-devel/distinfo +++ b/devel/anjuta-devel/distinfo @@ -1 +1 @@ -MD5 (anjuta-1.0.0.tar.gz) = 214e2b4997d87deda96405a6d97d6806 +MD5 (anjuta-1.0.1.tar.gz) = 2666a6b6a70918ec178ab6e3dee89fe3 diff --git a/devel/anjuta-devel/files/patch-Makefile.in b/devel/anjuta-devel/files/patch-Makefile.in index a85830d0f226..27c48c7a5eeb 100644 --- a/devel/anjuta-devel/files/patch-Makefile.in +++ b/devel/anjuta-devel/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue Nov 5 15:12:07 2002 -+++ Makefile.in Tue Nov 5 15:13:29 2002 -@@ -171,13 +171,13 @@ +--- Makefile.in.orig Thu Feb 20 08:41:48 2003 ++++ Makefile.in Thu Feb 20 08:43:33 2003 +@@ -172,9 +172,9 @@ am__quote = @am__quote@ install_sh = @install_sh@ @@ -12,17 +12,12 @@ anjutadocdir = ${prefix}/@NO_PREFIX_PACKAGE_DOC_DIR@ --anjutadoc_DATA = \ -+anjutadoc_DATA = # \ - README\ - COPYING\ - AUTHORS\ -@@ -563,7 +563,7 @@ +@@ -589,7 +589,7 @@ info-am: --install-data-am: install-anjutadocDATA install-gnomemenuDATA -+install-data-am: install-gnomemenuDATA +-install-data-am: install-anjuta_dataDATA install-anjutadocDATA \ ++install-data-am: install-anjuta_dataDATA \ + install-gnomemenuDATA install-exec-am: - diff --git a/devel/anjuta-devel/files/patch-src-Makefile.in b/devel/anjuta-devel/files/patch-src-Makefile.in index af786456e5d4..456416ccd17c 100644 --- a/devel/anjuta-devel/files/patch-src-Makefile.in +++ b/devel/anjuta-devel/files/patch-src-Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Tue Nov 5 15:22:08 2002 -+++ src/Makefile.in Tue Nov 5 15:23:34 2002 -@@ -178,7 +178,7 @@ +--- src/Makefile.in.orig Thu Feb 20 09:05:39 2003 ++++ src/Makefile.in Thu Feb 20 09:12:13 2003 +@@ -177,7 +177,7 @@ $(GNOME_INCLUDEDIR)\ $(EXTRA_GNOME_CFLAGS)\ $(EXTRA_ORBIT_CFLAGS)\ @@ -9,7 +9,7 @@ -I$(srcdir)/../tagmanager/include \ -I$(srcdir)/../widgets \ -I$(srcdir)/../pixmaps \ -@@ -186,28 +186,8 @@ +@@ -185,31 +185,8 @@ -I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\" @@ -33,14 +33,17 @@ - ../scintilla/LexBullant.o\ - ../scintilla/LexAda.o\ - ../scintilla/LexBaan.o\ -- ../scintilla/LexMatlab.o +- ../scintilla/LexMatlab.o \ +- ../scintilla/LexAsm.o \ +- ../scintilla/LexFortran.o \ +- ../scintilla/LexCSS.o - -+SCILEXERS = -lscintilla_lexers -+SCINTILLA = -lscintilla ++SCILEXERS = -lscintilla_lexers ++SCINTILLA = -lscintilla bin_PROGRAMS = anjuta -@@ -413,10 +393,10 @@ +@@ -413,10 +390,10 @@ $(GNOMEUI_LIBS)\ $(EXTRA_GNOME_LIBS)\ $(EXTRA_ORBIT_LIBS)\ @@ -51,10 +54,10 @@ + $(SCINTILLA)\ $(SCILEXERS) - subdir = src -@@ -473,20 +453,7 @@ - Gladen-common.$(OBJEXT) glades.$(OBJEXT) Prj-common.$(OBJEXT) \ - Gladen-stubs.$(OBJEXT) session.$(OBJEXT) + +@@ -489,22 +466,7 @@ + defaults.$(OBJEXT) resources.$(OBJEXT) session.$(OBJEXT) \ + widget-registry.$(OBJEXT) anjuta_OBJECTS = $(am_anjuta_OBJECTS) -anjuta_DEPENDENCIES = $(top_builddir)/scintilla/libscintilla.a \ - $(top_builddir)/tagmanager/libctags.a \ @@ -69,7 +72,9 @@ - ../scintilla/LexCrontab.o ../scintilla/LexEiffel.o \ - ../scintilla/LexLisp.o ../scintilla/LexRuby.o \ - ../scintilla/LexBullant.o ../scintilla/LexAda.o \ -- ../scintilla/LexBaan.o ../scintilla/LexMatlab.o +- ../scintilla/LexBaan.o ../scintilla/LexMatlab.o \ +- ../scintilla/LexAsm.o ../scintilla/LexFortran.o \ +- ../scintilla/LexCSS.o +anjuta_DEPENDENCIES = anjuta_LDFLAGS = diff --git a/devel/anjuta-devel/pkg-comment b/devel/anjuta-devel/pkg-comment deleted file mode 100644 index 7ea9034dfecf..000000000000 --- a/devel/anjuta-devel/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Integrated Development Environment for C and C++ diff --git a/devel/anjuta-devel/pkg-plist b/devel/anjuta-devel/pkg-plist index 9a48f20be760..3061dfc2ae70 100644 --- a/devel/anjuta-devel/pkg-plist +++ b/devel/anjuta-devel/pkg-plist @@ -5,6 +5,7 @@ lib/anjuta/libanjuta_clsGen.so lib/anjuta/libanjuta_patch.so lib/anjuta/libanjuta_sample1.so share/gnome/anjuta/README.stock_libs +share/gnome/anjuta/anjuta.glade share/gnome/anjuta/anjuta_project.template share/gnome/anjuta/autogen.sh.generic share/gnome/anjuta/autogen.sh.gnome @@ -59,11 +60,16 @@ share/gnome/anjuta/gnome2/linger.m4 share/gnome/anjuta/header.c share/gnome/anjuta/properties/ada.properties share/gnome/anjuta/properties/anjuta.properties +share/gnome/anjuta/properties/asm.properties +share/gnome/anjuta/properties/ave.properties share/gnome/anjuta/properties/baan.properties share/gnome/anjuta/properties/bash.properties +share/gnome/anjuta/properties/bullant.properties share/gnome/anjuta/properties/conf.properties share/gnome/anjuta/properties/cpp.properties share/gnome/anjuta/properties/cs.properties +share/gnome/anjuta/properties/eiffel.properties +share/gnome/anjuta/properties/fortran.properties share/gnome/anjuta/properties/html.properties share/gnome/anjuta/properties/idl.properties share/gnome/anjuta/properties/java.properties @@ -93,11 +99,11 @@ share/gnome/apps/Development/anjuta.desktop share/gnome/help/anjuta/C/anjuta-faqs/anjuta-faqs.sgml share/gnome/help/anjuta/C/anjuta-faqs/index.html share/gnome/help/anjuta/C/anjuta-manual/anjuta-manual.sgml -share/gnome/help/anjuta/C/anjuta-manual/authors.sgml share/gnome/help/anjuta/C/anjuta-manual/build.sgml share/gnome/help/anjuta/C/anjuta-manual/compileopts.sgml share/gnome/help/anjuta/C/anjuta-manual/debugger.sgml share/gnome/help/anjuta/C/anjuta-manual/execute.sgml +share/gnome/help/anjuta/C/anjuta-manual/figures/a2ps.png share/gnome/help/anjuta/C/anjuta-manual/figures/arguments.png share/gnome/help/anjuta/C/anjuta-manual/figures/attach.png share/gnome/help/anjuta/C/anjuta-manual/figures/brk_add.png @@ -109,6 +115,7 @@ share/gnome/help/anjuta/C/anjuta-manual/figures/ccview_struct.png share/gnome/help/anjuta/C/anjuta-manual/figures/configure_dlg.png share/gnome/help/anjuta/C/anjuta-manual/figures/defines.png share/gnome/help/anjuta/C/anjuta-manual/figures/devt_menu.png +share/gnome/help/anjuta/C/anjuta-manual/figures/doxygen.png share/gnome/help/anjuta/C/anjuta-manual/figures/editor_guides.png share/gnome/help/anjuta/C/anjuta-manual/figures/editor_margins.png share/gnome/help/anjuta/C/anjuta-manual/figures/editor_markers.png @@ -144,6 +151,7 @@ share/gnome/help/anjuta/C/anjuta-manual/figures/signals.png share/gnome/help/anjuta/C/anjuta-manual/figures/stack.png share/gnome/help/anjuta/C/anjuta-manual/figures/supports.png share/gnome/help/anjuta/C/anjuta-manual/figures/symbol_browser.png +share/gnome/help/anjuta/C/anjuta-manual/figures/tool-editor.png share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_browser.png share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_debug.png share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_ext.png @@ -158,9 +166,9 @@ share/gnome/help/anjuta/C/anjuta-manual/fileoperations.sgml share/gnome/help/anjuta/C/anjuta-manual/index.html share/gnome/help/anjuta/C/anjuta-manual/interface.sgml share/gnome/help/anjuta/C/anjuta-manual/introduction.sgml -share/gnome/help/anjuta/C/anjuta-manual/license.sgml share/gnome/help/anjuta/C/anjuta-manual/preferences.sgml share/gnome/help/anjuta/C/anjuta-manual/projects.sgml +share/gnome/help/anjuta/C/anjuta-manual/tools.sgml share/gnome/help/anjuta/C/anjuta-tutorial/anjuta-tutorial.sgml share/gnome/help/anjuta/C/anjuta-tutorial/figures/divided.png share/gnome/help/anjuta/C/anjuta-tutorial/figures/glade-l.png @@ -361,12 +369,12 @@ share/gnome/pixmaps/anjuta/prefs_general.xpm share/gnome/pixmaps/anjuta/prefs_messages.xpm share/gnome/pixmaps/anjuta/prefs_print.xpm share/gnome/pixmaps/anjuta/prefs_styles.xpm +share/gnome/pixmaps/anjuta/print.xpm share/gnome/pixmaps/anjuta/print_color.xpm share/gnome/pixmaps/anjuta/print_landscape.xpm share/gnome/pixmaps/anjuta/print_layout.xpm share/gnome/pixmaps/anjuta/print_nocolor.xpm share/gnome/pixmaps/anjuta/print_portrait.xpm -share/gnome/pixmaps/anjuta/print.xpm share/gnome/pixmaps/anjuta/project.xpm share/gnome/pixmaps/anjuta/redo.xpm share/gnome/pixmaps/anjuta/registers.xpm diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index dc22548dd807..4d2ad18cdb68 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -6,12 +6,13 @@ # PORTNAME= anjuta -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= anjuta MAINTAINER= gnome@FreeBSD.org +COMMENT= Integrated Development Environment for C and C++ LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index d0eee2b7ac8e..807f4a9309b5 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1 +1 @@ -MD5 (anjuta-1.0.0.tar.gz) = 214e2b4997d87deda96405a6d97d6806 +MD5 (anjuta-1.0.1.tar.gz) = 2666a6b6a70918ec178ab6e3dee89fe3 diff --git a/devel/anjuta/files/patch-Makefile.in b/devel/anjuta/files/patch-Makefile.in index a85830d0f226..27c48c7a5eeb 100644 --- a/devel/anjuta/files/patch-Makefile.in +++ b/devel/anjuta/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Tue Nov 5 15:12:07 2002 -+++ Makefile.in Tue Nov 5 15:13:29 2002 -@@ -171,13 +171,13 @@ +--- Makefile.in.orig Thu Feb 20 08:41:48 2003 ++++ Makefile.in Thu Feb 20 08:43:33 2003 +@@ -172,9 +172,9 @@ am__quote = @am__quote@ install_sh = @install_sh@ @@ -12,17 +12,12 @@ anjutadocdir = ${prefix}/@NO_PREFIX_PACKAGE_DOC_DIR@ --anjutadoc_DATA = \ -+anjutadoc_DATA = # \ - README\ - COPYING\ - AUTHORS\ -@@ -563,7 +563,7 @@ +@@ -589,7 +589,7 @@ info-am: --install-data-am: install-anjutadocDATA install-gnomemenuDATA -+install-data-am: install-gnomemenuDATA +-install-data-am: install-anjuta_dataDATA install-anjutadocDATA \ ++install-data-am: install-anjuta_dataDATA \ + install-gnomemenuDATA install-exec-am: - diff --git a/devel/anjuta/files/patch-src-Makefile.in b/devel/anjuta/files/patch-src-Makefile.in index af786456e5d4..456416ccd17c 100644 --- a/devel/anjuta/files/patch-src-Makefile.in +++ b/devel/anjuta/files/patch-src-Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Tue Nov 5 15:22:08 2002 -+++ src/Makefile.in Tue Nov 5 15:23:34 2002 -@@ -178,7 +178,7 @@ +--- src/Makefile.in.orig Thu Feb 20 09:05:39 2003 ++++ src/Makefile.in Thu Feb 20 09:12:13 2003 +@@ -177,7 +177,7 @@ $(GNOME_INCLUDEDIR)\ $(EXTRA_GNOME_CFLAGS)\ $(EXTRA_ORBIT_CFLAGS)\ @@ -9,7 +9,7 @@ -I$(srcdir)/../tagmanager/include \ -I$(srcdir)/../widgets \ -I$(srcdir)/../pixmaps \ -@@ -186,28 +186,8 @@ +@@ -185,31 +185,8 @@ -I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\" @@ -33,14 +33,17 @@ - ../scintilla/LexBullant.o\ - ../scintilla/LexAda.o\ - ../scintilla/LexBaan.o\ -- ../scintilla/LexMatlab.o +- ../scintilla/LexMatlab.o \ +- ../scintilla/LexAsm.o \ +- ../scintilla/LexFortran.o \ +- ../scintilla/LexCSS.o - -+SCILEXERS = -lscintilla_lexers -+SCINTILLA = -lscintilla ++SCILEXERS = -lscintilla_lexers ++SCINTILLA = -lscintilla bin_PROGRAMS = anjuta -@@ -413,10 +393,10 @@ +@@ -413,10 +390,10 @@ $(GNOMEUI_LIBS)\ $(EXTRA_GNOME_LIBS)\ $(EXTRA_ORBIT_LIBS)\ @@ -51,10 +54,10 @@ + $(SCINTILLA)\ $(SCILEXERS) - subdir = src -@@ -473,20 +453,7 @@ - Gladen-common.$(OBJEXT) glades.$(OBJEXT) Prj-common.$(OBJEXT) \ - Gladen-stubs.$(OBJEXT) session.$(OBJEXT) + +@@ -489,22 +466,7 @@ + defaults.$(OBJEXT) resources.$(OBJEXT) session.$(OBJEXT) \ + widget-registry.$(OBJEXT) anjuta_OBJECTS = $(am_anjuta_OBJECTS) -anjuta_DEPENDENCIES = $(top_builddir)/scintilla/libscintilla.a \ - $(top_builddir)/tagmanager/libctags.a \ @@ -69,7 +72,9 @@ - ../scintilla/LexCrontab.o ../scintilla/LexEiffel.o \ - ../scintilla/LexLisp.o ../scintilla/LexRuby.o \ - ../scintilla/LexBullant.o ../scintilla/LexAda.o \ -- ../scintilla/LexBaan.o ../scintilla/LexMatlab.o +- ../scintilla/LexBaan.o ../scintilla/LexMatlab.o \ +- ../scintilla/LexAsm.o ../scintilla/LexFortran.o \ +- ../scintilla/LexCSS.o +anjuta_DEPENDENCIES = anjuta_LDFLAGS = diff --git a/devel/anjuta/pkg-comment b/devel/anjuta/pkg-comment deleted file mode 100644 index 7ea9034dfecf..000000000000 --- a/devel/anjuta/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Integrated Development Environment for C and C++ diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist index 9a48f20be760..3061dfc2ae70 100644 --- a/devel/anjuta/pkg-plist +++ b/devel/anjuta/pkg-plist @@ -5,6 +5,7 @@ lib/anjuta/libanjuta_clsGen.so lib/anjuta/libanjuta_patch.so lib/anjuta/libanjuta_sample1.so share/gnome/anjuta/README.stock_libs +share/gnome/anjuta/anjuta.glade share/gnome/anjuta/anjuta_project.template share/gnome/anjuta/autogen.sh.generic share/gnome/anjuta/autogen.sh.gnome @@ -59,11 +60,16 @@ share/gnome/anjuta/gnome2/linger.m4 share/gnome/anjuta/header.c share/gnome/anjuta/properties/ada.properties share/gnome/anjuta/properties/anjuta.properties +share/gnome/anjuta/properties/asm.properties +share/gnome/anjuta/properties/ave.properties share/gnome/anjuta/properties/baan.properties share/gnome/anjuta/properties/bash.properties +share/gnome/anjuta/properties/bullant.properties share/gnome/anjuta/properties/conf.properties share/gnome/anjuta/properties/cpp.properties share/gnome/anjuta/properties/cs.properties +share/gnome/anjuta/properties/eiffel.properties +share/gnome/anjuta/properties/fortran.properties share/gnome/anjuta/properties/html.properties share/gnome/anjuta/properties/idl.properties share/gnome/anjuta/properties/java.properties @@ -93,11 +99,11 @@ share/gnome/apps/Development/anjuta.desktop share/gnome/help/anjuta/C/anjuta-faqs/anjuta-faqs.sgml share/gnome/help/anjuta/C/anjuta-faqs/index.html share/gnome/help/anjuta/C/anjuta-manual/anjuta-manual.sgml -share/gnome/help/anjuta/C/anjuta-manual/authors.sgml share/gnome/help/anjuta/C/anjuta-manual/build.sgml share/gnome/help/anjuta/C/anjuta-manual/compileopts.sgml share/gnome/help/anjuta/C/anjuta-manual/debugger.sgml share/gnome/help/anjuta/C/anjuta-manual/execute.sgml +share/gnome/help/anjuta/C/anjuta-manual/figures/a2ps.png share/gnome/help/anjuta/C/anjuta-manual/figures/arguments.png share/gnome/help/anjuta/C/anjuta-manual/figures/attach.png share/gnome/help/anjuta/C/anjuta-manual/figures/brk_add.png @@ -109,6 +115,7 @@ share/gnome/help/anjuta/C/anjuta-manual/figures/ccview_struct.png share/gnome/help/anjuta/C/anjuta-manual/figures/configure_dlg.png share/gnome/help/anjuta/C/anjuta-manual/figures/defines.png share/gnome/help/anjuta/C/anjuta-manual/figures/devt_menu.png +share/gnome/help/anjuta/C/anjuta-manual/figures/doxygen.png share/gnome/help/anjuta/C/anjuta-manual/figures/editor_guides.png share/gnome/help/anjuta/C/anjuta-manual/figures/editor_margins.png share/gnome/help/anjuta/C/anjuta-manual/figures/editor_markers.png @@ -144,6 +151,7 @@ share/gnome/help/anjuta/C/anjuta-manual/figures/signals.png share/gnome/help/anjuta/C/anjuta-manual/figures/stack.png share/gnome/help/anjuta/C/anjuta-manual/figures/supports.png share/gnome/help/anjuta/C/anjuta-manual/figures/symbol_browser.png +share/gnome/help/anjuta/C/anjuta-manual/figures/tool-editor.png share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_browser.png share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_debug.png share/gnome/help/anjuta/C/anjuta-manual/figures/toolbar_ext.png @@ -158,9 +166,9 @@ share/gnome/help/anjuta/C/anjuta-manual/fileoperations.sgml share/gnome/help/anjuta/C/anjuta-manual/index.html share/gnome/help/anjuta/C/anjuta-manual/interface.sgml share/gnome/help/anjuta/C/anjuta-manual/introduction.sgml -share/gnome/help/anjuta/C/anjuta-manual/license.sgml share/gnome/help/anjuta/C/anjuta-manual/preferences.sgml share/gnome/help/anjuta/C/anjuta-manual/projects.sgml +share/gnome/help/anjuta/C/anjuta-manual/tools.sgml share/gnome/help/anjuta/C/anjuta-tutorial/anjuta-tutorial.sgml share/gnome/help/anjuta/C/anjuta-tutorial/figures/divided.png share/gnome/help/anjuta/C/anjuta-tutorial/figures/glade-l.png @@ -361,12 +369,12 @@ share/gnome/pixmaps/anjuta/prefs_general.xpm share/gnome/pixmaps/anjuta/prefs_messages.xpm share/gnome/pixmaps/anjuta/prefs_print.xpm share/gnome/pixmaps/anjuta/prefs_styles.xpm +share/gnome/pixmaps/anjuta/print.xpm share/gnome/pixmaps/anjuta/print_color.xpm share/gnome/pixmaps/anjuta/print_landscape.xpm share/gnome/pixmaps/anjuta/print_layout.xpm share/gnome/pixmaps/anjuta/print_nocolor.xpm share/gnome/pixmaps/anjuta/print_portrait.xpm -share/gnome/pixmaps/anjuta/print.xpm share/gnome/pixmaps/anjuta/project.xpm share/gnome/pixmaps/anjuta/redo.xpm share/gnome/pixmaps/anjuta/registers.xpm |