diff --git a/www/lynx/Makefile b/www/lynx/Makefile index a4d729df531..221f44f5435 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,25 +1,37 @@ # OpenBSD makefile for: lynx # http://sol.slcc.edu/lynx/current/ -# Version required: 2.7.2 +# Version required: 2.8 # Date created: 17 November 1997 # Whom: gene # -# $OpenBSD: Makefile,v 1.9 1998/01/19 21:10:42 gene Exp $ +# $OpenBSD: Makefile,v 1.10 1998/03/12 07:48:28 marc Exp $ # -DISTNAME= lynx2-7-2 -PKGNAME= lynx-2.7.2 +PKGNAME= lynx-2.8 CATEGORIES= www -MASTER_SITES= http://sol.slcc.edu/lynx/release/ -EXTRACT_SUFX= .zip +MAINTAINER= ports@OpenBSD.ORG -MAINTAINER= gene@OpenBSD.ORG +NO_WRKDIR= "no working directory" +NO_CHECKSUM= "nothing to checksum" +NO_EXTRACT= "nothing to extract" +NO_PATCH= "nothing to patch" +NO_CONFIGURE= "nothing to configure" -BUILD_DEPENDS= unzip:$(PORTSDIR)/archivers/unzip +# Override fetch, nothing to fetch +# +do-fetch: + @${DO_NADA} -MAN1= lynx.1 -EXTRACT_CMD= $(PREFIX)/bin/unzip -EXTRACT_BEFORE_ARGS= -qq -ALL_TARGET= openbsd +# Override build. Nothing to build but this way the user still sees +# ===> Building for lynx-2.8 instead of nothing which is what we would +# get if NO_BUILD were defined. +# +do-build: + @${DO_NADA} + +# Just create a symbolic link to the standard distribution lynx +# +do-install: + @${LN} -fs /usr/bin/lynx ${PREFIX}/bin/lynx .include diff --git a/www/lynx/files/md5 b/www/lynx/files/md5 deleted file mode 100644 index 1dec0c28911..00000000000 --- a/www/lynx/files/md5 +++ /dev/null @@ -1 +0,0 @@ -MD5 (lynx2-7-2.zip) = 5a90e47091ff9d6ac1b9a63990581972 diff --git a/www/lynx/patches/patch-aa b/www/lynx/patches/patch-aa deleted file mode 100644 index b3cc44c20ff..00000000000 --- a/www/lynx/patches/patch-aa +++ /dev/null @@ -1,54 +0,0 @@ -*** Makefile.orig Mon Jan 12 11:48:03 1998 ---- Makefile Mon Jan 12 11:52:46 1998 -*************** -*** 211,216 **** ---- 211,217 ---- - @echo "news-slang -- for SONY NEWS-OS 4.2.1R with color slang package" - @echo "next -- for NeXT OS" - @echo "next-ncurses -- for NeXT OS using ncurses package" -+ @echo "openbsd -- for OpenBSD" - @echo "osf -- for Alpha OSF/1" - @echo "osf-slang -- for Alpha OSF/1 with color slang package" - @echo "ptx -- for Sequent's DYNIX/ptx, version 4, (current version)" -*************** -*** 987,992 **** ---- 988,1001 ---- - LIBS="-L/usr/local/lib -lncurses \ - $(WAISLIB) $(SOCKSLIB) $(SITE_LIBS)" \ - WWWLIB="../WWW/Library/next/libwww.a" -+ -+ openbsd: -+ cd WWW/Library/netbsd; $(MAKE) LYFLAGS="$(SITE_LYDEFS)" -+ cd src; $(MAKE) all CC="cc" MCFLAGS="-O -DFANCY_CURSES -DNCURSES \ -+ -DNCURSESHEADER -DUNIX -DNO_CUSERID -I../$(WWWINC) $(SITE_DEFS)" \ -+ LIBS="-lcurses -ltermlib -lcompat \ -+ $(WAISLIB) $(SOCKSLIB) $(SITE_LIBS)" \ -+ WWWLIB="../WWW/Library/netbsd/libwww.a" - - # isc - Interactive Unix for i386 and i486 machines - # According to Robert Salter (salter1@mster.nsbf.nasa.gov), -*** WWW/Library/netbsd/Makefile.orig Mon Jan 12 11:55:09 1998 ---- WWW/Library/netbsd/Makefile Mon Jan 12 11:58:21 1998 -*************** -*** 2,11 **** - # - - # For W3 distribution, machine type for subdirectories - WWW_MACH = netbsd - - # The ASIS repository's name for the machine we are on -! ASIS_MACH = i386/NetBSD - - - CFLAGS = -O -DUSE_DIRENT ---- 2,11 ---- - # - - # For W3 distribution, machine type for subdirectories - WWW_MACH = $(OPSYS) - - # The ASIS repository's name for the machine we are on -! ASIS_MACH = $(ARCH)/$(OPSYS) - - - CFLAGS = -O -DUSE_DIRENT diff --git a/www/lynx/patches/patch-ab b/www/lynx/patches/patch-ab deleted file mode 100644 index c7d3de68095..00000000000 --- a/www/lynx/patches/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ -*** src/LYCurses.h.orig Mon Jan 19 15:13:22 1998 ---- src/LYCurses.h Mon Jan 19 15:16:24 1998 -*************** -*** 41,47 **** - # ifdef __NetBSD__ - # include - # else -! # include - # endif /* __NetBSD__ */ - # endif /* NCURSESINCDIR */ - #else ---- 41,51 ---- - # ifdef __NetBSD__ - # include - # else -! # ifdef __OpenBSD__ -! # include -! # else -! # include /* fallthrough case */ -! # endif /* __OpenBSD__ */ - # endif /* __NetBSD__ */ - # endif /* NCURSESINCDIR */ - #else diff --git a/www/lynx/pkg/DESCR b/www/lynx/pkg/DESCR index 5d46780f5af..28345de944e 100644 --- a/www/lynx/pkg/DESCR +++ b/www/lynx/pkg/DESCR @@ -1,3 +1,9 @@ lynx is a program which allows a user to access World-Wide Web servers and other information servers. It uses only ascii representation so that it can be used from ascii-terminals and dialin-lines. + +lynx(1) was added to OpenBSD release 2.3. Therefore, it can be used +without installing this port. However, to maintain backward compatibility +with those who may have hard coded the path to lynx, the port can be' +installed. The installation will create a symbolic link to the released +version of lynx. A pkg_delete of this port will remove the link. diff --git a/www/lynx/pkg/PLIST b/www/lynx/pkg/PLIST index 67d846dc001..5a545c08939 100644 --- a/www/lynx/pkg/PLIST +++ b/www/lynx/pkg/PLIST @@ -1,5 +1 @@ bin/lynx -lib/lynx.cfg -man/man1/lynx.1 -@unexec rm -f %D/bin/lynx.old -@unexec rm -f %D/lib/lynx.oldcfg