diff options
author | joerg <joerg@pkgsrc.org> | 2007-07-16 09:57:56 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2007-07-16 09:57:56 +0000 |
commit | db7a13d59ef291554b00f8bca60bd799df5fc49f (patch) | |
tree | 98128d399e27358d0baa57ea5ec6719f97132a3a /pkgtools | |
parent | 58a9cf47723dba1e42e19cbaddcba35bc41b1bda (diff) | |
download | pkgsrc-db7a13d59ef291554b00f8bca60bd799df5fc49f.tar.gz |
Merge remaining small changes from NetBSD, most of all the pkgsrc.7 man
page. Fix build on !NetBSD. Rebuild man pages with nroff -mandoc on
NetBSD current for consistency. Make it DESTDIR safe. Remove the note
that src/usr.sbin/pkg_install is the authoritive version, it won't be
any longer.
Diffstat (limited to 'pkgtools')
31 files changed, 264 insertions, 185 deletions
diff --git a/pkgtools/pkg_install/files/README b/pkgtools/pkg_install/files/README index 50ecf4b1a9b..fa40db8ee9f 100644 --- a/pkgtools/pkg_install/files/README +++ b/pkgtools/pkg_install/files/README @@ -1,4 +1,4 @@ -# $NetBSD: README,v 1.8 2007/07/14 20:17:07 adrianp Exp $ +# $NetBSD: README,v 1.9 2007/07/16 09:57:56 joerg Exp $ # Original from FreeBSD, no rcs id. This is the pkg_install suite of tools for doing maintainance of @@ -18,5 +18,4 @@ Adrian Portelli. When making snapshots, please modify PKGTOOLS_VERSION in lib/version.h to that day's date. -src/usr.sbin/pkg_install is the canonical location for these sources. -Any changes should be made here first, then merged over to pkgsrc. +pkgsrc/pkgtools/pkg_install is the canonical location for these sources. diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in index 20ebe3dbf67..36ff759fcbc 100644 --- a/pkgtools/pkg_install/files/add/Makefile.in +++ b/pkgtools/pkg_install/files/add/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.13 2005/11/22 15:44:59 ben Exp $ +# $NetBSD: Makefile.in,v 1.14 2007/07/16 09:57:56 joerg Exp $ srcdir= @srcdir@ @@ -36,9 +36,9 @@ clean: rm -f $(OBJS) $(PROG) install: - $(INSTALL) -m 755 -d $(sbindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(cat1dir) - $(INSTALL) $(PROG) $(sbindir) - $(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1 - $(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0 + $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) + $(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG) + $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 + $(INSTALL) -m 444 $(PROG).cat1 ${DESTDIR}$(cat1dir)/$(PROG).0 diff --git a/pkgtools/pkg_install/files/add/pkg_add.1 b/pkgtools/pkg_install/files/add/pkg_add.1 index ba9e0d88678..2be1c8d405c 100644 --- a/pkgtools/pkg_install/files/add/pkg_add.1 +++ b/pkgtools/pkg_install/files/add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_add.1,v 1.18 2006/04/08 23:06:21 wiz Exp $ +.\" $NetBSD: pkg_add.1,v 1.19 2007/07/16 09:57:56 joerg Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -17,7 +17,7 @@ .\" .\" @(#)pkg_add.1 .\" -.Dd April 3, 2006 +.Dd March 2, 2007 .Dt PKG_ADD 1 .Os .Sh NAME @@ -636,7 +636,7 @@ package and running it after every .Xr pkg_info 1 , .Xr mktemp 3 , .Xr sysconf 3 , -.Xr packages 7 , +.Xr pkgsrc 7 , .Xr mtree 8 .Sh AUTHORS .Bl -tag -width indent -compact diff --git a/pkgtools/pkg_install/files/add/pkg_add.cat1 b/pkgtools/pkg_install/files/add/pkg_add.cat1 index e6c7282b70c..26d4dd410f6 100644 --- a/pkgtools/pkg_install/files/add/pkg_add.cat1 +++ b/pkgtools/pkg_install/files/add/pkg_add.cat1 @@ -1,4 +1,4 @@ -PKG_ADD(1) General Commands Manual PKG_ADD(1) +PKG_ADD(1) NetBSD General Commands Manual PKG_ADD(1) NNAAMMEE ppkkgg__aadddd -- a utility for installing and upgrading software package dis- @@ -222,9 +222,9 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS is overridable with the --ff flag. 7. The package build information from _+_B_U_I_L_D___I_N_F_O is then checked - for USE_ABI_DEPENDS=NO (or IGNORE_RECOMMENDED). If the package - was built with ABI dependency recommendations ignored, a warn- - ing will be issued. + for USE_ABI_DEPENDS=NO (or IGNORE_RECOMMENDED). If the pack- + age was built with ABI dependency recommendations ignored, a + warning will be issued. 8. If the package contains a _r_e_q_u_i_r_e script (see pkg_create(1)), it is executed with the following arguments: @@ -363,7 +363,7 @@ EEXXAAMMPPLLEESS SSEEEE AALLSSOO pkg_admin(1), pkg_create(1), pkg_delete(1), pkg_info(1), mktemp(3), - sysconf(3), packages(7), mtree(8) + sysconf(3), pkgsrc(7), mtree(8) AAUUTTHHOORRSS Jordan Hubbard @@ -388,4 +388,4 @@ BBUUGGSS Sure to be others. -pkgsrc April 3, 2006 pkgsrc +NetBSD 4.0 March 2, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in index 5117335ef93..418033e4da4 100644 --- a/pkgtools/pkg_install/files/admin/Makefile.in +++ b/pkgtools/pkg_install/files/admin/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.10 2004/08/21 06:33:40 jlam Exp $ +# $NetBSD: Makefile.in,v 1.11 2007/07/16 09:57:57 joerg Exp $ srcdir= @srcdir@ @@ -36,9 +36,9 @@ clean: rm -f $(OBJS) $(PROG) install: - $(INSTALL) -m 755 -d $(sbindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(cat1dir) - $(INSTALL) $(PROG) $(sbindir) - $(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1 - $(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0 + $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) + $(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG) + $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 + $(INSTALL) -m 444 $(PROG).cat1 ${DESTDIR}$(cat1dir)/$(PROG).0 diff --git a/pkgtools/pkg_install/files/admin/pkg_admin.1 b/pkgtools/pkg_install/files/admin/pkg_admin.1 index d553cea1eaa..91cd15017a2 100644 --- a/pkgtools/pkg_install/files/admin/pkg_admin.1 +++ b/pkgtools/pkg_install/files/admin/pkg_admin.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_admin.1,v 1.11 2005/11/05 13:20:09 wiz Exp $ +.\" $NetBSD: pkg_admin.1,v 1.12 2007/07/16 09:57:57 joerg Exp $ .\" .\" Copyright (c) 1999-2002 Hubert Feyrer. All rights reserved. .\" @@ -28,7 +28,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 1, 2005 +.Dd March 2, 2007 .Dt PKG_ADMIN 1 .Os .Sh NAME @@ -229,7 +229,7 @@ The default package database directory is .Xr pkg_delete 1 , .Xr pkg_info 1 , .Xr pkg_view 1 , -.Xr packages 7 +.Xr pkgsrc 7 .Sh HISTORY The .Nm diff --git a/pkgtools/pkg_install/files/admin/pkg_admin.cat1 b/pkgtools/pkg_install/files/admin/pkg_admin.cat1 index 913b5ca31a9..1d468f9cdec 100644 --- a/pkgtools/pkg_install/files/admin/pkg_admin.cat1 +++ b/pkgtools/pkg_install/files/admin/pkg_admin.cat1 @@ -143,7 +143,7 @@ FFIILLEESS SSEEEE AALLSSOO pkg_add(1), pkg_create(1), pkg_delete(1), pkg_info(1), pkg_view(1), - packages(7) + pkgsrc(7) HHIISSTTOORRYY The ppkkgg__aaddmmiinn command first appeared in NetBSD 1.4. @@ -151,4 +151,4 @@ HHIISSTTOORRYY AAUUTTHHOORRSS The ppkkgg__aaddmmiinn command was written by Hubert Feyrer. -NetBSD 3.0 November 1, 2005 NetBSD 3.0 +NetBSD 4.0 March 2, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/audit-packages/Makefile.in b/pkgtools/pkg_install/files/audit-packages/Makefile.in index 724bd1ca373..09cb788bf85 100644 --- a/pkgtools/pkg_install/files/audit-packages/Makefile.in +++ b/pkgtools/pkg_install/files/audit-packages/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.1 2007/07/14 20:17:08 adrianp Exp $ +# $NetBSD: Makefile.in,v 1.2 2007/07/16 09:57:57 joerg Exp $ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -25,7 +25,8 @@ do_subst = sed -e 's,_pkgdbdir_,$(pkgdbdir),g' \ CC = @CC@ CCLD= $(CC) LIBS= -linstall @LIBS@ -CPPFLAGS= @CPPFLAGS@ -DHOST=\"$(CANONICAL_HOST)\" -DPKGSRC -I. -I../lib +CPPFLAGS= @CPPFLAGS@ -I. -I../lib -DHOST=\"$(CANONICAL_HOST)\" -DPKGSRC +CPPFLAGS+= -DPREFIX=\"$(prefix)\" -DSYSCONFDIR=\"$(sysconfdir)\" DEFS= @DEFS@ CFLAGS= @CFLAGS@ -Wall LDFLAGS= @LDFLAGS@ -L../lib @@ -60,12 +61,12 @@ clean: rm -f *.o audit-packages install: - $(INSTALL) -m 755 -d $(sbindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(man5dir) - $(INSTALL) -m 755 -d $(cat1dir) - $(INSTALL) -m 755 -d $(cat5dir) - $(INSTALL) -m 755 -d $(sharedir) + $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man5dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat5dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(sharedir) $(INSTALL_PROGRAM) audit-packages $(DESTDIR)$(sbindir)/audit-packages $(INSTALL_SCRIPT) download-vulnerability-list.sh \ diff --git a/pkgtools/pkg_install/files/audit-packages/audit-packages.1.in b/pkgtools/pkg_install/files/audit-packages/audit-packages.1.in index 06ea4fa958c..68e8029cdd6 100644 --- a/pkgtools/pkg_install/files/audit-packages/audit-packages.1.in +++ b/pkgtools/pkg_install/files/audit-packages/audit-packages.1.in @@ -1,4 +1,4 @@ -.\" $NetBSD: audit-packages.1.in,v 1.1 2007/07/14 20:17:08 adrianp Exp $ +.\" $NetBSD: audit-packages.1.in,v 1.2 2007/07/16 09:57:57 joerg Exp $ .\" .\" Copyright (c) 2003 Jeremy C. Reed. All rights reserved. .\" @@ -317,7 +317,7 @@ FETCH_PROTO="http" .Xr pkg_info 1 , .Xr audit-packages.conf 5 , .Xr mk.conf 5 , -.Xr packages 7 , +.Xr pkgsrc 7 , .%T "Documentation on the NetBSD Package System" .Sh HISTORY The diff --git a/pkgtools/pkg_install/files/audit-packages/audit-packages.cat1.in b/pkgtools/pkg_install/files/audit-packages/audit-packages.cat1.in index 2a84417e27c..b0473d8c40c 100644 --- a/pkgtools/pkg_install/files/audit-packages/audit-packages.cat1.in +++ b/pkgtools/pkg_install/files/audit-packages/audit-packages.cat1.in @@ -96,41 +96,41 @@ DDEESSCCRRIIPPTTIIOONN The type of exploit can be any text, although some common types of exploits listed are: - ++oo cross-site-html - ++oo cross-site-scripting - ++oo denial-of-service - ++oo eol - ++oo file-permissions - ++oo local-access - ++oo local-code-execution - ++oo local-file-read - ++oo local-file-removal - ++oo local-file-write - ++oo local-root-file-view - ++oo local-root-shell - ++oo local-symlink-race - ++oo local-user-file-view - ++oo local-user-shell - ++oo privacy-leak - ++oo remote-code-execution - ++oo remote-command-inject - ++oo remote-file-creation - ++oo remote-file-read - ++oo remote-file-view - ++oo remote-file-write - ++oo remote-key-theft - ++oo remote-root-access - ++oo remote-root-shell - ++oo remote-script-inject - ++oo remote-server-admin - ++oo remote-use-of-secret - ++oo remote-user-access - ++oo remote-user-file-view - ++oo remote-user-shell - ++oo unknown - ++oo weak-authentication - ++oo weak-encryption - ++oo weak-ssl-authentication + ·· cross-site-html + ·· cross-site-scripting + ·· denial-of-service + ·· eol + ·· file-permissions + ·· local-access + ·· local-code-execution + ·· local-file-read + ·· local-file-removal + ·· local-file-write + ·· local-root-file-view + ·· local-root-shell + ·· local-symlink-race + ·· local-user-file-view + ·· local-user-shell + ·· privacy-leak + ·· remote-code-execution + ·· remote-command-inject + ·· remote-file-creation + ·· remote-file-read + ·· remote-file-view + ·· remote-file-write + ·· remote-key-theft + ·· remote-root-access + ·· remote-root-shell + ·· remote-script-inject + ·· remote-server-admin + ·· remote-use-of-secret + ·· remote-user-access + ·· remote-user-file-view + ·· remote-user-shell + ·· unknown + ·· weak-authentication + ·· weak-encryption + ·· weak-ssl-authentication The type _e_o_l implies that the package is no longer maintained by the software vendor but is provided by the pkgsrc team for your convenience @@ -169,8 +169,8 @@ EEXXAAMMPPLLEESS FETCH_PROTO="http" SSEEEE AALLSSOO - pkg_info(1), audit-packages.conf(5), mk.conf(5), packages(7), - _D_o_c_u_m_e_n_t_a_t_i_o_n _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m + pkg_info(1), audit-packages.conf(5), mk.conf(5), pkgsrc(7), _D_o_c_u_m_e_n_t_a_t_i_o_n + _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m HHIISSTTOORRYY The aauuddiitt--ppaacckkaaggeess and ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt commands were origi- @@ -180,4 +180,4 @@ HHIISSTTOORRYY signatures on downloaded files. The original idea came from Roland Dowdeswell and Bill Sommerfeld. -NetBSD 3.1 July 07, 2007 NetBSD 3.1 +NetBSD 4.0 July 07, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/audit-packages/audit-packages.conf.5.in b/pkgtools/pkg_install/files/audit-packages/audit-packages.conf.5.in index e3e405b6802..70aa8cca51b 100644 --- a/pkgtools/pkg_install/files/audit-packages/audit-packages.conf.5.in +++ b/pkgtools/pkg_install/files/audit-packages/audit-packages.conf.5.in @@ -1,4 +1,4 @@ -.\" $NetBSD: audit-packages.conf.5.in,v 1.1 2007/07/14 20:17:09 adrianp Exp $ +.\" $NetBSD: audit-packages.conf.5.in,v 1.2 2007/07/16 09:57:57 joerg Exp $ .\" .\" Copyright (c) 2007 Adrian Portelli. All rights reserved. .\" @@ -103,7 +103,7 @@ vulnerability. .Sh SEE ALSO .Xr pkg_info 1 , .Xr mk.conf 5 , -.Xr packages 7 , +.Xr pkgsrc 7 , .Xr audit-packages 8 and .%T "Documentation on the NetBSD Package System" .Sh HISTORY diff --git a/pkgtools/pkg_install/files/audit-packages/audit-packages.conf.cat5.in b/pkgtools/pkg_install/files/audit-packages/audit-packages.conf.cat5.in index 767176797e8..0b1a9bb7276 100644 --- a/pkgtools/pkg_install/files/audit-packages/audit-packages.conf.cat5.in +++ b/pkgtools/pkg_install/files/audit-packages/audit-packages.conf.cat5.in @@ -56,7 +56,7 @@ FFIILLEESS @sysconfdir@/audit-packages.conf SSEEEE AALLSSOO - pkg_info(1), mk.conf(5), packages(7), audit-packages(8) and _D_o_c_u_m_e_n_t_a_t_i_o_n + pkg_info(1), mk.conf(5), pkgsrc(7), audit-packages(8) and _D_o_c_u_m_e_n_t_a_t_i_o_n _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m HHIISSTTOORRYY @@ -67,4 +67,4 @@ HHIISSTTOORRYY ing signatures on downloaded files. The original idea came from Roland Dowdeswell and Bill Sommerfeld. -NetBSD 3.1 July 07, 2007 NetBSD 3.1 +NetBSD 4.0 July 07, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.1.in b/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.1.in index 22ffeb00dbf..7b6e0f0d806 100644 --- a/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.1.in +++ b/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.1.in @@ -1,4 +1,4 @@ -.\" $NetBSD: download-vulnerability-list.1.in,v 1.1 2007/07/14 20:17:10 adrianp Exp $ +.\" $NetBSD: download-vulnerability-list.1.in,v 1.2 2007/07/16 09:57:57 joerg Exp $ .\" .\" Copyright (c) 2003 Jeremy C. Reed. All rights reserved. .\" @@ -317,7 +317,7 @@ FETCH_PROTO="http" .Xr pkg_info 1 , .Xr audit-packages.conf 5 , .Xr mk.conf 5 , -.Xr packages 7 , +.Xr pkgsrc 7 , .%T "Documentation on the NetBSD Package System" .Sh HISTORY The diff --git a/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.cat1.in b/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.cat1.in index 2a84417e27c..b0473d8c40c 100644 --- a/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.cat1.in +++ b/pkgtools/pkg_install/files/audit-packages/download-vulnerability-list.cat1.in @@ -96,41 +96,41 @@ DDEESSCCRRIIPPTTIIOONN The type of exploit can be any text, although some common types of exploits listed are: - ++oo cross-site-html - ++oo cross-site-scripting - ++oo denial-of-service - ++oo eol - ++oo file-permissions - ++oo local-access - ++oo local-code-execution - ++oo local-file-read - ++oo local-file-removal - ++oo local-file-write - ++oo local-root-file-view - ++oo local-root-shell - ++oo local-symlink-race - ++oo local-user-file-view - ++oo local-user-shell - ++oo privacy-leak - ++oo remote-code-execution - ++oo remote-command-inject - ++oo remote-file-creation - ++oo remote-file-read - ++oo remote-file-view - ++oo remote-file-write - ++oo remote-key-theft - ++oo remote-root-access - ++oo remote-root-shell - ++oo remote-script-inject - ++oo remote-server-admin - ++oo remote-use-of-secret - ++oo remote-user-access - ++oo remote-user-file-view - ++oo remote-user-shell - ++oo unknown - ++oo weak-authentication - ++oo weak-encryption - ++oo weak-ssl-authentication + ·· cross-site-html + ·· cross-site-scripting + ·· denial-of-service + ·· eol + ·· file-permissions + ·· local-access + ·· local-code-execution + ·· local-file-read + ·· local-file-removal + ·· local-file-write + ·· local-root-file-view + ·· local-root-shell + ·· local-symlink-race + ·· local-user-file-view + ·· local-user-shell + ·· privacy-leak + ·· remote-code-execution + ·· remote-command-inject + ·· remote-file-creation + ·· remote-file-read + ·· remote-file-view + ·· remote-file-write + ·· remote-key-theft + ·· remote-root-access + ·· remote-root-shell + ·· remote-script-inject + ·· remote-server-admin + ·· remote-use-of-secret + ·· remote-user-access + ·· remote-user-file-view + ·· remote-user-shell + ·· unknown + ·· weak-authentication + ·· weak-encryption + ·· weak-ssl-authentication The type _e_o_l implies that the package is no longer maintained by the software vendor but is provided by the pkgsrc team for your convenience @@ -169,8 +169,8 @@ EEXXAAMMPPLLEESS FETCH_PROTO="http" SSEEEE AALLSSOO - pkg_info(1), audit-packages.conf(5), mk.conf(5), packages(7), - _D_o_c_u_m_e_n_t_a_t_i_o_n _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m + pkg_info(1), audit-packages.conf(5), mk.conf(5), pkgsrc(7), _D_o_c_u_m_e_n_t_a_t_i_o_n + _o_n _t_h_e _N_e_t_B_S_D _P_a_c_k_a_g_e _S_y_s_t_e_m HHIISSTTOORRYY The aauuddiitt--ppaacckkaaggeess and ddoowwnnllooaadd--vvuullnneerraabbiilliittyy--lliisstt commands were origi- @@ -180,4 +180,4 @@ HHIISSTTOORRYY signatures on downloaded files. The original idea came from Roland Dowdeswell and Bill Sommerfeld. -NetBSD 3.1 July 07, 2007 NetBSD 3.1 +NetBSD 4.0 July 07, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/bpm/bpm.cat1 b/pkgtools/pkg_install/files/bpm/bpm.cat1 index bdc82d4d24d..9320586bebb 100644 --- a/pkgtools/pkg_install/files/bpm/bpm.cat1 +++ b/pkgtools/pkg_install/files/bpm/bpm.cat1 @@ -1,7 +1,7 @@ BPM(1) NetBSD General Commands Manual BPM(1) NNAAMMEE - bbppmm - menu-based binary package manager + bbppmm -- menu-based binary package manager SSYYNNOOPPSSIISS bbppmm [--hhnnVVvv] [--bb _b_a_s_e_U_R_L] [--mm _m_a_c_h_i_n_e] [--rr _r_e_l_e_a_s_e] [--ww _s_e_c_o_n_d_s] @@ -58,4 +58,4 @@ SSEEEE AALLSSOO AAUUTTHHOORRSS The bbppmm utility was written by Alistair Crooks <agc@NetBSD.org>. -NetBSD 2.0 December 21, 2003 NetBSD 2.0 +NetBSD 4.0 December 21, 2003 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/create/Makefile.in b/pkgtools/pkg_install/files/create/Makefile.in index 80948a65bff..dc8d3c0332d 100644 --- a/pkgtools/pkg_install/files/create/Makefile.in +++ b/pkgtools/pkg_install/files/create/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.12 2005/11/22 15:44:59 ben Exp $ +# $NetBSD: Makefile.in,v 1.13 2007/07/16 09:57:58 joerg Exp $ srcdir= @srcdir@ @@ -39,9 +39,9 @@ clean: rm -f $(OBJS) $(PROG) install: - $(INSTALL) -m 755 -d $(sbindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(cat1dir) - $(INSTALL) $(PROG) $(sbindir) - $(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1 - $(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0 + $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) + $(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG) + $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 + $(INSTALL) -m 444 $(PROG).cat1 ${DESTDIR}$(cat1dir)/$(PROG).0 diff --git a/pkgtools/pkg_install/files/create/pkg_create.cat1 b/pkgtools/pkg_install/files/create/pkg_create.cat1 index bc6e0a6f8b3..a2dae709a34 100644 --- a/pkgtools/pkg_install/files/create/pkg_create.cat1 +++ b/pkgtools/pkg_install/files/create/pkg_create.cat1 @@ -121,11 +121,11 @@ OOPPTTIIOONNSS form of @@bbllddddeepp directives. --TT _b_u_i_l_d_p_k_g_s - This is assumed to be a whitespace separated list of package - names. The exact versions of the packages referred to in the - _b_u_i_l_d_p_k_g_s list will be added to the packing list in the form of - @@bbllddddeepp directives. This directives are stored after those cre- - ated by the --PP option. + The exact versions of the packages referred to in the _b_u_i_l_d_p_k_g_s + list will be added to the packing list in the form of @@bbllddddeepp + directives. This directives are stored after those created by + the --PP option. _b_u_i_l_d_p_k_g_s is assumed to be a whitespace separated + list of package names. --pp _p_r_e_f_i_x Set _p_r_e_f_i_x as the initial directory (base) to start from in @@ -280,7 +280,7 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS SSEEEE AALLSSOO pkg_add(1), pkg_admin(1), pkg_delete(1), pkg_info(1), sysconf(3), - packages(7) + pkgsrc(7) HHIISSTTOORRYY The ppkkgg__ccrreeaattee command first appeared in FreeBSD. @@ -301,4 +301,4 @@ BBUUGGSS invocations due to exec argument-space limitations (this depends on the value returned by ssyyssccoonnff(___S_C___A_R_G___M_A_X)). -NetBSD 4.0 March 8, 2007 NetBSD 4.0 +NetBSD 4.0 May 19, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/delete/Makefile.in b/pkgtools/pkg_install/files/delete/Makefile.in index b23dbc9ea3c..fe2e06e9e8a 100644 --- a/pkgtools/pkg_install/files/delete/Makefile.in +++ b/pkgtools/pkg_install/files/delete/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.10 2004/08/21 06:33:40 jlam Exp $ +# $NetBSD: Makefile.in,v 1.11 2007/07/16 09:57:58 joerg Exp $ srcdir= @srcdir@ @@ -36,9 +36,9 @@ clean: rm -f $(OBJS) $(PROG) install: - $(INSTALL) -m 755 -d $(sbindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(cat1dir) - $(INSTALL) $(PROG) $(sbindir) - $(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1 - $(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0 + $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) + $(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG) + $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 + $(INSTALL) -m 444 $(PROG).cat1 ${DESTDIR}$(cat1dir)/$(PROG).0 diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.1 b/pkgtools/pkg_install/files/delete/pkg_delete.1 index e23f06113e8..d2d7db974fa 100644 --- a/pkgtools/pkg_install/files/delete/pkg_delete.1 +++ b/pkgtools/pkg_install/files/delete/pkg_delete.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_delete.1,v 1.12 2005/05/30 13:23:31 wiz Exp $ +.\" $NetBSD: pkg_delete.1,v 1.13 2007/07/16 09:57:58 joerg Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -17,7 +17,7 @@ .\" .\" from FreeBSD: @(#)pkg_delete.1 .\" -.Dd February 4, 2005 +.Dd March 2, 2007 .Dt PKG_DELETE 1 .Os .Sh NAME @@ -296,7 +296,7 @@ appended to the path, e.g. .Xr pkg_create 1 , .Xr pkg_info 1 , .Xr mktemp 3 , -.Xr packages 7 , +.Xr pkgsrc 7 , .Xr mtree 8 .Sh AUTHORS .Bl -tag -width indent -compact diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 b/pkgtools/pkg_install/files/delete/pkg_delete.cat1 index 34f7705cef4..27c15fb5139 100644 --- a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 +++ b/pkgtools/pkg_install/files/delete/pkg_delete.cat1 @@ -157,7 +157,7 @@ EENNVVIIRROONNMMEENNTT SSEEEE AALLSSOO pkg_add(1), pkg_admin(1), pkg_create(1), pkg_info(1), mktemp(3), - packages(7), mtree(8) + pkgsrc(7), mtree(8) AAUUTTHHOORRSS Jordan Hubbard @@ -168,4 +168,4 @@ AAUUTTHHOORRSS NetBSD wildcard dependency processing, pkgdb, recursive "down" delete, etc. -NetBSD 3.0 February 4, 2005 NetBSD 3.0 +NetBSD 4.0 March 2, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/info/Makefile.in b/pkgtools/pkg_install/files/info/Makefile.in index 8207ab4e3ef..c14dcf496ce 100644 --- a/pkgtools/pkg_install/files/info/Makefile.in +++ b/pkgtools/pkg_install/files/info/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.10 2004/08/21 06:33:40 jlam Exp $ +# $NetBSD: Makefile.in,v 1.11 2007/07/16 09:57:58 joerg Exp $ srcdir= @srcdir@ @@ -36,9 +36,9 @@ clean: rm -f $(OBJS) $(PROG) install: - $(INSTALL) -m 755 -d $(sbindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(cat1dir) - $(INSTALL) $(PROG) $(sbindir) - $(INSTALL) -m 444 $(PROG).1 $(man1dir)/$(PROG).1 - $(INSTALL) -m 444 $(PROG).cat1 $(cat1dir)/$(PROG).0 + $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) + $(INSTALL) $(PROG) ${DESTDIR}$(sbindir)/$(PROG) + $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 + $(INSTALL) -m 444 $(PROG).cat1 ${DESTDIR}$(cat1dir)/$(PROG).0 diff --git a/pkgtools/pkg_install/files/info/pkg_info.1 b/pkgtools/pkg_install/files/info/pkg_info.1 index 87704db0336..359621af3dc 100644 --- a/pkgtools/pkg_install/files/info/pkg_info.1 +++ b/pkgtools/pkg_install/files/info/pkg_info.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_info.1,v 1.18 2006/04/24 13:52:05 dillo Exp $ +.\" $NetBSD: pkg_info.1,v 1.19 2007/07/16 09:57:58 joerg Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -17,7 +17,7 @@ .\" .\" @(#)pkg_info.1 .\" -.Dd April 15, 2006 +.Dd March 2, 2007 .Dt PKG_INFO 1 .Os .Sh NAME @@ -334,7 +334,7 @@ default locations. .Xr pkg_create 1 , .Xr pkg_delete 1 , .Xr mktemp 3 , -.Xr packages 7 , +.Xr pkgsrc 7 , .Xr mtree 8 .Sh AUTHORS .Bl -tag -width indent -compact diff --git a/pkgtools/pkg_install/files/info/pkg_info.cat1 b/pkgtools/pkg_install/files/info/pkg_info.cat1 index e8ab1a27f43..272f431d05c 100644 --- a/pkgtools/pkg_install/files/info/pkg_info.cat1 +++ b/pkgtools/pkg_install/files/info/pkg_info.cat1 @@ -186,7 +186,7 @@ EENNVVIIRROONNMMEENNTT SSEEEE AALLSSOO pkg_add(1), pkg_admin(1), pkg_create(1), pkg_delete(1), mktemp(3), - packages(7), mtree(8) + pkgsrc(7), mtree(8) AAUUTTHHOORRSS Jordan Hubbard @@ -197,4 +197,4 @@ AAUUTTHHOORRSS NetBSD wildcard dependency processing, pkgdb, depends displaying, pkg size display etc. -NetBSD 3.0 April 15, 2006 NetBSD 3.0 +NetBSD 4.0 March 2, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/lib/Makefile.in b/pkgtools/pkg_install/files/lib/Makefile.in index fb00a7e9902..2185dad3a1e 100644 --- a/pkgtools/pkg_install/files/lib/Makefile.in +++ b/pkgtools/pkg_install/files/lib/Makefile.in @@ -1,12 +1,14 @@ -# $NetBSD: Makefile.in,v 1.13 2006/08/19 14:38:52 schwarz Exp $ +# $NetBSD: Makefile.in,v 1.14 2007/07/16 09:57:59 joerg Exp $ srcdir= @srcdir@ pkgdbdir= @pkgdbdir@ mandir= @mandir@ -man5dir= $(mandir)/man5 cat5dir= $(mandir)/cat5 +cat7dir= $(mandir)/cat7 +man5dir= $(mandir)/man5 +man7dir= $(mandir)/man7 tar= @tar@ ftp= @ftp@ @@ -38,7 +40,11 @@ clean: rm -f $(OBJS) $(LIB) install: - $(INSTALL) -m 755 -d $(man5dir) - $(INSTALL) -m 755 -d $(cat5dir) - $(INSTALL) -m 444 pkg_summary.5 $(man5dir)/pkg_summary.5 - $(INSTALL) -m 444 pkg_summary.cat5 $(cat5dir)/pkg_summary.0 + $(INSTALL) -m 755 -d ${DESTDIR}$(man5dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat5dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man7dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat7dir) + $(INSTALL) -m 444 pkg_summary.5 ${DESTDIR}$(man5dir)/pkg_summary.5 + $(INSTALL) -m 444 pkg_summary.cat5 ${DESTDIR}$(cat5dir)/pkg_summary.0 + $(INSTALL) -m 444 pkgsrc.7 ${DESTDIR}$(man7dir)/pkgsrc.7 + $(INSTALL) -m 444 pkgsrc.cat7 ${DESTDIR}$(cat7dir)/pkgsrc.0 diff --git a/pkgtools/pkg_install/files/lib/lib.h b/pkgtools/pkg_install/files/lib/lib.h index 6d572f1d624..ba491004ca3 100644 --- a/pkgtools/pkg_install/files/lib/lib.h +++ b/pkgtools/pkg_install/files/lib/lib.h @@ -1,4 +1,4 @@ -/* $NetBSD: lib.h,v 1.24 2006/04/24 13:52:05 dillo Exp $ */ +/* $NetBSD: lib.h,v 1.25 2007/07/16 09:57:59 joerg Exp $ */ /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */ @@ -307,7 +307,7 @@ void cleanup(int); char *make_playpen(char *, size_t, size_t); char *where_playpen(void); void leave_playpen(char *); -uint64_t min_free(char *); +uint64_t min_free(const char *); void save_dirs(char **, char **); void restore_dirs(char *, char *); void show_version(void); diff --git a/pkgtools/pkg_install/files/lib/pkg_summary.cat5 b/pkgtools/pkg_install/files/lib/pkg_summary.cat5 index ffd69d82801..b6ed9dd2115 100644 --- a/pkgtools/pkg_install/files/lib/pkg_summary.cat5 +++ b/pkgtools/pkg_install/files/lib/pkg_summary.cat5 @@ -96,4 +96,4 @@ SSEEEE AALLSSOO HHIISSTTOORRYY The ppkkgg__ssuummmmaarryy format was first officially documented in April 2006. -NetBSD 3.0 February 5, 2007 NetBSD 3.0 +NetBSD 4.0 February 5, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/lib/pkgsrc.7 b/pkgtools/pkg_install/files/lib/pkgsrc.7 new file mode 100644 index 00000000000..41ec55e8afe --- /dev/null +++ b/pkgtools/pkg_install/files/lib/pkgsrc.7 @@ -0,0 +1,54 @@ +.\" $NetBSD: pkgsrc.7,v 1.1 2007/07/16 09:57:59 joerg Exp $ +.\" +.\" Copyright (c) 2007 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Thomas Klausner. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.Dd March 2, 2007 +.Dt PKGSRC 7 +.Os +.Sh NAME +.Nm pkgsrc +.Nd NetBSD packages collection (framework for third-party software) +.Sh DESCRIPTION +The +.Nx +Packages Collection (pkgsrc) is a framework for building and +maintaining third-party software on +.Nx +and other +.Ux Ns -like +systems. +It is used to enable freely available software to be configured +and built easily on supported platforms. +.Pp +Tools are available to install ready-to-use packages and to perform +various administrative tasks for the package system. +.Sh SEE ALSO +.Xr pkg_add 1 , +.Xr pkg_delete 1 , +.Xr pkg_info 1 , +.Pa http://www.netbsd.org/Documentation/pkgsrc/ diff --git a/pkgtools/pkg_install/files/lib/pkgsrc.cat7 b/pkgtools/pkg_install/files/lib/pkgsrc.cat7 new file mode 100644 index 00000000000..14556516ed2 --- /dev/null +++ b/pkgtools/pkg_install/files/lib/pkgsrc.cat7 @@ -0,0 +1,19 @@ +PKGSRC(7) NetBSD Miscellaneous Information Manual PKGSRC(7) + +NNAAMMEE + ppkkggssrrcc -- NetBSD packages collection (framework for third-party software) + +DDEESSCCRRIIPPTTIIOONN + The NetBSD Packages Collection (pkgsrc) is a framework for building and + maintaining third-party software on NetBSD and other UNIX-like systems. + It is used to enable freely available software to be configured and built + easily on supported platforms. + + Tools are available to install ready-to-use packages and to perform vari- + ous administrative tasks for the package system. + +SSEEEE AALLSSOO + pkg_add(1), pkg_delete(1), pkg_info(1), + _h_t_t_p_:_/_/_w_w_w_._n_e_t_b_s_d_._o_r_g_/_D_o_c_u_m_e_n_t_a_t_i_o_n_/_p_k_g_s_r_c_/ + +NetBSD 4.0 March 2, 2007 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/view/Makefile.in b/pkgtools/pkg_install/files/view/Makefile.in index b62d1935688..ec40c8a067f 100644 --- a/pkgtools/pkg_install/files/view/Makefile.in +++ b/pkgtools/pkg_install/files/view/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.4 2004/08/21 06:33:40 jlam Exp $ +# $NetBSD: Makefile.in,v 1.5 2007/07/16 09:57:59 joerg Exp $ prefix= @prefix@ exec_prefix= @exec_prefix@ @@ -19,16 +19,16 @@ clean: @true # do nothing install: - $(INSTALL) -m 755 -d $(sbindir) - $(INSTALL) -m 755 -d $(man1dir) - $(INSTALL) -m 755 -d $(cat1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(sbindir) + $(INSTALL) -m 755 -d ${DESTDIR}$(man1dir) + $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) @for script in $(SCRIPTS); do \ - echo "$(INSTALL) $$script.sh $(sbindir)/$$script"; \ - $(INSTALL) $$script.sh $(sbindir)/$$script; \ + echo "$(INSTALL) $$script.sh ${DESTDIR}$(sbindir)/$$script"; \ + $(INSTALL) $$script.sh ${DESTDIR}$(sbindir)/$$script; \ done @for script in $(SCRIPTS); do \ - echo "$(INSTALL) -m 444 $$script.1 $(man1dir)/$$script.1"; \ - $(INSTALL) -m 444 $$script.1 $(man1dir)/$$script.1; \ - echo "$(INSTALL) -m 444 $$script.cat1 $(cat1dir)/$$script.0"; \ - $(INSTALL) -m 444 $$script.cat1 $(cat1dir)/$$script.0; \ + echo "$(INSTALL) -m 444 $$script.1 ${DESTDIR}$(man1dir)/$$script.1"; \ + $(INSTALL) -m 444 $$script.1 ${DESTDIR}$(man1dir)/$$script.1; \ + echo "$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0"; \ + $(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0; \ done diff --git a/pkgtools/pkg_install/files/view/linkfarm.cat1 b/pkgtools/pkg_install/files/view/linkfarm.cat1 index 77897246e1f..75f06c09df7 100644 --- a/pkgtools/pkg_install/files/view/linkfarm.cat1 +++ b/pkgtools/pkg_install/files/view/linkfarm.cat1 @@ -1,7 +1,7 @@ LINKFARM(1) NetBSD General Commands Manual LINKFARM(1) NNAAMMEE - lliinnkkffaarrmm - manage symbolic links to package files + lliinnkkffaarrmm -- manage symbolic links to package files SSYYNNOOPPSSIISS lliinnkkffaarrmm [--ccDDnnRRVVvv] [--dd _s_t_o_w_d_i_r] [--ss _s_u_b_d_i_r] [--tt _t_a_r_g_e_t] _p_a_c_k_a_g_e @@ -64,4 +64,4 @@ SSEEEE AALLSSOO AAUUTTHHOORRSS The lliinnkkffaarrmm utility was written by Alistair G. Crooks <agc@NetBSD.org>. -NetBSD 2.0 September 2, 2003 NetBSD 2.0 +NetBSD 4.0 September 2, 2003 NetBSD 4.0 diff --git a/pkgtools/pkg_install/files/view/pkg_view.cat1 b/pkgtools/pkg_install/files/view/pkg_view.cat1 index 2a036988de1..aeb1ab0545a 100644 --- a/pkgtools/pkg_install/files/view/pkg_view.cat1 +++ b/pkgtools/pkg_install/files/view/pkg_view.cat1 @@ -141,4 +141,4 @@ SSEEEE AALLSSOO AAUUTTHHOORRSS The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@NetBSD.org>. -NetBSD 3.0 September 8, 2003 NetBSD 3.0 +NetBSD 4.0 September 8, 2003 NetBSD 4.0 |