From owner-svn-ports-head@FreeBSD.ORG Mon Apr 22 13:21:00 2013 Return-Path: Delivered-To: svn-ports-head@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 31502EAD; Mon, 22 Apr 2013 13:21:00 +0000 (UTC) (envelope-from ak@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 09C1B1B04; Mon, 22 Apr 2013 13:21:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MDKxfg055320; Mon, 22 Apr 2013 13:20:59 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3MDKxQ2055319; Mon, 22 Apr 2013 13:20:59 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201304221320.r3MDKxQ2055319@svn.freebsd.org> From: Alex Kozlov Date: Mon, 22 Apr 2013 13:20:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316229 - head/www/lynx X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2013 13:21:00 -0000 Author: ak Date: Mon Apr 22 13:20:59 2013 New Revision: 316229 URL: http://svnweb.freebsd.org/changeset/ports/316229 Log: - Convert to new options framework - Remove indefinite article from COMMENT - Convert Makefile headers to new style PR: ports/178046 Approved by: Jason Harris (maintainer) Feature safe: yes Modified: head/www/lynx/Makefile (contents, props changed) Modified: head/www/lynx/Makefile ============================================================================== --- head/www/lynx/Makefile Mon Apr 22 13:15:06 2013 (r316228) +++ head/www/lynx/Makefile Mon Apr 22 13:20:59 2013 (r316229) @@ -1,9 +1,5 @@ -# New ports collection makefile for: lynx -# Date created: 15 Dec 1994 -# Whom: Andrey Chernov -# +# Created by: Andrey Chernov # $FreeBSD$ -# PORTNAME= lynx PORTVERSION= 2.8.7.2 @@ -13,7 +9,7 @@ MASTER_SITES= http://lynx.isc.org/curren DISTNAME= ${PORTNAME}${PORTVERSION:R}rel.${PORTVERSION:E} MAINTAINER= jharris@widomaker.com -COMMENT= A non-graphical, text-based World-Wide Web client +COMMENT= Non-graphical, text-based World-Wide Web client CONFLICTS= lynx-2.8.[8-9]* @@ -28,14 +24,13 @@ CONFIGURE_ARGS+=--with-zlib --libdir="${ MAKE_JOBS_UNSAFE= yes -OPTIONS= SSL "SSL support" on \ - DEFAULT_COLORS "Colors support" off \ - IPV6 "IPv6 support" off \ - NLS "Native language support" on +OPTIONS_DEFINE= DEFAULT_COLORS IPV6 NLS SSL +OPTIONS_DEFAULT= SSL +DEFAULT_COLORS_DESC= Colors support -.include +.include -.if defined(WITHOUT_NLS) +.if empty(PORT_OPTIONS:MNLS) CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS='@comment ' .else @@ -45,21 +40,21 @@ CONFIGURE_ARGS+=--enable-nls --with-libi PLIST_SUB+= NLS='' .endif -.if defined(WITH_IPV6) && !defined(NO_INET6) +.if ${PORT_OPTIONS:MIPV6} && !defined(NO_INET6) CONFIGURE_ARGS+=--enable-ipv6 .else CONFIGURE_ARGS+=--disable-ipv6 .endif -.if defined(WITH_SSL) +.if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .endif -.if defined(WITH_DEFAULT_COLORS) +.if ${PORT_OPTIONS:MDEFAULT_COLORS} CONFIGURE_ARGS+=--enable-default-colors .endif -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) CONFIGURE_ARGS+=--disable-local-docs INSTALL_TARGET= install DOCSDIR= @@ -78,7 +73,7 @@ L_LIB= ${PREFIX}/etc SUB_FILES= pkg-message post-install: -.if defined(NOPORTDOCS) +.if empty(PORT_OPTIONS:MDOCS) [ -f ${L_LIB}/lynx.cfg ] || ${INSTALL} ${L_LIB}/lynx.cfg.sample ${L_LIB}/lynx.cfg [ -f ${L_LIB}/lynx.lss ] || ${INSTALL} ${L_LIB}/lynx.lss.sample ${L_LIB}/lynx.lss .else @@ -87,4 +82,4 @@ post-install: .endif ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg -.include +.include