From owner-svn-ports-head@freebsd.org Fri Mar 24 18:32:16 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E0FA5D1B972; Fri, 24 Mar 2017 18:32:16 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F5E91B22; Fri, 24 Mar 2017 18:32:16 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2OIWFTC039993; Fri, 24 Mar 2017 18:32:15 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2OIWFqG039991; Fri, 24 Mar 2017 18:32:15 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201703241832.v2OIWFqG039991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 24 Mar 2017 18:32:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436849 - in head/www/minio: . files 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.23 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: Fri, 24 Mar 2017 18:32:17 -0000 Author: swills Date: Fri Mar 24 18:32:15 2017 New Revision: 436849 URL: https://svnweb.freebsd.org/changeset/ports/436849 Log: www/minio: minor improvements * Avoid duplicating version * Correct order of rc script * Add -f flag to command_args Modified: head/www/minio/Makefile head/www/minio/files/minio.in Modified: head/www/minio/Makefile ============================================================================== --- head/www/minio/Makefile Fri Mar 24 18:30:47 2017 (r436848) +++ head/www/minio/Makefile Fri Mar 24 18:32:15 2017 (r436849) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= minio -PORTVERSION= 2017.02.16.01.47.30 +PORTVERSION= ${GH_TAGNAME:S/RELEASE.//:S/Z//:S/T/-/:S/-/./g} +PORTREVISION= 1 CATEGORIES= www MAINTAINER= swills@FreeBSD.org @@ -16,13 +17,12 @@ USES= compiler gmake USE_GITHUB= yes GH_TAGNAME= RELEASE.2017-02-16T01-47-30Z -GH_SUBDIR= src/github.com/minio/minio +GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} GH_TUPLE= \ - minio:mc:RELEASE.2017-02-06T20-16-19Z:mc/src/github.com/minio/mc \ - hashicorp:go-version:03c5bf6:go_version/src/github.com/hashicorp/go-version + minio:mc:RELEASE.2017-02-06T20-16-19Z:mc/src/github.com/minio/mc \ + hashicorp:go-version:03c5bf6:go_version/src/github.com/hashicorp/go-version MAKE_ENV= GOPATH=${WRKSRC} GOROOT=${LOCALBASE}/go -STRIP= # stripping can break go binaries PLIST_FILES= bin/minio USE_RC_SUBR= minio @@ -30,6 +30,9 @@ USE_RC_SUBR= minio USERS= minio GROUPS= minio +SUB_LIST= USER="${USERS}" \ + GROUP="${GROUPS}" + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/www/minio/files/minio.in ============================================================================== --- head/www/minio/files/minio.in Fri Mar 24 18:30:47 2017 (r436848) +++ head/www/minio/files/minio.in Fri Mar 24 18:32:15 2017 (r436849) @@ -3,24 +3,24 @@ # PROVIDE: minio # KEYWORD: shutdown -minio_enable="${minio_enable-NO}" -minio_config="${minio_config-%%PREFIX%%/etc/minio}" -minio_disks="${minio_disks-/var/db/minio}" -minio_address="${minio_address-:9000}" -minio_user="${minio_user-minio}" -minio_group="${minio_group-minio}" - . /etc/rc.subr name=minio -procname="%%PREFIX%%/bin/minio" rcvar=minio_enable load_rc_config ${name} +: ${minio_enable:="NO"} +: ${minio_config="%%PREFIX%%/etc/minio"} +: ${minio_disks="/var/db/minio"} +: ${minio_address=":9000"} +: ${minio_user:="%%USER%%"} +: ${minio_group:="%%GROUP%%"} + pidfile="/var/run/${name}.pid" +procname="%%PREFIX%%/bin/minio" command="/usr/sbin/daemon" -command_args="-c -p ${pidfile} /usr/bin/env ${minio_env} ${procname} -C \"${minio_config}\" server --address=\"${minio_address}\" --quiet ${minio_disks}" +command_args="-f -c -p ${pidfile} /usr/bin/env ${minio_env} ${procname} -C \"${minio_config}\" server --address=\"${minio_address}\" --quiet ${minio_disks}" start_precmd="minio_startprecmd"