From owner-svn-ports-head@freebsd.org Thu Nov 21 15:22:53 2019 Return-Path: Delivered-To: svn-ports-head@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 D1D6A1C2635; Thu, 21 Nov 2019 15:22:53 +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 47Jjx958t5z4Y2q; Thu, 21 Nov 2019 15:22:53 +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 946B7D4A5; Thu, 21 Nov 2019 15:22:53 +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 xALFMriK094707; Thu, 21 Nov 2019 15:22:53 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xALFMrrC094705; Thu, 21 Nov 2019 15:22:53 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201911211522.xALFMrrC094705@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 21 Nov 2019 15:22:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518101 - in head/sysutils/am-utils: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/sysutils/am-utils: . files X-SVN-Commit-Revision: 518101 X-SVN-Commit-Repository: ports 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.29 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: Thu, 21 Nov 2019 15:22:53 -0000 Author: cy Date: Thu Nov 21 15:22:52 2019 New Revision: 518101 URL: https://svnweb.freebsd.org/changeset/ports/518101 Log: 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. MFH: 2019Q4 Modified: head/sysutils/am-utils/Makefile head/sysutils/am-utils/files/amd.in Modified: head/sysutils/am-utils/Makefile ============================================================================== --- head/sysutils/am-utils/Makefile Thu Nov 21 15:04:12 2019 (r518100) +++ head/sysutils/am-utils/Makefile Thu Nov 21 15:22:52 2019 (r518101) @@ -3,7 +3,7 @@ PORTNAME= am-utils PORTVERSION= 6.2 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= sysutils net MASTER_SITES= ftp://ftp.am-utils.org/pub/am-utils/ \ @@ -16,10 +16,9 @@ COMMENT= Berkeley Automounter Suite of Utilities LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= OPENLDAP DOCS RC +OPTIONS_DEFINE= OPENLDAP DOCS OPTIONS_DEFAULT=OPENLDAP OPENLDAP_DESC= OpenLDAP support -RC_DESC= Use the rc script in this port USES= autoreconf:build bison libtool makeinfo perl5 USE_LDCONFIG= yes @@ -44,7 +43,9 @@ OPENLDAP_PORTDOCS= README.ldap ldap-id.txt ldap.schem OPTIONS_SUB= yes -RC_USE_RC_SUBR= amd +.if !exists(/etc/rc.d/amd) +USE_RC_SUBR= amd +.endif post-patch: @${RM} ${WRKSRC}/doc/am-utils.info* Modified: head/sysutils/am-utils/files/amd.in ============================================================================== --- head/sysutils/am-utils/files/amd.in Thu Nov 21 15:04:12 2019 (r518100) +++ head/sysutils/am-utils/files/amd.in Thu Nov 21 15:22:52 2019 (r518101) @@ -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"