From owner-svn-ports-all@FreeBSD.ORG  Wed Jan  9 13:17:28 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id DC436FD8;
 Wed,  9 Jan 2013 13:17:28 +0000 (UTC) (envelope-from sbz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9EBF5E96;
 Wed,  9 Jan 2013 13:17:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r09DHSqY085429;
 Wed, 9 Jan 2013 13:17:28 GMT (envelope-from sbz@svn.freebsd.org)
Received: (from sbz@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r09DHS8a085427;
 Wed, 9 Jan 2013 13:17:28 GMT (envelope-from sbz@svn.freebsd.org)
Message-Id: <201301091317.r09DHS8a085427@svn.freebsd.org>
From: Sofian Brabez <sbz@FreeBSD.org>
Date: Wed, 9 Jan 2013 13:17:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310142 - head/security/rkhunter
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jan 2013 13:17:28 -0000

Author: sbz
Date: Wed Jan  9 13:17:27 2013
New Revision: 310142
URL: http://svnweb.freebsd.org/changeset/ports/310142

Log:
  - Convert to new option framework

Modified:
  head/security/rkhunter/Makefile   (contents, props changed)
  head/security/rkhunter/pkg-descr   (contents, props changed)

Modified: head/security/rkhunter/Makefile
==============================================================================
--- head/security/rkhunter/Makefile	Wed Jan  9 13:13:02 2013	(r310141)
+++ head/security/rkhunter/Makefile	Wed Jan  9 13:17:27 2013	(r310142)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rkhunter
-# Date created:		15 May 2004
-# Whom:			Radim Kolar
-#
+# Created by: Radim Kolar
 # $FreeBSD$
-#
 
 PORTNAME=	rkhunter
 PORTVERSION=	1.4.0
@@ -14,10 +10,9 @@ MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Rootkit detection tool
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/files/LICENSE
 
-OPTIONS=	LSOF "Use LSOF" on \
-		NMAP "Use NMAP" off
+OPTIONS_DEFINE=	LSOF NMAP DOCS
+OPTIONS_DEFAULT=LSOF
 
 RUN_DEPENDS+=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
@@ -33,11 +28,11 @@ PORTDOCS=	ACKNOWLEDGMENTS CHANGELOG FAQ 
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_LSOF)
+.if ${PORT_OPTIONS:MLSOF}
 RUN_DEPENDS+=	lsof:${PORTSDIR}/sysutils/lsof
 .endif
 
-.if defined(WITH_NMAP)
+.if ${PORT_OPTIONS:MNMAP}
 RUN_DEPENDS+=	nmap:${PORTSDIR}/security/nmap
 .endif
 
@@ -51,7 +46,7 @@ do-install:
 		${MAN8PREFIX}/man/man8
 	@${MKDIR} ${PREFIX}/etc/periodic/security
 	${INSTALL_SCRIPT} ${WRKDIR}/415.${PORTNAME} ${PREFIX}/etc/periodic/security
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/files/|} ${DOCSDIR}
 .endif

Modified: head/security/rkhunter/pkg-descr
==============================================================================
--- head/security/rkhunter/pkg-descr	Wed Jan  9 13:13:02 2013	(r310141)
+++ head/security/rkhunter/pkg-descr	Wed Jan  9 13:17:27 2013	(r310142)
@@ -11,4 +11,4 @@ tests like:
 - Look for hidden files
 - Optional scan within plaintext and binary files
 
-WWW: http://rkhunter.sourceforge.net/
+WWW: http://rkhunter.sourceforge.net