update www/lynx

To: "pkgsrc-users%netbsd.org@localhost" <pkgsrc-users%netbsd.org@localhost>
Subject: update www/lynx
From: "Larson, Timothy E." <TELarson%west.com@localhost>
Date: Thu, 20 Aug 2009 11:10:39 -0500
I took a stab at updating Lynx to the newest release branch, 2.8.7.  It seems 
to work on Solaris 9, but not NetBSD 5.  Is anyone interested in working with 
me to review/improve this?  Or maybe someone is already working on this?

Thanks,
Tim


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/lynx/Makefile,v
retrieving revision 1.105
diff -u -r1.105 Makefile
--- Makefile    1 May 2009 15:16:12 -0000       1.105
+++ Makefile    20 Aug 2009 16:04:46 -0000
@@ -6,12 +6,11 @@
 # 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.7rel.1
+PKGNAME=       lynx-2.8.7.1
 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@localhost
@@ -25,7 +24,7 @@
 PKG_DESTDIR_SUPPORT=   user-destdir

 SUBDIR=                        current
-WRKSRC=                        ${WRKDIR}/lynx2-8-6
+WRKSRC=                        ${WRKDIR}/lynx2-8-7
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 BROKEN_GETTEXT_DETECTION= yes
@@ -36,8 +35,8 @@
 CONFIGURE_ENV+=                UNZIP=${TOOLS_PATH.unzip:Q}
 USE_TOOLS+=            gzip msgfmt unzip:run

-CONF_FILES+=           share/examples/lynx/lynx.cfg ${PKG_SYSCONFDIR}/lynx.cfg
-CONF_FILES+=           share/examples/lynx/lynx.lss ${PKG_SYSCONFDIR}/lynx.lss
+CONF_FILES+=           ${PKG_SYSCONFDIR}/lynx.cfg
+CONF_FILES+=           ${PKG_SYSCONFDIR}/lynx.lss

 # But no dependency on Perl.
 REPLACE_PERL+=                 samples/mailto-form.pl
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/lynx/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- PLIST       14 Jun 2009 22:00:25 -0000      1.11
+++ PLIST       20 Aug 2009 16:04:46 -0000
@@ -1,21 +1,22 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 22:00:25 joerg Exp $
+@comment $NetBSD$
 bin/lynx
-man/man1/lynx.1
-share/examples/lynx/lynx.cfg
-share/examples/lynx/lynx.lss
+etc/lynx.cfg
+etc/lynx.lss
 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
@@ -23,76 +24,14 @@
 share/locale/vi/LC_MESSAGES/lynx.mo
 share/locale/zh_CN/LC_MESSAGES/lynx.mo
 share/locale/zh_TW/LC_MESSAGES/lynx.mo
-share/lynx/lynx_doc/CHANGES
-share/lynx/lynx_doc/COPYHEADER
-share/lynx/lynx_doc/COPYHEADER.asc
-share/lynx/lynx_doc/COPYING
-share/lynx/lynx_doc/COPYING.asc
-share/lynx/lynx_doc/PROBLEMS
-share/lynx/lynx_doc/README
-share/lynx/lynx_doc/docs/CHANGES2.3.gz
-share/lynx/lynx_doc/docs/CHANGES2.4.gz
-share/lynx/lynx_doc/docs/CHANGES2.5.gz
-share/lynx/lynx_doc/docs/CHANGES2.6.gz
-share/lynx/lynx_doc/docs/CHANGES2.7.gz
-share/lynx/lynx_doc/docs/CHANGES2.8.gz
-share/lynx/lynx_doc/docs/CRAWL.announce.gz
-share/lynx/lynx_doc/docs/FM.announce.gz
-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.defines
-share/lynx/lynx_doc/docs/README.jp
-share/lynx/lynx_doc/docs/README.metrics
-share/lynx/lynx_doc/docs/README.rootcerts
-share/lynx/lynx_doc/docs/README.ssl
-share/lynx/lynx_doc/docs/README.sslcerts
-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/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/installdirs.html
-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-keymaps
-share/lynx/lynx_doc/samples/lynx.com
-share/lynx/lynx_doc/samples/lynx.lss
-share/lynx/lynx_doc/samples/lynxdump
-share/lynx/lynx_doc/samples/mailcap
+man/man1/lynx.1
+share/examples/lynx/lynx.cfg
+share/examples/lynx/lynx.lss
 share/lynx/lynx_doc/samples/mailto-form.pl
-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/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/c1.html
-share/lynx/lynx_doc/test/iso-8859-1.html
-share/lynx/lynx_doc/test/iso-8859-2.html
-share/lynx/lynx_doc/test/koi8-r.html
-share/lynx/lynx_doc/test/quickbrown.html
-share/lynx/lynx_doc/test/raw8bit.html
-share/lynx/lynx_doc/test/sgml.html
-share/lynx/lynx_doc/test/spaces.html
-share/lynx/lynx_doc/test/special_urls.html
-share/lynx/lynx_doc/test/tabtest.html
-share/lynx/lynx_doc/test/tags.html
-share/lynx/lynx_doc/test/test-styles.html
-share/lynx/lynx_doc/test/unicode.html
-share/lynx/lynx_doc/test/utf-8-demo.html
+share/lynx/lynx_help/about_lynx.html.gz
 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 +42,7 @@
 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
@@ -115,3 +55,4 @@
 share/lynx/lynx_help/lynx-dev.html.gz
 share/lynx/lynx_help/lynx_help_main.html.gz
 share/lynx/lynx_help/lynx_url_support.html.gz
+share/lynx/lynx_help/Lynx_users_guide.html.gz
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/lynx/distinfo,v
retrieving revision 1.25
diff -u -r1.25 distinfo
--- distinfo    11 May 2007 22:22:40 -0000      1.25
+++ distinfo    20 Aug 2009 16:04:46 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.25 2007/05/11 22:22:40 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 (patch-aa) = 85e76c4b2708e01dd1abdc1af764a067bd83bcb9
-SHA1 (patch-ab) = 26fab3bd426a76df530e6780eefe36464059bc6a
-SHA1 (patch-af) = be52c260ee5c052984e247bc04b5d6bb5bc6c1c2
+SHA1 (lynx2.8.7rel.1.tar.bz2) = f5e67a298322b22fe0edcfba326c02eaa5edcb72
+RMD160 (lynx2.8.7rel.1.tar.bz2) = 0969f85b6776c5e426cea4b910271356f9193bf1
+Size (lynx2.8.7rel.1.tar.bz2) = 2432045 bytes
+SHA1 (patch-aa) = 95864341cb7a54a59d35e27a0512133baad2dd76
+SHA1 (patch-ab) = 3b6a4f9ec68bd987e12aebe1293b96f91d512818
+SHA1 (patch-af) = e94577bf54df779c4f103dbd47d6efd05a6bc496
cvs diff: Diffing patches
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/www/lynx/patches/patch-aa,v
retrieving revision 1.8
diff -u -r1.8 patch-aa
--- patches/patch-aa    10 Mar 2007 09:14:09 -0000      1.8
+++ patches/patch-aa    20 Aug 2009 16:04:46 -0000
@@ -1,8 +1,7 @@
-$NetBSD: patch-aa,v 1.8 2007/03/10 09:14:09 wiz Exp $
-
---- makefile.in.orig   2006-09-03 23:25:39.000000000 +0000
-+++ makefile.in
-@@ -56,7 +56,7 @@ mandir= @mandir@/man1
+$NetBSD$
+--- makefile.in.orig   2008-09-21 17:49:47.000000000 -0500
++++ makefile.in        2009-08-20 09:08:06.000000000 -0500
+@@ -58,7 +58,7 @@
  MANDIR= $(DESTDIR)$(mandir)

  ## Where you want the lynx.cfg file installed
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/www/lynx/patches/patch-ab,v
retrieving revision 1.9
diff -u -r1.9 patch-ab
--- patches/patch-ab    10 Mar 2007 09:14:09 -0000      1.9
+++ patches/patch-ab    20 Aug 2009 16:04:46 -0000
@@ -1,8 +1,7 @@
-$NetBSD: patch-ab,v 1.9 2007/03/10 09:14:09 wiz Exp $
-
---- scripts/cfg_defs.sh.orig   2006-01-23 01:16:14.000000000 +0000
-+++ scripts/cfg_defs.sh
-@@ -19,6 +19,7 @@ static const struct {
+$NetBSD$
+--- scripts/cfg_defs.sh.orig   2006-01-22 19:16:14.000000000 -0600
++++ scripts/cfg_defs.sh        2009-08-20 09:09:02.000000000 -0500
+@@ -19,6 +19,7 @@
  EOF

  sed \
Index: patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/www/lynx/patches/patch-af,v
retrieving revision 1.5
diff -u -r1.5 patch-af
--- patches/patch-af    10 Mar 2007 14:10:40 -0000      1.5
+++ patches/patch-af    20 Aug 2009 16:04:46 -0000
@@ -1,8 +1,7 @@
-$NetBSD: patch-af,v 1.5 2007/03/10 14:10:40 tron Exp $
-
---- po/makefile.inn.orig       2004-01-28 19:30:38.000000000 +0000
-+++ po/makefile.inn
-@@ -71,6 +71,11 @@ INSTOBJEXT = @INSTOBJEXT@
+$NetBSD$
+--- po/makefile.inn.orig       2008-09-21 17:49:47.000000000 -0500
++++ po/makefile.inn    2009-08-20 09:13:41.000000000 -0500
+@@ -80,6 +80,11 @@
        $(MSGFMT) -o $@ $<

  .po.gmo:
@@ -14,24 +13,24 @@
        file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
          && rm -f $$file && $(GMSGFMT) -o $$file $<

-@@ -113,16 +118,16 @@ install-data: install-data-@USE_NLS@
+@@ -125,16 +130,16 @@
  install-data-no: all
  install-data-yes: all
        if test -r "$(MKINSTALLDIRS)"; then \
--        $(MKINSTALLDIRS) $(datadir); \
-+        $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+-        $(MKINSTALLDIRS) $(DATADIR); \
++        $(MKINSTALLDIRS) $(DESTDIR)$(DATADIR); \
        else \
--        $(SHELL) $(top_srcdir)/mkdirs.sh $(datadir); \
-+        $(SHELL) $(top_srcdir)/mkdirs.sh $(DESTDIR)$(datadir); \
+-        $(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);; \
+-          *.gmo) destdir=$(GNULOCALEDIR);; \
+-          *)     destdir=$(LOCALEDIR);; \
++          *.gmo) destdir=$(DESTDIR)$(GNULOCALEDIR);; \
++          *)     destdir=$(DESTDIR)$(LOCALEDIR);; \
          esac; \
          lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
          dir=$$destdir/$$lang/LC_MESSAGES; \
Follow-Ups:
- Re: update www/lynx
  - From: Thomas Klausner
Prev by Date: Re: Package binaries for NetBSD/alpha 4.0 / pkgsrc-2009Q1
Next by Date: Re: update www/lynx
Previous by Thread: Package binaries for NetBSD/sparc64 5.0 / pkgsrc-2009Q2
Next by Thread: Re: update www/lynx
Indexes:
Home | Main Index | Thread Index | Old Index