Fix cfg file path

Add official fixes set

3 files changed, 61 insertions, 25 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 607d1578bab0..69ae7a90bfe4 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -3,14 +3,15 @@
 # Date created:         15 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.74 1997/12/21 21:58:27 jseger Exp $
+# $Id: Makefile,v 1.75 1998/01/08 00:30:56 jseger Exp $
 #
 
 DISTNAME=       lynx2-7-2
 PKGNAME=        lynx-2.7.2
 CATEGORIES=	www
-MASTER_SITES=   http://sol.slcc.edu/lynx/release/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=   http://sol.slcc.edu/lynx/release/ \
+		http://www.slcc.edu/lynx/fote/patches/
+DISTFILES=      lynx2-7-2.zip 272fixes.zip
 
 MAINTAINER=	jseger@FreeBSD.ORG
 
@@ -18,7 +19,7 @@ BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 MAN1=		lynx.1
 EXTRACT_CMD=	unzip
-EXTRACT_BEFORE_ARGS=	-qq
+EXTRACT_BEFORE_ARGS=    -qq -o
 ALL_TARGET=	freebsd-ncurses
 
 .include <bsd.port.mk>
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 1dec0c289110..c0e96354a069 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1 +1,2 @@
 MD5 (lynx2-7-2.zip) = 5a90e47091ff9d6ac1b9a63990581972
+MD5 (272fixes.zip) = 673b5c168a37d7b66cd2253044490c2b
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index 5db43bdec008..576bcd58352c 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,21 +1,55 @@
---- Makefile.orig	Thu Apr  3 09:55:28 1997
-+++ Makefile	Mon Dec  1 18:22:13 1997
-@@ -14,15 +14,15 @@
- 
- ##change the next line if you want lynx installed somewhere
- ##besides /usr/local/bin
--exec= /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= /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= /usr/local/lib
-+cfg= ${PREFIX}/etc
- 
- installbin= install -c -s -m 755
- installdoc= install -c -m 444
+*** Makefile.orig	Wed Dec 31 17:11:19 1997
+--- Makefile	Wed Jan 14 02:01:23 1998
+***************
+*** 1,6 ****
+--- 1,7 ----
+  ##makefile for lynx
+  
+  SHELL = /bin/sh
++ PREFIX ?= /usr/local
+  
+  ##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 ----
+  
+  # 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'\"'
+  
+  # if you are compiling on a previously unsupported system, modify
+  # this generic entry!!