svn commit: r518165 - in branches/2019Q4/sysutils/am-utils: . files

[Cy Schubert]

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 <bsd.port.options.mk>
+.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"