Switch to lynx-ac

5 files changed, 58 insertions, 86 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 8ad471e50941..9588f104ec14 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,27 +1,27 @@
 # New ports collection makefile for:    lynx
-# http://www.crl.com/~subir/lynx.html
-# http://www.wfbr.edu/dir/lynx/
-# Version required:     2.7.1f
+# http://sol.slcc.edu/lynx/current/
+# Version required:     2.7.1ac
 # Date created:         15 Dec 1994
 # Whom:                 ache
 #
 # $Id: Makefile,v 1.41 1997/07/17 07:00:32 asami Exp $
 #
 
-DISTNAME=       lynx2-7-1
-PKGNAME=        lynx+fotemods-2.7.1f
+DISTNAME=       lynx2.7.1ac-0.44
+PKGNAME=        lynx-2.7.1ac-0.44
 CATEGORIES=	www
-MASTER_SITES=   http://www.slcc.edu/lynx/fote/patches/ \
-		http://www.slcc.edu/lynx/fote/
-DISTFILES=      lynx2-7-1.zip fotemods.zip
+MASTER_SITES=   http://sol.slcc.edu/lynx/current/
+WRKSRC=         ${WRKDIR}/lynx2-7-1
+GNU_CONFIGURE=  YES
+CONFIGURE_ARGS= --with-screen=ncurses
+MAKE_FLAGS=     libdir=${PREFIX}/etc \
+		SITE_DEFS=-DLYNX_CFG_FILE='\\\"${PREFIX}/etc/lynx.cfg\\\"' \
+		-f
+MAKEFILE=       makefile
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
-
-EXTRACT_CMD=    unzip
-EXTRACT_ARGS=   -q -u -o
-ALL_TARGET=     freebsd-ncurses
+ALL_TARGET=     lynx
 MAN1=		lynx.1
 
 .include <bsd.port.mk>
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index e6d949326fc3..8e0c1f5bc38e 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1,2 +1 @@
-MD5 (lynx2-7-1.zip) = 56a47b81fb76beddc79ed5fd629a5ec5
-MD5 (fotemods.zip) = f5561f2484af2a7d296b8a8eb78ff577
+MD5 (lynx2.7.1ac-0.44.tar.gz) = a78fe75d0c2fd9a2d770c652949a9485
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 8ad471e50941..9588f104ec14 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,27 +1,27 @@
 # New ports collection makefile for:    lynx
-# http://www.crl.com/~subir/lynx.html
-# http://www.wfbr.edu/dir/lynx/
-# Version required:     2.7.1f
+# http://sol.slcc.edu/lynx/current/
+# Version required:     2.7.1ac
 # Date created:         15 Dec 1994
 # Whom:                 ache
 #
 # $Id: Makefile,v 1.41 1997/07/17 07:00:32 asami Exp $
 #
 
-DISTNAME=       lynx2-7-1
-PKGNAME=        lynx+fotemods-2.7.1f
+DISTNAME=       lynx2.7.1ac-0.44
+PKGNAME=        lynx-2.7.1ac-0.44
 CATEGORIES=	www
-MASTER_SITES=   http://www.slcc.edu/lynx/fote/patches/ \
-		http://www.slcc.edu/lynx/fote/
-DISTFILES=      lynx2-7-1.zip fotemods.zip
+MASTER_SITES=   http://sol.slcc.edu/lynx/current/
+WRKSRC=         ${WRKDIR}/lynx2-7-1
+GNU_CONFIGURE=  YES
+CONFIGURE_ARGS= --with-screen=ncurses
+MAKE_FLAGS=     libdir=${PREFIX}/etc \
+		SITE_DEFS=-DLYNX_CFG_FILE='\\\"${PREFIX}/etc/lynx.cfg\\\"' \
+		-f
+MAKEFILE=       makefile
 
 MAINTAINER=	ache@FreeBSD.ORG
 
-BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
-
-EXTRACT_CMD=    unzip
-EXTRACT_ARGS=   -q -u -o
-ALL_TARGET=     freebsd-ncurses
+ALL_TARGET=     lynx
 MAN1=		lynx.1
 
 .include <bsd.port.mk>
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index e6d949326fc3..8e0c1f5bc38e 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1,2 +1 @@
-MD5 (lynx2-7-1.zip) = 56a47b81fb76beddc79ed5fd629a5ec5
-MD5 (fotemods.zip) = f5561f2484af2a7d296b8a8eb78ff577
+MD5 (lynx2.7.1ac-0.44.tar.gz) = a78fe75d0c2fd9a2d770c652949a9485
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index 5c1bf964e322..0e7eee2ccb51 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,58 +1,32 @@
-*** Makefile.orig	Mon Mar 17 09:18:40 1997
---- Makefile	Tue Mar 18 13:40:12 1997
+*** configure.bak	Mon Jul 28 04:36:15 1997
+--- configure	Tue Jul 29 00:22:49 1997
 ***************
-*** 14,31 ****
-  
-  ##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
-  
-  ##set the relative location of the WWW library Implementation directory,
-  ##from this directory
---- 14,31 ----
-  
-  ##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 ${BINMODE} -o ${BINOWN} -g ${BINGRP}
-! installdoc= ${INSTALL} -c -m ${MANMODE} -o ${MANOWN} -g ${MANGRP}
-  
-  ##set the relative location of the WWW library Implementation directory,
-  ##from this directory
+*** 5058,5063 ****
+--- 5058,5064 ----
+  	cat > conftest.$ac_ext <<EOF
+  #line 5060 "configure"
+  #include "confdefs.h"
++ #include <sys/types.h>
+  #include <utmp.h>
+  int main() {
+  struct utmp x; char *y = &x.ut_host[0]
+*** aclocal.m4.orig	Mon Jul 28 04:36:15 1997
+--- aclocal.m4	Tue Jul 29 14:08:40 1997
 ***************
-*** 270,276 ****
-  SITE_LYDEFS = $(DIR_LYDEFS) # Your defines here
-  
-  # Set SITE_DEFS to one or more of the defines for lynx below:
-! SITE_DEFS = $(DIR_DEFS) # Your defines here
-  
-  # if you are compiling on a previously unsupported system, modify
-  # this generic entry!!
---- 270,276 ----
-  SITE_LYDEFS = $(DIR_LYDEFS) # Your defines here
-  
-  # Set SITE_DEFS to one or more of the defines for lynx below:
-! SITE_DEFS = $(DIR_DEFS) -DLYNX_CFG_FILE='\"${PREFIX}/etc/lynx.cfg\"'
-  
-  # if you are compiling on a previously unsupported system, modify
-  # this generic entry!!
+*** 891,897 ****
+  [
+  AC_MSG_CHECKING(if struct utmp is declared)
+  AC_CACHE_VAL(cf_cv_have_utmp,[
+! 	AC_TRY_COMPILE([#include <utmp.h>],
+  	[struct utmp x; char *y = &x.ut_host[0]],
+  	[cf_cv_have_utmp=yes],
+  	[AC_TRY_COMPILE([#include <utmpx.h>],
+--- 891,898 ----
+  [
+  AC_MSG_CHECKING(if struct utmp is declared)
+  AC_CACHE_VAL(cf_cv_have_utmp,[
+! 	AC_TRY_COMPILE([#include <sys/types.h>
+! #include <utmp.h>],
+  	[struct utmp x; char *y = &x.ut_host[0]],
+  	[cf_cv_have_utmp=yes],
+  	[AC_TRY_COMPILE([#include <utmpx.h>],