svn commit: r358514 - head/www/lynx

[Adam Weinberger]

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 <bsd.port.options.mk>
+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 <bsd.port.options.mk>
 
-.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 <bsd.port.mk>

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
- at 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
- at exec if [ ! -f %B/lynx.cfg ]; then cp -p %D/%F %B/lynx.cfg; fi
- at 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
- at exec if [ ! -f %B/lynx.lss ]; then cp -p %D/%F %B/lynx.lss; fi
+ at sample etc/lynx.cfg.sample
+ at sample etc/lynx.lss.sample
 man/man1/lynx.1.gz
 @exec mkdir -p %D/%%PORTDOCS%%/share/lynx_help
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES