summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-06-19 20:51:52 +0000
committerJohn Marino <marino@FreeBSD.org>2014-06-19 20:51:52 +0000
commitcb4839820cb36d3bf69d53e79e35bc24c51dd039 (patch)
treec8f2e82d27dd4c32ceaa72975d1b9499ec23e6db
parentUpdate to 1.5.0 release. (diff)
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
Notes
Notes: svn path=/head/; revision=358465
-rw-r--r--ports-mgmt/pkg-devel/Makefile2
-rw-r--r--ports-mgmt/pkg-devel/files/extra-patch-docs_pkg.8 (renamed from ports-mgmt/pkg-devel/files/extra-patch-pkg_pkg.8)10
2 files changed, 6 insertions, 6 deletions
diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index 912335c235be..3d6b1b2f34e9 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -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 <bsd.port.pre.mk>
diff --git a/ports-mgmt/pkg-devel/files/extra-patch-pkg_pkg.8 b/ports-mgmt/pkg-devel/files/extra-patch-docs_pkg.8
index e5f32f7a4c05..ff2223629745 100644
--- a/ports-mgmt/pkg-devel/files/extra-patch-pkg_pkg.8
+++ b/ports-mgmt/pkg-devel/files/extra-patch-docs_pkg.8
@@ -1,5 +1,5 @@
---- src/pkg.8.orig 2013-11-27 18:14:50.000000000 +0000
-+++ src/pkg.8
+--- 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
@@ -9,11 +9,11 @@
.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:
+@@ -146,22 +146,6 @@ is installed and activated:
# pkg_install-specifics
fi
.Ed
--.It Fl j Ao jail name or id Ac
+-.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 ,
@@ -29,6 +29,6 @@
-.Xr jail 8
-and
-.Xr jls 8 .
- .It Fl c Ao chroot path Ac
+ .It Fl c Ao chroot path Ac , Cm --chroot Ao chroot path Ac
.Nm
will chroot in the