mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

ports-mgmt/pkg*: Prepare for alternative PORTSDIR support

Browse Source 
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.
This commit is contained in:
John Marino 2013-11-29 18:34:34 +00:00
parent 27955500a7
commit 2600ce4b43
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=335210
4 changed files with 78 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports-mgmt/pkg-devel/Makefile
View File

@ -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_CONF=/dev/null SRCCONF=/dev/null \
# 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)

34
ports-mgmt/pkg-devel/files/extra-patch-pkg_pkg.8 Normal file
View File

@ -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

5
ports-mgmt/pkg/Makefile
View File

@ -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_CONF=/dev/null SRCCONF=/dev/null \
# 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)

34
ports-mgmt/pkg/files/extra-patch-pkg_pkg.8 Normal file
View File

@ -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