- add a devel version of poudriere

- register conflicts between poudriere and poudriere-devel
- poudriere devel brings:
  * support for ports using svn, svn+http, svn+ssh
  * improve jail building from sources (still experimental)
  * POUDRIERE_DATA is no more needed, if it doesn't exists it now looks for a
    data zfs FS which by default will be in ${BASEFS}/data
  * bulks now keep packages by default (incremental) (-k is gone replace by a -c
    to clean everything before starting)
  * bulks are now built in parallel (number of parallel built being hw.ncpu by
    default
  * cron directory is now autocreated and default location is the data dir
  * jails are now created and mounted by default in a sub FS (${BASEFS}/jails/<jailname>
  * ports tree are now created and mounted by default in a sub FS (${BASEFS}/ports/<portstreename>
  * tinderbox-style output for logs
  * logs are now created in data/logs/<buildtype>/<jailname>/<portstreename>/pkgname.log
  * lots of performance improvements

5 files changed, 74 insertions, 1 deletions

diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile
index 876892e6fef9..3c2939ecf066 100644
--- a/ports-mgmt/Makefile
+++ b/ports-mgmt/Makefile
@@ -75,6 +75,7 @@
     SUBDIR += portupgrade
     SUBDIR += portupgrade-devel
     SUBDIR += poudriere
+    SUBDIR += poudriere-devel
     SUBDIR += psearch
     SUBDIR += pver
     SUBDIR += qtpkg
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
new file mode 100644
index 000000000000..81d3e9a88ba5
--- /dev/null
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -0,0 +1,62 @@
+# New ports collection makefile for:	poudriere
+# Date created:		2012-01-31
+# Whom:			Baptiste Daroussin <bapt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	poudriere
+PORTVERSION=	1.5.99.20120816
+CATEGORIES=	ports-mgmt
+MASTER_SITES=	http://fossil.etoilebsd.net/poudriere/tarball/
+
+MAINTAINER=	bapt@FreeBSD.org
+COMMENT=	Port build and test system
+
+LICENSE=	BSD
+
+FSL_CHKIN=	3f24277d18
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz?uuid=${FSL_CHKIN}
+PKGNAMESUFFIX=	-devel
+
+NO_BUILD=	yes
+MANCOMPRESSED=	yes
+MAN8=	poudriere.8
+
+CONFLICTS_INSTALL=	poudriere-[0-9]*
+
+OPTIONS_DEFINE=	ZSH
+ZSH_DESC=	Install zsh completion
+
+PLIST_FILES=	etc/poudriere.conf.sample \
+		bin/poudriere \
+		share/poudriere/clean.sh \
+		share/poudriere/common.sh \
+		share/poudriere/test_ports.sh \
+		share/poudriere/ports.sh \
+		share/poudriere/pbi.sh \
+		share/poudriere/jail.sh \
+		share/poudriere/bulk.sh \
+		share/poudriere/cron.sh \
+		share/poudriere/queue.sh \
+
+PLIST_DIRS=	share/poudriere \
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_ZSH)
+PLIST_FILES+=	share/zsh/site-functions/_poudriere
+PLIST_DIRSTRY+=	share/zsh/site-functions
+PLIST_DIRSTRY+=	share/zsh/
+.endif
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.orig" -delete
+
+post-install:
+.if defined(WITH_ZSH)
+	@${MKDIR} ${PREFIX}/share/zsh/site-functions/
+	@${INSTALL_DATA} ${WRKSRC}/zsh-completions ${PREFIX}/share/zsh/site-functions/_poudriere
+.endif
+
+.include <bsd.port.mk>
diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo
new file mode 100644
index 000000000000..2d6fed3f0934
--- /dev/null
+++ b/ports-mgmt/poudriere-devel/distinfo
@@ -0,0 +1,2 @@
+SHA256 (poudriere-1.5.99.20120816.tar.gz?uuid=3f24277d18) = eae419906d9b0b711ff0e1b4ca7d5a14ba2bfd5d49d1253eafc9de68625a33b2
+SIZE (poudriere-1.5.99.20120816.tar.gz?uuid=3f24277d18) = 27587
diff --git a/ports-mgmt/poudriere-devel/pkg-descr b/ports-mgmt/poudriere-devel/pkg-descr
new file mode 100644
index 000000000000..ee390600970a
--- /dev/null
+++ b/ports-mgmt/poudriere-devel/pkg-descr
@@ -0,0 +1,5 @@
+poudriere is a tool primarily designed to test package production on
+FreeBSD. However, most people will find it useful to bulk build ports
+for FreeBSD.
+
+WWW:	http://fossil.etoilebsd.net/poudriere
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile
index a7e2f1b0af01..591df6736813 100644
--- a/ports-mgmt/poudriere/Makefile
+++ b/ports-mgmt/poudriere/Makefile
@@ -20,7 +20,10 @@ NO_BUILD=	yes
 MANCOMPRESSED=	yes
 MAN8=	poudriere.8
 
-OPTIONS+=	ZSH "Install zsh completion" off
+OPTIONS_DEFINE=	ZSH
+ZSH_DESC=	Install zsh completion
+
+CONFLICTS_INSTALL=	poudriere-devel-*
 
 PLIST_FILES=	etc/poudriere.conf.sample \
 		bin/poudriere \