From owner-svn-ports-head@FreeBSD.ORG Thu Aug 16 10:11:06 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8984C106564A; Thu, 16 Aug 2012 10:11:06 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6A7DC8FC0C; Thu, 16 Aug 2012 10:11:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7GAB6m7099264; Thu, 16 Aug 2012 10:11:06 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7GAB6D8099259; Thu, 16 Aug 2012 10:11:06 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201208161011.q7GAB6D8099259@svn.freebsd.org> From: Baptiste Daroussin Date: Thu, 16 Aug 2012 10:11:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302633 - in head/ports-mgmt: . poudriere poudriere-devel poudriere-devel/files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2012 10:11:06 -0000 Author: bapt Date: Thu Aug 16 10:11:05 2012 New Revision: 302633 URL: http://svn.freebsd.org/changeset/ports/302633 Log: - 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/ * ports tree are now created and mounted by default in a sub FS (${BASEFS}/ports/ * tinderbox-style output for logs * logs are now created in data/logs////pkgname.log * lots of performance improvements Added: head/ports-mgmt/poudriere-devel/ - copied from r302603, head/ports-mgmt/poudriere/ Deleted: head/ports-mgmt/poudriere-devel/files/ Modified: head/ports-mgmt/Makefile head/ports-mgmt/poudriere-devel/Makefile head/ports-mgmt/poudriere-devel/distinfo head/ports-mgmt/poudriere/Makefile Modified: head/ports-mgmt/Makefile ============================================================================== --- head/ports-mgmt/Makefile Thu Aug 16 09:57:24 2012 (r302632) +++ head/ports-mgmt/Makefile Thu Aug 16 10:11:05 2012 (r302633) @@ -75,6 +75,7 @@ SUBDIR += portupgrade SUBDIR += portupgrade-devel SUBDIR += poudriere + SUBDIR += poudriere-devel SUBDIR += psearch SUBDIR += pver SUBDIR += qtpkg Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere/Makefile Wed Aug 15 20:17:48 2012 (r302603) +++ head/ports-mgmt/poudriere-devel/Makefile Thu Aug 16 10:11:05 2012 (r302633) @@ -6,24 +6,31 @@ # PORTNAME= poudriere -PORTVERSION= 1.5.4 -PORTREVISION= 1 +PORTVERSION= 1.5.99.20120816 CATEGORIES= ports-mgmt -MASTER_SITES= http://files.etoilebsd.net/poudriere/ +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 -OPTIONS+= ZSH "Install zsh completion" off +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 \ @@ -32,11 +39,8 @@ PLIST_FILES= etc/poudriere.conf.sample \ share/poudriere/bulk.sh \ share/poudriere/cron.sh \ share/poudriere/queue.sh \ - poudriere/cron/.keep PLIST_DIRS= share/poudriere \ - poudriere/cron \ - poudriere .include @@ -50,7 +54,6 @@ post-patch: @${FIND} ${WRKSRC} -name "*.orig" -delete post-install: - @${TOUCH} ${PREFIX}/poudriere/cron/.keep .if defined(WITH_ZSH) @${MKDIR} ${PREFIX}/share/zsh/site-functions/ @${INSTALL_DATA} ${WRKSRC}/zsh-completions ${PREFIX}/share/zsh/site-functions/_poudriere Modified: head/ports-mgmt/poudriere-devel/distinfo ============================================================================== --- head/ports-mgmt/poudriere/distinfo Wed Aug 15 20:17:48 2012 (r302603) +++ head/ports-mgmt/poudriere-devel/distinfo Thu Aug 16 10:11:05 2012 (r302633) @@ -1,2 +1,2 @@ -SHA256 (poudriere-1.5.4.tar.gz) = a50cbed9d2f7319d0b350bd2db3f6b14d93f9e27543684a4858c4c88bc00934f -SIZE (poudriere-1.5.4.tar.gz) = 23530 +SHA256 (poudriere-1.5.99.20120816.tar.gz?uuid=3f24277d18) = eae419906d9b0b711ff0e1b4ca7d5a14ba2bfd5d49d1253eafc9de68625a33b2 +SIZE (poudriere-1.5.99.20120816.tar.gz?uuid=3f24277d18) = 27587 Modified: head/ports-mgmt/poudriere/Makefile ============================================================================== --- head/ports-mgmt/poudriere/Makefile Thu Aug 16 09:57:24 2012 (r302632) +++ head/ports-mgmt/poudriere/Makefile Thu Aug 16 10:11:05 2012 (r302633) @@ -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 \