[Fpkg-cvs] CVS: freepkg/version fpkg_version.1
Status: Alpha
Brought to you by:
jlea
Menu
▾
▴
[Fpkg-cvs] CVS: freepkg/version fpkg_version.1
|
From: Jeremy L. <jl...@us...> - 2004-04-29 14:14:16
|
jlea 04/04/29 07:14:09
Modified: add fpkg_add.1 main.c
create fpkg_create.1 main.c
delete fpkg_delete.1 main.c
fpkg fpkg.1
info fpkg_info.1 main.c
lib show.c which.c
version fpkg_version.1
Log:
More renaming to FreePKG/fpkg.
Revision Changes Path
1.2 +24 -22 freepkg/add/fpkg_add.1
Index: fpkg_add.1
===================================================================
RCS file: /cvsroot/fpkg/freepkg/add/fpkg_add.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpkg_add.1 29 Apr 2004 13:25:27 -0000 1.1
+++ fpkg_add.1 29 Apr 2004 14:14:06 -0000 1.2
@@ -1,6 +1,5 @@
.\"
-.\" FreeBSD install - a package for the installation and maintainance
-.\" of non-core utilities.
+.\" FreePKG - A utility for managing 3rd party software.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -11,17 +10,19 @@
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\"
-.\" Jordan K. Hubbard
+.\" Jeremy D. Lea
.\"
+.\" Based on FreeBSD's pkg_install
+.\" by Jordan K. Hubbard and John Kohl
.\"
-.\" @(#)pkg_add.1
-.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.35.2.15 2003/08/11 01:13:43 kris Exp $
+.\" @(#)fpkg_add.1
+.\" $Id: fpkg_add.1,v 1.2 2004/04/29 14:14:06 jlea Exp $
.\"
.Dd November 25, 1994
-.Dt PKG_ADD 1
+.Dt FPKG_ADD 1
.Os
.Sh NAME
-.Nm pkg_add
+.Nm fpkg_add
.Nd a utility for installing software package distributions
.Sh SYNOPSIS
.Nm
@@ -34,7 +35,7 @@
.Nm
command is used to extract packages that have been previously created
with the
-.Xr pkg_create 1
+.Xr fpkg_create 1
command.
.Sh WARNING
.Bf -emphasis
@@ -61,7 +62,7 @@
and
.Cm @unexec
directives, and/or use the
-.Xr pkg_info 1
+.Xr fpkg_info 1
command to examine the package file.
.Ef
.Sh OPTIONS
@@ -219,14 +220,14 @@
A check is made to determine if the package conflicts (from
.Cm @conflicts
directives, see
-.Xr pkg_create 1 )
+.Xr fpkg_create 1 )
with an already-installed package.
If it is, installation is terminated.
.It
Scan all the package dependencies (from
.Cm @pkgdep
directives, see
-.Xr pkg_create 1 )
+.Xr fpkg_create 1 )
are read from the packing list.
If any of these required packages is not currently installed,
an attempt is made to find and install it;
@@ -250,7 +251,7 @@
If the package contains a
.Ar require
file (see
-.Xr pkg_create 1 ) ,
+.Xr fpkg_create 1 ) ,
then execute it with the following arguments:
.Bd -ragged -offset indent -compact
.Ar pkg-name
@@ -288,7 +289,7 @@
and
.Fl I
flags to
-.Xr pkg_create 1 ) .
+.Xr fpkg_create 1 ) .
.It
If
.Cm @option extract-in-place
@@ -300,7 +301,7 @@
If the package contains an
.Ar mtreefile
file (see
-.Xr pkg_create 1 ) ,
+.Xr fpkg_create 1 ) ,
then mtree is invoked as:
.Bd -ragged -offset indent -compact
.Cm mtree
@@ -345,7 +346,7 @@
and
.Fl I
flags to
-.Xr pkg_create 1 ) .
+.Xr fpkg_create 1 ) .
.Pp
Reasoning behind passing keywords such as
.Ar POST-INSTALL
@@ -364,7 +365,7 @@
script, description, and display files are copied into
.Pa /var/db/pkg/<pkg-name>
for subsequent possible use by
-.Xr pkg_delete 1 .
+.Xr fpkg_delete 1 .
Any package dependencies are recorded in the other packages'
.Pa /var/db/pkg/<other-pkg>/+REQUIRED_BY
file
@@ -384,7 +385,7 @@
is installed, even if the user might change it with the
.Fl p
flag to
-.Cm pkg_add .
+.Cm fpkg_add .
.Sh ENVIRONMENT
The value of the
.Ev PKG_PATH
@@ -466,11 +467,12 @@
Default location of the installed package database.
.El
.Sh SEE ALSO
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_info 1 ,
-.Xr pkg_update 1 ,
-.Xr pkg_version 1 ,
+.Xr fpkg 1 ,
+.Xr fpkg_create 1 ,
+.Xr fpkg_delete 1 ,
+.Xr fpkg_info 1 ,
+.Xr fpkg_update 1 ,
+.Xr fpkg_version 1 ,
.Xr mktemp 3 ,
.Xr sysconf 3 ,
.Xr mtree 8
1.3 +5 -19 freepkg/add/main.c
Index: main.c
===================================================================
RCS file: /cvsroot/fpkg/freepkg/add/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.c 29 Apr 2004 13:25:27 -0000 1.2
+++ main.c 29 Apr 2004 14:14:06 -0000 1.3
@@ -33,7 +33,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.2 2004/04/29 13:25:27 jlea Exp $";
+ "$Id: main.c,v 1.3 2004/04/29 14:14:06 jlea Exp $";
#endif
#include <sys/param.h>
@@ -74,48 +74,37 @@
case 'v':
PkgMgr.verbose = TRUE;
break;
-
case 'p':
strlcpy(PkgMgr.prefix_override, optarg, PATH_MAX);
break;
-
case 'I':
PkgMgr.noinstall = TRUE;
break;
-
case 'R':
PkgMgr.norecord = TRUE;
break;
-
case 'f':
PkgMgr.force = TRUE;
break;
-
case 'n':
PkgMgr.fake = TRUE;
PkgMgr.verbose = TRUE;
break;
-
case 'r':
remote = TRUE;
break;
-
case 't':
strlcpy(PkgMgr.mktmp_template, optarg, PATH_MAX);
break;
-
case 'S':
mode = SLAVE;
break;
-
case 'M':
mode = MASTER;
break;
-
case 'O':
mode = PORT;
break;
-
case 'h':
case '?':
default:
@@ -134,7 +123,7 @@
usage();
}
else if (read_line(tmp, PATH_MAX, stdin) == NULL) {
- msg_warn("pkg_add in PORT mode not passed a directory");
+ msg_warn("fpkg_add in PORT mode not passed a directory");
return FAIL;
}
if (pkg_mgr_add_port(tmp)) {
@@ -142,14 +131,13 @@
return FAIL;
}
break;
-
case SLAVE:
if (argc) {
msg_warn("cannot supply package name(s) in slave mode");
usage();
}
else if (read_line(tmp, PATH_MAX, stdin) == NULL) {
- msg_warn("pkg_add in SLAVE mode not passed a directory");
+ msg_warn("fpkg_add in SLAVE mode not passed a directory");
return FAIL;
}
if (pkg_mgr_add_slave(tmp)) {
@@ -157,7 +145,6 @@
return FAIL;
}
break;
-
case MASTER:
if (argc != 1) {
msg_warn("only one package name must be specified with master mode");
@@ -170,7 +157,6 @@
printf("%s\n", cp);
free(cp);
break;
-
case NORMAL:
/* If no packages, yelp */
if (!argc) {
@@ -196,8 +182,8 @@
usage()
{
fprintf(stderr, "%s\n%s\n",
- "usage: pkg_add [-vInrfRMSO] [-t template] [-p prefix]",
- " pkg-name [pkg-name ...]");
+"usage: fpkg_add [-vInrfRMSO] [-t template] [-p prefix]",
+" pkg-name [pkg-name ...]");
exit(1);
}
1.2 +17 -21 freepkg/create/fpkg_create.1
Index: fpkg_create.1
===================================================================
RCS file: /cvsroot/fpkg/freepkg/create/fpkg_create.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpkg_create.1 29 Apr 2004 13:25:28 -0000 1.1
+++ fpkg_create.1 29 Apr 2004 14:14:06 -0000 1.2
@@ -1,6 +1,5 @@
.\"
-.\" FreeBSD install - a package for the installation and maintainance
-.\" of non-core utilities.
+.\" FreePKG - A utility for managing 3rd party software.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -11,23 +10,20 @@
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\"
-.\" Jordan K. Hubbard
+.\" Jeremy D. Lea
.\"
+.\" Based on FreeBSD's pkg_install
+.\" by Jordan K. Hubbard and John Kohl
.\"
-.\" @(#)pkg_create.1
-.\" $FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.35.2.18 2003/09/03 08:23:56 roam Exp $
+.\" @(#)fpkg_create.1
+.\" $Id: fpkg_create.1,v 1.2 2004/04/29 14:14:06 jlea Exp $
.\"
-.\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
-.\" added dependency tracking, etc.
-.\"
-.\" [jkh] Took John's changes back and made some additional extensions for
-.\" better integration with FreeBSD's new ports collection.
.\"
.Dd April 21, 1995
-.Dt PKG_CREATE 1
+.Dt FPKG_CREATE 1
.Os
.Sh NAME
-.Nm pkg_create
+.Nm fpkg_create
.Nd a utility for creating software package distributions
.Sh SYNOPSIS
.Nm
@@ -108,7 +104,7 @@
Go into a `packing list Only' mode. This is a custom hack for the
.Fx
.Em "Ports Collection"
-and is used to do `fake pkg_add' operations when a port is installed.
+and is used to do `fake fpkg_add' operations when a port is installed.
In such cases, it is necessary to know what the final, adjusted packing
list will look like.
.It Fl v
@@ -409,14 +405,14 @@
Set internal package options, the only two currently supported ones
being
.Ar extract-in-place ,
-which tells the pkg_add command not to extract the package's tarball
+which tells the fpkg_add command not to extract the package's tarball
into a staging area but rather directly into the target
hierarchy (this is typically meant to be used only by distributions
or other special package types), and
.Ar preserve ,
-which tells pkg_add to move any existing files out of the way,
+which tells fpkg_add to move any existing files out of the way,
preserving the previous contents (which are also resurrected on
-pkg_delete, so caveat emptor).
+fpkg_delete, so caveat emptor).
.It Cm @owner Ar user
Set default ownership for all subsequently extracted files to
.Ar user .
@@ -531,11 +527,11 @@
is unsuitable.
.El
.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_info 1 ,
-.Xr pkg_update 1 ,
-.Xr pkg_version 1 ,
+.Xr fpkg 1 ,
+.Xr fpkg_add 1 ,
+.Xr fpkg_delete 1 ,
+.Xr fpkg_info 1 ,
+.Xr fpkg_version 1 ,
.Xr sysconf 3
.Sh HISTORY
The
1.3 +6 -8 freepkg/create/main.c
Index: main.c
===================================================================
RCS file: /cvsroot/fpkg/freepkg/create/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.c 29 Apr 2004 13:25:28 -0000 1.2
+++ main.c 29 Apr 2004 14:14:06 -0000 1.3
@@ -164,7 +164,6 @@
printf("%s\n", cp);
free(cp);
break;
-
case BACKUP:
if (*argv && isdir(*argv))
strlcpy(tmp, *argv++, PATH_MAX);
@@ -185,7 +184,6 @@
return err;
}
break;
-
case NORMAL:
if (argc != 1) {
msg_warn("only one package name can be specified for creatation");
@@ -206,12 +204,12 @@
usage()
{
fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n",
-"usage: pkg_create [-YNOBhv] [-P pkgs] [-p prefix] [-f contents] [-i iscript]",
-" [-I piscript] [-k dscript] [-K pdscript] [-r rscript] ",
-" [-t template] [-X excludefile] [-D displayfile] ",
-" [-L libdep:pkg] [-R rundep:pkg] [-m mtreefile] ",
-" [-o origin] -c comment -d description -f packlist ",
-" pkg-name");
+"usage: fpkg_create [-YNOBhv] [-P pkgs] [-p prefix] [-f contents] [-i iscript]",
+" [-I piscript] [-k dscript] [-K pdscript] [-r rscript] ",
+" [-t template] [-X excludefile] [-D displayfile] ",
+" [-L libdep:pkg] [-R rundep:pkg] [-m mtreefile] ",
+" [-o origin] -c comment -d description -f packlist ",
+" pkg-name");
exit(1);
}
1.2 +20 -18 freepkg/delete/fpkg_delete.1
Index: fpkg_delete.1
===================================================================
RCS file: /cvsroot/fpkg/freepkg/delete/fpkg_delete.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpkg_delete.1 29 Apr 2004 13:25:29 -0000 1.1
+++ fpkg_delete.1 29 Apr 2004 14:14:07 -0000 1.2
@@ -1,6 +1,5 @@
.\"
-.\" FreeBSD install - a package for the installation and maintainance
-.\" of non-core utilities.
+.\" FreePKG - A utility for managing 3rd party software.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -11,17 +10,19 @@
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\"
-.\" Jordan K. Hubbard
+.\" Jeremy D. Lea
.\"
+.\" Based on FreeBSD's pkg_install
+.\" by Jordan K. Hubbard and John Kohl
.\"
-.\" @(#)pkg_delete.1
-.\" $FreeBSD: src/usr.sbin/pkg_install/delete/pkg_delete.1,v 1.16.2.9 2002/06/21 16:42:18 charnier Exp $
+.\" @(#)fpkg_delete.1
+.\" $Id: fpkg_delete.1,v 1.2 2004/04/29 14:14:07 jlea Exp $
.\"
.Dd November 25, 1994
-.Dt PKG_DELETE 1
+.Dt FPKG_DELETE 1
.Os
.Sh NAME
-.Nm pkg_delete
+.Nm fpkg_delete
.Nd a utility for deleting previously installed software package distributions
.Sh SYNOPSIS
.Nm
@@ -36,7 +37,7 @@
.Nm
command is used to delete packages that have been previously installed
with the
-.Xr pkg_add 1
+.Xr fpkg_add 1
command.
.Sh WARNING
.Bf -emphasis
@@ -63,7 +64,7 @@
and
.Cm @unexec
directives, and/or use the
-.Xr pkg_info 1
+.Xr fpkg_info 1
command to examine the installed package control files.
.Ef
.Sh OPTIONS
@@ -90,7 +91,7 @@
as the directory in which to delete files from any installed packages
which do not explicitly set theirs. For most packages, the prefix will
be set automatically to the installed location by
-.Xr pkg_add 1 .
+.Xr fpkg_add 1 .
.It Fl d
Remove empty directories created by file cleanup. By default, only
files/directories explicitly listed in a package's contents (either as
@@ -146,7 +147,7 @@
If the package contains a
.Ar require
file (see
-.Xr pkg_create 1 ) ,
+.Xr fpkg_create 1 ) ,
then this is executed first as
.Bd -ragged -offset indent -compact
.Cm require
@@ -193,7 +194,7 @@
and
.Fl K
flags to
-.Xr pkg_create 1 ) .
+.Xr fpkg_create 1 ) .
.Pp
If a
.Cm post-deinstall
@@ -227,7 +228,7 @@
and
.Fl K
flags to
-.Xr pkg_create 1 ) .
+.Xr fpkg_create 1 ) .
.Pp
Reasoning behind passing keywords such as
.Ar DEINSTALL
@@ -251,7 +252,7 @@
option when running
.Nm
or
-.Cm pkg_add .
+.Cm fpkg_add .
.Sh ENVIRONMENT
The environment variable
.Ev PKG_DBDIR
@@ -262,10 +263,11 @@
Default location of the installed package database.
.El
.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_info 1 ,
-.Xr pkg_version 1 ,
+.Xr fpkg 1 ,
+.Xr fpkg_add 1 ,
+.Xr fpkg_create 1 ,
+.Xr fpkg_info 1 ,
+.Xr fpkg_version 1 ,
.Xr mktemp 3 ,
.Xr mtree 8
.Sh AUTHORS
1.3 +2 -2 freepkg/delete/main.c
Index: main.c
===================================================================
RCS file: /cvsroot/fpkg/freepkg/delete/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.c 29 Apr 2004 13:25:29 -0000 1.2
+++ main.c 29 Apr 2004 14:14:07 -0000 1.3
@@ -33,7 +33,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.2 2004/04/29 13:25:29 jlea Exp $";
+ "$Id: main.c,v 1.3 2004/04/29 14:14:07 jlea Exp $";
#endif
#include <sys/types.h>
@@ -118,7 +118,7 @@
static void
usage()
{
- fprintf(stderr, "usage: pkg_delete [-vDdnf] [-p prefix] pkg-name ...\n");
+ fprintf(stderr, "usage: fpkg_delete [-vDdnf] [-p prefix] pkg-name ...\n");
exit(1);
}
1.2 +9 -8 freepkg/fpkg/fpkg.1
Index: fpkg.1
===================================================================
RCS file: /cvsroot/fpkg/freepkg/fpkg/fpkg.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpkg.1 26 Apr 2004 00:05:19 -0000 1.1
+++ fpkg.1 29 Apr 2004 14:14:07 -0000 1.2
@@ -1,5 +1,5 @@
.\"
-.\" XXX: (jlea) insert final project name.
+.\" FreePKG - A utility for managing 3rd party software.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -13,10 +13,10 @@
.\" Jeremy D. Lea
.\"
.\" Based on FreeBSD's pkg_install
-.\" by Jordan K. Hubbard
+.\" by Jordan K. Hubbard and John Kohl
.\"
-.\" @(#)pkg_info.1
-.\" $Id: fpkg.1,v 1.1 2004/04/26 00:05:19 jlea Exp $
+.\" @(#)fpkg.1
+.\" $Id: fpkg.1,v 1.2 2004/04/29 14:14:07 jlea Exp $
.\"
.Dd Apr 15, 2004
.Dt FREEPKG 1
@@ -116,10 +116,11 @@
.Ed
.El
.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_info 1 ,
+.Xr fpkg_add 1 ,
+.Xr fpkg_create 1 ,
+.Xr fpkg_delete 1 ,
+.Xr fpkg_info 1 ,
+.Xr fpkg_version 1 ,
.Xr mktemp 3 ,
.Xr mtree 8
.Sh AUTHORS
1.2 +15 -13 freepkg/info/fpkg_info.1
Index: fpkg_info.1
===================================================================
RCS file: /cvsroot/fpkg/freepkg/info/fpkg_info.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpkg_info.1 29 Apr 2004 13:25:30 -0000 1.1
+++ fpkg_info.1 29 Apr 2004 14:14:08 -0000 1.2
@@ -1,6 +1,5 @@
.\"
-.\" FreeBSD install - a package for the installation and maintenance
-.\" of non-core utilities.
+.\" FreePKG - A utility for managing 3rd party software.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -11,17 +10,19 @@
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
.\"
-.\" Jordan K. Hubbard
+.\" Jeremy D. Lea
.\"
+.\" Based on FreeBSD's pkg_install
+.\" by Jordan K. Hubbard and John Kohl
.\"
-.\" @(#)pkg_info.1
-.\" $FreeBSD: src/usr.sbin/pkg_install/info/pkg_info.1,v 1.24.2.15 2004/04/06 03:49:11 cperciva Exp $
+.\" @(#)fpkg_info.1
+.\" $Id: fpkg_info.1,v 1.2 2004/04/29 14:14:08 jlea Exp $
.\"
.Dd February 8, 2001
-.Dt PKG_INFO 1
+.Dt FPKG_INFO 1
.Os
.Sh NAME
-.Nm pkg_info
+.Nm fpkg_info
.Nd a utility for displaying information on software packages
.Sh SYNOPSIS
.Nm
@@ -42,10 +43,10 @@
.Nm
command is used to dump out information for packages, either packed up in
files with the
-.Xr pkg_create 1
+.Xr fpkg_create 1
command or already installed on the system
with the
-.Xr pkg_add 1
+.Xr fpkg_add 1
command.
.Sh OPTIONS
The following command line options are supported:
@@ -211,10 +212,11 @@
Default location of the installed package database.
.El
.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_version 1 ,
+.Xr fpkg 1 ,
+.Xr fpkg_add 1 ,
+.Xr fpkg_create 1 ,
+.Xr fpkg_delete 1 ,
+.Xr fpkg_version 1 ,
.Xr mktemp 3 ,
.Xr mtree 8
.Sh AUTHORS
1.3 +5 -5 freepkg/info/main.c
Index: main.c
===================================================================
RCS file: /cvsroot/fpkg/freepkg/info/main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main.c 29 Apr 2004 13:25:30 -0000 1.2
+++ main.c 29 Apr 2004 14:14:08 -0000 1.3
@@ -47,7 +47,7 @@
#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.2 2004/04/29 13:25:30 jlea Exp $";
+ "$Id: main.c,v 1.3 2004/04/29 14:14:08 jlea Exp $";
#endif
static char Options[] = "acdDe:fghiIkl:LmopqrRst:v";
@@ -200,10 +200,10 @@
usage()
{
fprintf(stderr, "%s\n%s\n%s\n%s\n",
- "usage: pkg_info [-cdDfiIkLmoOpqrRsSvW] [-e package] [-l prefix]",
- " [-t template] [pkg-name ...]",
- " pkg_info [-W file] [-S shlib] [-O]",
- " pkg_info -a [flags]");
+ "usage: fpkg_info [-cdDfiIkLmoOpqrRsSvW] [-e package] [-l prefix]",
+ " [-t template] [pkg-name ...]",
+ " fpkg_info [-W file] [-S shlib] [-O]",
+ " fpkg_info -a [flags]");
exit(1);
}
1.3 +1 -1 freepkg/lib/show.c
Index: show.c
===================================================================
RCS file: /cvsroot/fpkg/freepkg/lib/show.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- show.c 29 Apr 2004 13:25:31 -0000 1.2
+++ show.c 29 Apr 2004 14:14:08 -0000 1.3
@@ -539,7 +539,7 @@
*/
/* XXX: (jlea) This needs work! */
if (pe->status == PKG_UNKNOWN) {
- /* XXX: (jlea) This should used pkg_add_master() */
+ /* XXX: (jlea) This should used pkg_mgr_add_master() */
if (fetch_pkg_entry(pe) == FAIL)
return FAIL;
if (extract_pkg_entry(pe, FALSE) == FAIL)
1.2 +1 -1 freepkg/lib/which.c
Index: which.c
===================================================================
RCS file: /cvsroot/fpkg/freepkg/lib/which.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- which.c 26 Apr 2004 00:05:47 -0000 1.1
+++ which.c 29 Apr 2004 14:14:08 -0000 1.2
@@ -130,7 +130,7 @@
/*
* Add a whole pkg-plist to the which list. This is done with the raw list,
* rather than a processed one so that we can use it to scan for installed
- * files before a pkg_create(1).
+ * files before a fpkg_create(1).
*/
error_code
add_which_plist(which_list *wl, char *contents)
1.2 +18 -25 freepkg/version/fpkg_version.1
Index: fpkg_version.1
===================================================================
RCS file: /cvsroot/fpkg/freepkg/version/fpkg_version.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpkg_version.1 29 Apr 2004 13:25:32 -0000 1.1
+++ fpkg_version.1 29 Apr 2004 14:14:09 -0000 1.2
@@ -1,7 +1,5 @@
.\"
-.\" Copyright 1998 Bruce A. Mah
-.\"
-.\" All rights reserved.
+.\" FreePKG - A utility for managing 3rd party software.
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -12,23 +10,17 @@
.\" 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 DEVELOPERS ``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 DEVELOPERS 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.
+.\" Jeremy D. Lea
+.\"
+.\" Based on FreeBSD's pkg_version
+.\" Copyright 1998 Bruce A. Mah
.\"
-.\" $FreeBSD: src/usr.sbin/pkg_install/version/pkg_version.1,v 1.5.2.14 2002/06/21 16:42:26 charnier Exp $
+.\" $Id: fpkg_version.1,v 1.2 2004/04/29 14:14:09 jlea Exp $
.Dd July 17, 1998
-.Dt PKG_VERSION 1
+.Dt FPKG_VERSION 1
.Os
.Sh NAME
-.Nm pkg_version
+.Nm fpkg_version
.Nd summarize installed versions of packages
.Sh SYNOPSIS
.Nm
@@ -44,7 +36,7 @@
.Nm
command is used to produce a report of non-base software packages
installed using the
-.Xr pkg_add 1
+.Xr fpkg_add 1
command.
.Pp
Each package's version number is checked against one of two sources to
@@ -179,10 +171,11 @@
.El
.Sh SEE ALSO
.Xr fetch 1 ,
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_info 1
+.Xr fpkg 1 ,
+.Xr fpkg_add 1 ,
+.Xr fpkg_create 1 ,
+.Xr fpkg_delete 1 ,
+.Xr fpkg_info 1
.Sh FILES
.Bl -tag -width /usr/ports/INDEX -compact
.It Pa /usr/ports/INDEX
@@ -194,12 +187,12 @@
command, which checks the installed packages against the local ports
index file:
.Pp
-.Dl % pkg_version -v
+.Dl % fpkg_version -v
.Pp
The command below generates a report against
the version numbers in the on-line ports collection:
.Pp
-.Dl % pkg_version ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/-current/ports/INDEX
+.Dl % fpkg_version ftp://ftp.FreeBSD.org/pub/FreeBSD/branches/-current/ports/INDEX
.Pp
The command below generates a file of commands to run to update the installed
files.
@@ -214,7 +207,7 @@
Blindly running the output of this command may leave a system in an
unusable state.
.Pp
-.Dl % pkg_version -c > do_update
+.Dl % fpkg_version -c > do_update
.Pp
The following command compares two package version strings:
.Pp
@@ -239,4 +232,4 @@
.Pp
Commands output assumes you install new software using the ports system,
rather than using
-.Xr pkg_add 1 .
+.Xr fpkg_add 1 .
|
