mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-29 01:13:08 +00:00
- update to 4.0.0.b2
- convert to OPTIONSng - drop local patches incorporated upstream Submitted by: beat@
This commit is contained in:
Ion-Mihai Tetcu
parent
c0fa58a965
commit
049a76a52f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=310314
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= tinderbox
|
||||
DISTVERSION= 3.4${SNAP}
|
||||
PORTREVISION= 2
|
||||
DISTVERSION= 4.0.0.b2
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= ports-mgmt
|
||||
MASTER_SITES= http://tinderbox.marcuscom.com/ \
|
||||
@ -16,36 +15,43 @@ COMMENT= Port build tinderbox system, devel version
|
||||
|
||||
CONFLICTS= tinderbox-[0-9]*
|
||||
|
||||
OPTIONS= PGSQL "With pgsql" Off \
|
||||
MYSQL "With mysql" On \
|
||||
WEBUI "Install web interface" On \
|
||||
APACHE "Use Apache for web interface" On \
|
||||
HIAWATHA "Use Hiawatha for web interface" Off \
|
||||
LIGHTTPD "Use LightHTTPD for web interface" Off \
|
||||
CHECK_FOR_ROOT "Check if ./tc is run by uid 0" On \
|
||||
EMAILS "Support for build failure/completion emails" On \
|
||||
LSOF "For killMountProcesses() when using nullfs" On \
|
||||
LOG_COMPRESS "Support bzip'ing the logs" On \
|
||||
PARALLEL "Enable PARALLEL extra patch" On \
|
||||
TMPFS "Enable TMPFS extra patch" Off
|
||||
OPTIONS_MULTI= DB
|
||||
OPTIONS_MULTI_DB= PGSQL MYSQL SQLITE
|
||||
|
||||
OPTIONS_RADIO= WEB
|
||||
OPTIONS_RADIO_WEB= APACHE HIAWATHA LIGHTTPD
|
||||
|
||||
OPTIONS_DEFINE= CHECK_FOR_ROOT EMAILS LSOF LOG_COMPRESS PARALLEL \
|
||||
TMPFS
|
||||
|
||||
CHECK_FOR_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
|
||||
PARALLEL_DESC= Apply PARALLEL extra patch
|
||||
TMPFS_DESC= Apply TMPFS extra patch
|
||||
HIAWATHA_DESC= Hiawatha server
|
||||
|
||||
OPTIONS_DEFAULT= MYSQL APACHE CHECK_FOR_ROOT EMAILS LSOF \
|
||||
LOG_COMPRESS PARALLEL
|
||||
|
||||
NO_BUILD= yes
|
||||
WANT_PERL= yes
|
||||
SUB_FILES= pkg-message
|
||||
|
||||
SNAP= .r3-20120404
|
||||
#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
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if !defined(WITH_PGSQL) && defined(WITHOUT_MYSQL)
|
||||
IGNORE= is useless without a database. Please (re)run 'make config' and choose one of PGSQL and MYSQL
|
||||
.if ${PORT_OPTIONS:MAPACHE} || ${PORT_OPTIONS:MHIAWATHA} || ${PORT_OPTIONS:MLIGHTTPD}
|
||||
WEBUI= yes
|
||||
.endif
|
||||
|
||||
.if defined(WITH_WEBUI)
|
||||
.if defined(WEBUI)
|
||||
WANT_PHP_WEB= yes
|
||||
USE_PHP= session
|
||||
PLIST_SUB+= WEBUI=""
|
||||
@ -53,17 +59,17 @@ PLIST_SUB+= WEBUI=""
|
||||
PLIST_SUB+= WEBUI="@comment "
|
||||
.endif
|
||||
|
||||
.if defined(WITH_PGSQL)
|
||||
.if ${PORT_OPTIONS:MPGSQL}
|
||||
USE_PGSQL= yes
|
||||
.if defined(WITH_WEBUI)
|
||||
.if defined(WEBUI)
|
||||
RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql
|
||||
USE_PHP+= pgsql
|
||||
.endif
|
||||
RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_MYSQL)
|
||||
.if defined(WITH_WEBUI)
|
||||
.if ${PORT_OPTIONS:MMYSQL}
|
||||
.if defined(WEBUI)
|
||||
RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/mysql.php:${PORTSDIR}/databases/pear-MDB2_Driver_mysql
|
||||
USE_PHP+= mysql
|
||||
.endif
|
||||
@ -71,47 +77,49 @@ USE_MYSQL= yes
|
||||
RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
|
||||
.endif
|
||||
|
||||
.if !defined(WITHOUT_APACHE) && defined(WITH_WEBUI)
|
||||
.if ${PORT_OPTIONS:MSQLITE}
|
||||
.if defined(WEBUI)
|
||||
RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/sqlite.php:${PORTSDIR}/databases/pear-MDB2_Driver_sqlite
|
||||
USE_PHP+= sqlite
|
||||
.endif
|
||||
RUN_DEPENDS+= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
|
||||
.endif
|
||||
|
||||
.if ${PORT_OPTIONS:MAPACHE}
|
||||
USE_APACHE_RUN= 22+
|
||||
.elif defined(WITH_LIGHTTPD) && defined(WITH_WEBUI)
|
||||
.elif ${PORT_OPTIONS:MLIGHTTPD}
|
||||
RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd
|
||||
.elif defined(WITH_HIAWATHA) && defined(WITH_WEBUI)
|
||||
.elif ${PORT_OPTIONS:MHIAWATHA}
|
||||
RUN_DEPENDS+= hiawatha:${PORTSDIR}/www/hiawatha
|
||||
.endif
|
||||
|
||||
.if defined(WITH_EMAILS)
|
||||
.if ${PORT_OPTIONS:MEMAILS}
|
||||
RUN_DEPENDS+= p5-Net>=0:${PORTSDIR}/net/p5-Net
|
||||
.endif
|
||||
|
||||
.if defined(WITH_LSOF)
|
||||
.if ${PORT_OPTIONS:MLSOF}
|
||||
RUN_DEPENDS+= lsof:${PORTSDIR}/sysutils/lsof
|
||||
.endif
|
||||
|
||||
.if defined(WITH_LOG_COMPRESS)
|
||||
.if ${PORT_OPTIONS:MLOG_COMPRESS}
|
||||
RUN_DEPENDS+= p5-Compress-Bzip2>=0:${PORTSDIR}/archivers/p5-Compress-Bzip2
|
||||
.endif
|
||||
|
||||
.if defined(WITH_TMPFS) && defined(WITH_PARALLEL)
|
||||
.if ${PORT_OPTIONS:MTMPFS} && ${PORT_OPTIONS:MPARALLEL}
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-tmpfs_para.patch
|
||||
.elif defined(WITH_TMPFS) && !defined(WITH_PARALLEL)
|
||||
.elif ${PORT_OPTIONS:MTMPFS}
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-tmpfs.patch
|
||||
.elif defined(WITH_PARALLEL) && !defined(WITH_TMPFS)
|
||||
.elif ${PORT_OPTIONS:MPARALLEL}
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-parallel.patch
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if (!defined(WITHOUT_APACHE) || defined(WITH_LIGHTTPD) || defined(WITH_HIAWATHA)) && !defined(WITH_WEBUI)
|
||||
@${ECHO_CMD} "It doesn't make sense to depend on Apache, Hiawatha or LightHTTPD if not using the WebUI."
|
||||
@${FALSE}
|
||||
.endif
|
||||
|
||||
.if !defined(WITH_WEBUI)
|
||||
.if ! defined(WEBUI)
|
||||
post-extract:
|
||||
@${RM} -R ${WRKSRC}/webui
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
.ifdef WITHOUT_CHECK_FOR_ROOT
|
||||
.if ! ${PORT_OPTIONS:MCHECK_FOR_ROOT}
|
||||
${REINPLACE_CMD} -e 's/^if \[ `id -u` != 0 \]; then/if false; then/' \
|
||||
${WRKSRC}/tc
|
||||
.endif
|
||||
@ -133,4 +141,4 @@ do-install:
|
||||
post-install:
|
||||
@${CAT} ${PKGMESSAGE}
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (tinderbox/tinderbox-3.4.r3-20120404.tar.gz) = 178b55ae047704e32da1937f0ce367d209024ad302d08a5c1a8be9b9725cf33e
|
||||
SIZE (tinderbox/tinderbox-3.4.r3-20120404.tar.gz) = 937472
|
||||
SHA256 (tinderbox/tinderbox-4.0.0.b2.tar.gz) = 0b05c59a10789e64a0dcc61150aa2229b89ce881f67cfb4416ad1a95160a9c31
|
||||
SIZE (tinderbox/tinderbox-4.0.0.b2.tar.gz) = 150213
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
Index: lib/tinderlib.sh
|
||||
===================================================================
|
||||
RCS file: /space/cvs/marcuscom-cvs/portstools/tinderbox/lib/tinderlib.sh,v
|
||||
retrieving revision 1.69
|
||||
diff -u -r1.69 tinderlib.sh
|
||||
--- lib/tinderlib.sh 20 Jun 2012 20:47:42 -0000 1.69
|
||||
+++ lib/tinderlib.sh 26 Jun 2012 19:42:23 -0000
|
||||
@@ -664,7 +664,7 @@
|
||||
|
||||
for r in ${reqs} ; do
|
||||
if [ "${use_pkgng}" = "yes" ]; then
|
||||
- if [ -z $(pkg info -q ${r}) ]; then
|
||||
+ if [ -z $(pkg info -qgO ${r}) ]; then
|
||||
missing="${missing} ${r}"
|
||||
error=1
|
||||
fi
|
||||
@ -1,28 +0,0 @@
|
||||
--- ./lib/tinderlib.sh.orig 2012-11-07 10:17:43.000000000 +0100
|
||||
+++ ./lib/tinderlib.sh 2012-11-07 10:18:27.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.9 2012/04/04 10:38:41 beat Exp $
|
||||
+# $MCom: portstools/tinderbox/lib/tinderlib.sh,v 1.55.2.10 2012/05/21 01:19:28 marcus Exp $
|
||||
#
|
||||
|
||||
tinderLocJail () {
|
||||
@@ -225,6 +225,7 @@
|
||||
requestMount () {
|
||||
# set up defaults
|
||||
_type=""
|
||||
+ _options=""
|
||||
_srcloc=""
|
||||
_dstloc=""
|
||||
_nullfs=0
|
||||
@@ -632,7 +633,7 @@
|
||||
|
||||
for r in ${reqs} ; do
|
||||
if [ "${use_pkgng}" = "yes" ]; then
|
||||
- if [ -z $(pkg info -qgO ${r}) ]; then
|
||||
+ if [ -z $(pkg info -q ${r}) ]; then
|
||||
missing="${missing} ${r}"
|
||||
error=1
|
||||
fi
|
||||
@ -1,8 +0,0 @@
|
||||
--- ./sql/values.hooks.orig 2011-10-16 03:52:55.000000000 +0300
|
||||
+++ ./sql/values.hooks 2011-10-16 22:39:42.000000000 +0300
|
||||
@@ -15,4 +15,4 @@
|
||||
INSERT INTO hooks VALUES ('prePortBuild', NULL, 'Hook to run before building a port.\nIf this command returns a non-zero value, the port will not be built.\nThe following environment will be passed to the hook command:\n\tPACKAGE_NAME : Package name of the port\n\tBUILD : Build name for this port\n\tJAIL : Jail name for this Build\n\tPORTSTREE : PortsTree name for this Build\n\tCHROOT : Location of the Build root\n\tPORTDIR : Directory origin of this port\n\tPB : Tinderbox root\n\tTOTAL_SIZE : Estimated total size (in KB) required for this build');
|
||||
INSERT INTO hooks VALUES ('postPortBuild', NULL, 'Hook to run after building a port.\nThe following environment will be passed to the hook command:\n\tPACKAGE_NAME : Package name of the port\n\tBUILD : Build name for this port\n\tJAIL : Jail name for this Build\n\tPORTSTREE : PortsTree name for this Build\n\tCHROOT : Location of the Build root\n\tPORTDIR : Directory origin of this port\n\tPB : Tinderbox root\n\tSTATUS : Status of the port build\n\tFAIL_REASON : Reason why the port build failed (if any)\n\tTOTAL_SIZE : Total size (in KB) used for this build');
|
||||
INSERT INTO hooks VALUES ('prePortChecksum', NULL, 'Hook to run before checking a port''s distfile checksum(s).\nIf this command returns a non-zero value, the port will not be built.\nThe following environment will be passed to the hook command:\n\tPACKAGE_NAME : Package name of the port\n\tBUILD : Build name for this port\n\tJAIL : Jail name for this Build\n\tPORTSTREE : PortsTree name for this Build\n\tCHROOT : Location of the Build root\n\tPORTDIR : Directory origin of this port\n\tPB : Tinderbox root\n\tTOTAL_SIZE : Estimated total size (in KB) required for this build');
|
||||
- INSERT INTO hooks VALUES ('postPortChecksum', NULL, 'Hook to run after checking a port's distfie checksum(s).\nThe following environment will be passed to the hook command:\n\tPACKAGE_NAME : Package name of the port\n\tBUILD : Build name for this port\n\tJAIL : Jail name for this Build\n\tPORTSTREE : PortsTree name for this Build\n\tCHROOT : Location of the Build root\n\tPORTDIR : Directory origin of this port\n\tPB : Tinderbox root\n\tERROR : Error returned from the make checksum (0 means no error occurred)\n\tFAIL_REASON : Reason why the port build failed (if any)\n\tTOTAL_SIZE : Total size (in KB) used for this build'); INSERT INTO hooks VALUES ('postPortChecksum', NULL, 'Hook to run after checking a port''s distfie checksum(s).\nThe following environment will be passed to the hook command:\n\tPACKAGE_NAME : Package name of the port\n\tBUILD : Build name for this port\n\tJAIL : Jail name for this Build\n\tPORTSTREE : PortsTree name for this Build\n\tCHROOT : Location of the Build root\n\tPORTDIR : Directory origin of this port\n\tPB : Tinderbox root\n\tERROR : Error returned from the make checksum (0 means no error occurred)\n\tFAIL_REASON : Reason why the port build failed (if any)\n\tTOTAL_SIZE : Total size (in KB) used for this build');
|
||||
+INSERT INTO hooks VALUES ('postPortChecksum', NULL, 'Hook to run after checking a port''s distfie checksum(s).\nThe following environment will be passed to the hook command:\n\tPACKAGE_NAME : Package name of the port\n\tBUILD : Build name for this port\n\tJAIL : Jail name for this Build\n\tPORTSTREE : PortsTree name for this Build\n\tCHROOT : Location of the Build root\n\tPORTDIR : Directory origin of this port\n\tPB : Tinderbox root\n\tERROR : Error returned from the make checksum (0 means no error occurred)\n\tFAIL_REASON : Reason why the port build failed (if any)\n\tTOTAL_SIZE : Total size (in KB) used for this build');
|
||||
@ -30,6 +30,7 @@ tinderbox/scripts/lib/Tinderbox/User.pm
|
||||
tinderbox/scripts/lib/buildscript
|
||||
tinderbox/scripts/lib/db-mysql.sh
|
||||
tinderbox/scripts/lib/db-pgsql.sh
|
||||
tinderbox/scripts/lib/db-sqlite.sh
|
||||
tinderbox/scripts/lib/enterbuild
|
||||
tinderbox/scripts/lib/makemake
|
||||
tinderbox/scripts/lib/pnohang.c
|
||||
@ -44,6 +45,8 @@ tinderbox/scripts/sql/schema.mysql.post
|
||||
tinderbox/scripts/sql/schema.mysql.pre
|
||||
tinderbox/scripts/sql/schema.pgsql.post
|
||||
tinderbox/scripts/sql/schema.pgsql.pre
|
||||
tinderbox/scripts/sql/schema.sqlite.post
|
||||
tinderbox/scripts/sql/schema.sqlite.pre
|
||||
tinderbox/scripts/sql/values.config
|
||||
tinderbox/scripts/sql/values.hooks
|
||||
tinderbox/scripts/sql/values.lp
|
||||
@ -58,28 +61,8 @@ 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.2.4_to_3.2.5.sql
|
||||
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.0_to_3.1.sql
|
||||
tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.0_to_3.1.sql
|
||||
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.1_to_3.2.sql
|
||||
tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.1_to_3.2.sql
|
||||
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2_to_3.2.1.sql
|
||||
tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2_to_3.2.1.sql
|
||||
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.1_to_3.2.2.sql
|
||||
tinderbox/scripts/upgrade/mig_pgsql_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_pgsql_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_pgsql_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_pgsql_tinderbox-3.2.5_to_3.2.6.sql
|
||||
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.5_to_3.2.6.sql
|
||||
tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.2.6_to_3.3.sql
|
||||
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.2.6_to_3.3.sql
|
||||
tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.3_to_3.3.1.sql
|
||||
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.3_to_3.3.1.sql
|
||||
tinderbox/scripts/upgrade/mig_pgsql_tinderbox-3.3.1_to_3.3.2.sql
|
||||
tinderbox/scripts/upgrade/mig_mysql_tinderbox-3.3.1_to_3.3.2.sql
|
||||
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/order.lst
|
||||
%%WEBUI%%tinderbox/scripts/webui/core/Build.php
|
||||
|
||||
Loading…
Reference in New Issue
Block a user