From owner-svn-ports-head@FreeBSD.ORG Sun Oct 27 18:19:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 02E9C3AD; Sun, 27 Oct 2013 18:19:15 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D4F7824F1; Sun, 27 Oct 2013 18:19:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9RIJErC076019; Sun, 27 Oct 2013 18:19:14 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9RIJE8D076013; Sun, 27 Oct 2013 18:19:14 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201310271819.r9RIJE8D076013@svn.freebsd.org> From: Olli Hauer Date: Sun, 27 Oct 2013 18:19:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331795 - in head/ports-mgmt: tinderbox tinderbox-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Sun, 27 Oct 2013 18:19:15 -0000 Author: ohauer Date: Sun Oct 27 18:19:13 2013 New Revision: 331795 URL: http://svnweb.freebsd.org/changeset/ports/331795 Log: - add stage support to tinderbox / tinderbox-devel - sync OPTIONS - preserve use hooks / scrips by using dirrmtry - remove ' from DESC (don't break vim sytax) PR: ports/182615 Submitted by: ohauer Approved by: maintainer timeout (> 20 days) Modified: head/ports-mgmt/tinderbox-devel/Makefile head/ports-mgmt/tinderbox-devel/pkg-plist head/ports-mgmt/tinderbox/Makefile head/ports-mgmt/tinderbox/pkg-plist Modified: head/ports-mgmt/tinderbox-devel/Makefile ============================================================================== --- head/ports-mgmt/tinderbox-devel/Makefile Sun Oct 27 18:15:25 2013 (r331794) +++ head/ports-mgmt/tinderbox-devel/Makefile Sun Oct 27 18:19:13 2013 (r331795) @@ -22,19 +22,19 @@ OPTIONS_MULTI_DB= PGSQL MYSQL SQLITE OPTIONS_RADIO= WEB OPTIONS_RADIO_WEB= APACHE HIAWATHA LIGHTTPD NGINX -OPTIONS_DEFINE= CHECK_FOR_ROOT EMAILS LSOF LOG_COMPRESS PARALLEL \ - TMPFS +OPTIONS_DEFINE= CHECK_ROOT EMAILS LSOF LOG_COMPRESS \ + PARALLEL TMPFS -CHECK_FOR_ROOT_DESC= Check if ./tc is run by uid 0 +CHECK_ROOT_DESC= Check if ./tc is run by uid 0 EMAILS_DESC= Support for build failure/completion emails LSOF_DESC= For killMountProcesses() when using nullfs -LOG_COMPRESS_DESC= Support bzip'ing the logs +LOG_COMPRESS_DESC= Support bzip log compression PARALLEL_DESC= Apply PARALLEL extra patch TMPFS_DESC= Apply TMPFS extra patch HIAWATHA_DESC= Hiawatha server NGINX_DESC= Nginx server -OPTIONS_DEFAULT= MYSQL APACHE CHECK_FOR_ROOT EMAILS LSOF \ +OPTIONS_DEFAULT= MYSQL APACHE CHECK_ROOT EMAILS LSOF \ LOG_COMPRESS PARALLEL NO_BUILD= yes @@ -44,10 +44,6 @@ SUB_FILES= pkg-message #SNAP= .r3-20120404 #SNAP= -20110101 # 22:28:07 UTC -MAN1= tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \ - tc-configJail.1 tc-configTinderd.1 tc-init.1 - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAPACHE} || ${PORT_OPTIONS:MHIAWATHA} || ${PORT_OPTIONS:MLIGHTTPD} || ${PORT_OPTIONS:MNGINX} @@ -115,30 +111,18 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-tmpfs EXTRA_PATCHES+= ${FILESDIR}/extra-parallel.patch .endif -.if ! defined(WEBUI) -post-extract: - @${RM} -R ${WRKSRC}/webui -.endif - post-patch: -.if ! ${PORT_OPTIONS:MCHECK_FOR_ROOT} +.if ! ${PORT_OPTIONS:MCHECK_ROOT} ${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \ ${WRKSRC}/tc .endif - @cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \; do-install: - @${MKDIR} ${PREFIX}/tinderbox/scripts - @${ECHO_CMD} "Installing man pages ..." - cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \ - cd ${WRKSRC} && ${RM} -r ${WRKSRC}/man - @${ECHO_CMD} "Installing rc script ..." - ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${PREFIX}/etc/rc.d/${PORTNAME} - @${ECHO_CMD} "Installing tinderbox ..." - ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts - @${ECHO_CMD} "All Done" - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/tinderbox/scripts + ${TAR} -C ${WRKSRC} --exclude man --exclude '*.orig' --exclude '*.bak' -cf - . \ + | tar -xf - --unlink -C ${STAGEDIR}${PREFIX}/tinderbox/scripts + ${TAR} -C ${WRKSRC}/man/man1 --exclude '*.orig' --exclude '*.bak' -cf - . \ + | tar -xf - --unlink -C ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${STAGEDIR}${PREFIX}/etc/rc.d/${PORTNAME} .include Modified: head/ports-mgmt/tinderbox-devel/pkg-plist ============================================================================== --- head/ports-mgmt/tinderbox-devel/pkg-plist Sun Oct 27 18:15:25 2013 (r331794) +++ head/ports-mgmt/tinderbox-devel/pkg-plist Sun Oct 27 18:19:13 2013 (r331795) @@ -1,4 +1,11 @@ etc/rc.d/tinderbox +man/man1/tc-configCcache.1.gz +man/man1/tc-configDistfile.1.gz +man/man1/tc-configGet.1.gz +man/man1/tc-configJail.1.gz +man/man1/tc-configTinderd.1.gz +man/man1/tc-init.1.gz +tinderbox/scripts/.version tinderbox/scripts/README tinderbox/scripts/contrib/hooks/compress_wrkdir/README.txt tinderbox/scripts/contrib/hooks/compress_wrkdir/compress_wrkdir.sh @@ -9,8 +16,8 @@ tinderbox/scripts/contrib/hooks/kse-fix/ tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh -tinderbox/scripts/contrib/hooks/mass-build-pgsql/mass-build-pgsql.sh tinderbox/scripts/contrib/hooks/mass-build-pgsql/README.txt +tinderbox/scripts/contrib/hooks/mass-build-pgsql/mass-build-pgsql.sh tinderbox/scripts/ds.ph.dist tinderbox/scripts/etc/env/.keep_me tinderbox/scripts/etc/rc.d/tinderd @@ -61,10 +68,10 @@ tinderbox/scripts/upgrade/builds.map tinderbox/scripts/upgrade/config.map tinderbox/scripts/upgrade/hooks.map tinderbox/scripts/upgrade/jails.map -tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.3_to_4.0.0.sql tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.3_to_4.0.0.sql -tinderbox/scripts/upgrade/user_permissions.map +tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.3_to_4.0.0.sql tinderbox/scripts/upgrade/order.lst +tinderbox/scripts/upgrade/user_permissions.map %%WEBUI%%tinderbox/scripts/webui/core/Build.php %%WEBUI%%tinderbox/scripts/webui/core/BuildGroups.php %%WEBUI%%tinderbox/scripts/webui/core/BuildPortsQueue.php @@ -158,7 +165,7 @@ tinderbox/scripts/upgrade/order.lst @dirrm tinderbox/scripts/contrib/hooks/kse-fix @dirrm tinderbox/scripts/contrib/hooks/create-pkgng-repo @dirrm tinderbox/scripts/contrib/hooks/compress_wrkdir -@dirrm tinderbox/scripts/contrib/hooks -@dirrm tinderbox/scripts/contrib -@dirrm tinderbox/scripts +@dirrmtry tinderbox/scripts/contrib/hooks +@dirrmtry tinderbox/scripts/contrib +@dirrmtry tinderbox/scripts @dirrmtry tinderbox Modified: head/ports-mgmt/tinderbox/Makefile ============================================================================== --- head/ports-mgmt/tinderbox/Makefile Sun Oct 27 18:15:25 2013 (r331794) +++ head/ports-mgmt/tinderbox/Makefile Sun Oct 27 18:19:13 2013 (r331795) @@ -27,7 +27,7 @@ OPTIONS_DEFINE= CHECK_ROOT EMAILS LSOF CHECK_ROOT_DESC= Check if ./tc is run by uid 0 EMAILS_DESC= Support for build failure/completion emails LSOF_DESC= For killMountProcesses() when using nullfs -LOG_COMPRESS_DESC= Support bzip'ing the logs +LOG_COMPRESS_DESC= Support bzip log compression HIAWATHA_DESC= Hiawatha server NGINX_DESC= Nginx server @@ -38,10 +38,6 @@ NO_BUILD= yes WANT_PERL= yes SUB_FILES= pkg-message -MAN1= tc-configCcache.1 tc-configDistfile.1 tc-configGet.1 \ - tc-configJail.1 tc-configTinderd.1 tc-init.1 - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAPACHE} || ${PORT_OPTIONS:MHIAWATHA} || ${PORT_OPTIONS:MLIGHTTPD} || ${PORT_OPTIONS:MNGINX} @@ -53,7 +49,6 @@ WANT_PHP_WEB= yes USE_PHP= session PLIST_SUB+= WEBUI="" .else -EXTRACT_BEFORE_ARGS= --exclude webui -xf PLIST_SUB+= WEBUI="@comment " .endif @@ -107,20 +102,13 @@ post-patch: ${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \ ${WRKSRC}/tc .endif - @cd ${WRKSRC} && ${FIND} -E . -regex '.*(orig|bak)' -exec ${RM} {} \; do-install: - @${MKDIR} ${PREFIX}/tinderbox/scripts - @${ECHO_CMD} "Installing man pages ..." - cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 && \ - cd ${WRKSRC} && ${RM} -r ${WRKSRC}/man - @${ECHO_CMD} "Installing rc script ..." - ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${PREFIX}/etc/rc.d/${PORTNAME} - @${ECHO_CMD} "Installing tinderbox ..." - ${CP} -R ${WRKSRC}/* ${PREFIX}/tinderbox/scripts - @${ECHO_CMD} "All Done" - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/tinderbox/scripts + ${TAR} -C ${WRKSRC} --exclude man --exclude '*.orig' --exclude '*.bak' -cf - . \ + | tar -xf - --unlink -C ${STAGEDIR}${PREFIX}/tinderbox/scripts + ${TAR} -C ${WRKSRC}/man/man1 --exclude '*.orig' --exclude '*.bak' -cf - . \ + | tar -xf - --unlink -C ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/tinderd ${STAGEDIR}${PREFIX}/etc/rc.d/${PORTNAME} .include Modified: head/ports-mgmt/tinderbox/pkg-plist ============================================================================== --- head/ports-mgmt/tinderbox/pkg-plist Sun Oct 27 18:15:25 2013 (r331794) +++ head/ports-mgmt/tinderbox/pkg-plist Sun Oct 27 18:19:13 2013 (r331795) @@ -1,4 +1,11 @@ etc/rc.d/tinderbox +man/man1/tc-configCcache.1.gz +man/man1/tc-configDistfile.1.gz +man/man1/tc-configGet.1.gz +man/man1/tc-configJail.1.gz +man/man1/tc-configTinderd.1.gz +man/man1/tc-init.1.gz +tinderbox/scripts/.version tinderbox/scripts/README tinderbox/scripts/contrib/hooks/compress_wrkdir/README.txt tinderbox/scripts/contrib/hooks/compress_wrkdir/compress_wrkdir.sh @@ -9,8 +16,8 @@ tinderbox/scripts/contrib/hooks/kse-fix/ tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh -tinderbox/scripts/contrib/hooks/mass-build-pgsql/mass-build-pgsql.sh tinderbox/scripts/contrib/hooks/mass-build-pgsql/README.txt +tinderbox/scripts/contrib/hooks/mass-build-pgsql/mass-build-pgsql.sh tinderbox/scripts/ds.ph.dist tinderbox/scripts/etc/env/.keep_me tinderbox/scripts/etc/rc.d/tinderd @@ -61,10 +68,10 @@ tinderbox/scripts/upgrade/builds.map tinderbox/scripts/upgrade/config.map tinderbox/scripts/upgrade/hooks.map tinderbox/scripts/upgrade/jails.map -tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.3_to_4.0.0.sql tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.3_to_4.0.0.sql -tinderbox/scripts/upgrade/user_permissions.map +tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.3_to_4.0.0.sql tinderbox/scripts/upgrade/order.lst +tinderbox/scripts/upgrade/user_permissions.map %%WEBUI%%tinderbox/scripts/webui/core/Build.php %%WEBUI%%tinderbox/scripts/webui/core/BuildGroups.php %%WEBUI%%tinderbox/scripts/webui/core/BuildPortsQueue.php @@ -158,7 +165,7 @@ tinderbox/scripts/upgrade/order.lst @dirrm tinderbox/scripts/contrib/hooks/kse-fix @dirrm tinderbox/scripts/contrib/hooks/create-pkgng-repo @dirrm tinderbox/scripts/contrib/hooks/compress_wrkdir -@dirrm tinderbox/scripts/contrib/hooks -@dirrm tinderbox/scripts/contrib -@dirrm tinderbox/scripts +@dirrmtry tinderbox/scripts/contrib/hooks +@dirrmtry tinderbox/scripts/contrib +@dirrmtry tinderbox/scripts @dirrmtry tinderbox