From owner-svn-ports-all@FreeBSD.ORG  Mon Nov 19 16:22:35 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9048C753;
 Mon, 19 Nov 2012 16:22:35 +0000 (UTC) (envelope-from wxs@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 5A7D28FC08;
 Mon, 19 Nov 2012 16:22:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAJGMZfa097392;
 Mon, 19 Nov 2012 16:22:35 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAJGMZps097391;
 Mon, 19 Nov 2012 16:22:35 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201211191622.qAJGMZps097391@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Mon, 19 Nov 2012 16:22:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307565 - head/net/silc-client
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: Mon, 19 Nov 2012 16:22:35 -0000

Author: wxs
Date: Mon Nov 19 16:22:34 2012
New Revision: 307565
URL: http://svnweb.freebsd.org/changeset/ports/307565

Log:
  Convert to new options.
  Avoid using != in assignment.
  
  Feature safe:	yes

Modified:
  head/net/silc-client/Makefile   (contents, props changed)

Modified: head/net/silc-client/Makefile
==============================================================================
--- head/net/silc-client/Makefile	Mon Nov 19 15:17:56 2012	(r307564)
+++ head/net/silc-client/Makefile	Mon Nov 19 16:22:34 2012	(r307565)
@@ -34,11 +34,10 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--without-libtoolfix
 WANT_PERL=	yes
 
-OPTIONS=	PTHREADS "Enable pthreads support" off \
-		IPV6 "Enable IPv6 support" on \
-		ICONV "Enable international character support" on \
-		PERL "Enable perl support" on \
-		OPTIMIZED_ASM "Use assembler optimizations (i386 only)" on
+OPTIONS_DEFINE=	PTHREADS IPV6 ICONV PERL OPTIMIZED_ASM
+PTHREADS_DESC=	"Enable pthreads support"
+OPTIMIZED_ASM_DESC=	"Use assembler optimizations (i386 only)"
+OPTIONS_DEFAULT=	IPV6 ICONV PERL OPTIMIZED_ASM
 
 .ifdef(IRSSI_PLUGIN)
 CONFIGURE_ARGS+=	--with-silc-plugin=${PREFIX}/lib/irssi \
@@ -83,41 +82,40 @@ post-install:
 	fi
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} != "i386"
 WITHOUT_OPTIMIZED_ASM=	yes
 .endif
 
-.if defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITH_ICONV)
+.if ${PORT_OPTIONS:MICONV}
 USE_ICONV=		yes
 CONFIGURE_ARGS+=	--with-iconv
 .else
 CONFIGURE_ARGS+=	--without-iconv
 .endif
 
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=		yes
-PERL_ARCHNAME!=		${PERL} -V:archname 2>/dev/null || true
-PLIST_SUB+=		WITH_PERL="" PERL_ARCHNAME=${PERL_ARCHNAME:S/archname='//:S/';//}
+PLIST_SUB+=		WITH_PERL="" PERL_ARCHNAME="${ARCH}-freebsd"
 CONFIGURE_ARGS+=	--with-perl-lib=${PREFIX}/lib/${PORTNAME}/perl
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
-.if defined(WITHOUT_OPTIMIZED_ASM)
+.if ${PORT_OPTIONS:MOPTIMIZED_ASM}
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
-.if defined(WITH_PTHREADS)
+.if ${PORT_OPTIONS:MPTHREADS}
 CFLAGS+=		${PTHREAD_CFLAGS} ${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--without-pthreads
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>