Index: head/devel/buildbot-worker/files/buildbot-worker.in =================================================================== --- head/devel/buildbot-worker/files/buildbot-worker.in (revision 445206) +++ head/devel/buildbot-worker/files/buildbot-worker.in (revision 445207) @@ -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 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 445206) +++ head/devel/py-twisted152/Makefile (revision 445207) @@ -1,43 +1,40 @@ # 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