4 files changed, 70 insertions, 61 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 2cb8ec70de2a..728363d0f2da 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,25 +1,32 @@
 # New ports collection makefile for:    lynx
-# Version required:     2.7.2
+# Version required:     2.8
 # Date created:         15 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.76 1998/01/13 23:29:08 ache Exp $
+# $Id: Makefile,v 1.77 1998/01/26 16:08:52 jseger Exp $
 #
 
-DISTNAME=       lynx2-7-2
-PKGNAME=        lynx-2.7.2
+DISTNAME=       lynx2-8
+PKGNAME=        lynx-2.8
 CATEGORIES=	www
-MASTER_SITES=   http://sol.slcc.edu/lynx/release/ \
-		http://www.freebsd.org/~jseger/
-DISTFILES=      lynx2-7-2.zip 272fixes.zip
+MASTER_SITES=   http://sol.slcc.edu/lynx/release/
 
 MAINTAINER=	jseger@FreeBSD.ORG
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-MAN1=		lynx.1
+EXTRACT_SUFX=   .zip
 EXTRACT_CMD=	unzip
 EXTRACT_BEFORE_ARGS=    -qq -o
-ALL_TARGET=	freebsd-ncurses
+
+GNU_CONFIGURE=  YES
+CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc"
+MAKEFILE=       makefile
+INSTALL_TARGET= install install-help
+MAN1=		lynx.1
+
+post-install:
+	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lynx_help
+	chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/etc/lynx.cfg
 
 .include <bsd.port.mk>
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index db61c7f79e4d..44afaacebabe 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1,2 +1 @@
-MD5 (lynx2-7-2.zip) = 5a90e47091ff9d6ac1b9a63990581972
-MD5 (272fixes.zip) = 2fd90daf942117276c29ef77d8445d85
+MD5 (lynx2-8.zip) = 9d981cbd55e8064d13a80b996e260ce0
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index 576bcd58352c..d1df17696a47 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,55 +1,19 @@
-*** Makefile.orig	Wed Dec 31 17:11:19 1997
---- Makefile	Wed Jan 14 02:01:23 1998
+*** makefile.in.bak	Sun Dec 14 02:30:40 1997
+--- makefile.in	Mon Dec 15 17:48:54 1997
 ***************
-*** 1,6 ****
---- 1,7 ----
-  ##makefile for lynx
+*** 37,43 ****
+  libdir= @libdir@
   
-  SHELL = /bin/sh
-+ PREFIX ?= /usr/local
+  ## Where you want the help-files installed
+! helpdir= @libdir@/lynx_help
   
-  ##uncomment the next line if your make fails to set $(MAKE)
-  #MAKE= make
-***************
-*** 14,28 ****
-  
-  ##change the next line if you want lynx installed somewhere
-  ##besides /usr/local/bin
-! exec= /usr/local/bin
-  
-  ##change the next line if you want the lynx man file installed somewhere
-  ##besides /usr/local/man/man1
-! doc= /usr/local/man/man1
-  
-  ##change the next line if you want the lynx.cfg file installed somewhere
-  ##besides /usr/local/lib
-! cfg= /usr/local/lib
-  
-  installbin= install -c -s -m 755
-  installdoc= install -c -m 444
---- 15,29 ----
-  
-  ##change the next line if you want lynx installed somewhere
-  ##besides /usr/local/bin
-! exec= ${PREFIX}/bin
-  
-  ##change the next line if you want the lynx man file installed somewhere
-  ##besides /usr/local/man/man1
-! doc= ${PREFIX}/man/man1
-  
-  ##change the next line if you want the lynx.cfg file installed somewhere
-  ##besides /usr/local/lib
-! cfg= ${PREFIX}/etc
-  
-  installbin= install -c -s -m 755
-  installdoc= install -c -m 444
-***************
-*** 274,279 ****
---- 275,281 ----
+  installbin= @INSTALL_PROGRAM@ -s -m 755
+  installdoc= @INSTALL_DATA@
+--- 37,43 ----
+  libdir= @libdir@
   
-  # Set SITE_DEFS to one or more of the defines for lynx below:
-  SITE_DEFS = $(DIR_DEFS) # Your defines here
-+ SITE_DEFS += -DLYNX_CFG_FILE='\"'$(PREFIX)/etc/lynx.cfg'\"'
+  ## Where you want the help-files installed
+! helpdir= $(prefix)/lib/lynx_help
   
-  # if you are compiling on a previously unsupported system, modify
-  # this generic entry!!
+  installbin= @INSTALL_PROGRAM@ -s -m 755
+  installdoc= @INSTALL_DATA@
diff --git a/www/lynx/pkg-plist b/www/lynx/pkg-plist
index ae7306329c4e..1b8bbaea4e0e 100644
--- a/www/lynx/pkg-plist
+++ b/www/lynx/pkg-plist
@@ -1,3 +1,42 @@
 bin/lynx
 etc/lynx.cfg
 man/man1/lynx.1.gz
+lib/lynx_help/keystrokes/cookie_help.html
+lib/lynx_help/keystrokes/visited_help.html
+lib/lynx_help/keystrokes/edit_help.html
+lib/lynx_help/keystrokes/dired_help.html
+lib/lynx_help/keystrokes/xterm_help.html
+lib/lynx_help/keystrokes/scrolling_help.html
+lib/lynx_help/keystrokes/print_help.html
+lib/lynx_help/keystrokes/other_help.html
+lib/lynx_help/keystrokes/option_help.html
+lib/lynx_help/keystrokes/movement_help.html
+lib/lynx_help/keystrokes/history_help.html
+lib/lynx_help/keystrokes/gopher_types_help.html
+lib/lynx_help/keystrokes/bookmark_help.html
+lib/lynx_help/keystrokes/keystroke_help.html
+lib/lynx_help/keystrokes/follow_help.html
+lib/lynx_help/lynx_url_support.html
+lib/lynx_help/Lynx_users_guide.html
+lib/lynx_help/lynx_help_main.html
+lib/lynx_help/about_lynx.html
+lib/lynx_help/lynx-dev.html
+lib/lynx_help/COPYHEADER
+lib/lynx_help/COPYING
+lib/lynx_help/PROBLEMS
+lib/lynx_help/README
+lib/lynx_help/samples/jumpsVMS.html
+lib/lynx_help/samples/jumpsUnix.html
+lib/lynx_help/samples/mime.types
+lib/lynx_help/samples/lynx.com
+lib/lynx_help/samples/mailcap
+lib/lynx_help/samples/lynx.lss
+lib/lynx_help/test/tabtest.html
+lib/lynx_help/test/iso8859-1.html
+lib/lynx_help/test/TestComment.html
+lib/lynx_help/test/ISO_LATIN1_test.html
+lib/lynx_help/test/README.txt
+lib/lynx_help/test/iso88592.html
+lib/lynx_help/test/ALT88592.html
+lib/lynx_help/test/unicode.html
+lib/lynx_help/test/sgml.html