From owner-svn-ports-all@freebsd.org  Mon Dec 26 11:30:06 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 687ECC9136E;
 Mon, 26 Dec 2016 11:30:06 +0000 (UTC)
 (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 3839F11E9;
 Mon, 26 Dec 2016 11:30:06 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQBU5dR064314;
 Mon, 26 Dec 2016 11:30:05 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQBU5vD064313;
 Mon, 26 Dec 2016 11:30:05 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201612261130.uBQBU5vD064313@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 26 Dec 2016 11:30:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r429492 - head/security/clamtk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Dec 2016 11:30:06 -0000

Author: amdmi3
Date: Mon Dec 26 11:30:05 2016
New Revision: 429492
URL: https://svnweb.freebsd.org/changeset/ports/429492

Log:
  - Don't replace /usr/bin with ${LOCALBASE}/bin as it does need /usr/bin (to search for crontab) and still does fall back to search in /usr/local (for clamav binaries)
  - Ensure that /usr/local is raplaced with ${LOCALBASE}
  - Switch to options helpers
  
  PR:		205952
  Submitted by:	lhersch@dssgmbh.de
  Approved by:	maintainer timeout (tj, almost a year)

Modified:
  head/security/clamtk/Makefile

Modified: head/security/clamtk/Makefile
==============================================================================
--- head/security/clamtk/Makefile	Mon Dec 26 11:12:53 2016	(r429491)
+++ head/security/clamtk/Makefile	Mon Dec 26 11:30:05 2016	(r429492)
@@ -37,7 +37,7 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/usr/bin|${LOCALBASE}/bin|g ; \
+		's|/usr/local|${LOCALBASE}|g ; \
 		 s|/usr/share|${PREFIX}/share|g ; \
 		 s|/var/lib/clamav|/var/db/clamav|g' ${WRKSRC}/lib/*.pm
 
@@ -55,6 +55,8 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/po/$${l}.mo \
 		${STAGEDIR}${PREFIX}/share/locale/$${l}/LC_MESSAGES/${PORTNAME}.mo; \
 	done
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in CHANGES DISCLAIMER README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}