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

Reviewed by:	bapt
Approved by:	cperciva
MFC after:	1 month

8 files changed, 45 insertions, 7 deletions

diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index d146441..923fe45 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -15,7 +15,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 4, 2009
+.Dd November 9, 2012
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -578,6 +578,10 @@ and
 are not suitable for creating the staging area.
 .It Pa /var/db/pkg
 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
 .Sh SEE ALSO
 .Xr pkg_create 1 ,
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index fa0365e..18780a0 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -23,7 +23,7 @@
 .\" [jkh] Took John's changes back and made some additional extensions for
 .\" better integration with FreeBSD's new ports collection.
 .\"
-.Dd Oct 12, 2010
+.Dd November 9, 2012
 .Dt PKG_CREATE 1
 .Os
 .Sh NAME
@@ -635,6 +635,10 @@ does not exist.
 The last choice if
 .Pa /tmp
 is unsuitable.
+.It Ev PKG_OLD_NOWARN
+If set
+.Nm
+will not warn about its use in the presence of pkgng databases.
 .El
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index f10651c..a07b1b6 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -17,7 +17,7 @@
 .\"     @(#)pkg_delete.1
 .\" $FreeBSD$
 .\"
-.Dd May 30, 2008
+.Dd November 9, 2012
 .Dt PKG_DELETE 1
 .Os
 .Sh NAME
@@ -276,6 +276,10 @@ specifies an alternative location for the installed package database.
 .Bl -tag -width /var/db/pkg -compact
 .It Pa /var/db/pkg
 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
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index 8b032c1..c29687d 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -17,7 +17,7 @@
 .\"     @(#)pkg_info.1
 .\" $FreeBSD$
 .\"
-.Dd May 30, 2008
+.Dd November 9, 2012
 .Dt PKG_INFO 1
 .Os
 .Sh NAME
@@ -258,6 +258,10 @@ Specifies an alternative package location, if a given package cannot be
 found.
 .It Ev PKGDIR
 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
 .Sh FILES
 .Bl -tag -width ".Pa /var/db/pkg" -compact
@@ -277,6 +281,10 @@ The last choice if
 is unsuitable.
 .It Pa /var/db/pkg
 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
 .Sh SEE ALSO
 .Xr pkg_add 1 ,
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index a96214b..aebcc0b 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -99,7 +99,7 @@
  * Version of the package tools - increase whenever you make a change
  * 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 main(argc, argv)	real_main(argc, argv)
diff --git a/usr.sbin/pkg_install/lib/pkgng.c b/usr.sbin/pkg_install/lib/pkgng.c
index d9eae2f..a8731c7 100644
--- a/usr.sbin/pkg_install/lib/pkgng.c
+++ b/usr.sbin/pkg_install/lib/pkgng.c
@@ -40,7 +40,11 @@ void warnpkgng(void)
 {
 	char pkgngpath[MAXPATHLEN];
 	char *pkgngdir;
+	char *dontwarn;
 
+	dontwarn = getenv("PKG_OLD_NOWARN");
+	if (dontwarn != NULL)
+		return;
 	pkgngdir = getenv("PKG_DBDIR");
 	if (pkgngdir == NULL)
 		pkgngdir = "/var/db/pkg";
diff --git a/usr.sbin/pkg_install/updating/pkg_updating.1 b/usr.sbin/pkg_install/updating/pkg_updating.1
index 9d12724..3fe16fd 100644
--- a/usr.sbin/pkg_install/updating/pkg_updating.1
+++ b/usr.sbin/pkg_install/updating/pkg_updating.1
@@ -10,7 +10,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 30, 2008
+.Dd November 9, 2012
 .Dt PKG_UPDATING 1
 .Os
 .Sh NAME
@@ -77,6 +77,13 @@ installed ports:
 Fetch UPDATING file from ftp mirror and show all entries of all
 installed ports:
 .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
 .Xr pkg_add 1 ,
 .Xr pkg_create 1 ,
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
index db0d7af..26caf8c 100644
--- a/usr.sbin/pkg_install/version/pkg_version.1
+++ b/usr.sbin/pkg_install/version/pkg_version.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 30, 2008
+.Dd November 9, 2012
 .Dt PKG_VERSION 1
 .Os
 .Sh NAME
@@ -233,6 +233,13 @@ The following command compares two package version strings:
 The
 .Fl c
 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
 .Xr fetch 1 ,
 .Xr pkg_add 1 ,