From owner-svn-ports-all@FreeBSD.ORG Thu Jun 19 20:51:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F41A6AB6; Thu, 19 Jun 2014 20:51:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C730429D5; Thu, 19 Jun 2014 20:51:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5JKpqa7045458; Thu, 19 Jun 2014 20:51:52 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5JKpquh045456; Thu, 19 Jun 2014 20:51:52 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406192051.s5JKpquh045456@svn.freebsd.org> From: John Marino Date: Thu, 19 Jun 2014 20:51:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358465 - in head/ports-mgmt/pkg-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Jun 2014 20:51:53 -0000 Author: marino Date: Thu Jun 19 20:51:52 2014 New Revision: 358465 URL: http://svnweb.freebsd.org/changeset/ports/358465 QAT: https://qat.redports.org/buildarchive/r358465/ Log: ports-mgmt/pkg-devel: Chase relocation of pkg.8 man page The pkg.8 manpage is edited by an extra patch on DragonFly due to differences in jail operation. The patch no longer applies both due to file relocation and regular bitrot. Regenerate the patch and change its name to reflect the new file location. This is a no-op on all releases of FreeBSD. Approved by: just-fix-it blanket Added: head/ports-mgmt/pkg-devel/files/extra-patch-docs_pkg.8 (contents, props changed) Deleted: head/ports-mgmt/pkg-devel/files/extra-patch-pkg_pkg.8 Modified: head/ports-mgmt/pkg-devel/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Thu Jun 19 20:38:00 2014 (r358464) +++ head/ports-mgmt/pkg-devel/Makefile Thu Jun 19 20:51:52 2014 (r358465) @@ -27,7 +27,7 @@ GNU_CONFIGURE= yes USE_SUBMAKE= yes .if !exists(/usr/include/jail.h) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-pkg_pkg.8 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include Added: head/ports-mgmt/pkg-devel/files/extra-patch-docs_pkg.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg-devel/files/extra-patch-docs_pkg.8 Thu Jun 19 20:51:52 2014 (r358465) @@ -0,0 +1,34 @@ +--- docs/pkg.8.orig 2014-06-19 12:43:52.000000000 +0000 ++++ docs/pkg.8 +@@ -30,7 +30,7 @@ + .Op Fl d + .Op Fl l + .Op Fl N +-.Op Fl j Ao jail name or id Ac | Fl c Ao chroot path Ac ++.Op Fl c Ao chroot path Ac + .Op Fl C Ao configuration file Ac + .Op Fl R Ao repository configuration directory Ac + .Ao command Ac Ao Ar flags Ac +@@ -146,22 +146,6 @@ is installed and activated: + # pkg_install-specifics + fi + .Ed +-.It Fl j Ao jail name or id Ac , Cm --jail Ao jail name or id Ac +-.Nm +-will execute in the given +-.Ao jail name or id Ac , +-where +-.Em name +-matches +-.Dq Cm jls Ar name +-and +-.Em id +-matches +-.Dq Cm jls Ar jid . +-See +-.Xr jail 8 +-and +-.Xr jls 8 . + .It Fl c Ao chroot path Ac , Cm --chroot Ao chroot path Ac + .Nm + will chroot in the