diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2004-02-12 15:57:05 +0000 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2004-02-12 15:57:05 +0000 |
commit | 42b187699a1cbba42895f2e1f137fbd1c29d5813 (patch) | |
tree | 8ec34e4bd3d2ac2fd948b2a2c499933cbc84cc07 /www/lynx | |
parent | Remove `vulnerability-test-port'--- it wasn't supposed to get committed (diff) |
Update to 2.8.5.
Add CONFLICTS, fetching (and verifying) of PGP signature.
Use DOCSDIR macro. [v]
Submitted by: Jason Harris <jharris@widomaker.com> (maintainer),
osa [v]
PR: 62713
Notes
Notes:
svn path=/head/; revision=100776
Diffstat (limited to 'www/lynx')
-rw-r--r-- | www/lynx/Makefile | 24 | ||||
-rw-r--r-- | www/lynx/distinfo | 15 | ||||
-rw-r--r-- | www/lynx/files/patch-aa | 28 | ||||
-rw-r--r-- | www/lynx/files/patch-ab | 11 | ||||
-rw-r--r-- | www/lynx/files/patch-syslog | 11 | ||||
-rw-r--r-- | www/lynx/pkg-plist | 97 |
6 files changed, 100 insertions, 86 deletions
diff --git a/www/lynx/Makefile b/www/lynx/Makefile index 8d05fe4bc41f..63ef3c9024b2 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -6,41 +6,39 @@ # PORTNAME= lynx -PORTVERSION= 2.8.4.1d -PORTREVISION= 0 +PORTVERSION= 2.8.5 CATEGORIES= www ipv6 MASTER_SITES= http://lynx.isc.org/current/ -DISTNAME= ${PORTNAME}2.8.4rel.1 - -PATCH_SITES= http://lynx.isc.org/release/patches/ -PATCHFILES= lynx2.8.4rel.1a.patch \ - lynx2.8.4rel.1b.patch \ - lynx2.8.4rel.1c.patch \ - lynx2.8.4rel.1d.patch +DISTNAME= ${PORTNAME}2.8.5rel.1 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER?= jharris@widomaker.com COMMENT?= A non-graphical, text-based World-Wide Web client +CONFLICTS?= lynx-ssl* lynx-current* + +USE_GPG?= yes +SIG_FILES= ${DISTNAME}${EXTRACT_SUFX}.asc USE_BZIP2= yes -WRKSRC= ${WRKDIR}/${PORTNAME}2-8-4 +WRKSRC= ${WRKDIR}/${PORTNAME}2-8-5 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${L_LIB}" \ --enable-nsl-fork --enable-persistent-cookies \ --enable-ipv6 -MAKE_ARGS= helpdir=${L_HELP} docdir=${L_DOC} +MAKE_ARGS= helpdir=${L_HELP} docdir=${DOCSDIR} MAKEFILE= makefile INSTALL_TARGET= install-full MAN1= lynx.1 L_LIB= ${PREFIX}/etc -L_DOC= ${PREFIX}/share/doc/lynx L_HELP= ${PREFIX}/share/lynx_help post-patch: @${RM} -f ${WRKSRC}/CHANGES.orig post-install: - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_DOC} + ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_HELP} ${CHOWN} ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg diff --git a/www/lynx/distinfo b/www/lynx/distinfo index c020b31147fd..5a673796a604 100644 --- a/www/lynx/distinfo +++ b/www/lynx/distinfo @@ -1,5 +1,10 @@ -MD5 (lynx2.8.4rel.1.tar.bz2) = 6916c0127839f1e454052b683e4691c4 -MD5 (lynx2.8.4rel.1a.patch) = d209e52d8182c7c12d784e90c0890ee4 -MD5 (lynx2.8.4rel.1b.patch) = a687a3d2465d5fd42ce686485dbf71eb -MD5 (lynx2.8.4rel.1c.patch) = 728c8dfde1484b68940673ccf060707e -MD5 (lynx2.8.4rel.1d.patch) = f710a4b1eac5be0f014816dd48da6ddc +MD5 (lynx2.8.5rel.1.tar.bz2) = d1e5134e5d175f913c16cb6768bc30eb +SHA1 (lynx2.8.5rel.1.tar.bz2) = c70866f67c1365b55e0c9c0c569190f5919d28d4 +RMD160 (lynx2.8.5rel.1.tar.bz2) = 80d20261ac6eaebe1d940fb5de485daaad7bb3b7 +SHA256 (lynx2.8.5rel.1.tar.bz2) = 37607008086933c869be26b4db687f61a768c51ddefa741e77225069b880bc63 +SIZE (lynx2.8.5rel.1.tar.bz2) = 2177287 +MD5 (lynx2.8.5rel.1.tar.bz2.asc) = 1c24e82ecefb1fb08d76d7260609bb68 +SHA1 (lynx2.8.5rel.1.tar.bz2.asc) = e7d5d536e9070ac403a572fa1f8286b1b8ead2b8 +RMD160 (lynx2.8.5rel.1.tar.bz2.asc) = 9d42f41a2f00e08e631c2f3382af581f30e69855 +SHA256 (lynx2.8.5rel.1.tar.bz2.asc) = 528dbcd057484729597169a6711a119919087d5644c37a3c17a48d3a43a744da +SIZE (lynx2.8.5rel.1.tar.bz2.asc) = 245 diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa index 270ee222a0ca..b91c64f0090a 100644 --- a/www/lynx/files/patch-aa +++ b/www/lynx/files/patch-aa @@ -1,11 +1,15 @@ ---- makefile.in.orig Tue Feb 13 04:33:21 2001 -+++ makefile.in Sat Mar 3 05:21:01 2001 -@@ -387,22 +387,19 @@ - fi ; \ - )' - @-rm -f $(HELPDIR)/help_files.sed +=================================================================== +RCS file: makefile.in,v +retrieving revision 1.1 +diff -u -r1.1 makefile.in +--- makefile.in 2004/02/11 01:50:15 1.1 ++++ makefile.in 2004/02/11 01:53:41 +@@ -362,22 +362,18 @@ + if test "$(COMPRESS_PROG)" != "" ; then \ + (cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \ + fi' - @echo Updating $(libdir)/lynx.cfg -- $(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \ +- @ECHO_CC@$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \ - mv $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.tmp ; \ - else \ - cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \ @@ -23,19 +27,17 @@ - $(LIBDIR)/lynx.tmp >$(LIBDIR)/lynx.cfg - chmod 644 $(LIBDIR)/lynx.cfg + $(LIBDIR)/lynx.tmp >$(LIBDIR)/lynx.cfg.default -+ chmod 644 $(LIBDIR)/lynx.cfg.default -rm -f $(LIBDIR)/lynx.tmp + -[ ! -f $(LIBDIR)/lynx.cfg ] && $(INSTALL_DATA) $(LIBDIR)/lynx.cfg.default $(LIBDIR)/lynx.cfg LYHelp.h : help_files.sed LYHelp.hin @echo Creating $@ -@@ -424,8 +421,7 @@ - $(SHELL) -c '$(srcdir)/cfg_defs.sh $(srcdir)' +@@ -399,7 +395,7 @@ + $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(srcdir)/cfg_defs.sh $(srcdir)' install-cfg : $(LIBDIR) -- -mv -f $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.oldcfg -- $(INSTALL_DATA) $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg -+ $(INSTALL_DATA) $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg.default +- @$(SHELL) -c '$(srcdir)/scripts/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg' ++ @$(SHELL) -c '$(srcdir)/scripts/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg.default' install-lss : $(LIBDIR) -mv -f $(LIBDIR)/lynx.lss $(LIBDIR)/lynx.oldlss diff --git a/www/lynx/files/patch-ab b/www/lynx/files/patch-ab deleted file mode 100644 index 936670b8ea72..000000000000 --- a/www/lynx/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- userdefs.h.bak Fri Jun 23 19:15:08 2000 -+++ userdefs.h Mon Jan 15 22:30:35 2001 -@@ -361,7 +361,7 @@ - * not necessarily try a different filename when they are called, making it - * impossible to rename the file. Others make world-writable files. - */ --/*#define USE_MKSTEMP */ -+#define USE_MKSTEMP - - /******************************** - * Comment this line out to let the user enter his/her email address diff --git a/www/lynx/files/patch-syslog b/www/lynx/files/patch-syslog deleted file mode 100644 index d15cae52d4ec..000000000000 --- a/www/lynx/files/patch-syslog +++ /dev/null @@ -1,11 +0,0 @@ ---- src/LYUtils.c.orig Mon Jun 11 10:04:20 2001 -+++ src/LYUtils.c Wed Jan 16 18:03:39 2002 -@@ -8163,7 +8163,7 @@ - buf[colon2 - arg + 1] = 0; - StrAllocCat(buf, "******"); - StrAllocCat(buf, atsign); -- syslog (LOG_INFO|LOG_LOCAL5, buf); -+ syslog (LOG_INFO|LOG_LOCAL5, "%s", buf); - CTRACE((tfp, "...alter %s\n", buf)); - FREE(buf); - return; diff --git a/www/lynx/pkg-plist b/www/lynx/pkg-plist index c70849e0febb..811a5a5a6583 100644 --- a/www/lynx/pkg-plist +++ b/www/lynx/pkg-plist @@ -3,38 +3,68 @@ bin/lynx etc/lynx.cfg.default @exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi @exec mkdir -p %D/share/lynx_help -share/doc/lynx/CHANGES -share/doc/lynx/COPYHEADER +%%DOCSDIR%%/CHANGES +%%DOCSDIR%%/COPYHEADER @exec ln -sf %D/%F %D/share/lynx_help -share/doc/lynx/COPYING +%%DOCSDIR%%/COPYING @exec ln -sf %D/%F %D/share/lynx_help -share/doc/lynx/PROBLEMS -share/doc/lynx/README -share/doc/lynx/samples/blue-background.lss -share/doc/lynx/samples/bright-blue.lss -share/doc/lynx/samples/cernrules.txt -share/doc/lynx/samples/installdirs.html -share/doc/lynx/samples/jumpsUnix.html -share/doc/lynx/samples/jumpsVMS.html -share/doc/lynx/samples/lynx-keymaps -share/doc/lynx/samples/lynx.com -share/doc/lynx/samples/lynx.lss -share/doc/lynx/samples/mailcap -share/doc/lynx/samples/mailto-form.pl -share/doc/lynx/samples/mild-colors.lss -share/doc/lynx/samples/mime.types -share/doc/lynx/test/ALT88592.html -share/doc/lynx/test/ISO_LATIN1_test.html -share/doc/lynx/test/README.txt -share/doc/lynx/test/TestComment.html -share/doc/lynx/test/c1.html -share/doc/lynx/test/iso8859-1.html -share/doc/lynx/test/iso88592.html -share/doc/lynx/test/raw8bit.html -share/doc/lynx/test/sgml.html -share/doc/lynx/test/spaces.html -share/doc/lynx/test/tabtest.html -share/doc/lynx/test/unicode.html +%%DOCSDIR%%/PROBLEMS +%%DOCSDIR%%/README +%%DOCSDIR%%/docs/CHANGES2.3 +%%DOCSDIR%%/docs/CHANGES2.4 +%%DOCSDIR%%/docs/CHANGES2.5 +%%DOCSDIR%%/docs/CHANGES2.6 +%%DOCSDIR%%/docs/CHANGES2.7 +%%DOCSDIR%%/docs/CHANGES2.8 +%%DOCSDIR%%/docs/CMU.announce +%%DOCSDIR%%/docs/CRAWL.announce +%%DOCSDIR%%/docs/FM.announce +%%DOCSDIR%%/docs/IBMPC-charsets.announce +%%DOCSDIR%%/docs/OS-390.announce +%%DOCSDIR%%/docs/README.TRST +%%DOCSDIR%%/docs/README.chartrans +%%DOCSDIR%%/docs/README.defines +%%DOCSDIR%%/docs/README.jp +%%DOCSDIR%%/docs/README.rootcerts +%%DOCSDIR%%/docs/README.ssl +%%DOCSDIR%%/docs/README.sslcerts +%%DOCSDIR%%/docs/SOCKETSHR.announce +%%DOCSDIR%%/docs/TCPWARE.announce +%%DOCSDIR%%/docs/VMSWAIS.announce +%%DOCSDIR%%/docs/djgpp.key +%%DOCSDIR%%/docs/pdcurses.key +%%DOCSDIR%%/docs/slang.key +%%DOCSDIR%%/docs/win-386.announce +%%DOCSDIR%%/samples/blue-background.lss +%%DOCSDIR%%/samples/bright-blue.lss +%%DOCSDIR%%/samples/cernrules.txt +%%DOCSDIR%%/samples/installdirs.html +%%DOCSDIR%%/samples/jumpsUnix.html +%%DOCSDIR%%/samples/jumpsVMS.html +%%DOCSDIR%%/samples/keepviewer +%%DOCSDIR%%/samples/lynxdump +%%DOCSDIR%%/samples/lynx-keymaps +%%DOCSDIR%%/samples/lynx.com +%%DOCSDIR%%/samples/lynx.lss +%%DOCSDIR%%/samples/mailcap +%%DOCSDIR%%/samples/mailto-form.pl +%%DOCSDIR%%/samples/mild-colors.lss +%%DOCSDIR%%/samples/mime.types +%%DOCSDIR%%/test/ALT88592.html +%%DOCSDIR%%/test/ISO_LATIN1_test.html +%%DOCSDIR%%/test/README.txt +%%DOCSDIR%%/test/TestComment.html +%%DOCSDIR%%/test/c1.html +%%DOCSDIR%%/test/iso8859-1.html +%%DOCSDIR%%/test/iso88592.html +%%DOCSDIR%%/test/koi8-r.html +%%DOCSDIR%%/test/quickbrown.html +%%DOCSDIR%%/test/raw8bit.html +%%DOCSDIR%%/test/sgml.html +%%DOCSDIR%%/test/spaces.html +%%DOCSDIR%%/test/tabtest.html +%%DOCSDIR%%/test/unicode.html +%%DOCSDIR%%/test/utf-8-demo.html share/lynx_help/COPYHEADER share/lynx_help/COPYING share/lynx_help/Lynx_users_guide.html @@ -61,8 +91,9 @@ share/lynx_help/keystrokes/xterm_help.html share/lynx_help/lynx-dev.html share/lynx_help/lynx_help_main.html share/lynx_help/lynx_url_support.html -@dirrm share/doc/lynx/samples -@dirrm share/doc/lynx/test -@dirrm share/doc/lynx +@dirrm %%DOCSDIR%%/docs +@dirrm %%DOCSDIR%%/samples +@dirrm %%DOCSDIR%%/test +@dirrm %%DOCSDIR%% @dirrm share/lynx_help/keystrokes @dirrm share/lynx_help |