4 files changed, 65 insertions, 61 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index f9379098ce41..83774e5cb0ed 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=	2.8.7d4
+PORTVERSION=	2.8.7d5
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://lynx.isc.org/current/
-DISTNAME=	${PORTNAME}2.8.7dev.4
+DISTNAME=	${PORTNAME}2.8.7dev.5
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	A non-graphical, text-based World-Wide Web client
@@ -18,13 +18,17 @@ RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
 WRKSRC=		${WRKDIR}/${PORTNAME}2-8-7
 USE_BZIP2=	yes
+USE_ICONV=	yes
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
+CONFIGURE_ARGS= --with-screen=ncursesw --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-nls --with-bzlib \
-		--enable-nested-tables --enable-locale-charset \
-		--enable-scrollbar --enable-addrlist-page
+		--enable-nested-tables --enable-default-colors \
+		--enable-scrollbar --enable-addrlist-page \
+		--enable-gzip-help \
+		--with-mime-libdir=${PREFIX}/etc \
+		--with-libiconv-prefix=${LOCALBASE}
 
 .ifndef NO_OPENSSL
 USE_OPENSSL=	yes
@@ -41,9 +45,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CC="${CC} -Ichrtrans -I${LOCALBASE}/include -Darc4random_push=" LDFLAGS="${LDFLAGS}" \
-		LIBS=-lncurses
+CONFIGURE_ENV+= CC="${CC} -Ichrtrans"
 MAKE_FLAGS=	helpdir=${L_HELP} docdir=${L_DOC} -f
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-full
@@ -61,11 +63,6 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-patch:
-	${REINPLACE_CMD} \
-		-e 's:/usr/local/lib/mosaic/mime\.types:${PREFIX}/etc/mime.types:' \
-		${WRKSRC}/lynx.cfg ${WRKSRC}/userdefs.h
-
 post-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_DOC}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_HELP}
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index 70f56793634a..818fb131ee70 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1,3 +1,3 @@
-MD5 (lynx2.8.7dev.4.tar.bz2) = 8e65d8375ab70964c83803ea6b71a549
-SHA256 (lynx2.8.7dev.4.tar.bz2) = 67e0b027f03bf40734f561cfe61136debe62e8100b6f7bf7c7243458b2a08bfa
-SIZE (lynx2.8.7dev.4.tar.bz2) = 2279807
+MD5 (lynx2.8.7dev.5.tar.bz2) = 65d2635a99aa18ae04d0e228b13e0738
+SHA256 (lynx2.8.7dev.5.tar.bz2) = e7f7098fd04f25bf1a713418f65bf2c7890d8d36b4fba04acc93702a50adc197
+SIZE (lynx2.8.7dev.5.tar.bz2) = 2287744
diff --git a/www/lynx-current/files/patch-aa b/www/lynx-current/files/patch-aa
index e53ee9ebdb39..8e88ed2357ae 100644
--- a/www/lynx-current/files/patch-aa
+++ b/www/lynx-current/files/patch-aa
@@ -1,11 +1,12 @@
---- makefile.in.orig	Mon Sep  4 03:25:39 2006
-+++ makefile.in	Wed Oct  4 03:19:56 2006
-@@ -360,13 +360,9 @@
+--- makefile.in.orig	Fri May 18 02:53:22 2007
++++ makefile.in	Fri May 25 05:06:51 2007
+@@ -365,14 +365,9 @@
  		if test "$(COMPRESS_PROG)" != "" ; then \
  			(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
  		fi'
 -	@echo Updating $(sysconfdir)/lynx.cfg
--	@ECHO_CC@$(SHELL) -c 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
+-	@ECHO_CC@$(SHELL) -c \
+-	'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
 -		mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
 -	else \
 -		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
@@ -17,7 +18,7 @@
  	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
  		-e '/^#HELPFILE:file/s!#!!' \
  		$(SYSCONFDIR)/lynx.tmp | \
-@@ -374,9 +370,10 @@
+@@ -380,9 +375,10 @@
  	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
  	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
  		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
@@ -30,7 +31,7 @@
  
  LYHelp.h : help_files.sed LYHelp.hin
  	@echo Creating $@
-@@ -398,7 +395,7 @@
+@@ -404,7 +400,7 @@
  	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
  
  install-cfg : $(SYSCONFDIR)
@@ -38,4 +39,4 @@
 +	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.default
  
  install-lss : $(SYSCONFDIR)
- 	-mv -f $(SYSCONFDIR)/lynx.lss $(SYSCONFDIR)/lynx.oldlss
+ 	@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index c6ef080709ff..e0f1f3e19b80 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -15,16 +15,16 @@ etc/lynx.lss
 %%DOCSDIR%%/COPYING.asc
 %%DOCSDIR%%/PROBLEMS
 %%DOCSDIR%%/README
-%%DOCSDIR%%/docs/CHANGES2.3
-%%DOCSDIR%%/docs/CHANGES2.4
-%%DOCSDIR%%/docs/CHANGES2.5
-%%DOCSDIR%%/docs/CHANGES2.6
-%%DOCSDIR%%/docs/CHANGES2.7
-%%DOCSDIR%%/docs/CHANGES2.8
-%%DOCSDIR%%/docs/CRAWL.announce
-%%DOCSDIR%%/docs/FM.announce
-%%DOCSDIR%%/docs/IBMPC-charsets.announce
-%%DOCSDIR%%/docs/OS-390.announce
+%%DOCSDIR%%/docs/CHANGES2.3.gz
+%%DOCSDIR%%/docs/CHANGES2.4.gz
+%%DOCSDIR%%/docs/CHANGES2.5.gz
+%%DOCSDIR%%/docs/CHANGES2.6.gz
+%%DOCSDIR%%/docs/CHANGES2.7.gz
+%%DOCSDIR%%/docs/CHANGES2.8.gz
+%%DOCSDIR%%/docs/CRAWL.announce.gz
+%%DOCSDIR%%/docs/FM.announce.gz
+%%DOCSDIR%%/docs/IBMPC-charsets.announce.gz
+%%DOCSDIR%%/docs/OS-390.announce.gz
 %%DOCSDIR%%/docs/README.TRST
 %%DOCSDIR%%/docs/README.chartrans
 %%DOCSDIR%%/docs/README.defines
@@ -33,16 +33,18 @@ etc/lynx.lss
 %%DOCSDIR%%/docs/README.rootcerts
 %%DOCSDIR%%/docs/README.ssl
 %%DOCSDIR%%/docs/README.sslcerts
-%%DOCSDIR%%/docs/SOCKETSHR.announce
-%%DOCSDIR%%/docs/TCPWARE.announce
-%%DOCSDIR%%/docs/VMSWAIS.announce
+%%DOCSDIR%%/docs/SOCKETSHR.announce.gz
+%%DOCSDIR%%/docs/TCPWARE.announce.gz
+%%DOCSDIR%%/docs/VMSWAIS.announce.gz
 %%DOCSDIR%%/docs/djgpp.key
+%%DOCSDIR%%/docs/index.html
 %%DOCSDIR%%/docs/pdcurses.key
 %%DOCSDIR%%/docs/slang.key
-%%DOCSDIR%%/docs/win-386.announce
+%%DOCSDIR%%/docs/win-386.announce.gz
 %%DOCSDIR%%/samples/blue-background.lss
 %%DOCSDIR%%/samples/bright-blue.lss
 %%DOCSDIR%%/samples/cernrules.txt
+%%DOCSDIR%%/samples/index.html
 %%DOCSDIR%%/samples/installdirs.html
 %%DOCSDIR%%/samples/jumpsUnix.html
 %%DOCSDIR%%/samples/jumpsVMS.html
@@ -61,6 +63,7 @@ etc/lynx.lss
 %%DOCSDIR%%/test/README.txt
 %%DOCSDIR%%/test/TestComment.html
 %%DOCSDIR%%/test/c1.html
+%%DOCSDIR%%/test/index.html
 %%DOCSDIR%%/test/iso-8859-1.html
 %%DOCSDIR%%/test/iso-8859-2.html
 %%DOCSDIR%%/test/koi8-r.html
@@ -78,6 +81,7 @@ etc/lynx.lss
 %%NLS%%share/locale/cs/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/da/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/en/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/et/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/lynx.mo
@@ -94,30 +98,32 @@ etc/lynx.lss
 %%NLS%%share/locale/vi/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lynx.mo
-share/lynx_help/Lynx_users_guide.html
-share/lynx_help/about_lynx.html
-share/lynx_help/keystrokes/alt_edit_help.html
-share/lynx_help/keystrokes/bashlike_edit_help.html
-share/lynx_help/keystrokes/bookmark_help.html
-share/lynx_help/keystrokes/cookie_help.html
-share/lynx_help/keystrokes/dired_help.html
-share/lynx_help/keystrokes/edit_help.html
-share/lynx_help/keystrokes/environments.html
-share/lynx_help/keystrokes/follow_help.html
-share/lynx_help/keystrokes/gopher_types_help.html
-share/lynx_help/keystrokes/history_help.html
-share/lynx_help/keystrokes/keystroke_help.html
-share/lynx_help/keystrokes/movement_help.html
-share/lynx_help/keystrokes/option_help.html
-share/lynx_help/keystrokes/other_help.html
-share/lynx_help/keystrokes/print_help.html
-share/lynx_help/keystrokes/scrolling_help.html
-share/lynx_help/keystrokes/test_display.html
-share/lynx_help/keystrokes/visited_help.html
-share/lynx_help/keystrokes/xterm_help.html
-share/lynx_help/lynx-dev.html
-share/lynx_help/lynx_help_main.html
-share/lynx_help/lynx_url_support.html
+share/lynx_help/Lynx_users_guide.html.gz
+share/lynx_help/about_lynx.html.gz
+share/lynx_help/index.html.gz
+share/lynx_help/keystrokes/alt_edit_help.html.gz
+share/lynx_help/keystrokes/bashlike_edit_help.html.gz
+share/lynx_help/keystrokes/bookmark_help.html.gz
+share/lynx_help/keystrokes/cookie_help.html.gz
+share/lynx_help/keystrokes/dired_help.html.gz
+share/lynx_help/keystrokes/edit_help.html.gz
+share/lynx_help/keystrokes/environments.html.gz
+share/lynx_help/keystrokes/follow_help.html.gz
+share/lynx_help/keystrokes/gopher_types_help.html.gz
+share/lynx_help/keystrokes/history_help.html.gz
+share/lynx_help/keystrokes/index.html.gz
+share/lynx_help/keystrokes/keystroke_help.html.gz
+share/lynx_help/keystrokes/movement_help.html.gz
+share/lynx_help/keystrokes/option_help.html.gz
+share/lynx_help/keystrokes/other_help.html.gz
+share/lynx_help/keystrokes/print_help.html.gz
+share/lynx_help/keystrokes/scrolling_help.html.gz
+share/lynx_help/keystrokes/test_display.html.gz
+share/lynx_help/keystrokes/visited_help.html.gz
+share/lynx_help/keystrokes/xterm_help.html.gz
+share/lynx_help/lynx-dev.html.gz
+share/lynx_help/lynx_help_main.html.gz
+share/lynx_help/lynx_url_support.html.gz
 @dirrm %%DOCSDIR%%/samples
 @dirrm %%DOCSDIR%%/test
 @dirrm %%DOCSDIR%%/docs