[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (566c0f7de52a5943dbc7a8a5123cf5421778d167)

Vlad Glagolev scm at sourcemage.org
Sun Jul 6 06:38:19 EDT 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ChangeLog               |    5 +
 http/elinks/BUILD       |   21 ++++----
 http/elinks/CONFIGURE   |   31 +++++++++++
 http/elinks/DEPENDS     |  126 ++++++++++++++++++++++++------------------------
 http/elinks/DETAILS     |   26 +++++----
 http/elinks/HISTORY     |   16 +++++-
 http/elinks/PREPARE     |    8 +--
 http/elinks/PRE_BUILD   |    8 +--
 http/elinks/PROVIDES    |    1 
 http/elinks/TRIGGERS    |    1 
 http/elinks/elinks.gpg  |binary
 http/elinks/lua51.patch |   72 +++++++++++++++++++++++++++
 12 files changed, 223 insertions(+), 92 deletions(-)

New commits:
commit 566c0f7de52a5943dbc7a8a5123cf5421778d167
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    elinks/elinks.gpg: added gpg key for elinks

commit 21c0d19df1a05d91e71112c5d69903cff33973ef
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    elinks: huge fixups -- fixed lua support, added conf options, fixed multijob build, added JavaScript support via spidermonkey, cleaned up

diff --git a/ChangeLog b/ChangeLog
index b4c7b3d..dada366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-07-06 Vlad Glagolev <stealth at sourcemage.org>
+	* http/elinks/elinks.gpg: added gpg key for elinks
+
 2008-07-05 David Kowis <dkowis at shlrm.org>
 	* ruby-raa/passenger: mod_rails (basically) Apache module for rails :D
 
@@ -12,7 +15,7 @@
 	* editors/medit: new spell. Bug #14551
 
 2008-07-01 Mathieu Lonjaret <lejatorn at sourcemage.org>
-	* utils/vx32: new spell 
+	* utils/vx32: new spell
 	* utils/9vx-data: new spell
 
 2008-06-30 David Kowis <dkowis at shlrm.org>
diff --git a/http/elinks/BUILD b/http/elinks/BUILD
index ce02aff..3575780 100755
--- a/http/elinks/BUILD
+++ b/http/elinks/BUILD
@@ -1,9 +1,14 @@
-OPTS="--enable-exmode          \
-      --enable-fastmem         \
-      --enable-html-highlight  \
-      --enable-leds            \
-      --enable-nntp            \
-      --without-gnutls         \
-      $OPTS"                   &&
+if [[ $ELINKS_VCS == y ]]; then
+  ./autogen.sh
+fi &&
 
-default_build
+OPTS="--enable-exmode \
+      --enable-fastmem \
+      --enable-html-highlight \
+      --enable-leds \
+      --without-gnutls \
+      $ELINKS_OPTS $OPTS" &&
+
+make_single &&
+default_build &&
+make_normal
diff --git a/http/elinks/CONFIGURE b/http/elinks/CONFIGURE
new file mode 100755
index 0000000..15d8b07
--- /dev/null
+++ b/http/elinks/CONFIGURE
@@ -0,0 +1,31 @@
+config_query_option ELINKS_OPTS \
+                    "Enable 256-colors support?" n \
+                    "--enable-256-colors" "--disable-256-colors" &&
+
+config_query_option ELINKS_OPTS \
+                    "Enable 88-colors support?" n \
+                    "--enable-88-colors" "--disable-88-colors" &&
+
+config_query_option ELINKS_OPTS \
+                    "Enable local CGI support?" n \
+                    "--enable-cgi" "--disable-cgi" &&
+
+config_query_option ELINKS_OPTS \
+                    "Enable FSP protocol support?" n \
+                    "--enable-fsp" "--disable-fsp" &&
+
+config_query_option ELINKS_OPTS \
+                    "Enable Gopher protocol support?" n \
+                    "--enable-gopher" "--disable-gopher" &&
+
+config_query_option ELINKS_OPTS \
+                    "Enable Finger protocol support?" n \
+                    "--enable-finger" "--disable-finger" &&
+
+config_query_option ELINKS_OPTS \
+                    "Enable NNTP protocol support?" y \
+                    "--enable-nntp" "--disable-nntp" &&
+
+config_query_option ELINKS_OPTS \
+                    "Enable BitTorrent protocol support?" y \
+                    "--enable-bittorrent" "--disable-bittorrent"
diff --git a/http/elinks/DEPENDS b/http/elinks/DEPENDS
index 46b4939..dd2fc39 100755
--- a/http/elinks/DEPENDS
+++ b/http/elinks/DEPENDS
@@ -1,75 +1,79 @@
-if  [  "$ELINKS_CVS" ==  'y'  ];  then
-  depends  CVS  &&
+optional_depends zlib \
+                 "--with-zlib" \
+                 "--without-zlib" \
+                 "for zlib compression support" &&
 
-  optional_depends  python                      \
-                    '--with-python'             \
-                    '--without-python'          \
-                    'python scripting support'
-fi  &&
+optional_depends bzip2 \
+                 "--with-bzlib" \
+                 "--without-bzlib" \
+                 "for BZIP2 compression support" &&
 
-optional_depends  zlib                            \
-                  '--with-zlib'                   \
-                  '--without-zlib'                \
-                  'for zlib compression support'  &&
+optional_depends X11-LIBS \
+                 "--with-x" \
+                 "--without-x" \
+                 "use X Window System" &&
 
-optional_depends  bzip2                            \
-                  '--with-bzlib'                   \
-                  '--without-bzlib'                \
-                  'for BZIP2 compression support'  &&
+optional_depends openssl \
+                 "--with-openssl" \
+                 "--without-openssl" \
+                 "encryption for HTTPS"  &&
 
-optional_depends  X11-LIBS                     \
-                  '--with-x'                   \
-                  '--without-x'                \
-                  'for X-Windows GUI support'  &&
+optional_depends spidermonkey \
+                 "--with-spidermonkey" \
+                 "--without-spidermonkey" \
+                 "SpiderMonkey Mozilla JavaScript engine support" &&
 
-optional_depends  openssl                 \
-                  '--with-openssl'        \
-                  '--without-openssl'     \
-                  'encryption for HTTPS'  &&
+optional_depends lua \
+                 "--with-lua" \
+                 "--without-lua" \
+                 "lua scripting support" &&
 
-# Only builds against OLD gnutls (1.0); if uncommenting, also remove
-# --without-gnutls from BUILD and uncomment line in TRIGGERS
-#optional_depends  gnutls                  \
-#                  '--with-gnutls'         \
-#                  '--without-gnutls'      \
-#                  'encryption for HTTPS'  &&
+optional_depends python \
+                 "--with-python" \
+                 "--without-python" \
+                 "python scripting support" &&
 
-optional_depends  lua                      \
-                  '--with-lua'             \
-                  '--without-lua'          \
-                  'lua scripting support'  &&
+optional_depends ruby \
+                 "--with-ruby" \
+                 "--without-ruby" \
+                 "ruby scripting support" &&
 
-optional_depends  guile                      \
-                  '--with-guile'             \
-                  '--without-guile'          \
-                  'guile scripting support'  &&
+optional_depends perl \
+                 "--with-perl" \
+                 "--without-perl" \
+                 "perl scripting support" &&
 
-optional_depends  perl                      \
-                  '--with-perl'             \
-                  '--without-perl'          \
-                  'perl scripting support'  &&
+optional_depends guile \
+                 "--with-guile" \
+                 "--without-guile" \
+                 "guile scripting support" &&
 
-optional_depends  ruby                      \
-                  '--with-ruby'             \
-                  '--without-ruby'          \
-                  'ruby scripting support'  &&
+optional_depends libidn \
+                 "--with-idn" \
+                 "--without-idn" \
+                 "international domain names support" &&
 
-optional_depends  libidn                                \
-                  '--with-idn'                          \
-                  '--without-idn'                       \
-                  'international domain names support'  &&
+optional_depends gpm \
+                 "--with-gpm" \
+                 "--without-gpm" \
+                 "GPM mouse support" &&
 
-optional_depends  gpm                  \
-                  '--with-gpm'         \
-                  '--without-gpm'      \
-                  'GPM mouse support'  &&
+optional_depends xterm \
+                 "--with-xterm" \
+                 "--without-xterm" \
+                 "how to invoke the X terminal emulator" &&
 
-optional_depends  expat                        \
-                  '--enable-xbel'              \
-                  '--disable-xbel'             \
-                  'for XBEL bookmark support'  &&
+optional_depends expat \
+                 "--enable-xbel" \
+                 "--disable-xbel" \
+                 "for XBEL bookmark support" &&
 
-optional_depends  samba                       \
-                  '--enable-smb'              \
-                  '--disable-smb'             \
-                  'for SMB protocol support'
+# SMB protocol support is disabled until ELinks 0.12.0 release
+#optional_depends samba \
+#                 "--enable-smb" \
+#                 "--disable-smb" \
+#                 "for SMB protocol support" &&
+
+if [[ $ELINKS_VCS == y ]]; then
+  depends git
+fi
diff --git a/http/elinks/DETAILS b/http/elinks/DETAILS
index 8dfa338..24741da 100755
--- a/http/elinks/DETAILS
+++ b/http/elinks/DETAILS
@@ -1,32 +1,34 @@
            SPELL=elinks
   SECURITY_PATCH=2
-if  [  "$ELINKS_CVS"  ==  'y'  ];  then
-  if  [  "$ELINKS_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if [[ $ELINKS_VCS == y ]]; then
+  if [[ $ELINKS_VCS_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
-         VERSION=cvs
+         VERSION=git
   fi
-          SOURCE=$SPELL-cvs.tar.bz2
-   SOURCE_URL[0]=cvs://:pserver:anonymous@cvs.elinks.or.cz:/var/cvs/elinks:elinks
+          SOURCE=$SPELL-$VERSION.tar.bz2
+   SOURCE_URL[0]=git_http://elinks.cz/elinks.git:$SPELL
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
          VERSION=0.11.4
-     SOURCE_HASH='sha512:46eeff2180204fc5c3007e5254d02cae227d0351a4ae651b7d38b6e391d5517e8bb73cffe31ea8326fdb526eb1dc1ffd62b1f8c020263ca2ed694a5b626b0337'
           SOURCE=$SPELL-$VERSION.tar.bz2
+         SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://elinks.or.cz/download/$SOURCE
-#     SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_GPG=elinks.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://elinks.or.cz/
          ENTERED=20050711
       LICENSE[0]=GPL
         KEYWORDS="web http"
-           SHORT='Feature-rich text mode web browser'
+           SHORT="feature-rich text mode web browser"
 cat << EOF
 ELinks is an advanced and well-established feature-rich text mode web
-(HTTP/FTP/..) browser.  ELinks can render both frames and tables, is highly
-customizable and can be extended via Lua or Guile scripts.  It is very portable
-and runs on a variety of platforms.  It originates from the Links project
-written by Mikulas Patocka.
+(HTTP/FTP/..) browser. ELinks can render both frames and tables, is highly
+customizable and can be extended via Lua or Guile scripts. It is very portable
+and runs on a variety of platforms. It originates from the Links project written
+by Mikulas Patocka.
 EOF
diff --git a/http/elinks/HISTORY b/http/elinks/HISTORY
index c922407..e5babe2 100644
--- a/http/elinks/HISTORY
+++ b/http/elinks/HISTORY
@@ -1,3 +1,18 @@
+2008-07-06 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: fixed short and long descs, replaced cvs with git, replaced
+	  hash with upstream gpg key, cleaned up
+	* PREPARE: added some bashism, replaced cvs with git, cleaned up
+	* PRE_BUILD: autoconf process moved to BUILD, added patch to fix lua
+	  detection and build (due to lua 5.0 -> 5.1 api changes)
+	* BUILD: autoconf on git version, added bittorrent protocol support,
+	  fixed multijob build, moved protocol opts to CONFIGURE
+	* DEPENDS: python is available now, cleaned up, removed commented gnutls
+	  dep: badly supported by upstream, added opt xterm and spidermonkey
+	  deps, commented samba support
+	* TRIGGERS: removed commented gnutls trigger
+	* CONFIGURE: added various options
+	* PROVIDES: added HTML_TO_TEXT provider
+
 2008-06-21 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 0.11.4
 
@@ -66,4 +81,3 @@
 
 2005-07-11 Jeremy Blosser <jblosser-smgl at firinn.org>
 	* BUILD, DEPENDS, DETAILS, PREPARE, PROVIDES, TRIGGERS: Initial version
-
diff --git a/http/elinks/PREPARE b/http/elinks/PREPARE
index a0d547c..9fd6945 100755
--- a/http/elinks/PREPARE
+++ b/http/elinks/PREPARE
@@ -1,6 +1,6 @@
-config_query  ELINKS_CVS  'Use development version from CVS?'  n  &&
+config_query ELINKS_VCS "Build latest version from development tree?" n &&
 
-if  [  "$ELINKS_CVS"  ==  "y"  ];  then
-  config_query  ELINKS_CVS_AUTOUPDATE                                       \
-                "Update to the latest CVS automatically on every cast?"  n
+if [[ $ELINKS_VCS == y ]]; then
+  config_query ELINKS_VCS_AUTOUPDATE \
+               "Automatically update on every system update?" n
 fi
diff --git a/http/elinks/PRE_BUILD b/http/elinks/PRE_BUILD
index 2437c55..a3208d9 100755
--- a/http/elinks/PRE_BUILD
+++ b/http/elinks/PRE_BUILD
@@ -1,6 +1,6 @@
-default_pre_build  &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
 
-if  [  "$ELINKS_CVS"  ==  'y'  ];  then
-  cd  $SOURCE_DIRECTORY  &&
-  NOCONFIGURE=ON  ./autogen.sh
+if is_depends_enabled $SPELL lua; then
+  patch -p0 < $SPELL_DIRECTORY/lua51.patch
 fi
diff --git a/http/elinks/PROVIDES b/http/elinks/PROVIDES
index 904c589..d3978a7 100755
--- a/http/elinks/PROVIDES
+++ b/http/elinks/PROVIDES
@@ -1 +1,2 @@
+HTML_TO_TEXT
 WEB-BROWSER
diff --git a/http/elinks/TRIGGERS b/http/elinks/TRIGGERS
index ee96a38..6f87e9c 100755
--- a/http/elinks/TRIGGERS
+++ b/http/elinks/TRIGGERS
@@ -1,2 +1 @@
 on_cast openssl check_self
-#on_cast gnutls  check_self
diff --git a/http/elinks/elinks.gpg b/http/elinks/elinks.gpg
new file mode 100644
index 0000000..7cf233f
Binary files /dev/null and b/http/elinks/elinks.gpg differ
diff --git a/http/elinks/lua51.patch b/http/elinks/lua51.patch
new file mode 100644
index 0000000..a7239e1
--- /dev/null
+++ b/http/elinks/lua51.patch
@@ -0,0 +1,72 @@
+--- configure.orig	2008-06-21 00:20:03.000000000 +0400
++++ configure	2008-07-06 13:27:54.943891435 +0400
+@@ -17623,7 +17623,7 @@
+ 	for luadir in "$withval" "" /usr /usr/local; do
+ 		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 ! -z "$luadir"; then
+ 					LUA_LIBS="-L$luadir/lib $LUA_LIBS"
+--- src/scripting/lua/core.c.orig	Sun Jan 29 08:10:39 2006
++++ src/scripting/lua/core.c	Thu Oct 19 14:10:34 2006
+@@ -633,7 +633,7 @@ do_hooks_file(LS, unsigned char *prefix,
+ 	if (file_can_read(file)) {
+ 		int oldtop = lua_gettop(S);
+ 
+-		if (lua_dofile(S, file) != 0)
++		if (luaL_dofile(S, file) != 0)
+ 			sleep(3); /* Let some time to see error messages. */
+ 		lua_settop(S, oldtop);
+ 	}
+@@ -644,13 +644,24 @@ do_hooks_file(LS, unsigned char *prefix,
+ void
+ init_lua(struct module *module)
+ {
++	static const luaL_Reg lualibs[] = {
++		{"", luaopen_base},
++		{LUA_TABLIBNAME, luaopen_table},
++		{LUA_IOLIBNAME, luaopen_io},
++		{LUA_OSLIBNAME, luaopen_os},
++		{LUA_STRLIBNAME, luaopen_string},
++		{LUA_MATHLIBNAME, luaopen_math},
++		{NULL, NULL}
++	};
++	const luaL_Reg *lib = lualibs;
++
+ 	L = lua_open();
+ 
+-	luaopen_base(L);
+-	luaopen_table(L);
+-	luaopen_io(L);
+-	luaopen_string(L);
+-	luaopen_math(L);
++	for (; lib->func; lib++) {
++		lua_pushcfunction(L, lib->func);
++		lua_pushstring(L, lib->name);
++		lua_call(L, 1, 0);
++	}
+ 
+ 	lua_register(L, LUA_ALERT, l_alert);
+ 	lua_register(L, "current_url", l_current_url);
+@@ -755,7 +766,7 @@ handle_ret_eval(struct session *ses)
+ 		int oldtop = lua_gettop(L);
+ 
+ 		if (prepare_lua(ses) == 0) {
+-			lua_dostring(L, expr);
++			luaL_dostring(L, expr);
+ 			lua_settop(L, oldtop);
+ 			finish_lua();
+ 		}
+--- src/scripting/lua/hooks.c.orig	Thu Oct 19 12:54:09 2006
++++ src/scripting/lua/hooks.c	Thu Oct 19 12:54:25 2006
+@@ -200,7 +200,7 @@ static enum evhook_status
+ script_hook_quit(va_list ap, void *data)
+ {
+ 	if (!prepare_lua(NULL)) {
+-		lua_dostring(lua_state, "if quit_hook then quit_hook() end");
++		luaL_dostring(lua_state, "if quit_hook then quit_hook() end");
+ 		finish_lua();
+ 	}
+ 



More information about the SM-Commit mailing list