From owner-svn-ports-branches@freebsd.org Fri Nov 22 21:03:42 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CCA11C1895; Fri, 22 Nov 2019 21:03:42 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47KTRy0Kxvz4FvT; Fri, 22 Nov 2019 21:03:42 +0000 (UTC) (envelope-from cy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C93EB169E; Fri, 22 Nov 2019 21:03:41 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAML3fsO044940; Fri, 22 Nov 2019 21:03:41 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAML3fhg044938; Fri, 22 Nov 2019 21:03:41 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201911222103.xAML3fhg044938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 22 Nov 2019 21:03:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r518165 - in branches/2019Q4/sysutils/am-utils: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in branches/2019Q4/sysutils/am-utils: . files X-SVN-Commit-Revision: 518165 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Nov 2019 21:03:42 -0000 Author: cy Date: Fri Nov 22 21:03:41 2019 New Revision: 518165 URL: https://svnweb.freebsd.org/changeset/ports/518165 Log: MFH: r518051 r518052 r518101 Add rc.d support, stealing the rc.d file from base. Make the installation of the rc script conditional to avoid conflict with base. Rather than an option, automatically detect if the target system has an amd rc script. Eventually when amd is removed from base packages will automatically include the rc script. Adjust the location of the amd binary in the supplied rc script. Approved by: portmgr (joneum) Added: branches/2019Q4/sysutils/am-utils/files/amd.in - copied, changed from r518051, head/sysutils/am-utils/files/amd.in Modified: branches/2019Q4/sysutils/am-utils/Makefile Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/sysutils/am-utils/Makefile ============================================================================== --- branches/2019Q4/sysutils/am-utils/Makefile Fri Nov 22 20:51:54 2019 (r518164) +++ branches/2019Q4/sysutils/am-utils/Makefile Fri Nov 22 21:03:41 2019 (r518165) @@ -3,7 +3,7 @@ PORTNAME= am-utils PORTVERSION= 6.2 -PORTREVISION= 4 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= sysutils net MASTER_SITES= ftp://ftp.am-utils.org/pub/am-utils/ \ @@ -44,7 +44,9 @@ OPENLDAP_VARS= DOCS+="README.ldap ldap-id.txt ldap.s OPTIONS_SUB= yes -.include +.if !exists(/etc/rc.d/amd) +USE_RC_SUBR= amd +.endif post-patch: @${RM} ${WRKSRC}/doc/am-utils.info* Copied and modified: branches/2019Q4/sysutils/am-utils/files/amd.in (from r518051, head/sysutils/am-utils/files/amd.in) ============================================================================== --- head/sysutils/am-utils/files/amd.in Wed Nov 20 21:16:14 2019 (r518051, copy source) +++ branches/2019Q4/sysutils/am-utils/files/amd.in Fri Nov 22 21:03:41 2019 (r518165) @@ -14,7 +14,7 @@ name="amd" desc="Automatically mount filesystems" rcvar="amd_enable" -command="/usr/sbin/${name}" +command=%%PREFIX%%/sbin/${name} start_precmd="amd_precmd" command_args="&" extra_commands="reload"