From owner-svn-src-head@FreeBSD.ORG Mon Nov 26 05:11:07 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E5CCA3EE; Mon, 26 Nov 2012 05:11:07 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CBD898FC12; Mon, 26 Nov 2012 05:11:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQ5B7Ch002354; Mon, 26 Nov 2012 05:11:07 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAQ5B7DQ002346; Mon, 26 Nov 2012 05:11:07 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201211260511.qAQ5B7DQ002346@svn.freebsd.org> From: Eitan Adler Date: Mon, 26 Nov 2012 05:11:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243554 - in head/usr.sbin/pkg_install: add create delete info lib updating version X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 05:11:08 -0000 Author: eadler Date: Mon Nov 26 05:11:07 2012 New Revision: 243554 URL: http://svnweb.freebsd.org/changeset/base/243554 Log: Provide an option to users to shoot themselves in the foot. Reviewed by: bapt Approved by: cperciva MFC after: 1 month Modified: head/usr.sbin/pkg_install/add/pkg_add.1 head/usr.sbin/pkg_install/create/pkg_create.1 head/usr.sbin/pkg_install/delete/pkg_delete.1 head/usr.sbin/pkg_install/info/pkg_info.1 head/usr.sbin/pkg_install/lib/lib.h head/usr.sbin/pkg_install/lib/pkgng.c head/usr.sbin/pkg_install/updating/pkg_updating.1 head/usr.sbin/pkg_install/version/pkg_version.1 Modified: head/usr.sbin/pkg_install/add/pkg_add.1 ============================================================================== --- head/usr.sbin/pkg_install/add/pkg_add.1 Mon Nov 26 05:11:03 2012 (r243553) +++ head/usr.sbin/pkg_install/add/pkg_add.1 Mon Nov 26 05:11:07 2012 (r243554) @@ -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 , Modified: head/usr.sbin/pkg_install/create/pkg_create.1 ============================================================================== --- head/usr.sbin/pkg_install/create/pkg_create.1 Mon Nov 26 05:11:03 2012 (r243553) +++ head/usr.sbin/pkg_install/create/pkg_create.1 Mon Nov 26 05:11:07 2012 (r243554) @@ -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 , Modified: head/usr.sbin/pkg_install/delete/pkg_delete.1 ============================================================================== --- head/usr.sbin/pkg_install/delete/pkg_delete.1 Mon Nov 26 05:11:03 2012 (r243553) +++ head/usr.sbin/pkg_install/delete/pkg_delete.1 Mon Nov 26 05:11:07 2012 (r243554) @@ -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 th .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 , Modified: head/usr.sbin/pkg_install/info/pkg_info.1 ============================================================================== --- head/usr.sbin/pkg_install/info/pkg_info.1 Mon Nov 26 05:11:03 2012 (r243553) +++ head/usr.sbin/pkg_install/info/pkg_info.1 Mon Nov 26 05:11:07 2012 (r243554) @@ -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 locatio 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 , Modified: head/usr.sbin/pkg_install/lib/lib.h ============================================================================== --- head/usr.sbin/pkg_install/lib/lib.h Mon Nov 26 05:11:03 2012 (r243553) +++ head/usr.sbin/pkg_install/lib/lib.h Mon Nov 26 05:11:07 2012 (r243554) @@ -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) Modified: head/usr.sbin/pkg_install/lib/pkgng.c ============================================================================== --- head/usr.sbin/pkg_install/lib/pkgng.c Mon Nov 26 05:11:03 2012 (r243553) +++ head/usr.sbin/pkg_install/lib/pkgng.c Mon Nov 26 05:11:07 2012 (r243554) @@ -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"; Modified: head/usr.sbin/pkg_install/updating/pkg_updating.1 ============================================================================== --- head/usr.sbin/pkg_install/updating/pkg_updating.1 Mon Nov 26 05:11:03 2012 (r243553) +++ head/usr.sbin/pkg_install/updating/pkg_updating.1 Mon Nov 26 05:11:07 2012 (r243554) @@ -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 , Modified: head/usr.sbin/pkg_install/version/pkg_version.1 ============================================================================== --- head/usr.sbin/pkg_install/version/pkg_version.1 Mon Nov 26 05:11:03 2012 (r243553) +++ head/usr.sbin/pkg_install/version/pkg_version.1 Mon Nov 26 05:11:07 2012 (r243554) @@ -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 packa 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 ,