svn commit: r419634 - head/www/lynx
Pawel Pekala
pawel at FreeBSD.org
Thu Aug 4 17:34:25 UTC 2016
Author: pawel
Date: Thu Aug 4 17:34:24 2016
New Revision: 419634
URL: https://svnweb.freebsd.org/changeset/ports/419634
Log:
- Add external applications support, on by default [1]
- Remove L_LIB variable, it's only used in one place
- Convert SSL option to helpers, port links to ssl libs only when SSL=on
- Move variable setting before options block
- Make symlinks point to relative not full paths, post-install should
be executed only when DOCS=on otherwise build fails as files
are not there
PR: 211242 [1]
Submitted by: kaltheat at gmail.com [1]
Approved by: maintainer [1]
Modified:
head/www/lynx/Makefile
Modified: head/www/lynx/Makefile
==============================================================================
--- head/www/lynx/Makefile Thu Aug 4 17:30:18 2016 (r419633)
+++ head/www/lynx/Makefile Thu Aug 4 17:34:24 2016 (r419634)
@@ -3,7 +3,7 @@
PORTNAME= lynx
PORTVERSION= 2.8.8.2
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= http://invisible-mirror.net/archives/lynx/tarballs/ \
@@ -19,21 +19,24 @@ CONFLICTS= lynx-2.8.[8-9]d*
USES= cpe ncurses shebangfix tar:bzip2
SHEBANG_FILES= samples/mailto-form.pl
-USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}2-8-8
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--with-zlib --libdir="${L_LIB}" \
+CONFIGURE_ARGS+=--with-zlib --libdir="${PREFIX}/etc" \
--enable-nsl-fork --enable-persistent-cookies \
--enable-nested-tables --enable-gzip-help \
--with-screen=ncursesw
CPE_VERSION= ${PORTVERSION:R}
CPE_UPDATE= rel.${PORTVERSION:E}
+MAKEFILE= makefile
+L_HELP= ${PREFIX}/share/lynx_help
+SUB_FILES= pkg-message
MAKE_JOBS_UNSAFE= yes
-OPTIONS_DEFINE= DEFAULT_COLORS IPV6 NLS SSL DOCS
-OPTIONS_DEFAULT= SSL
+OPTIONS_DEFINE= DEFAULT_COLORS IPV6 NLS SSL DOCS EXTERNALS
+OPTIONS_DEFAULT= SSL EXTERNALS
DEFAULT_COLORS_DESC= Colors support
+EXTERNALS_DESC= External application support
OPTIONS_SUB= yes
NLS_USES= gettext iconv
@@ -47,25 +50,16 @@ DEFAULT_COLORS_CONFIGURE_ENABLE= default
DOCS_CONFIGURE_ENABLE= local-docs
DOCS_INSTALL_TARGET= install-full
DOCS_MAKE_ARGS= helpdir=${L_HELP} docdir=${DOCSDIR}
-L_HELP= ${PREFIX}/share/lynx_help
-.include <bsd.port.options.mk>
+EXTERNALS_CONFIGURE_ENABLE=externs
-.if ${PORT_OPTIONS:MSSL}
-CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
-.endif
-
-MAKEFILE= makefile
-
-L_LIB= ${PREFIX}/etc
-
-SUB_FILES= pkg-message
+SSL_CONFIGURE_ON= --with-ssl=${OPENSSLBASE}
+SSL_USES= ssl
-post-install:
+post-install-DOCS-on:
# Fix some stage symlinks
- ${LN} -sf ${DOCSDIR}/COPYHEADER ${STAGEDIR}${L_HELP}
- ${LN} -sf ${DOCSDIR}/COPYING ${STAGEDIR}${L_HELP}
- ${LN} -sf ${DOCSDIR}/COPYHEADER.asc ${STAGEDIR}${L_HELP}
- ${LN} -sf ${DOCSDIR}/COPYING.asc ${STAGEDIR}${L_HELP}
+.for doc in COPYHEADER COPYING COPYHEADER.asc COPYING.asc
+ (cd ${STAGEDIR}${L_HELP} && ln -sf ../doc/lynx/${doc} .)
+.endfor
.include <bsd.port.mk>
More information about the svn-ports-head
mailing list