svn commit: r518101 - in head/sysutils/am-utils: . files
Cy Schubert
cy at FreeBSD.org
Thu Nov 21 15:22:53 UTC 2019
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"
More information about the svn-ports-head
mailing list