pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/elinks Update to elinks-0.12pre2. Kerberos suppor...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f7098dda917b
branches: trunk
changeset: 549623:f7098dda917b
user: bjs <bjs%pkgsrc.org@localhost>
date: Thu Nov 06 08:33:31 2008 +0000
description:
Update to elinks-0.12pre2. Kerberos support has been added,
as well as support for boehm-gc and utf8. Myriad bug fixes.
I've switched the javascript support library over too lang/see,
as it seems to work better. If a release does not come out by
the next branch, I will package a snapshot, as it seems like
they've fixed even more bugs in the development tree.
diffstat:
www/elinks/Makefile | 6 ++++--
www/elinks/PLIST | 9 ++++++---
www/elinks/distinfo | 21 ++++++++++-----------
www/elinks/options.mk | 36 +++++++++++++++++++++++++-----------
www/elinks/patches/patch-aa | 41 ++++++++++++++++++++++-------------------
www/elinks/patches/patch-ab | 10 +++++-----
www/elinks/patches/patch-ac | 4 ++--
www/elinks/patches/patch-ad | 4 ++--
www/elinks/patches/patch-ae | 8 ++++----
www/elinks/patches/patch-af | 23 -----------------------
www/elinks/patches/patch-ag | 4 ++--
11 files changed, 82 insertions(+), 84 deletions(-)
diffs (truncated from 347 to 300 lines):
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/Makefile
--- a/www/elinks/Makefile Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/Makefile Thu Nov 06 08:33:31 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2008/07/03 21:33:41 abs Exp $
+# $NetBSD: Makefile,v 1.40 2008/11/06 08:33:31 bjs Exp $
-DISTNAME= elinks-0.11.4
+DISTNAME= elinks-0.12pre2
+PKGNAME= ${DISTNAME:S/pre/rc/}
CATEGORIES= www
MASTER_SITES= http://elinks.or.cz/download/ \
http://ftp.icm.edu.pl/packages/elinks/
@@ -18,6 +19,7 @@
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/${PKGBASE}
CONFIGURE_ARGS+= --enable-256-colors
+CONFIGURE_ARGS+= --enable-utf-8
.include "options.mk"
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/PLIST
--- a/www/elinks/PLIST Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/PLIST Thu Nov 06 08:33:31 2008 +0000
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.9 2007/06/21 15:52:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/11/06 08:33:31 bjs Exp $
bin/elinks
man/man1/elinks.1
man/man5/elinks.conf.5
man/man5/elinkskeys.5
-share/elinks/locale/charset.alias
-share/elinks/locale/locale.alias
+share/elinks/locale/af/LC_MESSAGES/elinks.mo
share/elinks/locale/be/LC_MESSAGES/elinks.mo
share/elinks/locale/bg/LC_MESSAGES/elinks.mo
share/elinks/locale/ca/LC_MESSAGES/elinks.mo
+share/elinks/locale/charset.alias
share/elinks/locale/cs/LC_MESSAGES/elinks.mo
share/elinks/locale/da/LC_MESSAGES/elinks.mo
share/elinks/locale/de/LC_MESSAGES/elinks.mo
@@ -22,6 +22,7 @@
share/elinks/locale/id/LC_MESSAGES/elinks.mo
share/elinks/locale/is/LC_MESSAGES/elinks.mo
share/elinks/locale/it/LC_MESSAGES/elinks.mo
+share/elinks/locale/locale.alias
share/elinks/locale/lt/LC_MESSAGES/elinks.mo
share/elinks/locale/nb/LC_MESSAGES/elinks.mo
share/elinks/locale/nl/LC_MESSAGES/elinks.mo
@@ -95,5 +96,7 @@
@dirrm share/elinks/locale/bg
@dirrm share/elinks/locale/be/LC_MESSAGES
@dirrm share/elinks/locale/be
+@dirrm share/elinks/locale/af/LC_MESSAGES
+@dirrm share/elinks/locale/af
@dirrm share/elinks/locale
@dirrm share/elinks
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/distinfo
--- a/www/elinks/distinfo Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/distinfo Thu Nov 06 08:33:31 2008 +0000
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.24 2008/06/23 21:06:47 bjs Exp $
+$NetBSD: distinfo,v 1.25 2008/11/06 08:33:31 bjs Exp $
-SHA1 (elinks-0.11.4.tar.bz2) = 4eddfcd79da3e0e3da1c186668ef804f5fec50cd
-RMD160 (elinks-0.11.4.tar.bz2) = 0341c01b4727d76d864cbaa8a7c6ebb637cdea1c
-Size (elinks-0.11.4.tar.bz2) = 2479650 bytes
-SHA1 (patch-aa) = f69bf1c5128a3023f6c90d3e79a8cb65336541a3
-SHA1 (patch-ab) = dd1c48e0c1b7980b6332e11ab38e13202325cd55
-SHA1 (patch-ac) = f7dc18652782a5ad0768a5693a69bcadc6e5754d
-SHA1 (patch-ad) = 3378dc9415533234fe98a038831cd5208c85f0aa
-SHA1 (patch-ae) = 566ac2d8900c0f64414eb7b9164fd3b8557046fd
-SHA1 (patch-af) = 55922138dc8ef861fcb9ab352670bac614afb405
-SHA1 (patch-ag) = 34d794c4c0cb99d6c5a1b19f4485f7c59962064a
+SHA1 (elinks-0.12pre2.tar.bz2) = 7bb30f817cc053b87f80c32359dfccbc49e067eb
+RMD160 (elinks-0.12pre2.tar.bz2) = 94af523e31d24e09c9cb6a41e5d87456f288f234
+Size (elinks-0.12pre2.tar.bz2) = 2770126 bytes
+SHA1 (patch-aa) = b2bef596793e8fb75e89fb95daf399240f28fa0b
+SHA1 (patch-ab) = a1d9b4246869c1999043c76dbcb35996a6b294fd
+SHA1 (patch-ac) = a7f4bacbdf4073a5a733fe565b1f51dc755c7e4d
+SHA1 (patch-ad) = 089e2455c64cbfb48907693a653e76cc97961622
+SHA1 (patch-ae) = a46c419ec3d96825958903459708b8b131862053
+SHA1 (patch-ag) = c31bede62a6baa1d43ab1dff639f9d7265d2bece
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/options.mk
--- a/www/elinks/options.mk Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/options.mk Thu Nov 06 08:33:31 2008 +0000
@@ -1,12 +1,16 @@
-# $NetBSD: options.mk,v 1.8 2008/02/06 04:30:37 bjs Exp $
+# $NetBSD: options.mk,v 1.9 2008/11/06 08:33:31 bjs Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.elinks
PKG_SUPPORTED_OPTIONS+= bittorrent nntp javascript finger gopher
-PKG_SUPPORTED_OPTIONS+= inet6 x11 elinks-fastmem elinks-exmode expat
+PKG_SUPPORTED_OPTIONS+= inet6 x11 elinks-exmode expat
PKG_SUPPORTED_OPTIONS+= elinks-html-highlight elinks-root-exec
+PKG_SUPPORTED_OPTIONS+= kerberos
PKG_OPTIONS_GROUP.tls= gnutls ssl
+PKG_OPTIONS_GROUP.malloc= boehm-gc elinks-fastmem
PKG_OPTIONS_REQUIRED_GROUPS= tls
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_OPTIONS_OPTIONAL_GROUPS= malloc
+PKG_SUGGESTED_OPTIONS= ssl javascript elinks-html-highlight elinks-exmode
+PKG_SUGGESTED_OPTIONS+= expat boehm-gc
PKG_OPTIONS_LEGACY_OPTS= spidermonkey:javascript
@@ -43,12 +47,14 @@
.if !empty(PKG_OPTIONS:Mjavascript)
-.include "../../lang/ossp-js/buildlink3.mk"
+.include "../../lang/see/buildlink3.mk"
-CONFIGURE_ARGS+= --with-spidermonkey=${BUILDLINK_PREFIX.ossp-js:Q}
+CONFIGURE_ARGS+= --with-see=${BUILDLINK_PREFIX.see:Q}
+CONFIGURE_ARGS+= --without-spidermonkey
CONFIGURE_ARGS+= --enable-sm-scripting
.else
CONFIGURE_ARGS+= --without-spidermonkey
+CONFIGURE_ARGS+= --without-see
CONFIGURE_ARGS+= --disable-sm-scripting
.endif
@@ -96,12 +102,6 @@
CONFIGURE_ARGS+= --disable-xbel
.endif
-.if !empty(PKG_OPTIONS:Melinks-fastmem)
-CONFIGURE_ARGS+= --enable-fastmem
-.else
-CONFIGURE_ARGS+= --disable-fastmem
-.endif
-
.if !empty(PKG_OPTIONS:Melinks-html-highlight)
CONFIGURE_ARGS+= --enable-html-highlight
.else
@@ -119,3 +119,17 @@
.else
CONFIGURE_ARGS+= --enable-no-root
.endif
+
+.if !empty(PKG_OPTIONS:Mboehm-gc)
+CONFIGURE_ARGS+= --with-gc=${BUILDLINK_PREFIX.boehm-gc:Q}
+. include "../../devel/boehm-gc/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Melinks-fastmem)
+CONFIGURE_ARGS+= --enable-fastmem
+.endif
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+CONFIGURE_ARGS+= --with-gssapi
+. include "../../mk/krb5.buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-gssapi
+.endif
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/patches/patch-aa
--- a/www/elinks/patches/patch-aa Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/patches/patch-aa Thu Nov 06 08:33:31 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2008/03/10 01:57:43 bjs Exp $
+$NetBSD: patch-aa,v 1.10 2008/11/06 08:33:31 bjs Exp $
---- configure.orig 2008-03-04 04:29:56.000000000 -0500
+--- configure.orig 2008-09-21 07:15:24.000000000 -0400
+++ configure
-@@ -907,7 +907,7 @@ Optional Packages:
+@@ -1453,7 +1453,7 @@ Optional Packages:
--without-openssl disable OpenSSL support
--with-openssl=DIR enable OpenSSL support (default)
--with-x use the X Window System
@@ -11,7 +11,7 @@
Some influential environment variables:
CC C compiler command
-@@ -2959,7 +2959,7 @@ _ACEOF
+@@ -3525,7 +3525,7 @@ _ACEOF
echo > config.asciidoc-unsafe.txt
@@ -20,28 +20,31 @@
ASCIIDOC_FLAGS=--unsafe
fi
rm config.asciidoc-unsafe.*
-@@ -17623,7 +17623,7 @@ if test -z "$disable_lua"; then
- for luadir in "$withval" "" /usr /usr/local; do
+@@ -18899,8 +18899,8 @@ if test -z "$disable_lua"; then
for suffix in "" 50; do
- if test "$cf_result" = no; then
-- LUA_LIBS="-llua$suffix -llualib$suffix -lm"
-+ LUA_LIBS="-llua$suffix -lm"
+ if test "$cf_result" = no && ( test -f "$luadir/include/lua.h" || \
+ test -f "$luadir/include/lua$suffix/lua.h" ) ; then
+- LUA_LIBS="-L$luadir/lib -llua$suffix -llualib$suffix -lm"
+- LUA_CFLAGS="-I$luadir/include -I$luadir/include/lua$suffix"
++ LUA_LIBS="-L$luadir/lib -llua$suffix -lm"
++ LUA_CFLAGS="-I$luadir/include"
- if test ! -z "$luadir"; then
- LUA_LIBS="-L$luadir/lib $LUA_LIBS"
-@@ -20602,9 +20602,9 @@ done
+ LIBS="$LUA_LIBS $LIBS_X"
+ CFLAGS="$CFLAGS_X $LUA_CFLAGS"
+@@ -21532,9 +21532,9 @@ done
--# Check whether --with-libiconv or --without-libiconv was given.
-+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
- if test "${with_libiconv+set}" = set; then
-- withval="$with_libiconv"
-+ withval="$with_libiconv_prefix"
-
+-# Check whether --with-libiconv was given.
+-if test "${with_libiconv+set}" = set; then
+- withval=$with_libiconv;
++# Check whether --with-libiconv-prefix was given.
++if test "${with_libiconv_prefix+set}" = set; then
++ withval=$with_libiconv_prefix;
for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
-@@ -23356,7 +23356,7 @@ _ACEOF
+ if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+@@ -24635,7 +24635,7 @@ _ACEOF
# Create LIBDIR #define for config.h
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/patches/patch-ab
--- a/www/elinks/patches/patch-ab Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/patches/patch-ab Thu Nov 06 08:33:31 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2008/01/09 03:48:07 bjs Exp $
+$NetBSD: patch-ab,v 1.7 2008/11/06 08:33:31 bjs Exp $
---- src/scripting/lua/core.c.orig 2008-01-08 18:35:08.000000000 -0500
+--- src/scripting/lua/core.c.orig 2008-09-21 04:45:22.000000000 -0400
+++ src/scripting/lua/core.c
-@@ -641,7 +641,7 @@ do_hooks_file(LS, unsigned char *prefix,
+@@ -658,7 +658,7 @@ do_hooks_file(LS, unsigned char *prefix,
if (file_can_read(file)) {
int oldtop = lua_gettop(S);
@@ -11,7 +11,7 @@
sleep(3); /* Let some time to see error messages. */
lua_settop(S, oldtop);
}
-@@ -652,13 +652,24 @@ do_hooks_file(LS, unsigned char *prefix,
+@@ -669,13 +669,24 @@ do_hooks_file(LS, unsigned char *prefix,
void
init_lua(struct module *module)
{
@@ -43,7 +43,7 @@
lua_register(L, LUA_ALERT, l_alert);
lua_register(L, "current_url", l_current_url);
-@@ -763,7 +774,7 @@ handle_ret_eval(struct session *ses)
+@@ -780,7 +791,7 @@ handle_ret_eval(struct session *ses)
int oldtop = lua_gettop(L);
if (prepare_lua(ses) == 0) {
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/patches/patch-ac
--- a/www/elinks/patches/patch-ac Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/patches/patch-ac Thu Nov 06 08:33:31 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2006/08/14 22:38:24 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2008/11/06 08:33:31 bjs Exp $
---- src/scripting/lua/hooks.c.orig 2006-01-29 13:10:39.000000000 +0000
+--- src/scripting/lua/hooks.c.orig 2008-09-21 04:45:22.000000000 -0400
+++ src/scripting/lua/hooks.c
@@ -200,7 +200,7 @@ static enum evhook_status
script_hook_quit(va_list ap, void *data)
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/patches/patch-ad
--- a/www/elinks/patches/patch-ad Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/patches/patch-ad Thu Nov 06 08:33:31 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2007/06/21 15:52:16 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2008/11/06 08:33:31 bjs Exp $
---- src/intl/gettext/Makefile.orig 2006-11-19 08:46:37.000000000 -0500
+--- src/intl/gettext/Makefile.orig 2008-09-21 04:45:22.000000000 -0400
+++ src/intl/gettext/Makefile
@@ -3,6 +3,7 @@ include $(top_builddir)/Makefile.config
diff -r 2dc02d15cdad -r f7098dda917b www/elinks/patches/patch-ae
--- a/www/elinks/patches/patch-ae Thu Nov 06 07:50:56 2008 +0000
+++ b/www/elinks/patches/patch-ae Thu Nov 06 08:33:31 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2007/08/09 13:03:21 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2008/11/06 08:33:31 bjs Exp $
---- src/util/memory.c.orig 2007-04-15 16:51:03.000000000 -0400
+--- src/util/memory.c.orig 2008-09-21 04:45:22.000000000 -0400
+++ src/util/memory.c
-@@ -20,6 +20,12 @@
+@@ -21,6 +21,12 @@
#include "util/error.h"
#include "util/memory.h"
@@ -15,7 +15,7 @@
#if !defined(DEBUG_MEMLEAK) && !defined(CONFIG_FASTMEM)
Home |
Main Index |
Thread Index |
Old Index