From owner-svn-ports-head@FreeBSD.ORG  Sun Sep  9 21:12:47 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EABDE1065678;
	Sun,  9 Sep 2012 21:12:47 +0000 (UTC)
	(envelope-from ehaupt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BE8F28FC15;
	Sun,  9 Sep 2012 21:12:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q89LClmN038636;
	Sun, 9 Sep 2012 21:12:47 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q89LCl4D038634;
	Sun, 9 Sep 2012 21:12:47 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201209092112.q89LCl4D038634@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Sun, 9 Sep 2012 21:12:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303997 - head/security/vpnc
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Sep 2012 21:12:48 -0000

Author: ehaupt
Date: Sun Sep  9 21:12:47 2012
New Revision: 303997
URL: http://svn.freebsd.org/changeset/ports/303997

Log:
  - Use OPTIONSng
  - Remove deprecated header information

Modified:
  head/security/vpnc/Makefile

Modified: head/security/vpnc/Makefile
==============================================================================
--- head/security/vpnc/Makefile	Sun Sep  9 21:03:25 2012	(r303996)
+++ head/security/vpnc/Makefile	Sun Sep  9 21:12:47 2012	(r303997)
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	vpnc
-# Date created:				15 December 2003
-# Whom:					Christian Lackas
-#
 # $FreeBSD$
-#
 
 PORTNAME=	vpnc
 PORTVERSION=	0.5.3
@@ -28,15 +23,18 @@ ALL_TARGET=	all
 PORTDOCS=	README TODO
 MAN8=		vpnc.8
 
-OPTIONS+=	DECRYPT       "cisco-decypt password decrypt utility"      on
-OPTIONS+=	SSL           "OpenSSL certificate support (hybrid only)"  off
-OPTIONS+=	CISCOVERSION  "Mask linux presentation string"             off
-
 MAKE_ENV+=	BINS="${EXTRABUILDS}"
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DECRYPT SSL CISCOVERSION
+
+DECRYPT_DESC=		cisco-decypt password decrypt utility
+CISCOVERSION_DESC=	Mask linux presentation string
+
+OPTIONS_DEFAULT=DECRYPT
+
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DECRYPT)
+.if ${PORT_OPTIONS:MDECRYPT}
 MAN1=		cisco-decrypt.1
 EXTRABUILDS+=	cisco-decrypt
 PLIST_SUB+=	DECRYPT=""
@@ -44,13 +42,13 @@ PLIST_SUB+=	DECRYPT=""
 PLIST_SUB+=	DECRYPT="@comment "
 .endif
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 NO_PACKAGE=	binary linked against OpenSSL must not be redistributed
 CFLAGS+=	-DOPENSSL_GPL_VIOLATION
 LDFLAGS+=	-lcrypto
 .endif
 
-.if defined(WITH_CISCOVERSION)
+.if ${PORT_OPTIONS:MCISCOVERSION}
 CFLAGS+=	-DCISCO_PATCH_VERSION
 .endif
 
@@ -61,7 +59,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${PREFIX}/sbin/vpnc
-.if defined(WITH_DECRYPT)
+.if ${PORT_OPTIONS:MDECRYPT}
 	${INSTALL_PROGRAM} ${WRKSRC}/cisco-decrypt ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
 .endif
@@ -77,4 +75,4 @@ do-install:
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>