svn commit: r348866 - head/ports-mgmt/poudriere-devel

Bryan Drewery bdrewery at FreeBSD.org
Sun Mar 23 15:40:11 UTC 2014 

Author: bdrewery
Date: Sun Mar 23 15:40:10 2014
New Revision: 348866
URL: http://svnweb.freebsd.org/changeset/ports/348866
QAT: https://qat.redports.org/buildarchive/r348866/

Log:
  - Update to checkin 0966e62bc4
  - Cleanup Makefile to use pkg-plist [1]
  
  Changes:
    - make_index fixes (use ports/portsnap version now)
    - Documentation updates
    - Use autotools for build
    - All incremental messages are in a consistent format now.
    - New daemon poudriered using libucl with fine-grained permissions, but
      not yet hooked up or documented. It will be hooked up to poudriere-queue
      and documented soon.
    - Add an nc(1) wrapper to work around src change r249499.
    - status: Add -H for scripted mode
    - status: Show URL if available
    - Allow to specify revision when running poudriere jail -u with svn method
      with -t
    - bulk: Add -i and -I for interactive testing of all specified ports at once,
      requires ports r348859 change to Mk/bsd.port.mk.
    - Report modification of directories during leftover check (owner or
      permission changed).
    - Fix ipv6 only usage
    - Ensure /sbin and /usr/sbin are in PATH when running
    - Remove trailing slashes from listed_ports.
    - Exit quicker after ^C during packaging phases by killing pkg-static
    - Fix child process cleanup logic to only sleep if child still running.
    - Always dismount filesystems and try cleaning up when exiting and in jail -k
    - For stage_orphans, ignore modified files (such as nobody vs root)
    - testport -I: Mark cleanup done, not as recursively failing
    - testport -i: Use a local.conf instead of PACKAGESITE
    - testport -I: Suggest same login method which is more sane/clean than exec
      /bin/sh
    - options: Require dialog4ports as it runs from host and
      jail may be for a different ARCH
    - Ignore parents of home directories too during leftovers check
    - Restrict ZFS on 9.0/9.1 due to known deadlock
    - bulk: Parse MOVED for given port build list
    - Add support for svnlite and overriding SVN_CMD
    - Show warning when jail is newer than host
    - Show host/jail OSVERSION in build logs
  
  Submitted by:	Johannes Jost Meixner <xmj at chaot.net> [1] (based on)
  PR:		ports/187373 [1]

Added:
  head/ports-mgmt/poudriere-devel/pkg-plist   (contents, props changed)
Modified:
  head/ports-mgmt/poudriere-devel/Makefile
  head/ports-mgmt/poudriere-devel/distinfo

Modified: head/ports-mgmt/poudriere-devel/Makefile
==============================================================================
--- head/ports-mgmt/poudriere-devel/Makefile	Sun Mar 23 15:34:13 2014	(r348865)
+++ head/ports-mgmt/poudriere-devel/Makefile	Sun Mar 23 15:40:10 2014	(r348866)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-PORTVERSION=	3.0.99.20140131
+PORTVERSION=	3.0.99.20140320
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://fossil.etoilebsd.net/poudriere/tarball/ \
 		LOCAL/bdrewery/${PORTNAME}/
@@ -13,93 +13,23 @@ COMMENT=	Port build and test system
 
 LICENSE=	BSD2CLAUSE
 
-FSL_CHKIN=	74abc9e1c2
-
-OPTIONS_DEFINE=	ZSH
-
 CONFLICTS_INSTALL=	poudriere-[0-9]*
 
+FSL_CHKIN=	0966e62bc4
+
 USES=		uidfix
+GNU_CONFIGURE=	yes
 
-PLIST_FILES=	etc/poudriere.conf.sample \
-		etc/poudriere.d/hooks/bulk.sh.sample \
-		etc/poudriere.d/hooks/pkgbuild.sh.sample \
-		etc/rc.d/poudriere \
-		bin/poudriere \
-		man/man8/poudriere.8.gz \
-		libexec/poudriere/cpdup \
-		libexec/poudriere/dirwatch \
-		libexec/poudriere/dirempty \
-		libexec/poudriere/make_index \
-		libexec/poudriere/rename \
-		share/poudriere/awk/dependency_loop.awk \
-		share/poudriere/awk/humanize.awk \
-		share/poudriere/awk/json.awk \
-		share/poudriere/awk/siginfo_buildtime.awk \
-		share/poudriere/html/index.html \
-		share/poudriere/html/assets/bootstrap/css/bootstrap-responsive.min.css \
-		share/poudriere/html/assets/bootstrap/css/bootstrap.min.css \
-		share/poudriere/html/assets/bootstrap/img/glyphicons-halflings-white.png \
-		share/poudriere/html/assets/bootstrap/img/glyphicons-halflings.png \
-		share/poudriere/html/assets/bootstrap/js/bootstrap.min.js \
-		share/poudriere/html/assets/dataTables/css/jquery.dataTables.css \
-		share/poudriere/html/assets/dataTables/images/back_disabled.png \
-		share/poudriere/html/assets/dataTables/images/back_enabled.png \
-		share/poudriere/html/assets/dataTables/images/back_enabled_hover.png \
-		share/poudriere/html/assets/dataTables/images/forward_disabled.png \
-		share/poudriere/html/assets/dataTables/images/forward_enabled.png \
-		share/poudriere/html/assets/dataTables/images/forward_enabled_hover.png \
-		share/poudriere/html/assets/dataTables/images/sort_asc.png \
-		share/poudriere/html/assets/dataTables/images/sort_asc_disabled.png \
-		share/poudriere/html/assets/dataTables/images/sort_both.png \
-		share/poudriere/html/assets/dataTables/images/sort_desc.png \
-		share/poudriere/html/assets/dataTables/images/sort_desc_disabled.png \
-		share/poudriere/html/assets/dataTables/js/jquery.dataTables.min.js \
-		share/poudriere/html/assets/jquery-1.9.1.min.js \
-		share/poudriere/html/assets/logo.jpg \
-		share/poudriere/html/assets/poudriere.css \
-		share/poudriere/html/assets/poudriere.js \
-		share/poudriere/bulk.sh \
-		share/poudriere/clean.sh \
-		share/poudriere/common.sh \
-		share/poudriere/common.sh.dragonfly \
-		share/poudriere/common.sh.freebsd \
-		share/poudriere/daemon.sh \
-		share/poudriere/distclean.sh \
-		share/poudriere/jail.sh \
-		share/poudriere/options.sh \
-		share/poudriere/pkgclean.sh \
-		share/poudriere/ports.sh \
-		share/poudriere/processonelog.sh \
-		share/poudriere/processonelog2.sh \
-		share/poudriere/queue.sh \
-		share/poudriere/status.sh \
-		share/poudriere/testport.sh
-
-PLIST_DIRS=	libexec/poudriere \
-		share/poudriere/awk \
-		share/poudriere/html/assets/bootstrap/css \
-		share/poudriere/html/assets/bootstrap/img \
-		share/poudriere/html/assets/bootstrap/js \
-		share/poudriere/html/assets/bootstrap \
-		share/poudriere/html/assets/dataTables/css \
-		share/poudriere/html/assets/dataTables/images \
-		share/poudriere/html/assets/dataTables/js \
-		share/poudriere/html/assets/dataTables \
-		share/poudriere/html/assets \
-		share/poudriere/html \
-		share/poudriere
-PLIST_DIRSTRY=	etc/poudriere.d/hooks \
-		etc/poudriere.d
+OPTIONS_DEFINE=	ZSH
+OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
+post-install:
 .if ${PORT_OPTIONS:MZSH}
-PLIST_FILES+=	share/zsh/site-functions/_poudriere
-PLIST_DIRSTRY+=	share/zsh/site-functions
-PLIST_DIRSTRY+=	share/zsh/
-.else
-MAKE_ENV+=	NO_ZSH=yes
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
+	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
+	    ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 .endif
 
 .include <bsd.port.mk>

Modified: head/ports-mgmt/poudriere-devel/distinfo
==============================================================================
--- head/ports-mgmt/poudriere-devel/distinfo	Sun Mar 23 15:34:13 2014	(r348865)
+++ head/ports-mgmt/poudriere-devel/distinfo	Sun Mar 23 15:40:10 2014	(r348866)
@@ -1,2 +1,2 @@
-SHA256 (poudriere-3.0.99.20140131.tar.gz?uuid=74abc9e1c2) = 85dc27eac54b93047a20e117a666851d90ec7838911d33071edde750c2248c23
-SIZE (poudriere-3.0.99.20140131.tar.gz?uuid=74abc9e1c2) = 252849
+SHA256 (poudriere-3.0.99.20140320.tar.gz?uuid=0966e62bc4) = 8f63df4003b8a09ef6f8fe0b2e14050bc2e742fb0d745080ce1a194d155cc268
+SIZE (poudriere-3.0.99.20140320.tar.gz?uuid=0966e62bc4) = 2364140

Added: head/ports-mgmt/poudriere-devel/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/poudriere-devel/pkg-plist	Sun Mar 23 15:40:10 2014	(r348866)
@@ -0,0 +1,71 @@
+bin/poudriere
+etc/poudriere.conf.sample
+etc/poudriered.conf.sample
+etc/rc.d/poudriered
+libexec/poudriere/cpdup
+libexec/poudriere/dirempty
+libexec/poudriere/dirwatch
+libexec/poudriere/make_index
+libexec/poudriere/nc
+libexec/poudriere/rename
+sbin/poudriered
+man/man8/poudriere.8.gz
+%%DATADIR%%/awk/dependency_loop.awk
+%%DATADIR%%/awk/humanize.awk
+%%DATADIR%%/awk/json.awk
+%%DATADIR%%/awk/siginfo_buildtime.awk
+%%DATADIR%%/bulk.sh
+%%DATADIR%%/clean.sh
+%%DATADIR%%/common.sh
+%%DATADIR%%/common.sh.dragonfly
+%%DATADIR%%/common.sh.freebsd
+%%DATADIR%%/daemon.sh
+%%DATADIR%%/distclean.sh
+%%DATADIR%%/html/assets/bootstrap/css/bootstrap-responsive.min.css
+%%DATADIR%%/html/assets/bootstrap/css/bootstrap.min.css
+%%DATADIR%%/html/assets/bootstrap/img/glyphicons-halflings-white.png
+%%DATADIR%%/html/assets/bootstrap/img/glyphicons-halflings.png
+%%DATADIR%%/html/assets/bootstrap/js/bootstrap.min.js
+%%DATADIR%%/html/assets/dataTables/css/jquery.dataTables.css
+%%DATADIR%%/html/assets/dataTables/images/back_disabled.png
+%%DATADIR%%/html/assets/dataTables/images/back_enabled.png
+%%DATADIR%%/html/assets/dataTables/images/back_enabled_hover.png
+%%DATADIR%%/html/assets/dataTables/images/forward_disabled.png
+%%DATADIR%%/html/assets/dataTables/images/forward_enabled.png
+%%DATADIR%%/html/assets/dataTables/images/forward_enabled_hover.png
+%%DATADIR%%/html/assets/dataTables/images/sort_asc.png
+%%DATADIR%%/html/assets/dataTables/images/sort_asc_disabled.png
+%%DATADIR%%/html/assets/dataTables/images/sort_both.png
+%%DATADIR%%/html/assets/dataTables/images/sort_desc.png
+%%DATADIR%%/html/assets/dataTables/images/sort_desc_disabled.png
+%%DATADIR%%/html/assets/dataTables/js/jquery.dataTables.min.js
+%%DATADIR%%/html/assets/jquery-1.9.1.min.js
+%%DATADIR%%/html/assets/logo.jpg
+%%DATADIR%%/html/assets/poudriere.css
+%%DATADIR%%/html/assets/poudriere.js
+%%DATADIR%%/html/index.html
+%%DATADIR%%/jail.sh
+%%DATADIR%%/options.sh
+%%DATADIR%%/pkgclean.sh
+%%DATADIR%%/ports.sh
+%%DATADIR%%/processonelog.sh
+%%DATADIR%%/processonelog2.sh
+%%DATADIR%%/queue.sh
+%%DATADIR%%/status.sh
+%%DATADIR%%/testport.sh
+%%ZSH%%share/zsh/site-functions/_poudriere
+%%ZSH%%@dirrmtry share/zsh/site-functions
+%%ZSH%%@dirrmtry share/zsh/
+ at dirrm %%DATADIR%%/html/assets/dataTables/js
+ at dirrm %%DATADIR%%/html/assets/dataTables/images
+ at dirrm %%DATADIR%%/html/assets/dataTables/css
+ at dirrm %%DATADIR%%/html/assets/dataTables
+ at dirrm %%DATADIR%%/html/assets/bootstrap/js
+ at dirrm %%DATADIR%%/html/assets/bootstrap/img
+ at dirrm %%DATADIR%%/html/assets/bootstrap/css
+ at dirrm %%DATADIR%%/html/assets/bootstrap
+ at dirrm %%DATADIR%%/html/assets
+ at dirrm %%DATADIR%%/html
+ at dirrm %%DATADIR%%/awk
+ at dirrm %%DATADIR%%
+ at dirrm libexec/poudriere

More information about the svn-ports-head mailing list