Provide an option to users to shoot themselves in the foot.

Reviewed by:	bapt
Approved by:	cperciva
MFC after:	1 month
This commit is contained in:
Eitan Adler 2012-11-26 05:11:07 +00:00
parent 166fab99e0
commit fe02827f92
8 changed files with 45 additions and 7 deletions

View File

@ -15,7 +15,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd January 4, 2009 .Dd November 9, 2012
.Dt PKG_ADD 1 .Dt PKG_ADD 1
.Os .Os
.Sh NAME .Sh NAME
@ -578,6 +578,10 @@ and
are not suitable for creating the staging area. are not suitable for creating the staging area.
.It Pa /var/db/pkg .It Pa /var/db/pkg
Default location of the installed package database. Default location of the installed package database.
.It Ev PKG_OLD_NOWARN
If set
.Nm
will not warn about its use in the presence of pkgng databases.
.El .El
.Sh SEE ALSO .Sh SEE ALSO
.Xr pkg_create 1 , .Xr pkg_create 1 ,

View File

@ -23,7 +23,7 @@
.\" [jkh] Took John's changes back and made some additional extensions for .\" [jkh] Took John's changes back and made some additional extensions for
.\" better integration with FreeBSD's new ports collection. .\" better integration with FreeBSD's new ports collection.
.\" .\"
.Dd Oct 12, 2010 .Dd November 9, 2012
.Dt PKG_CREATE 1 .Dt PKG_CREATE 1
.Os .Os
.Sh NAME .Sh NAME
@ -635,6 +635,10 @@ does not exist.
The last choice if The last choice if
.Pa /tmp .Pa /tmp
is unsuitable. is unsuitable.
.It Ev PKG_OLD_NOWARN
If set
.Nm
will not warn about its use in the presence of pkgng databases.
.El .El
.Sh SEE ALSO .Sh SEE ALSO
.Xr pkg_add 1 , .Xr pkg_add 1 ,

View File

@ -17,7 +17,7 @@
.\" @(#)pkg_delete.1 .\" @(#)pkg_delete.1
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd May 30, 2008 .Dd November 9, 2012
.Dt PKG_DELETE 1 .Dt PKG_DELETE 1
.Os .Os
.Sh NAME .Sh NAME
@ -276,6 +276,10 @@ specifies an alternative location for the installed package database.
.Bl -tag -width /var/db/pkg -compact .Bl -tag -width /var/db/pkg -compact
.It Pa /var/db/pkg .It Pa /var/db/pkg
Default location of the installed package database. Default location of the installed package database.
.It Ev PKG_OLD_NOWARN
If set
.Nm
will not warn about its use in the presence of pkgng databases.
.El .El
.Sh SEE ALSO .Sh SEE ALSO
.Xr pkg_add 1 , .Xr pkg_add 1 ,

View File

@ -17,7 +17,7 @@
.\" @(#)pkg_info.1 .\" @(#)pkg_info.1
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd May 30, 2008 .Dd November 9, 2012
.Dt PKG_INFO 1 .Dt PKG_INFO 1
.Os .Os
.Sh NAME .Sh NAME
@ -258,6 +258,10 @@ Specifies an alternative package location, if a given package cannot be
found. found.
.It Ev PKGDIR .It Ev PKGDIR
Specifies an alternative location to save downloaded packages to. Specifies an alternative location to save downloaded packages to.
.It Ev PKG_OLD_NOWARN
If set
.Nm
will not warn about its use in the presence of pkgng databases.
.El .El
.Sh FILES .Sh FILES
.Bl -tag -width ".Pa /var/db/pkg" -compact .Bl -tag -width ".Pa /var/db/pkg" -compact
@ -277,6 +281,10 @@ The last choice if
is unsuitable. is unsuitable.
.It Pa /var/db/pkg .It Pa /var/db/pkg
Default location of the installed package database. Default location of the installed package database.
.It Ev PKG_OLD_NOWARN
If set
.Nm
will not warn about its use in the presence of pkgng databases.
.El .El
.Sh SEE ALSO .Sh SEE ALSO
.Xr pkg_add 1 , .Xr pkg_add 1 ,

View File

@ -99,7 +99,7 @@
* Version of the package tools - increase whenever you make a change * Version of the package tools - increase whenever you make a change
* in the code that is not cosmetic only. * in the code that is not cosmetic only.
*/ */
#define PKG_INSTALL_VERSION 20121024 #define PKG_INSTALL_VERSION 20121109
#define PKG_WRAPCONF_FNAME "/var/db/pkg_install.conf" #define PKG_WRAPCONF_FNAME "/var/db/pkg_install.conf"
#define main(argc, argv) real_main(argc, argv) #define main(argc, argv) real_main(argc, argv)

View File

@ -40,7 +40,11 @@ void warnpkgng(void)
{ {
char pkgngpath[MAXPATHLEN]; char pkgngpath[MAXPATHLEN];
char *pkgngdir; char *pkgngdir;
char *dontwarn;
dontwarn = getenv("PKG_OLD_NOWARN");
if (dontwarn != NULL)
return;
pkgngdir = getenv("PKG_DBDIR"); pkgngdir = getenv("PKG_DBDIR");
if (pkgngdir == NULL) if (pkgngdir == NULL)
pkgngdir = "/var/db/pkg"; pkgngdir = "/var/db/pkg";

View File

@ -10,7 +10,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd May 30, 2008 .Dd November 9, 2012
.Dt PKG_UPDATING 1 .Dt PKG_UPDATING 1
.Os .Os
.Sh NAME .Sh NAME
@ -77,6 +77,13 @@ installed ports:
Fetch UPDATING file from ftp mirror and show all entries of all Fetch UPDATING file from ftp mirror and show all entries of all
installed ports: installed ports:
.Dl % pkg_updating -f ftp://ftp.freebsd.org/pub/FreeBSD/ports/packages/UPDATING .Dl % pkg_updating -f ftp://ftp.freebsd.org/pub/FreeBSD/ports/packages/UPDATING
.Sh ENVRIOMENT
.Bl -tag -width indent
.It Ev PKG_OLD_NOWARN
If set
.Nm
will not warn about its use in the presence of pkgng databases.
.El
.Sh SEE ALSO .Sh SEE ALSO
.Xr pkg_add 1 , .Xr pkg_add 1 ,
.Xr pkg_create 1 , .Xr pkg_create 1 ,

View File

@ -25,7 +25,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd May 30, 2008 .Dd November 9, 2012
.Dt PKG_VERSION 1 .Dt PKG_VERSION 1
.Os .Os
.Sh NAME .Sh NAME
@ -233,6 +233,13 @@ The following command compares two package version strings:
The The
.Fl c .Fl c
option has been deprecated and is no longer supported. option has been deprecated and is no longer supported.
.Sh ENVRIOMENT
.Bl -tag -width indent
.It Ev PKG_OLD_NOWARN
If set
.Nm
will not warn about its use in the presence of pkgng databases.
.El
.Sh SEE ALSO .Sh SEE ALSO
.Xr fetch 1 , .Xr fetch 1 ,
.Xr pkg_add 1 , .Xr pkg_add 1 ,