Upgrade to pre11

4 files changed, 13 insertions, 71 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index b7d530951dcf..9a5a0198a119 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    lynx
 # http://sol.slcc.edu/lynx/current/
-# Version required:     2.8.1dev.X
+# Version required:     2.8.1pre.X
 # Date created:         15 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.91 1998/08/23 05:01:14 ache Exp $
+# $Id: Makefile,v 1.92 1998/09/07 19:34:50 ache Exp $
 #
 
-DISTNAME=       lynx2.8.1dev.25
-PKGNAME=        lynx-2.8.1dev.25
+DISTNAME=       lynx2.8.1pre.11
+PKGNAME=        lynx-2.8.1pre.11
 CATEGORIES=	www
 MASTER_SITES=   http://sol.slcc.edu/lynx/current/
 
@@ -17,14 +17,18 @@ MAINTAINER=	ache@FreeBSD.ORG
 NO_LATEST_LINK=	YES
 WRKSRC=         ${WRKDIR}/lynx2-8-1
 GNU_CONFIGURE=  YES
-CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc" \
-		--enable-nsl-fork
+CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
+		--enable-nsl-fork --enable-persistent-cookies
+MAKE_FLAGS=     helpdir=${L_HELP} -f
 MAKEFILE=       makefile
 INSTALL_TARGET= install install-help
 MAN1=		lynx.1
 
+L_LIB=          ${PREFIX}/etc
+L_HELP=         ${PREFIX}/lib/lynx_help
+
 post-install:
-	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lynx_help
-	chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/etc/lynx.cfg
+	chown -R ${SHAREOWN}:${SHAREGRP} ${L_HELP}
+	chown ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg
 
 .include <bsd.port.mk>
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index ea8667e097b8..80f687c1d8a1 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8.1dev.25.tar.gz) = 62a24965ccedae939b185ba26f63843c
+MD5 (lynx2.8.1pre.11.tar.gz) = 6c83a955f8fdcf9091b0b3ad4de22191
diff --git a/www/lynx-current/files/patch-aa b/www/lynx-current/files/patch-aa
deleted file mode 100644
index 8d594ee59e05..000000000000
--- a/www/lynx-current/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-*** makefile.in.orig	Mon Sep  7 14:02:16 1998
---- makefile.in	Mon Sep  7 23:23:06 1998
-***************
-*** 43,49 ****
-  libdir= @libdir@
-  
-  ## Where you want the help-files installed
-! helpdir= @libdir@/lynx_help
-  
-  ##set the relative location of the WWW library Implementation directory,
-  ##from this directory
---- 43,49 ----
-  libdir= @libdir@
-  
-  ## Where you want the help-files installed
-! helpdir= $(prefix)/lib/lynx_help
-  
-  ##set the relative location of the WWW library Implementation directory,
-  ##from this directory
-***************
-*** 319,325 ****
-  
-  install-log : $(libdir) config.cache
-  	-@sed	-e '/^#/d' \
-! 		-e 's/^.._cv_\(.*\)=.*=\(.*\)\}/\1=\2/g' \
-  		config.cache | \
-  	$(AWK) -F= '{printf "%-30s = %s\n",$$1,$$2}' |sort > $(libdir)/lynx_site.txt
-  
---- 319,325 ----
-  
-  install-log : $(libdir) config.cache
-  	-@sed	-e '/^#/d' \
-! 		-e 's/^.._cv_\(.*\)=.*=\(.*\)}/\1=\2/g' \
-  		config.cache | \
-  	$(AWK) -F= '{printf "%-30s = %s\n",$$1,$$2}' |sort > $(libdir)/lynx_site.txt
-  
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index 99af552ec551..1766f548b0e5 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -1,11 +1,6 @@
 bin/lynx
 etc/lynx.cfg
-lib/lynx_help/CHANGES
-lib/lynx_help/COPYHEADER
-lib/lynx_help/COPYING
 lib/lynx_help/Lynx_users_guide.html
-lib/lynx_help/PROBLEMS
-lib/lynx_help/README
 lib/lynx_help/about_lynx.html
 lib/lynx_help/keystrokes/bookmark_help.html
 lib/lynx_help/keystrokes/cookie_help.html
@@ -25,26 +20,5 @@ lib/lynx_help/keystrokes/xterm_help.html
 lib/lynx_help/lynx-dev.html
 lib/lynx_help/lynx_help_main.html
 lib/lynx_help/lynx_url_support.html
-lib/lynx_help/samples/jumpsUnix.html
-lib/lynx_help/samples/jumpsVMS.html
-lib/lynx_help/samples/lynx-keymaps
-lib/lynx_help/samples/lynx.com
-lib/lynx_help/samples/lynx.lss
-lib/lynx_help/samples/mailcap
-lib/lynx_help/samples/mime.types
-lib/lynx_help/test/ALT88592.html
-lib/lynx_help/test/ISO_LATIN1_test.html
-lib/lynx_help/test/README.txt
-lib/lynx_help/test/TestComment.html
-lib/lynx_help/test/c1.html
-lib/lynx_help/test/iso8859-1.html
-lib/lynx_help/test/iso88592.html
-lib/lynx_help/test/raw8bit.html
-lib/lynx_help/test/sgml.html
-lib/lynx_help/test/spaces.html
-lib/lynx_help/test/tabtest.html
-lib/lynx_help/test/unicode.html
 @dirrm lib/lynx_help/keystrokes
-@dirrm lib/lynx_help/samples
-@dirrm lib/lynx_help/test
 @dirrm lib/lynx_help