pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Adapt to lua-5.1.1. Bump PKGREVISION.
details: https://anonhg.NetBSD.org/pkgsrc/rev/6bb10a4724f0
branches: trunk
changeset: 517559:6bb10a4724f0
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Aug 14 22:37:57 2006 +0000
description:
Adapt to lua-5.1.1. Bump PKGREVISION.
diffstat:
games/stratagus/Makefile | 4 +-
games/stratagus/distinfo | 5 +-
games/stratagus/patches/patch-ab | 20 ++++-
games/stratagus/patches/patch-ac | 13 +++
wm/ion/Makefile | 6 +-
wm/ion/distinfo | 21 +++-
wm/ion/patches/patch-aa | 161 +++++++++++++++++++++++++++++++++++++++
wm/ion/patches/patch-ab | 41 +++++++++
wm/ion/patches/patch-ac | 23 +++++
wm/ion/patches/patch-ad | 4 +-
wm/ion/patches/patch-ae | 4 +-
wm/ion/patches/patch-af | 32 +++++++
wm/ion/patches/patch-ag | 105 +++++++++++++++++++++++++
wm/ion/patches/patch-ah | 4 +-
wm/ion/patches/patch-ai | 4 +-
wm/ion/patches/patch-aj | 4 +-
wm/ion/patches/patch-ak | 4 +-
wm/ion/patches/patch-al | 23 +++++
wm/ion/patches/patch-am | 55 +++++++++++++
www/elinks/Makefile | 4 +-
www/elinks/distinfo | 5 +-
www/elinks/patches/patch-aa | 28 ++++++
www/elinks/patches/patch-ab | 22 +++++
www/elinks/patches/patch-ac | 13 +++
24 files changed, 574 insertions(+), 31 deletions(-)
diffs (truncated from 772 to 300 lines):
diff -r bd72fe57b8f4 -r 6bb10a4724f0 games/stratagus/Makefile
--- a/games/stratagus/Makefile Mon Aug 14 22:37:21 2006 +0000
+++ b/games/stratagus/Makefile Mon Aug 14 22:37:57 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/06/15 13:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/08/14 22:37:57 wiz Exp $
#
DISTNAME= stratagus-2.1-src
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stratagus/}
diff -r bd72fe57b8f4 -r 6bb10a4724f0 games/stratagus/distinfo
--- a/games/stratagus/distinfo Mon Aug 14 22:37:21 2006 +0000
+++ b/games/stratagus/distinfo Mon Aug 14 22:37:57 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/05/15 21:30:00 joerg Exp $
+$NetBSD: distinfo,v 1.4 2006/08/14 22:37:57 wiz Exp $
SHA1 (stratagus-2.1-src.tar.gz) = 33181d57e018825a450f1e8c0ec31b0887cbd39c
RMD160 (stratagus-2.1-src.tar.gz) = f5f97854cad9f17104de34613012fd3aa2efbb9b
Size (stratagus-2.1-src.tar.gz) = 995686 bytes
SHA1 (patch-aa) = 2f1403d58b3a745845c3b3e94abb7cf65b00194d
-SHA1 (patch-ab) = 404081c88b943c3edc76e0503c19fdb98a732145
+SHA1 (patch-ab) = cd9235023dcb2bc05828857c8f1d538a0d06eab5
+SHA1 (patch-ac) = 78aca58075dd730a799dc9d0fb79ca4c6c010a34
diff -r bd72fe57b8f4 -r 6bb10a4724f0 games/stratagus/patches/patch-ab
--- a/games/stratagus/patches/patch-ab Mon Aug 14 22:37:21 2006 +0000
+++ b/games/stratagus/patches/patch-ab Mon Aug 14 22:37:57 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2006/05/15 21:30:00 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2006/08/14 22:37:57 wiz Exp $
---- configure.orig 2006-05-15 21:03:08.000000000 +0000
+--- configure.orig 2004-07-02 01:46:35.000000000 +0000
+++ configure
@@ -3050,7 +3050,7 @@ if test "`uname -a | grep -is cygwin`" -
ARCH=win32
@@ -11,3 +11,19 @@
ARCH=bsd
PLATFORM="-DBSD"
elif test "`uname -a | grep -is beos`"; then
+@@ -5548,6 +5548,7 @@ fi
+
+ fi
+
++if false; then
+ echo "$as_me:$LINENO: checking for luaopen_base in -llualib" >&5
+ echo $ECHO_N "checking for luaopen_base in -llualib... $ECHO_C" >&6
+ if test "${ac_cv_lib_lualib_luaopen_base+set}" = set; then
+@@ -5759,6 +5760,7 @@ fi
+ fi
+
+ fi
++fi
+
+ LUA_LIBS="$LUA_LIBS -lm"
+
diff -r bd72fe57b8f4 -r 6bb10a4724f0 games/stratagus/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/games/stratagus/patches/patch-ac Mon Aug 14 22:37:57 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/08/14 22:37:57 wiz Exp $
+
+--- src/stratagus/script.c.orig 2004-06-26 22:38:18.000000000 +0000
++++ src/stratagus/script.c
+@@ -325,7 +325,7 @@ void CclGarbageCollect(int fast)
+ DebugPrint("Garbage collect (before): %d/%d\n" _C_
+ lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
+
+- lua_setgcthreshold(Lua, 0);
++ lua_gc(Lua, LUA_GCCOLLECT, 0);
+
+ DebugPrint("Garbage collect (after): %d/%d\n" _C_
+ lua_getgccount(Lua) _C_ lua_getgcthreshold(Lua));
diff -r bd72fe57b8f4 -r 6bb10a4724f0 wm/ion/Makefile
--- a/wm/ion/Makefile Mon Aug 14 22:37:21 2006 +0000
+++ b/wm/ion/Makefile Mon Aug 14 22:37:57 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2006/06/08 09:47:14 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/08/14 22:40:53 wiz Exp $
#
DISTNAME= ion-2-20040729
PKGNAME= ${DISTNAME:S/-2-/-/}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= wm x11
MASTER_SITES= http://modeemi.cs.tut.fi/~tuomov/ion/dl/
@@ -33,7 +33,7 @@
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-INSTALLATION_DIRS= bin lib/ion libexec/ion man/man1
+INSTALLATION_DIRS= bin lib/ion libexec/ion ${PKGMANDIR}/man1
INSTALLATION_DIRS+= share/doc/ion share/examples/ion share/ion
.include "../../lang/lua/buildlink3.mk"
diff -r bd72fe57b8f4 -r 6bb10a4724f0 wm/ion/distinfo
--- a/wm/ion/distinfo Mon Aug 14 22:37:21 2006 +0000
+++ b/wm/ion/distinfo Mon Aug 14 22:37:57 2006 +0000
@@ -1,11 +1,18 @@
-$NetBSD: distinfo,v 1.16 2005/02/23 18:43:54 wiz Exp $
+$NetBSD: distinfo,v 1.17 2006/08/14 22:40:53 wiz Exp $
SHA1 (ion-2-20040729.tar.gz) = 92329a392de13dfb79ecd236eeb121a7045327e5
RMD160 (ion-2-20040729.tar.gz) = a32053c744cc130d9feb07f64bf3fef6cb4fa0c7
Size (ion-2-20040729.tar.gz) = 399367 bytes
-SHA1 (patch-ad) = 063d68427764a3cdde8ef52d798583d43a3f5dca
-SHA1 (patch-ae) = 69581555a9805360f6c15f338420a16912c2966f
-SHA1 (patch-ah) = 2e123cf133811518de31453a11ba2a1a47df440f
-SHA1 (patch-ai) = 05d9748fdbd04f5af3e89cafb69e1d060641af83
-SHA1 (patch-aj) = 8bd079ca571f058a5fb2c2112215d442d92f0e5f
-SHA1 (patch-ak) = a6236279a8ab91b9a9f0b24996825e590751f8a0
+SHA1 (patch-aa) = c0d85dbd55aee975bfda331ed4d5fa0624c52018
+SHA1 (patch-ab) = 43eadf5e67f579bab2b60075099630cb69f44ef7
+SHA1 (patch-ac) = 7d8ce4c6a5e827a45d8f8c397d783eeda9fd69a1
+SHA1 (patch-ad) = e5c10cf264e1b43144af7dec64c11c588e6384dc
+SHA1 (patch-ae) = 403325bab7298e88232872275287fbde102cd5a3
+SHA1 (patch-af) = aa1871320528f4e3d51686b977e37022cd10c9e5
+SHA1 (patch-ag) = 9dfe4f3b703fc130d4a16a4141b8c815fab0564a
+SHA1 (patch-ah) = 82e21bce3d4bc0456a9f194f9d7e6d09e1418014
+SHA1 (patch-ai) = 0bcc1fd90f3e68fe869458387ab91fdb70393748
+SHA1 (patch-aj) = a0a78f7e3f7e6109db80b6da81293a5abefb09c0
+SHA1 (patch-ak) = f2a8f6cb99e69b539d5f1085c638e5ea20fac6e6
+SHA1 (patch-al) = 19941501d9a51b07e113ae46505800b290d4317b
+SHA1 (patch-am) = 2ada18354c7427fb9f9abbc537030fc7d3d1e2a8
diff -r bd72fe57b8f4 -r 6bb10a4724f0 wm/ion/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/ion/patches/patch-aa Mon Aug 14 22:37:57 2006 +0000
@@ -0,0 +1,161 @@
+$NetBSD: patch-aa,v 1.3 2006/08/14 22:40:53 wiz Exp $
+
+--- configure.orig 2004-07-29 03:10:34.000000000 +0000
++++ configure
+@@ -5254,7 +5254,7 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char lua_open ();
++#include <lua.h>
+ int
+ main ()
+ {
+@@ -5437,147 +5437,6 @@ if test $ac_cv_lib_m_exp = yes; then
+ lua_extra_libs="$lua_extra_libs -lm"
+ fi
+
+-as_ac_Lib=`echo "ac_cv_lib_lualib$with_lua_suffix''_luaopen_loadlib" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for luaopen_loadlib in -llualib$with_lua_suffix" >&5
+-echo $ECHO_N "checking for luaopen_loadlib in -llualib$with_lua_suffix... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-llualib$with_lua_suffix $LUA_LIBS $lua_extra_libs $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char luaopen_loadlib ();
+-int
+-main ()
+-{
+-luaopen_loadlib ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- eval "$as_ac_Lib=yes"
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Lib=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+- LUA_LIBS="$LUA_LIBS $lua_extra_libs -llualib$with_lua_suffix"
+-else
+- exit 1
+-fi
+-
+-
+-echo "$as_me:$LINENO: checking for liblua version >= 5.0" >&5
+-echo $ECHO_N "checking for liblua version >= 5.0... $ECHO_C" >&6
+-save_CFLAGS="$CFLAGS"
+-save_LIBS="$LIBS"
+-CFLAGS="$CFLAGS $LUA_INCLUDES"
+-LIBS="$LIBS $LUA_LIBS"
+-if test "$cross_compiling" = yes; then
+- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-
+-#include <lua.h>
+-#include <stdlib.h>
+-#include <string.h>
+-
+-int main()
+-{
+- if(strcmp(lua_version(), LUA_VERSION)!=0){
+- printf("Error: lua_version() does not match LUA_VERSION. ");
+- exit(EXIT_FAILURE);
+- }
+- printf("(found %s)... ", lua_version());
+- if(strcmp(lua_version(), "Lua 5.0")<0)
+- exit(EXIT_FAILURE);
+- exit(EXIT_SUCCESS);
+-}
+-
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+- exit 1
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-CFLAGS="$save_CFLAGS"
+-LIBS="$save_LIBS"
+-
+-
+-
+-
+
+ echo "$as_me:$LINENO: checking for asprintf" >&5
+ echo $ECHO_N "checking for asprintf... $ECHO_C" >&6
diff -r bd72fe57b8f4 -r 6bb10a4724f0 wm/ion/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/ion/patches/patch-ab Mon Aug 14 22:37:57 2006 +0000
@@ -0,0 +1,41 @@
Home |
Main Index |
Thread Index |
Old Index