diff options
| -rw-r--r-- | www/lynx/Makefile | 20 | ||||
| -rw-r--r-- | www/lynx/PLIST | 26 | ||||
| -rw-r--r-- | www/lynx/distinfo | 11 | ||||
| -rw-r--r-- | www/lynx/patches/patch-ac | 18 | ||||
| -rw-r--r-- | www/lynx/patches/patch-af | 27 |
5 files changed, 58 insertions, 44 deletions
diff --git a/www/lynx/Makefile b/www/lynx/Makefile index b69d12313a0..d0c4c049b83 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,22 +1,16 @@ -# $NetBSD: Makefile,v 1.105 2009/05/01 15:16:12 zafer Exp $ +# $NetBSD: Makefile,v 1.106 2009/08/09 08:20:27 wiz Exp $ -# -# NOTE: Please do not enable the lynxcgi feature unless it is lynx -# version 2.8.6dev.15 or later. There is a known security issue -# with this feature in earlier versions (CVE-2005-2929, CVE-2008-4690). -# - -DISTNAME= lynx2.8.6rel.5 -PKGNAME= lynx-2.8.6.5 -PKGREVISION= 2 +DISTNAME= lynx2.8.7 +PKGNAME= lynx-2.8.7 CATEGORIES= www MASTER_SITES= http://lynx.isc.org/${SUBDIR:Q}/ \ - ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/ + ftp://ftp.cyf-kr.edu.pl/pub/unix/lynx/${SUBDIR:Q}/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://lynx.isc.org/ COMMENT= Alphanumeric display oriented World-Wide Web Client +LICENSE= gnu-gpl-v2 # problem with WWW/Library/Implementation MAKE_JOBS_SAFE= no @@ -24,8 +18,8 @@ MAKE_JOBS_SAFE= no PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir -SUBDIR= current -WRKSRC= ${WRKDIR}/lynx2-8-6 +SUBDIR= ${DISTNAME} +WRKSRC= ${WRKDIR}/lynx2-8-7 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes BROKEN_GETTEXT_DETECTION= yes diff --git a/www/lynx/PLIST b/www/lynx/PLIST index a977a7c9587..c3cd2617f28 100644 --- a/www/lynx/PLIST +++ b/www/lynx/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2009/06/14 22:00:25 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2009/08/09 08:20:27 wiz Exp $ bin/lynx man/man1/lynx.1 share/examples/lynx/lynx.cfg @@ -7,15 +7,17 @@ share/locale/ca/LC_MESSAGES/lynx.mo share/locale/cs/LC_MESSAGES/lynx.mo share/locale/da/LC_MESSAGES/lynx.mo share/locale/de/LC_MESSAGES/lynx.mo +share/locale/en/LC_MESSAGES/lynx.mo share/locale/et/LC_MESSAGES/lynx.mo +share/locale/fi/LC_MESSAGES/lynx.mo share/locale/fr/LC_MESSAGES/lynx.mo share/locale/hu/LC_MESSAGES/lynx.mo +share/locale/id/LC_MESSAGES/lynx.mo share/locale/it/LC_MESSAGES/lynx.mo share/locale/ja/LC_MESSAGES/lynx.mo share/locale/nl/LC_MESSAGES/lynx.mo share/locale/pt_BR/LC_MESSAGES/lynx.mo share/locale/ru/LC_MESSAGES/lynx.mo -share/locale/rw/LC_MESSAGES/lynx.mo share/locale/sl/LC_MESSAGES/lynx.mo share/locale/sv/LC_MESSAGES/lynx.mo share/locale/tr/LC_MESSAGES/lynx.mo @@ -42,9 +44,11 @@ share/lynx/lynx_doc/docs/IBMPC-charsets.announce.gz share/lynx/lynx_doc/docs/OS-390.announce.gz share/lynx/lynx_doc/docs/README.TRST share/lynx/lynx_doc/docs/README.chartrans +share/lynx/lynx_doc/docs/README.cookies share/lynx/lynx_doc/docs/README.defines share/lynx/lynx_doc/docs/README.jp share/lynx/lynx_doc/docs/README.metrics +share/lynx/lynx_doc/docs/README.options share/lynx/lynx_doc/docs/README.rootcerts share/lynx/lynx_doc/docs/README.ssl share/lynx/lynx_doc/docs/README.sslcerts @@ -52,32 +56,48 @@ share/lynx/lynx_doc/docs/SOCKETSHR.announce.gz share/lynx/lynx_doc/docs/TCPWARE.announce.gz share/lynx/lynx_doc/docs/VMSWAIS.announce.gz share/lynx/lynx_doc/docs/djgpp.key +share/lynx/lynx_doc/docs/index.html share/lynx/lynx_doc/docs/pdcurses.key share/lynx/lynx_doc/docs/slang.key share/lynx/lynx_doc/docs/win-386.announce.gz share/lynx/lynx_doc/samples/blue-background.lss share/lynx/lynx_doc/samples/bright-blue.lss share/lynx/lynx_doc/samples/cernrules.txt +share/lynx/lynx_doc/samples/home.htm +share/lynx/lynx_doc/samples/index.html share/lynx/lynx_doc/samples/installdirs.html +share/lynx/lynx_doc/samples/jumps.htm share/lynx/lynx_doc/samples/jumpsUnix.html share/lynx/lynx_doc/samples/jumpsVMS.html share/lynx/lynx_doc/samples/keepviewer +share/lynx/lynx_doc/samples/lynx-demo.cfg share/lynx/lynx_doc/samples/lynx-keymaps +share/lynx/lynx_doc/samples/lynx.bat share/lynx/lynx_doc/samples/lynx.com +share/lynx/lynx_doc/samples/lynx.ico share/lynx/lynx_doc/samples/lynx.lss +share/lynx/lynx_doc/samples/lynx_bookmarks.htm share/lynx/lynx_doc/samples/lynxdump share/lynx/lynx_doc/samples/mailcap share/lynx/lynx_doc/samples/mailto-form.pl +share/lynx/lynx_doc/samples/midnight.lss share/lynx/lynx_doc/samples/mild-colors.lss share/lynx/lynx_doc/samples/mime.types share/lynx/lynx_doc/samples/oldlynx +share/lynx/lynx_doc/samples/opaque.lss share/lynx/lynx_doc/test/ALT88592.html share/lynx/lynx_doc/test/ISO_LATIN1_test.html share/lynx/lynx_doc/test/README.txt share/lynx/lynx_doc/test/TestComment.html +share/lynx/lynx_doc/test/bad-html.html share/lynx/lynx_doc/test/c1.html +share/lynx/lynx_doc/test/cp-1252.html +share/lynx/lynx_doc/test/cp-1252a.html +share/lynx/lynx_doc/test/index.html share/lynx/lynx_doc/test/iso-8859-1.html +share/lynx/lynx_doc/test/iso-8859-1a.html share/lynx/lynx_doc/test/iso-8859-2.html +share/lynx/lynx_doc/test/iso-8859-2a.html share/lynx/lynx_doc/test/koi8-r.html share/lynx/lynx_doc/test/quickbrown.html share/lynx/lynx_doc/test/raw8bit.html @@ -93,6 +113,7 @@ share/lynx/lynx_help/COPYHEADER share/lynx/lynx_help/COPYING share/lynx/lynx_help/Lynx_users_guide.html.gz share/lynx/lynx_help/about_lynx.html.gz +share/lynx/lynx_help/index.html.gz share/lynx/lynx_help/keystrokes/alt_edit_help.html.gz share/lynx/lynx_help/keystrokes/bashlike_edit_help.html.gz share/lynx/lynx_help/keystrokes/bookmark_help.html.gz @@ -103,6 +124,7 @@ share/lynx/lynx_help/keystrokes/environments.html.gz share/lynx/lynx_help/keystrokes/follow_help.html.gz share/lynx/lynx_help/keystrokes/gopher_types_help.html.gz share/lynx/lynx_help/keystrokes/history_help.html.gz +share/lynx/lynx_help/keystrokes/index.html.gz share/lynx/lynx_help/keystrokes/keystroke_help.html.gz share/lynx/lynx_help/keystrokes/movement_help.html.gz share/lynx/lynx_help/keystrokes/option_help.html.gz diff --git a/www/lynx/distinfo b/www/lynx/distinfo index c3bc2e6820e..d39d8491d4d 100644 --- a/www/lynx/distinfo +++ b/www/lynx/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.25 2007/05/11 22:22:40 wiz Exp $ +$NetBSD: distinfo,v 1.26 2009/08/09 08:20:27 wiz Exp $ -SHA1 (lynx2.8.6rel.5.tar.bz2) = 019246b83fc7b6cb32bac0023f2ae6c5d330d18c -RMD160 (lynx2.8.6rel.5.tar.bz2) = 0ea800c3204d66c1470f63a0143fd71eca06e005 -Size (lynx2.8.6rel.5.tar.bz2) = 2290787 bytes +SHA1 (lynx2.8.7.tar.bz2) = f5e67a298322b22fe0edcfba326c02eaa5edcb72 +RMD160 (lynx2.8.7.tar.bz2) = 0969f85b6776c5e426cea4b910271356f9193bf1 +Size (lynx2.8.7.tar.bz2) = 2432045 bytes SHA1 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9 SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a -SHA1 (patch-af) = be52c260ee5c052984e247bc04b5d6bb5bc6c1c2 +SHA1 (patch-ac) = 863e5ddac0496caa0f9611c0794ced8006897439 +SHA1 (patch-af) = 79188265d998d962675e221d170042cc35182e8e diff --git a/www/lynx/patches/patch-ac b/www/lynx/patches/patch-ac new file mode 100644 index 00000000000..f78ed79acd4 --- /dev/null +++ b/www/lynx/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.3 2009/08/09 08:20:27 wiz Exp $ + +LYMain.c: In function 'SetLocale': +LYMain.c:941: error: 'LC_ALL' undeclared (first use in this function) +LYMain.c:941: error: (Each undeclared identifier is reported only once +LYMain.c:941: error: for each function it appears in.) + +--- src/LYMain.c.orig 2009-07-05 23:52:33.000000000 +0000 ++++ src/LYMain.c +@@ -57,7 +57,7 @@ + #include <io.h> + #endif + +-#if defined(LOCALE) && !defined(HAVE_LIBINTL_H) ++#if defined(LOCALE) + #undef gettext /* Solaris locale.h prototypes gettext() */ + #include <locale.h> + #ifndef HAVE_GETTEXT diff --git a/www/lynx/patches/patch-af b/www/lynx/patches/patch-af index 139bf1dd844..1f109a62589 100644 --- a/www/lynx/patches/patch-af +++ b/www/lynx/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.5 2007/03/10 14:10:40 tron Exp $ +$NetBSD: patch-af,v 1.6 2009/08/09 08:20:27 wiz Exp $ ---- po/makefile.inn.orig 2004-01-28 19:30:38.000000000 +0000 +--- po/makefile.inn.orig 2008-09-21 22:49:47.000000000 +0000 +++ po/makefile.inn -@@ -71,6 +71,11 @@ INSTOBJEXT = @INSTOBJEXT@ +@@ -80,6 +80,11 @@ INSTOBJEXT = @INSTOBJEXT@ $(MSGFMT) -o $@ $< .po.gmo: @@ -14,24 +14,3 @@ $NetBSD: patch-af,v 1.5 2007/03/10 14:10:40 tron Exp $ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< -@@ -113,16 +118,16 @@ install-data: install-data-@USE_NLS@ - install-data-no: all - install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ -- $(MKINSTALLDIRS) $(datadir); \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ -- $(SHELL) $(top_srcdir)/mkdirs.sh $(datadir); \ -+ $(SHELL) $(top_srcdir)/mkdirs.sh $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - case "$$cat" in \ -- *.gmo) destdir=$(gnulocaledir);; \ -- *) destdir=$(localedir);; \ -+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ -+ *) destdir=$(DESTDIR)$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ |