diff options
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/tinderbox/Makefile | 3 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox/distinfo | 4 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox/files/patch-lib-buildscript | 80 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox/files/patch-lib-portbuild | 44 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox/files/patch-lib-tc_command.sh | 11 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox/files/patch-lib-tinderbox.env | 16 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox/files/patch-lib-tinderlib.sh | 19 | ||||
| -rw-r--r-- | ports-mgmt/tinderbox/pkg-plist | 35 |
8 files changed, 31 insertions, 181 deletions
diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile index 9d26359f67fa..d9dba84de910 100644 --- a/ports-mgmt/tinderbox/Makefile +++ b/ports-mgmt/tinderbox/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= tinderbox -PORTVERSION= 3.3 -PORTREVISION= 4 +PORTVERSION= 3.4 CATEGORIES= ports-mgmt MASTER_SITES= http://tinderbox.marcuscom.com/ \ http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/ diff --git a/ports-mgmt/tinderbox/distinfo b/ports-mgmt/tinderbox/distinfo index eb275bc8efe7..312699f41af8 100644 --- a/ports-mgmt/tinderbox/distinfo +++ b/ports-mgmt/tinderbox/distinfo @@ -1,2 +1,2 @@ -SHA256 (tinderbox/tinderbox-3.3.tar.gz) = 403ddecb04b901bc2e59943d185cfab8878cba592e6458ce2402984347380475 -SIZE (tinderbox/tinderbox-3.3.tar.gz) = 132918 +SHA256 (tinderbox/tinderbox-3.4.tar.gz) = 85f53cbe3deb37d9cf9d4e22ee49acd7a9acaa395811cf7f5f6cf9edcd57b79f +SIZE (tinderbox/tinderbox-3.4.tar.gz) = 147218 diff --git a/ports-mgmt/tinderbox/files/patch-lib-buildscript b/ports-mgmt/tinderbox/files/patch-lib-buildscript deleted file mode 100644 index 02c88223d547..000000000000 --- a/ports-mgmt/tinderbox/files/patch-lib-buildscript +++ /dev/null @@ -1,80 +0,0 @@ ---- lib/buildscript.orig.or 2009-11-27 18:32:31.000000000 +0100 -+++ lib/buildscript 2009-12-27 21:08:53.000000000 +0100 -@@ -103,7 +103,6 @@ - PLISTCHECK=$8 - - L=$(echo ${LOCALBASE} | sed 's,^/,,') --X=$(echo ${X11BASE} | sed 's,^/,,') - - if [ $phase = 1 ]; then - -@@ -113,7 +112,7 @@ - echo "building for: $(uname -rm)" - echo "maintained by: $(make maintainer)" - echo "Makefile ident: $(ident ${dir}/Makefile | grep 'FreeBSD:' | sed 's/^[ \t]*//')" -- echo "prefixes: LOCALBASE=${L} X11BASE=${X} PREFIX=$(make -V PREFIX)" -+ echo "prefixes: LOCALBASE=${L} PREFIX=$(make -V PREFIX)" - echo "Begin Configuration:" - echo "---Begin Environment---" - printenv -@@ -162,7 +161,6 @@ - ./${L}/etc/apache2 - ./${L}/news - ./${L}/share/xml --./${X}/etc/gconf - ./${L}/etc/gconf - ./var/db/fontconfig - EOF -@@ -231,7 +229,6 @@ - ./${L}/etc/apache2 - ./${L}/news - ./${L}/share/xml --./${X}/etc/gconf - ./${L}/etc/gconf - ./var/db/fontconfig - EOF -@@ -270,7 +267,7 @@ - /pnohang $TIMEOUT /tmp/make.log5 ${pkgname} make -k regression-test - cat /tmp/make.log5 - -- mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${X}/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|usr/X11R6 )" > /tmp/list.preinstall -+ mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${L}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${L}/lib/X11/fonts/TrueType|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|usr/X11R6 )" > /tmp/list.preinstall - - if [ -s /tmp/list.preinstall ]; then - echo "================================================================" -@@ -322,7 +319,7 @@ - del_pkg ${pkgname} - - -- mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${X}/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/*|usr/X11R6 )" > /tmp/list3 -+ mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${L}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${L}/lib/X11/fonts/TrueType|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/*|usr/X11R6 )" > /tmp/list3 - - dirty=0 - if [ -s /tmp/list3 ]; then -@@ -331,7 +328,7 @@ - grep ' missing$' /tmp/list3 > /tmp/list5 - grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6 - if [ -n "${PLISTCHECK}" ]; then -- if grep -vqE "(${X}|${L})/etc/" /tmp/list4; then -+ if grep -vqE "(${L})/etc/" /tmp/list4; then - echo "1" > /tmp/status - dirty=1 - fi -@@ -379,7 +376,7 @@ - fi - - # Compare the state of the filesystem now to clean system (should again be clean) -- mtree -X /tmp/mtree.preexclude -x -f /tmp/mtree.pristine -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${X}/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/*|usr/X11R6 )" > /tmp/list3 -+ mtree -X /tmp/mtree.preexclude -x -f /tmp/mtree.pristine -p / | egrep -v "^(${L}/var|${L}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |${L} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|${L}/man/..( |/man. )|${L}/lib/X11/fonts/TrueType|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/*|usr/X11R6 )" > /tmp/list3 - echo - echo "=== Checking filesystem state after all packages deleted" - -@@ -389,7 +386,7 @@ - grep ' missing$' /tmp/list3 > /tmp/list5 - grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6 - if [ -n "${PLISTCHECK}" ]; then -- if grep -vqE "(${X}|${L})/etc/" /tmp/list4; then -+ if grep -vqE "(${L})/etc/" /tmp/list4; then - #echo "1" > /tmp/status - fi - if [ -s /tmp/list5 ]; then diff --git a/ports-mgmt/tinderbox/files/patch-lib-portbuild b/ports-mgmt/tinderbox/files/patch-lib-portbuild deleted file mode 100644 index 227046456108..000000000000 --- a/ports-mgmt/tinderbox/files/patch-lib-portbuild +++ /dev/null @@ -1,44 +0,0 @@ ---- lib/portbuild.orig 2009-11-27 18:32:31.000000000 +0100 -+++ lib/portbuild 2009-12-25 21:07:00.000000000 +0100 -@@ -1,6 +1,6 @@ - #!/bin/sh - # --# $MCom: portstools/tinderbox/lib/portbuild,v 1.123.2.5 2009/10/17 19:48:36 marcus Exp $ -+# $MCom: portstools/tinderbox/lib/portbuild,v 1.123.2.6 2009/12/24 17:23:32 marcus Exp $ - - . ${pb}/scripts/lib/tinderlib.sh - -@@ -170,7 +170,7 @@ - fi - - # directories to clean --cleandirs="${LOCALBASE} ${X11BASE} /compat /var/db/pkg" -+cleandirs="${LOCALBASE} /compat /var/db/pkg" - - for dir in ${cleandirs}; do - cleanDirs ${build} ${chroot}${dir} -@@ -194,15 +194,6 @@ - >/dev/null 2>&1 - fi - --mkdir -p ${chroot}${X11BASE} --case "${X_WINDOW_SYSTEM}" in -- "xfree86-3") _X_MTREE="BSD.x11.dist";; -- *) _X_MTREE="BSD.x11-4.dist";; --esac --mkdir -p ${chroot}${X11BASE} --mtree -deU -f ${chroot}/etc/mtree/${_X_MTREE} -p ${chroot}${X11BASE} \ -- >/dev/null 2>&1 -- - # mount linprocfs if required - if [ "${ARCH}" = "i386" -o "${ARCH}" = "amd64" ]; then - mkdir -p ${chroot}/compat/linux/proc -@@ -244,7 +235,7 @@ - ulimit -f 16384000 - ulimit -t 7200 - --export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin:${X11BASE}/bin -+export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin - - # Set HOME to be /root to avoid errant leftover files - export HOME=/root diff --git a/ports-mgmt/tinderbox/files/patch-lib-tc_command.sh b/ports-mgmt/tinderbox/files/patch-lib-tc_command.sh deleted file mode 100644 index 4fd43ee7d4fd..000000000000 --- a/ports-mgmt/tinderbox/files/patch-lib-tc_command.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/tc_command.sh.orgi 2009-12-27 14:53:40.000000000 +0100 -+++ lib/tc_command.sh 2009-12-27 14:53:52.000000000 +0100 -@@ -223,7 +223,7 @@ - #--------------------------------------------------------------------------- - - Setup () { -- MAN_PREREQS="lang/perl5.[81]" -+ MAN_PREREQS="lang/perl5.[81]*" - OPT_PREREQS="lang/php[45] databases/pear-MDB2 www/php[45]-session" - PREF_FILES="tinderbox.ph" - README="$(tinderLoc scripts README)" diff --git a/ports-mgmt/tinderbox/files/patch-lib-tinderbox.env b/ports-mgmt/tinderbox/files/patch-lib-tinderbox.env deleted file mode 100644 index dc7c359d930b..000000000000 --- a/ports-mgmt/tinderbox/files/patch-lib-tinderbox.env +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/tinderbox.env.orig 2009-11-27 18:32:31.000000000 +0100 -+++ lib/tinderbox.env 2009-12-25 21:07:09.000000000 +0100 -@@ -1,4 +1,4 @@ --# $MCom: portstools/tinderbox/lib/tinderbox.env,v 1.27.2.1 2009/08/22 23:28:31 marcus Exp $ -+# $MCom: portstools/tinderbox/lib/tinderbox.env,v 1.27.2.2 2009/12/24 17:23:32 marcus Exp $ - # - # Global environmental variable declarations, which can be overridden - # on any of a per-build, per-jail and/or per-portstree basis -@@ -23,7 +23,6 @@ - #9X_WINDOW_SYSTEM=xorg - # - LOCALBASE=/usr/local --X11BASE=/usr/local - OSVERSION=`awk '/^#define __FreeBSD_version/ {print $3}' < ^^SRCBASE^^/sys/sys/param.h` - OSREL=`awk 'BEGIN {FS="\""}; /^REVISION/ {print $2}' < ^^SRCBASE^^/sys/conf/newvers.sh` - BRANCH=`awk 'BEGIN {FS="\""}; /^BRANCH/ {print $2}' < ^^SRCBASE^^/sys/conf/newvers.sh` diff --git a/ports-mgmt/tinderbox/files/patch-lib-tinderlib.sh b/ports-mgmt/tinderbox/files/patch-lib-tinderlib.sh deleted file mode 100644 index 206acbb3e95c..000000000000 --- a/ports-mgmt/tinderbox/files/patch-lib-tinderlib.sh +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/tinderlib.sh.orig 2009-11-27 18:32:31.000000000 +0100 -+++ lib/tinderlib.sh 2009-12-25 21:07:17.000000000 +0100 -@@ -23,7 +23,7 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - # --# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.5 2009/03/14 23:57:13 marcus Exp $ -+# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.6 2009/12/24 17:23:32 marcus Exp $ - # - - tinderLocJail () { -@@ -505,7 +505,6 @@ - jailBase=$(tinderLoc jail ${jail}) - eval "export __MAKE_CONF=${jailBase}/make.conf" >/dev/null 2>&1 - eval "export LOCALBASE=/nonexistentlocal" >/dev/null 2>&1 -- eval "export X11BASE=/nonexistentx" >/dev/null 2>&1 - eval "export PKG_DBDIR=/nonexistentdb" >/dev/null 2>&1 - if [ x"${OPTIONS_ENABLED}" != x"1" ]; then - eval "export PORT_DBDIR=/nonexistentportdb" >/dev/null 2>&1 diff --git a/ports-mgmt/tinderbox/pkg-plist b/ports-mgmt/tinderbox/pkg-plist index 472d969ae331..4f7242f85f2c 100644 --- a/ports-mgmt/tinderbox/pkg-plist +++ b/ports-mgmt/tinderbox/pkg-plist @@ -1,12 +1,16 @@ etc/rc.d/tinderbox tinderbox/scripts/.version tinderbox/scripts/README -tinderbox/scripts/ds.ph.dist -tinderbox/scripts/contrib/hooks/make-jobs-safe/README.txt -tinderbox/scripts/contrib/hooks/make-jobs-safe/make-jobs-safe.sh -tinderbox/scripts/contrib/hooks/kse-fix/libmap.conf +tinderbox/scripts/contrib/hooks/compress_wrkdir/README.txt +tinderbox/scripts/contrib/hooks/compress_wrkdir/compress_wrkdir.sh tinderbox/scripts/contrib/hooks/kse-fix/README.txt tinderbox/scripts/contrib/hooks/kse-fix/kse-fix.sh +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/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 tinderbox/scripts/lib/Tinderbox/Build.pm @@ -55,15 +59,27 @@ tinderbox/scripts/upgrade/hooks.map tinderbox/scripts/upgrade/jails.map tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.0_to_3.1.sql tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.1_to_3.2.sql +tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.1_to_3.2.2.sql +tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.2_to_3.2.3.sql +tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.3_to_3.2.4.sql +tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.4_to_3.2.5.sql +tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.5_to_3.2.6.sql +tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2_to_3.2.1.sql tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.0_to_3.1.sql tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.1_to_3.2.sql +tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.1_to_3.2.2.sql +tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.2_to_3.2.3.sql +tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.3_to_3.2.4.sql +tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.4_to_3.2.5.sql +tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.5_to_3.2.6.sql tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2_to_3.2.1.sql -tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2_to_3.2.1.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 %%WEBUI%%tinderbox/scripts/webui/core/Config.php +%%WEBUI%%tinderbox/scripts/webui/core/Hooks.php %%WEBUI%%tinderbox/scripts/webui/core/Jail.php %%WEBUI%%tinderbox/scripts/webui/core/LogfilePattern.php %%WEBUI%%tinderbox/scripts/webui/core/Port.php @@ -74,11 +90,12 @@ tinderbox/scripts/upgrade/user_permissions.map %%WEBUI%%tinderbox/scripts/webui/core/TinderboxDS.php %%WEBUI%%tinderbox/scripts/webui/core/User.php %%WEBUI%%tinderbox/scripts/webui/core/functions.php +%%WEBUI%%tinderbox/scripts/webui/favicon.ico %%WEBUI%%tinderbox/scripts/webui/inc_ds.php.dist %%WEBUI%%tinderbox/scripts/webui/inc_tinderbox.php.dist %%WEBUI%%tinderbox/scripts/webui/index.php -%%WEBUI%%tinderbox/scripts/webui/favicon.ico %%WEBUI%%tinderbox/scripts/webui/module/module.php +%%WEBUI%%tinderbox/scripts/webui/module/moduleBuildGroups.php %%WEBUI%%tinderbox/scripts/webui/module/moduleBuildPorts.php %%WEBUI%%tinderbox/scripts/webui/module/moduleBuilds.php %%WEBUI%%tinderbox/scripts/webui/module/moduleConfig.php @@ -92,6 +109,7 @@ tinderbox/scripts/upgrade/user_permissions.map %%WEBUI%%tinderbox/scripts/webui/templates/default/config.tpl %%WEBUI%%tinderbox/scripts/webui/templates/default/current_buildports.tpl %%WEBUI%%tinderbox/scripts/webui/templates/default/describe_port.tpl +%%WEBUI%%tinderbox/scripts/webui/templates/default/display_build_groups.tpl %%WEBUI%%tinderbox/scripts/webui/templates/default/display_login.tpl %%WEBUI%%tinderbox/scripts/webui/templates/default/display_markup_log.tpl %%WEBUI%%tinderbox/scripts/webui/templates/default/failed_buildports.tpl @@ -111,6 +129,7 @@ tinderbox/scripts/upgrade/user_permissions.map %%WEBUI%%tinderbox/scripts/webui/templates/paefchen/config.tpl %%WEBUI%%tinderbox/scripts/webui/templates/paefchen/current_buildports.tpl %%WEBUI%%tinderbox/scripts/webui/templates/paefchen/describe_port.tpl +%%WEBUI%%tinderbox/scripts/webui/templates/paefchen/display_build_groups.tpl %%WEBUI%%tinderbox/scripts/webui/templates/paefchen/display_login.tpl %%WEBUI%%tinderbox/scripts/webui/templates/paefchen/display_markup_log.tpl %%WEBUI%%tinderbox/scripts/webui/templates/paefchen/failed_buildports.tpl @@ -144,8 +163,10 @@ tinderbox/scripts/upgrade/user_permissions.map @dirrm tinderbox/scripts/etc/rc.d @dirrm tinderbox/scripts/etc/env @dirrm tinderbox/scripts/etc -@dirrm tinderbox/scripts/contrib/hooks/kse-fix +@dirrm tinderbox/scripts/contrib/hooks/mass-build-pgsql @dirrm tinderbox/scripts/contrib/hooks/make-jobs-safe +@dirrm tinderbox/scripts/contrib/hooks/kse-fix +@dirrm tinderbox/scripts/contrib/hooks/compress_wrkdir @dirrm tinderbox/scripts/contrib/hooks @dirrm tinderbox/scripts/contrib @dirrm tinderbox/scripts |