From owner-p4-projects@FreeBSD.ORG Wed Jan 28 16:12:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E6CC1065733; Wed, 28 Jan 2009 16:12:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10D211065731 for ; Wed, 28 Jan 2009 16:12:08 +0000 (UTC) (envelope-from flz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E59918FC12 for ; Wed, 28 Jan 2009 16:12:07 +0000 (UTC) (envelope-from flz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SGC7TC061455 for ; Wed, 28 Jan 2009 16:12:07 GMT (envelope-from flz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0SGC7BY061453 for perforce@freebsd.org; Wed, 28 Jan 2009 16:12:07 GMT (envelope-from flz@freebsd.org) Date: Wed, 28 Jan 2009 16:12:07 GMT Message-Id: <200901281612.n0SGC7BY061453@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to flz@freebsd.org using -f From: Florent Thoumie To: Perforce Change Reviews Cc: Subject: PERFORCE change 156800 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jan 2009 16:12:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=156800 Change 156800 by flz@flz_mayday on 2009/01/28 16:11:07 IFC. Affected files ... .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#7 integrate .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/pkg_add.1#3 integrate .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#19 integrate .. //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#13 integrate Differences ... ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/main.c#7 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.79 2008/10/17 15:10:45 brooks Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.80 2008/12/25 15:44:10 flz Exp $"); #include #include @@ -79,6 +79,7 @@ { 602000, 602099, "/packages-6.2-release" }, { 603000, 603099, "/packages-6.3-release" }, { 700000, 700099, "/packages-7.0-release" }, + { 701000, 701099, "/packages-7.1-release" }, { 300000, 399000, "/packages-3-stable" }, { 400000, 499000, "/packages-4-stable" }, { 502100, 502128, "/packages-5-current" }, ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/add/pkg_add.1#3 (text+ko) ==== @@ -13,9 +13,9 @@ .\" .\" Jordan K. Hubbard .\" -.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.77 2008/05/30 14:26:07 flz Exp $ +.\" $FreeBSD: src/usr.sbin/pkg_install/add/pkg_add.1,v 1.79 2009/01/11 13:56:55 chinsan Exp $ .\" -.Dd May 30, 2008 +.Dd January 4, 2009 .Dt PKG_ADD 1 .Os .Sh NAME @@ -90,7 +90,7 @@ .It Fl i , -no-deps Install the package without fetching and installing dependencies. -.It Fl I , -no-scripts +.It Fl I , -no-script If any installation scripts (pre-install or post-install) exist for a given package, do not execute them. .It Fl n , -dry-run ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/lib.h#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.69 2008/07/08 03:21:05 keramida Exp $ */ +/* $FreeBSD: src/usr.sbin/pkg_install/lib/lib.h,v 1.72 2009/01/06 19:00:12 flz Exp $ */ /* * FreeBSD install - a package for the installation and maintainance @@ -113,7 +113,7 @@ * Version of the package tools - increase only when some * functionality used by bsd.port.mk is changed, added or removed */ -#define PKG_INSTALL_VERSION 20080708 +#define PKG_INSTALL_VERSION 20090106 #define PKG_WRAPCONF_FNAME "/var/db/pkg_install.conf" // #define main(argc, argv) real_main(argc, argv) ==== //depot/projects/soc2008/andenore_pkginstall/src/usr.sbin/pkg_install/lib/plist.c#13 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/plist.c,v 1.52 2007/03/28 05:33:52 njl Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/plist.c,v 1.55 2009/01/06 19:00:12 flz Exp $"); #include "lib.h" #include