From 80669ed59f5ec4221fdcc9e9a3d0df2b798160bb Mon Sep 17 00:00:00 2001 From: fredb Date: Thu, 8 Feb 2001 19:52:03 +0000 Subject: Update lynx-current to 2.8.4dev16. This snapshot contains very many bug-fixes, and also integrates SSL and internationalization support! For details, see the CHANGES file in the snapshot or at http://lynx.isc.org/current/CHANGES No longer bother installing lynx{.cfg,.lss} to ${PREFIX}/etc/. They weren't being looked at by default, anyway, while it remains trivial to override the default locations via environment variables. --- www/lynx-current/Makefile | 74 ++++++--------------------------------- www/lynx-current/files/md5 | 13 ++----- www/lynx-current/files/patch-sum | 7 ++-- www/lynx-current/patches/patch-aa | 14 ++++---- www/lynx-current/patches/patch-ab | 12 ------- www/lynx-current/patches/patch-ae | 8 ++--- www/lynx-current/pkg/PLIST | 11 ++---- 7 files changed, 29 insertions(+), 110 deletions(-) delete mode 100644 www/lynx-current/patches/patch-ab (limited to 'www/lynx-current') diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile index 29173819784..ed8e5b2f6f2 100644 --- a/www/lynx-current/Makefile +++ b/www/lynx-current/Makefile @@ -1,41 +1,26 @@ -# $NetBSD: Makefile,v 1.24 2001/02/03 19:07:42 fredb Exp $ +# $NetBSD: Makefile,v 1.25 2001/02/08 19:52:03 fredb Exp $ # -DISTNAME= lynx2.8.4dev.10 -PKGNAME= lynx-2.8.4.0b10 +DISTNAME= lynx2.8.4dev.16 +PKGNAME= lynx-2.8.4.0b16 CATEGORIES= www MASTER_SITES= http://lynx.isc.org/current/ \ http://lynx.isc.org/po/ \ http://www.iro.umontreal.ca/contrib/po/teams/PO/ EXTRACT_SUFX= .tar.bz2 -DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} -DISTFILES+= lynx-2.8.3.rel1.cs.po -DISTFILES+= lynx-2.8.4.da.po -DISTFILES+= lynx-2.8.3.rel1.de.po -DISTFILES+= lynx-2.8.3.rel1.ja.po -DISTFILES+= lynx-2.8.3.rel1.nl.po -DISTFILES+= lynx-2.8.3.rel1.pt_BR.po -DISTFILES+= lynx-2.8.3.rel1.ru.po -DISTFILES+= lynx-2.8.3.rel1.sl.po - -PATCH_SITES= http://www.moxienet.com/lynx/ -PATCHFILES= lynx-283-ssl.patch.gz -PATCH_DIST_STRIP= -p1 - -MAINTAINER= fb@enteract.com + +MAINTAINER= fredb@netbsd.org HOMEPAGE= http://lynx.browser.org/ BUILD_DEPENDS+= msgfmt:../../devel/gettext -USE_LIBINTL= yes - -DIST_SUBDIR= lynx -EXTRACT_ONLY= ${DISTFILES:M*.tar.bz2} WRKSRC= ${WRKDIR}/lynx2-8-4 GNU_CONFIGURE= yes +USE_LIBINTL= yes USE_SSL= yes -INSTALL_TARGET= install-bin install-man install-cfg install-help install-doc +INSTALL_TARGET= install-bin install-cfg install-help install-lss +INSTALL_TARGET+= install-doc install-man MAKEFILE= makefile BUILD_DEFS+= LYNX_SCREEN_LIB USE_SOCKS USE_INET6 @@ -45,6 +30,9 @@ CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --with-nls-datadir=${PREFIX}/share CONFIGURE_ARGS+= --without-included-gettext +# With SSL, lynx can get https:// and snews:// URL's. +CONFIGURE_ARGS+= --with-ssl + # Note: --enable-{default-colors,scrollbar} are simply ignored # for certain settings of --with-screen. CONFIGURE_ARGS+= --with-screen=${LYNX_SCREEN_LIB} @@ -65,48 +53,8 @@ CONFIGURE_ARGS+= --enable-justify-elts CONFIGURE_ARGS+= --enable-prettysrc CONFIGURE_ARGS+= --enable-read-eta -post-extract: - ${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.cs.po \ - ${WRKSRC}/po/cs.po - ${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.4.da.po \ - ${WRKSRC}/po/da.po - ${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.de.po \ - ${WRKSRC}/po/de.po - ${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.ja.po \ - ${WRKSRC}/po/ja.po - ${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.nl.po \ - ${WRKSRC}/po/nl.po - ${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.pt_BR.po \ - ${WRKSRC}/po/pt_BR.po - ${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.ru.po \ - ${WRKSRC}/po/ru.po - ${CP} ${DISTDIR}/${DIST_SUBDIR}/lynx-2.8.3.rel1.sl.po \ - ${WRKSRC}/po/sl.po - -post-configure: - (${ECHO}; \ - ${ECHO} '#undef LYNX_CFG_FILE'; \ - ${ECHO} '#define LYNX_CFG_FILE "${PREFIX}/etc/lynx.cfg"'; \ - ${ECHO} '#undef LYNX_LSS_FILE'; \ - ${ECHO} '#define LYNX_LSS_FILE "${PREFIX}/etc/lynx.lss"') \ - >> ${WRKSRC}/userdefs.h - (${ECHO}; \ - ${ECHO} 'SSL_LIBS= ${SSLLIBS}'; \ - ${ECHO} 'SSL_DEFINES= -DUSE_SSL ${SSLINCS}') \ - >> ${WRKSRC}/makefile - (${ECHO}; \ - ${ECHO} 'INTLLIB= -L${LOCALBASE}/lib -lintl'; \ - ${ECHO} 'INTLDIR_CPPFLAGS= -I${LOCALBASE}/include') \ - >> ${WRKSRC}/src/makefile - post-install: ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/lynx - if [ ! -f ${PREFIX}/etc/lynx.cfg ]; then \ - ${CP} ${PREFIX}/share/lynx/lynx.cfg ${PREFIX}/etc/; \ - fi - if [ ! -f ${PREFIX}/etc/lynx.lss ]; then \ - ${CP} ${PREFIX}/share/lynx/lynx_doc/samples/lynx.lss ${PREFIX}/etc/; \ - fi .include "../../mk/bsd.prefs.mk" diff --git a/www/lynx-current/files/md5 b/www/lynx-current/files/md5 index 6cbc906c9a1..2f3421cd39b 100644 --- a/www/lynx-current/files/md5 +++ b/www/lynx-current/files/md5 @@ -1,12 +1,3 @@ -$NetBSD: md5,v 1.7 2000/10/18 03:55:47 fredb Exp $ +$NetBSD: md5,v 1.8 2001/02/08 19:52:03 fredb Exp $ -MD5 (lynx/lynx2.8.4dev.10.tar.bz2) = b0f7b58fc8742b126fb78189cb13b948 -MD5 (lynx/lynx-2.8.3.rel1.cs.po) = af4f8890fe06500f878a664bf3eba362 -MD5 (lynx/lynx-2.8.4.da.po) = 8a9a5e30b655ef6bb4541b0fd60d552b -MD5 (lynx/lynx-2.8.3.rel1.de.po) = 0ed4a1d0a09a6c1742a2808f22c747db -MD5 (lynx/lynx-2.8.3.rel1.ja.po) = afe4cdd5cd4908de9e21b07b335faa0a -MD5 (lynx/lynx-2.8.3.rel1.nl.po) = 33e98f38c2f61bd86311c2e5be4a7e97 -MD5 (lynx/lynx-2.8.3.rel1.pt_BR.po) = 1deedb9954cbe299d2c6fcdc65b24084 -MD5 (lynx/lynx-2.8.3.rel1.ru.po) = 3cc74eb861aefcb0037bb0784cca7227 -MD5 (lynx/lynx-2.8.3.rel1.sl.po) = 4f5562aa17f767f40f549ea015d39a20 -MD5 (lynx/lynx-283-ssl.patch.gz) = c48607b33f493284ba60c8a431a13b03 +MD5 (lynx2.8.4dev.16.tar.bz2) = 8db0588e3ce75a92455b33a11c0f6703 diff --git a/www/lynx-current/files/patch-sum b/www/lynx-current/files/patch-sum index 1d012b8c347..016eb1e68ca 100644 --- a/www/lynx-current/files/patch-sum +++ b/www/lynx-current/files/patch-sum @@ -1,7 +1,6 @@ -$NetBSD: patch-sum,v 1.4 2001/02/06 07:07:43 itojun Exp $ +$NetBSD: patch-sum,v 1.5 2001/02/08 19:52:03 fredb Exp $ -MD5 (patch-aa) = 072f8a39714a5fe048b2f22d0d81d36f -MD5 (patch-ab) = 045fec4a443e066bdfa6f88202528d3a +MD5 (patch-aa) = 6cbf38885526260607e8ccc12a454d2e MD5 (patch-ac) = ec10e0f1cc88c81237e75262dce63d6f MD5 (patch-ad) = f90d7b543fce9491af13faf73a2a611c -MD5 (patch-ae) = 1d4215fb03b50b7dfb3a0443fbb4418e +MD5 (patch-ae) = d2b3513288722f670351c84adef88c8e diff --git a/www/lynx-current/patches/patch-aa b/www/lynx-current/patches/patch-aa index a7dd08be30a..afa3ed9bdea 100644 --- a/www/lynx-current/patches/patch-aa +++ b/www/lynx-current/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2000/05/09 00:55:00 fredb Exp $ +$NetBSD: patch-aa,v 1.3 2001/02/08 19:52:04 fredb Exp $ ---- configure.orig Sat Apr 22 20:16:38 2000 -+++ configure Mon May 8 19:27:11 2000 -@@ -5666,7 +5666,7 @@ - LIBS="$LIBS -L$cf_cv_use_libsocks" +--- configure.orig Mon Jan 1 19:39:50 2001 ++++ configure Wed Feb 7 15:40:30 2001 +@@ -5863,7 +5863,7 @@ + fi ;; esac -LIBS="$LIBS -lsocks" @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2000/05/09 00:55:00 fredb Exp $ cat >> confdefs.h <<\EOF #define SOCKS 1 EOF -@@ -6597,7 +6597,10 @@ +@@ -6832,7 +6832,10 @@ echo "$ac_t""$cf_cv_screen" 1>&6 case $cf_cv_screen in @@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.2 2000/05/09 00:55:00 fredb Exp $ ;; pdcurses) cf_cv_ncurses_header=xcurses.h -@@ -7171,6 +7174,12 @@ +@@ -7478,6 +7481,12 @@ case $cf_cv_ncurses_header in # (vi */ncurses.h) diff --git a/www/lynx-current/patches/patch-ab b/www/lynx-current/patches/patch-ab deleted file mode 100644 index 0f409191fdd..00000000000 --- a/www/lynx-current/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2000/05/08 01:46:57 fredb Exp $ - ---- src/LYStrings.c.orig Mon Apr 17 05:59:17 2000 -+++ src/LYStrings.c Sun May 7 19:43:16 2000 -@@ -25,6 +25,7 @@ - #endif /* DJGPP_KEYHANDLER */ - - #ifdef USE_COLOR_STYLE -+#include - #include - #include - #endif diff --git a/www/lynx-current/patches/patch-ae b/www/lynx-current/patches/patch-ae index 7a157b99ba7..3e32ceb17ec 100644 --- a/www/lynx-current/patches/patch-ae +++ b/www/lynx-current/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.1 2001/02/06 07:07:44 itojun Exp $ +$NetBSD: patch-ae,v 1.2 2001/02/08 19:52:04 fredb Exp $ ---- WWW/Library/Implementation/HTParse.c.orig Wed Dec 15 20:03:18 1999 -+++ WWW/Library/Implementation/HTParse.c Tue Feb 6 15:58:26 2001 +--- WWW/Library/Implementation/HTParse.c.orig Wed Oct 25 11:35:28 2000 ++++ WWW/Library/Implementation/HTParse.c Tue Feb 6 15:26:57 2001 @@ -291,7 +291,11 @@ char *p2, *h; if ((p2 = strchr(result, '@')) != NULL) @@ -11,6 +11,6 @@ $NetBSD: patch-ae,v 1.1 2001/02/06 07:07:44 itojun Exp $ +#else p2 = strchr(tail, ':'); +#endif - if (p2 != NULL && !isdigit((unsigned char)p2[1])) + if (p2 != NULL && !isdigit(UCH(p2[1]))) /* ** Colon not followed by a port number. diff --git a/www/lynx-current/pkg/PLIST b/www/lynx-current/pkg/PLIST index cfb84b0f96f..73f14b64ced 100644 --- a/www/lynx-current/pkg/PLIST +++ b/www/lynx-current/pkg/PLIST @@ -1,23 +1,18 @@ -@comment $NetBSD: PLIST,v 1.2 2000/08/07 11:48:48 fredb Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/02/08 19:52:04 fredb Exp $ bin/lynx man/man1/lynx.1 share/locale/cs/LC_MESSAGES/lynx.mo share/locale/da/LC_MESSAGES/lynx.mo share/locale/de/LC_MESSAGES/lynx.mo -share/locale/es/LC_MESSAGES/lynx.mo share/locale/fr/LC_MESSAGES/lynx.mo -share/locale/it/LC_MESSAGES/lynx.mo share/locale/ja/LC_MESSAGES/lynx.mo -share/locale/ko/LC_MESSAGES/lynx.mo share/locale/nl/LC_MESSAGES/lynx.mo -share/locale/no/LC_MESSAGES/lynx.mo -share/locale/pl/LC_MESSAGES/lynx.mo -share/locale/pt/LC_MESSAGES/lynx.mo share/locale/pt_BR/LC_MESSAGES/lynx.mo share/locale/ru/LC_MESSAGES/lynx.mo share/locale/sl/LC_MESSAGES/lynx.mo share/locale/sv/LC_MESSAGES/lynx.mo share/lynx/lynx.cfg +share/lynx/lynx.lss share/lynx/lynx_doc/CHANGES share/lynx/lynx_doc/COPYHEADER share/lynx/lynx_doc/COPYING @@ -73,8 +68,6 @@ share/lynx/lynx_help/keystrokes/scrolling_help.html.gz share/lynx/lynx_help/keystrokes/test_display.html.gz share/lynx/lynx_help/keystrokes/visited_help.html.gz share/lynx/lynx_help/keystrokes/xterm_help.html.gz -@exec if [ ! -f %D/etc/lynx.cfg ]; then cp %D/share/lynx/lynx.cfg %D/etc/; fi -@exec if [ ! -f %D/etc/lynx.lss ]; then cp %D/share/lynx/lynx_doc/samples/lynx.lss %D/etc/; fi @dirrm share/lynx/lynx_help/keystrokes @dirrm share/lynx/lynx_help @dirrm share/lynx/lynx_doc/samples -- cgit v1.2.3