4 files changed, 8 insertions, 14 deletions

diff --git a/sysutils/qjail/Makefile b/sysutils/qjail/Makefile
index c534b0a33154..f5b3a143607a 100644
--- a/sysutils/qjail/Makefile
+++ b/sysutils/qjail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qjail
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -14,7 +14,7 @@ LICENSE=	BSD
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
-MAN8=		qjail.8 qjail-intro.8 qjail.conf.8
+MAN8=		qjail.8 qjail-intro.8 qjail.conf.8 qjail-howto.8
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
@@ -26,7 +26,8 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/qjail2 ${PREFIX}/etc/rc.d
 	@${INSTALL_SCRIPT} ${WRKSRC}/qjail-jail2 ${PREFIX}/etc/rc.d
 	@${INSTALL_DATA}   ${WRKSRC}/qjail.conf.sample ${PREFIX}/etc
-.for i in qjail qjail-intro qjail.conf
+	@${INSTALL_DATA}   ${WRKSRC}/qjail.portsnap.conf ${PREFIX}/etc
+.for i in qjail qjail-intro qjail.conf qjail-howto
 	@${INSTALL_MAN}    ${WRKSRC}/${i}.8 ${MAN8PREFIX}/man/man8
 .endfor
 # note examples are mandatory. qjail will not function without them
diff --git a/sysutils/qjail/distinfo b/sysutils/qjail/distinfo
index 823beb5a8424..5d9cafbce7ca 100644
--- a/sysutils/qjail/distinfo
+++ b/sysutils/qjail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qjail-2.0.tar.bz2) = d6ef6a034f58be79e3e0eef7ac2f5c94b810a3e57e9abbe578bbd5153238ca2f
-SIZE (qjail-2.0.tar.bz2) = 49135
+SHA256 (qjail-2.1.tar.bz2) = 1b051c5c43334bc0b5cd1c3ac4b13ab06c7c552095aaedcdf69ff83349de4af5
+SIZE (qjail-2.1.tar.bz2) = 57497
diff --git a/sysutils/qjail/pkg-message b/sysutils/qjail/pkg-message
index f7db3991750e..dfdfe11bb684 100644
--- a/sysutils/qjail/pkg-message
+++ b/sysutils/qjail/pkg-message
@@ -3,3 +3,4 @@ Use the qjail utility to deploy small or large numbers of jails quickly.
 First issue "rehash" command to enable the qjail command (if using csh).
 Then issue "man qjail-intro" to read the qjail introduction.
 After reading that do "man qjail" for the usage details.
+For the BIG PICTURE issue "man qjail-howto".
diff --git a/sysutils/qjail/pkg-plist b/sysutils/qjail/pkg-plist
index 8c41e81826d7..f8106ab5b8f7 100644
--- a/sysutils/qjail/pkg-plist
+++ b/sysutils/qjail/pkg-plist
@@ -1,5 +1,6 @@
 bin/qjail
 etc/qjail.conf.sample
+etc/qjail.portsnap.conf
 etc/rc.d/qjail-jail2
 etc/rc.d/qjail2
 %%EXAMPLESDIR%%/default/etc/make.conf
@@ -8,11 +9,9 @@ etc/rc.d/qjail2
 %%EXAMPLESDIR%%/default/etc/rc.conf
 %%EXAMPLESDIR%%/default/root/.cshrc
 %%EXAMPLESDIR%%/default/usr/local/etc/sudoers
-%%EXAMPLESDIR%%/default/usr/share/skel/dot.cshrc
 %%EXAMPLESDIR%%/nullmailer-example/etc/mail/mailer.conf
 %%EXAMPLESDIR%%/nullmailer-example/etc/rc.conf
 %%EXAMPLESDIR%%/nullmailer-example/usr/local/etc/nullmailer/remotes
-%%EXAMPLESDIR%%/ssh-default/etc/csh.cshrc
 %%EXAMPLESDIR%%/ssh-default/etc/group
 %%EXAMPLESDIR%%/ssh-default/etc/make.conf
 %%EXAMPLESDIR%%/ssh-default/etc/master.passwd
@@ -23,8 +22,6 @@ etc/rc.d/qjail2
 %%EXAMPLESDIR%%/ssh-default/etc/rc.conf
 %%EXAMPLESDIR%%/ssh-default/etc/spwd.db
 %%EXAMPLESDIR%%/ssh-default/etc/ssh/sshd_config
-%%EXAMPLESDIR%%/ssh-default/home
-%%EXAMPLESDIR%%/ssh-default/readme.txt
 %%EXAMPLESDIR%%/ssh-default/root/.cshrc
 %%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.cshrc
 %%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.login
@@ -35,9 +32,6 @@ etc/rc.d/qjail2
 %%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.rhosts
 %%EXAMPLESDIR%%/ssh-default/usr/home/qjail/.shrc
 %%EXAMPLESDIR%%/ssh-default/usr/local/etc/sudoers
-%%EXAMPLESDIR%%/ssh-default/usr/share/skel/dot.cshrc
-@dirrm %%EXAMPLESDIR%%/ssh-default/usr/share/skel
-@dirrm %%EXAMPLESDIR%%/ssh-default/usr/share
 @dirrm %%EXAMPLESDIR%%/ssh-default/usr/home/qjail
 @dirrm %%EXAMPLESDIR%%/ssh-default/usr/home
 @dirrm %%EXAMPLESDIR%%/ssh-default/usr/local/etc
@@ -54,8 +48,6 @@ etc/rc.d/qjail2
 @dirrm %%EXAMPLESDIR%%/nullmailer-example/etc/mail
 @dirrm %%EXAMPLESDIR%%/nullmailer-example/etc
 @dirrm %%EXAMPLESDIR%%/nullmailer-example
-@dirrm %%EXAMPLESDIR%%/default/usr/share/skel
-@dirrm %%EXAMPLESDIR%%/default/usr/share
 @dirrm %%EXAMPLESDIR%%/default/usr/local/etc
 @dirrm %%EXAMPLESDIR%%/default/usr/local
 @dirrm %%EXAMPLESDIR%%/default/usr