Index: head/devel/buildbot/Makefile =================================================================== --- head/devel/buildbot/Makefile (revision 445205) +++ head/devel/buildbot/Makefile (revision 445206) @@ -1,45 +1,49 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= buildbot PORTVERSION= 0.9.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP MAINTAINER= grembo@FreeBSD.org COMMENT= Continuous Integration Framework (Master) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4 \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt \ ${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 TEST_DEPENDS= trial:devel/py-twisted \ buildbot-worker>=${PORTVERSION}:devel/buildbot-worker \ ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock \ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ ${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests +USE_RC_SUBR= buildbot USES= python:-2.7 USE_PYTHON= autoplist distutils + +SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} NO_ARCH= yes post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 ${REINPLACE_CMD} -e \ 's|/usr/bin/python|${PYTHON_CMD}|g' @${FIND} ${WRKSRC} -name \*.bak -delete do-test: @cd ${WRKSRC} && trial buildbot .include Index: head/devel/buildbot/files/buildbot.in =================================================================== --- head/devel/buildbot/files/buildbot.in (nonexistent) +++ head/devel/buildbot/files/buildbot.in (revision 445206) @@ -0,0 +1,57 @@ +#!/bin/sh + +# $FreeBSD$ +# PROVIDE: buildbot +# REQUIRE: DAEMON +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable buildbot: +# buildbot_enable (bool): Set to "NO" by default +# buildbot_basedir (path): Must be set to the path of the buildbot directory +# file, e.g. /var/www/buildbot +# buildbot_user (str): Set to "root" by default. Change it to run +# buildbot as a different user. + +. /etc/rc.subr + +export PATH=${PATH}:%%PREFIX%%/bin + +name="buildbot" +rcvar=buildbot_enable +command="%%PREFIX%%/bin/buildbot" +load_rc_config $name + +check_cmd="${name}_check" +extra_commands="check reload" +reload_cmd="${name}_reload" +start_precmd="${name}_prestart" +stop_precmd="${name}_prestop" + +pidfile="${buildbot_basedir}/twistd.pid" +procname="%%PYTHON_CMD%%" + +buildbot_check() +{ + echo "Checking BuildBot config" + rc_flags="${buildbot_basedir} ${rc_flags}" + ${command} checkconfig ${rc_flags} +} + +buildbot_prestart() +{ + rc_flags="start ${buildbot_basedir} ${rc_flags}" +} + +buildbot_prestop() +{ + rc_flags="stop ${buildbot_basedir} ${rc_flags}" +} + +buildbot_reload() +{ + rc_flags="${buildbot_basedir} ${rc_flags}" + ${command} sighup ${rc_flags} +} + +run_rc_command "$1" Property changes on: head/devel/buildbot/files/buildbot.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/buildbot-worker/Makefile =================================================================== --- head/devel/buildbot-worker/Makefile (revision 445205) +++ head/devel/buildbot-worker/Makefile (revision 445206) @@ -1,37 +1,38 @@ # Created by: Frederic Praca # $FreeBSD$ PORTNAME= buildbot-worker PORTVERSION= 0.9.5 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP MAINTAINER= grembo@FreeBSD.org COMMENT= Continuous Integration Framework (Worker) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted TEST_DEPENDS= trial:devel/py-twisted \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock USES= python:-2.7 USE_PYTHON= autoplist distutils USE_RC_SUBR= buildbot-worker SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} NO_ARCH= yes PLIST_FILES= man/man1/buildbot-worker.1.gz post-install: ${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${MANPREFIX}/man/man1 do-test: @cd ${WRKSRC} && trial buildbot_worker.test .include Index: head/devel/buildbot-worker/files/buildbot-worker.in =================================================================== --- head/devel/buildbot-worker/files/buildbot-worker.in (revision 445205) +++ head/devel/buildbot-worker/files/buildbot-worker.in (revision 445206) @@ -1,121 +1,121 @@ #!/bin/sh # $FreeBSD$ -# PROVIDE: buildbot-worker +# PROVIDE: buildbot_worker # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to run buildbot-worker: # # buildbot_worker_enable (bool): Set to "YES" to enable buildbot-worker. # Default: "NO" # # buildbot_worker_flags (flags): Set extra command flags here. See buildbot-worker(8) # Default: Empty (""). # # buildbot_worker_uid (user): User to run buildbot-worker as. # Default: "buildbot" # # buildbot_worker_gid (group): Group to run buildbot-worker as. # Default: "buildbot" # # buildbot_worker_basedir (path): Location for buildbot-worker base directory # Default: %%PREFIX%%/etc/buildbot-worker # # buildbot_worker_profiles (str): Define profiles names. Space-delimited. # Default: Empty ("") # # This rc.d script supports multiple "profiles". When profiles are # specified, the non-profile specific parameters become defaults. # # Example: # # buildbot_worker_profiles="foo bar" # # buildbot_worker_foo_enable="YES" # buildbot_worker_foo_basedir="/usr/home/foo/buildbot" # buildbot_worker_foo_uid="foo" # buildbot_worker_foo_gid="foo" # # buildbot_worker_bar_enable="YES" # buildbot_worker_bar_basedir="/usr/home/buildbot/" . /etc/rc.subr export PATH=${PATH}:%%LOCALBASE%%/bin -name=buildbot-worker +name=buildbot_worker desc="Buildbot Buildworker" rcvar=buildbot_worker_enable load_rc_config ${name} # These are just the defaults, they might get overriden for a specific profile. eval ": \${${name}_enable:=\"NO\"}" eval ": \${${name}_flags:=\"\"}" eval ": \${${name}_uid:=\"buildbot\"}" eval ": \${${name}_gid:=\"buildbot\"}" eval ": \${${name}_basedir:=\"%%PREFIX%%/etc/${name}\"}" command="%%PREFIX%%/bin/twistd" command_interpreter="%%PYTHON_CMD%%" pidfile="${buildbot_worker_basedir}/twistd.pid" # A specific profile is specified in the command if [ -n "$2" ]; then profile="$2" # Override defaults with profile-specific values if [ -n "${buildbot_worker_profiles}" ]; then eval buildbot_worker_enable="\${buildbot_worker_${profile}_enable:-${buildbot_worker_enable}}" eval buildbot_worker_flags="\${buildbot_worker_${profile}_flags:-${buildbot_worker_flags}}" eval buildbot_worker_uid="\${buildbot_worker_${profile}_uid:-${buildbot_worker_uid}}" eval buildbot_worker_gid="\${buildbot_worker_${profile}_gid:-${buildbot_worker_gid}}" eval buildbot_worker_basedir="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}" eval pidfile="\${buildbot_worker_${profile}_basedir:-${buildbot_worker_basedir}}/twistd.pid" else echo "%%PREFIX%%/etc/rc.d/${name}: extra argument ignored" fi # A specific profile is not in the command else # Check if any profiles are defined if [ -n "$1" -a -n "${buildbot_worker_profiles}" ]; then # Loop through them for profile in ${buildbot_worker_profiles}; do eval _enable="\${buildbot_worker_${profile}_enable}" case "${_enable:-${buildbot_worker_enable}}" in [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) continue ;; [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) ;; *) if test -z "$_enable"; then _var=buildbot_worker_enable else _var=buildbot_worker_"${profile}"_enable fi warn "Bad value" \ "'${_enable:-${buildbot_worker_enable}}'" \ "for ${_var}. " \ "Profile ${profile} skipped." continue ;; esac echo "===> ${name} profile: ${profile}" if %%PREFIX%%/etc/rc.d/${name} $1 ${profile}; then success="${profile} ${success:-}" else failed="${profile} (${retcode}) ${failed:-}" fi done # Exit so that non-profile rc.d is not started when there are profiles exit 0 fi fi # run_rc_command would send ${name}_flags as parameters to $command (daemon) # This ensures they are actually passed to fcgiwrap instead. actual_buildbot_worker_flags="${buildbot_worker_flags}" buildbot_worker_flags="" command_args="--uid=${buildbot_worker_uid} --gid=${buildbot_worker_gid} --pidfile=${pidfile} --python=${buildbot_worker_basedir}/buildbot.tac ${actual_buildbot_worker_flags}" run_rc_command "$1" Index: head/devel/py-twisted152/Makefile =================================================================== --- head/devel/py-twisted152/Makefile (revision 445205) +++ head/devel/py-twisted152/Makefile (revision 445206) @@ -1,40 +1,43 @@ # Created by: Johann Visagie # $FreeBSD$ PORTNAME= twisted PORTVERSION= 15.2.1 CATEGORIES= devel net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= 152 MAINTAINER= python@FreeBSD.org COMMENT= Metaport of Twisted, an event-driven networking engine LICENSE= MIT +DEPRECATED= Deprecated by upstream years ago. Use "USES=twisted" instead +EXPIRATION_DATE=2017-08-07 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:devel/py-twistedCore USES= metaport python:2 OPTIONS_DEFINE= CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS OPTIONS_DEFAULT=CONCH LORE MAIL NAMES NEWS PAIR RUNNER WEB WORDS CONCH_DESC= SSH and SFTP protocol LORE_DESC= Documentation generator MAIL_DESC= SMTP, IMAP and POP protocol NAMES_DESC= DNS protocol NEWS_DESC= NNTP protocol PAIR_DESC= Twisted Pair can do low level TCP work RUNNER_DESC= Process management WEB_DESC= HTTP protocol WORDS_DESC= Chat and Instant Messaging CONCH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedConch>=${PORTVERSION}:security/py-twistedConch LORE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedLore>=${PORTVERSION}:textproc/py-twistedLore MAIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedMail>=${PORTVERSION}:mail/py-twistedMail NAMES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedNames>=${PORTVERSION}:dns/py-twistedNames NEWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedNews>=${PORTVERSION}:news/py-twistedNews PAIR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedPair>=${PORTVERSION}:net/py-twistedPair RUNNER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedRunner>=${PORTVERSION}:devel/py-twistedRunner WEB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedWeb>=${PORTVERSION}:www/py-twistedWeb WORDS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twistedWords>=${PORTVERSION}:net-im/py-twistedWords .include