From owner-svn-ports-branches@freebsd.org  Sat Nov 23 06:52:47 2019
Return-Path: <owner-svn-ports-branches@freebsd.org>
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 9501B1ABEB5;
 Sat, 23 Nov 2019 06:52:47 +0000 (UTC)
 (envelope-from antoine@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 47KkWg3RvGz3CG6;
 Sat, 23 Nov 2019 06:52:47 +0000 (UTC)
 (envelope-from antoine@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 599C78249;
 Sat, 23 Nov 2019 06:52:47 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAN6qlEx093958;
 Sat, 23 Nov 2019 06:52:47 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAN6ql96093957;
 Sat, 23 Nov 2019 06:52:47 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201911230652.xAN6ql96093957@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sat, 23 Nov 2019 06:52:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r518186 - in branches/2019Q4/sysutils/am-utils: . files
X-SVN-Group: ports-branches
X-SVN-Commit-Author: antoine
X-SVN-Commit-Paths: in branches/2019Q4/sysutils/am-utils: . files
X-SVN-Commit-Revision: 518186
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
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Nov 2019 06:52:47 -0000

Author: antoine
Date: Sat Nov 23 06:52:46 2019
New Revision: 518186
URL: https://svnweb.freebsd.org/changeset/ports/518186

Log:
  Revert r518165 and unbreak quarterly branch

Deleted:
  branches/2019Q4/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	Sat Nov 23 06:25:07 2019	(r518185)
+++ branches/2019Q4/sysutils/am-utils/Makefile	Sat Nov 23 06:52:46 2019	(r518186)
@@ -3,7 +3,7 @@
 
 PORTNAME=	am-utils
 PORTVERSION=	6.2
-PORTREVISION=	8
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/ \
@@ -44,9 +44,7 @@ OPENLDAP_VARS=			DOCS+="README.ldap ldap-id.txt ldap.s
 
 OPTIONS_SUB=	yes
 
-.if !exists(/etc/rc.d/amd)
-USE_RC_SUBR=	amd
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/am-utils.info*