svn commit: r335210 - in head/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files

[John Marino]

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 <bsd.port.pre.mk>
 
 .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 <bsd.port.pre.mk>
 
 .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