From owner-svn-ports-all@FreeBSD.ORG  Sun Nov 25 03:21:09 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 EAA063C3;
 Sun, 25 Nov 2012 03:21:09 +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 B699D8FC12;
 Sun, 25 Nov 2012 03:21:09 +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 qAP3L9aj084362;
 Sun, 25 Nov 2012 03:21:09 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAP3L9O1084360;
 Sun, 25 Nov 2012 03:21:09 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201211250321.qAP3L9O1084360@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Sun, 25 Nov 2012 03:21:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307732 - 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: Sun, 25 Nov 2012 03:21:10 -0000

Author: wxs
Date: Sun Nov 25 03:21:09 2012
New Revision: 307732
URL: http://svnweb.freebsd.org/changeset/ports/307732

Log:
  Rename OPTIMIZED_ASM option to just ASM. This one has a description
  in bsd.options.desc.mk.
  
  Fix build on i386 by partially reverting r307565. Only a partial revert
  because I worked around a bug where ${PERL} was not recognized after switching
  to new style options.
  
  Feature safe:	yes

Modified:
  head/net/silc-client/Makefile

Modified: head/net/silc-client/Makefile
==============================================================================
--- head/net/silc-client/Makefile	Sat Nov 24 22:16:37 2012	(r307731)
+++ head/net/silc-client/Makefile	Sun Nov 25 03:21:09 2012	(r307732)
@@ -34,10 +34,10 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--without-libtoolfix
 WANT_PERL=	yes
 
-OPTIONS_DEFINE=	PTHREADS IPV6 ICONV PERL OPTIMIZED_ASM
+OPTIONS_DEFINE=	PTHREADS IPV6 ICONV PERL
+OPTIONS_DEFINE_i386=	ASM
 PTHREADS_DESC=	Enable pthreads support
-OPTIMIZED_ASM_DESC=	Use assembler optimizations (i386 only)
-OPTIONS_DEFAULT=	IPV6 ICONV PERL OPTIMIZED_ASM
+OPTIONS_DEFAULT=	IPV6 ICONV PERL ASM
 
 .ifdef(IRSSI_PLUGIN)
 CONFIGURE_ARGS+=	--with-silc-plugin=${PREFIX}/lib/irssi \
@@ -84,10 +84,6 @@ post-install:
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} != "i386"
-WITHOUT_OPTIMIZED_ASM=	yes
-.endif
-
 .if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
@@ -101,14 +97,15 @@ CONFIGURE_ARGS+=	--without-iconv
 
 .if ${PORT_OPTIONS:MPERL}
 USE_PERL5=		yes
-PLIST_SUB+=		WITH_PERL="" PERL_ARCHNAME="${ARCH}-freebsd"
+PERL_ARCHNAME!=		perl -V:archname
+PLIST_SUB+=		WITH_PERL="" PERL_ARCHNAME="${PERL_ARCHNAME:S/archname='//:S/';//}"
 CONFIGURE_ARGS+=	--with-perl-lib=${PREFIX}/lib/${PORTNAME}/perl
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MOPTIMIZED_ASM}
+.if empty(${PORT_OPTIONS:MASM})
 CONFIGURE_ARGS+=	--disable-asm
 .endif