From owner-svn-ports-head@FreeBSD.ORG Fri Nov 29 18:34:35 2013 Return-Path: Delivered-To: svn-ports-head@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 B0873632; Fri, 29 Nov 2013 18:34:35 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9BF3417EB; Fri, 29 Nov 2013 18:34:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rATIYZTQ058184; Fri, 29 Nov 2013 18:34:35 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rATIYYcT058180; Fri, 29 Nov 2013 18:34:34 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201311291834.rATIYYcT058180@svn.freebsd.org> From: John Marino Date: Fri, 29 Nov 2013 18:34:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335210 - in head/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/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-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Nov 2013 18:34:35 -0000 Author: marino Date: Fri Nov 29 18:34:34 2013 New Revision: 335210 URL: http://svnweb.freebsd.org/changeset/ports/335210 Log: ports-mgmt/pkg*: Prepare for alternative PORTSDIR support With the PKG_PORTSDIR make argument set, Release 1.2.2 will properly build pkg when PORTSDIR doesn't equal the default /usr/ports, as is the standard case with DragonFly. Additionally, pkg(8) and pkg-static(8) man pages are conditionally edited to remove references to the -j option when libjail isn't found on the system. This extra-patch should never be used on FreeBSD. Added: head/ports-mgmt/pkg-devel/files/ head/ports-mgmt/pkg-devel/files/extra-patch-pkg_pkg.8 (contents, props changed) head/ports-mgmt/pkg/files/ head/ports-mgmt/pkg/files/extra-patch-pkg_pkg.8 (contents, props changed) Modified: head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Fri Nov 29 18:00:12 2013 (r335209) +++ head/ports-mgmt/pkg-devel/Makefile Fri Nov 29 18:34:34 2013 (r335210) @@ -20,6 +20,7 @@ USE_XZ= yes NO_CCACHE= yes USE_LDCONFIG= yes USES= uidfix +MAKE_ARGS+= PKG_PORTSDIR=${PORTSDIR} MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \ PORTREVISION=${PORTREVISION} @@ -28,6 +29,10 @@ MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CO # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes +.if !exists(/usr/include/jail.h) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-pkg_pkg.8 +.endif + .include .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) Added: head/ports-mgmt/pkg-devel/files/extra-patch-pkg_pkg.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg-devel/files/extra-patch-pkg_pkg.8 Fri Nov 29 18:34:34 2013 (r335210) @@ -0,0 +1,34 @@ +--- pkg/pkg.8.orig 2013-11-27 18:14:50.000000000 +0000 ++++ pkg/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 +@@ -129,22 +129,6 @@ is installed and activated: + # pkg_install-specifics + fi + .Ed +-.It Fl j 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 + .Nm + will chroot in the Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Fri Nov 29 18:00:12 2013 (r335209) +++ head/ports-mgmt/pkg/Makefile Fri Nov 29 18:34:34 2013 (r335210) @@ -20,6 +20,7 @@ NO_CCACHE= yes USE_LDCONFIG= yes USES= uidfix shebangfix SHEBANG_FILES= scripts/completion/_pkg.bash.in +MAKE_ARGS+= PKG_PORTSDIR=${PORTSDIR} MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \ PORTREVISION=${PORTREVISION} @@ -28,6 +29,10 @@ MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CO # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes +.if !exists(/usr/include/jail.h) +EXTRA_PATCHES= ${FILESDIR}/extra-patch-pkg_pkg.8 +.endif + .include .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) Added: head/ports-mgmt/pkg/files/extra-patch-pkg_pkg.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/extra-patch-pkg_pkg.8 Fri Nov 29 18:34:34 2013 (r335210) @@ -0,0 +1,34 @@ +--- pkg/pkg.8.orig 2013-11-27 18:14:50.000000000 +0000 ++++ pkg/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 +@@ -129,22 +129,6 @@ is installed and activated: + # pkg_install-specifics + fi + .Ed +-.It Fl j 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 + .Nm + will chroot in the