From owner-svn-ports-all@FreeBSD.ORG Fri Jun 20 07:12:23 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B64E2C3; Fri, 20 Jun 2014 07:12:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 893062DB8; Fri, 20 Jun 2014 07:12:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5K7CNBJ036503; Fri, 20 Jun 2014 07:12:23 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5K7CNHA036501; Fri, 20 Jun 2014 07:12:23 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201406200712.s5K7CNHA036501@svn.freebsd.org> From: Adam Weinberger Date: Fri, 20 Jun 2014 07:12:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358514 - 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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 07:12:23 -0000 Author: adamw Date: Fri Jun 20 07:12:22 2014 New Revision: 358514 URL: http://svnweb.freebsd.org/changeset/ports/358514 QAT: https://qat.redports.org/buildarchive/r358514/ Log: Use OPTIONS helpers and @sample, and add DOCS to OPTIONS_DEFINE. PORTREVISION bump. Modified: head/www/lynx/Makefile head/www/lynx/pkg-plist Modified: head/www/lynx/Makefile ============================================================================== --- head/www/lynx/Makefile Fri Jun 20 07:05:08 2014 (r358513) +++ head/www/lynx/Makefile Fri Jun 20 07:12:22 2014 (r358514) @@ -3,6 +3,7 @@ PORTNAME= lynx PORTVERSION= 2.8.7.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= http://lynx.isc.org/current/ @@ -13,7 +14,7 @@ COMMENT= Non-graphical, text-based World CONFLICTS= lynx-2.8.[8-9]* -USE_BZIP2= yes +USES= tar:bzip2 USE_OPENSSL= yes WRKSRC= ${WRKDIR}/${PORTNAME}2-8-7 GNU_CONFIGURE= yes @@ -24,44 +25,28 @@ CONFIGURE_ARGS+=--with-zlib --libdir="${ MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= DEFAULT_COLORS IPV6 NLS SSL +OPTIONS_DEFINE= DEFAULT_COLORS IPV6 NLS SSL DOCS OPTIONS_DEFAULT= SSL DEFAULT_COLORS_DESC= Colors support +OPTIONS_SUB= yes -.include +NLS_USES= gettext iconv +NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} -.if empty(PORT_OPTIONS:MNLS) -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS='@comment ' -.else -USES+= gettext iconv -CONFIGURE_ARGS+=--enable-nls ${ICONV_CONFIGURE_ARG} -PLIST_SUB+= NLS='' -.endif +IPV6_CONFIGURE_ENABLE= ipv6 -.if ${PORT_OPTIONS:MIPV6} && !defined(NO_INET6) -CONFIGURE_ARGS+=--enable-ipv6 -.else -CONFIGURE_ARGS+=--disable-ipv6 -.endif +DEFAULT_COLORS_CONFIGURE_ENABLE= default-colors -.if ${PORT_OPTIONS:MSSL} -CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} -.endif +DOCS_CONFIGURE_ENABLE= local-docs +DOCS_INSTALL_TARGET= install-full +DOCS_MAKE_ARGS= helpdir=${L_HELP} docdir=${DOCSDIR} +L_HELP= ${PREFIX}/share/lynx_help -.if ${PORT_OPTIONS:MDEFAULT_COLORS} -CONFIGURE_ARGS+=--enable-default-colors -.endif +.include -.if empty(PORT_OPTIONS:MDOCS) -CONFIGURE_ARGS+=--disable-local-docs -INSTALL_TARGET= install -DOCSDIR= -L_HELP= -.else -INSTALL_TARGET= install-full -L_HELP= ${PREFIX}/share/lynx_help -MAKE_ARGS= helpdir=${L_HELP} docdir=${DOCSDIR} +.if ${PORT_OPTIONS:MSSL} +CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .endif MAKEFILE= makefile @@ -71,10 +56,8 @@ L_LIB= ${PREFIX}/etc SUB_FILES= pkg-message post-install: -.if ${PORT_OPTIONS:MDOCS} # Fix some stage symlinks ${LN} -sf ${DOCSDIR}/COPYHEADER ${STAGEDIR}${L_HELP} ${LN} -sf ${DOCSDIR}/COPYING ${STAGEDIR}${L_HELP} -.endif .include Modified: head/www/lynx/pkg-plist ============================================================================== --- head/www/lynx/pkg-plist Fri Jun 20 07:05:08 2014 (r358513) +++ head/www/lynx/pkg-plist Fri Jun 20 07:12:22 2014 (r358514) @@ -1,10 +1,6 @@ bin/lynx -@unexec if cmp -s %D/etc/lynx.cfg %D/etc/lynx.cfg.sample; then rm -f %D/etc/lynx.cfg; fi -etc/lynx.cfg.sample -@exec if [ ! -f %B/lynx.cfg ]; then cp -p %D/%F %B/lynx.cfg; fi -@unexec if cmp -s %D/etc/lynx.lss %D/etc/lynx.lss.sample; then rm -f %D/etc/lynx.lss; fi -etc/lynx.lss.sample -@exec if [ ! -f %B/lynx.lss ]; then cp -p %D/%F %B/lynx.lss; fi +@sample etc/lynx.cfg.sample +@sample etc/lynx.lss.sample man/man1/lynx.1.gz @exec mkdir -p %D/%%PORTDOCS%%/share/lynx_help %%PORTDOCS%%%%DOCSDIR%%/CHANGES