Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 May 2014 10:13:38 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r355156 - head/sysutils/qjail2
Message-ID:  <201405251013.s4PADcMT066062@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Sun May 25 10:13:38 2014
New Revision: 355156
URL: http://svnweb.freebsd.org/changeset/ports/355156
QAT: https://qat.redports.org/buildarchive/r355156/

Log:
  - Stage support
  
  PR:		189894
  Submitted by:	Joe Barbish <qjail@a1poweruser.com> (maintainer)

Modified:
  head/sysutils/qjail2/Makefile
  head/sysutils/qjail2/pkg-plist

Modified: head/sysutils/qjail2/Makefile
==============================================================================
--- head/sysutils/qjail2/Makefile	Sun May 25 10:13:09 2014	(r355155)
+++ head/sysutils/qjail2/Makefile	Sun May 25 10:13:38 2014	(r355156)
@@ -5,41 +5,40 @@ PORTNAME=	qjail
 PORTVERSION=	2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	qjail@a1poweruser.com
 COMMENT=	Utility to quickly deploy and manage jails
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
+NEED_ROOT=	yes
 NO_BUILD=	yes
-PKGNAMESUFFIX=	2
-
-MAN8=		qjail.8 qjail-intro.8 qjail.conf.8 qjail-howto.8
 
 CONFLICTS_INSTALL=	qjail-1.* qjail-3.*
 
-NO_STAGE=	yes
-post-patch:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|/usr/local|${PREFIX}|'
-	@${FIND} ${WRKSRC}/examples -name '*.bak' -delete
-
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/qjail ${PREFIX}/bin
-	@${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
-	@${INSTALL_DATA}   ${WRKSRC}/qjail.portsnap.conf ${PREFIX}/etc
+
+	${INSTALL_SCRIPT} ${WRKSRC}/qjail		\
+		${STAGEDIR}${PREFIX}/bin
+
+.for i in qjail2 qjail-jail2
+	${INSTALL_SCRIPT} ${WRKSRC}/${i}		\
+		${STAGEDIR}${PREFIX}/etc/rc.d
+.endfor
+
+.for i in qjail.conf.sample qjail.portsnap.conf
+	${INSTALL_DATA}   ${WRKSRC}/${i}		\
+		${STAGEDIR}${PREFIX}/etc
+.endfor
+
 .for i in qjail qjail-intro qjail.conf qjail-howto
-	@${INSTALL_MAN}    ${WRKSRC}/${i}.8 ${MAN8PREFIX}/man/man8
+	${INSTALL_MAN}    ${WRKSRC}/${i}.8		\
+		${STAGEDIR}${MAN8PREFIX}/man/man8
 .endfor
+
 # note examples are mandatory. qjail will not function without them
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC}/examples/ \
-	    && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-
-post-install:
-	@${ECHO_MSG} "#"
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG} "#"
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/			\
+	&& ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>

Modified: head/sysutils/qjail2/pkg-plist
==============================================================================
--- head/sysutils/qjail2/pkg-plist	Sun May 25 10:13:09 2014	(r355155)
+++ head/sysutils/qjail2/pkg-plist	Sun May 25 10:13:38 2014	(r355156)
@@ -3,6 +3,10 @@ etc/qjail.conf.sample
 etc/qjail.portsnap.conf
 etc/rc.d/qjail-jail2
 etc/rc.d/qjail2
+man/man8/qjail.8.gz
+man/man8/qjail-intro.8.gz
+man/man8/qjail-howto.8.gz
+man/man8/qjail.conf.8.gz
 %%EXAMPLESDIR%%/default/etc/make.conf
 %%EXAMPLESDIR%%/default/etc/motd
 %%EXAMPLESDIR%%/default/etc/periodic.conf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405251013.s4PADcMT066062>