Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3643/main/finkinfo/languages

Modified Files:
        lua51.info 
Log Message:
Update from tracker 
http://sourceforge.net/tracker/index.php?func=detail&aid=1696827&group_id=17203&atid=414256

Index: lua51.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/lua51.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lua51.info  12 Nov 2006 22:34:28 -0000      1.3
+++ lua51.info  1 May 2007 17:40:02 -0000       1.4
@@ -1,7 +1,8 @@
 #
 # lua51.info
 #
-# Fink package file, maintained by Asko Kauppi <[EMAIL PROTECTED]> and 
Jean-Louis Fuchs <[EMAIL PROTECTED]>
+# Fink package file, maintained by Asko Kauppi <[EMAIL PROTECTED]> and 
+# Jean-Louis Fuchs <[EMAIL PROTECTED]>
 #
 # Home:
 #   svn://slugak.dyndns.org/public/lua-fink/
@@ -15,8 +16,10 @@
 #    'update-alternatives' for the common 'lua' command (otherwise, no 
conflicts).
 #
 # Todo:
-#   - add 'lua51-xxx-64bit' packages, using 64-bit integers (integer patch) 
and doubles.
-#     See D.Morrison's email on 20.7.2006 20:37 for info.
+#   - none
+#
+# Bugs:
+#   - none known
 #
 # Notes:
 #   - The "-ev" parameter to scripts is giving quite a lot of (unnecessary?) 
build output.
@@ -24,12 +27,27 @@
 #     okay with just "-e".
 #
 # History:
+#   AKa 4-Apr-2007: 5.1.2-3 Using 5.1.2 proper
+#                   Compiling using dlopen() (LUA_USE_DLOPEN, LUA_USE_POSIX) 
+#                   and not NSLoadModule() (LUA_USE_MACOSX), due to 
multithreading
+#                   problems (NSLINKMODULE_OPTION_PRIVATE) using modules.
+#   AKa 28-Mar-2007: 5.1.2-2 Removing the token filter patch, by lhf's request.
+#   AKa 23-Mar-2007: 5.1.2-1 Using 5.1.2-rc1 just announced
+#   AKa 21-Mar-2007: 5.1.1-14 Changing 'lua51' interpreter to link into shared
+#                   library (was statically linked). This must solve issues of
+#                   unallocated free -messages with multithreading and multiple
+#                   Lua states.
+#   AKa 12.11.2006: 5.1.1-13 Applying LHF's token filter patch (as Source2).
+#                   "ranlib %i/lib/liblua.a" added back
+#                   removed the patch (Lua in fink stable is without it)
+#   AKa 4.10.2006: 5.1.1-12 liblua.a (static library) troubles solved, 
required no changes in
+#                   the .info (= -11 is still bugless, KNOCK-KNOCK)
 #   AKa 9.9.2006: 5.1.1-11 Man pages as "slave alternatives", requested by 
bcully.
 #   AKa 24.8.2006: 5.1.1-10 Adding /usr/local/share/lua/5.1/ and 
/usr/local/lib/5.1/ into 
-#                           module paths (user compiled modules). 
+#                   module paths (user compiled modules). 
 #   AKa 24.8.2006: 5.1.1-9 Adding '%i/lib/pkgconfig/lua.pc'
-#                          Adding '%i/include/lua.hpp'
-#                          Adding also 'luac' to use "update-alternatives"
+#                   Adding '%i/include/lua.hpp'
+#                   Adding also 'luac' to use "update-alternatives"
 #   AKa 20.8.2006: 5.1.1-8 Using 'SourceRename:' to allow test use of Lua 
alphas/betas to come.
 #   AKa 16.8.2006: 5.1.1-7 Added use of "update-alternatives", to get the 
'lua' command point to
 #                         the most recent Lua instance there is.
@@ -53,45 +71,45 @@
 
 # --- lua51 (main package, Lua 5.1 'lua51' interpreter) ---
 #
-# Pure script packages can depend on 'lua51' package, making sure they have 
the version 
-# of Lua available that they were tested with.
-#
-# Note: This package is NOT dependent on 'lua51-shlibs', the Lua code is 
baked-in into the interpreter itself
-#       (can be done both ways, this seems to be currently preferred in 5.1 
and is simpler)
+# Pure script packages can depend on 'lua51' package, making sure they have 
the 
+# version of Lua available that they were tested with.
 #
-# Note: Do NOT use %v (version) automatically in place of each "5.1.1" and 
such there is; Lua 5.2 will have
-#      %v=5.2, but 5.2.0 is needed as the "long version".
+# Note: Do NOT use %v (version) automatically in place of each "5.1.2" and such
+#       there is; Lua 5.2 will have %v=5.2, but 5.2.0 is needed as the "long
+#       version".
 #
-# Note: Some script packages may sport their own command line shell scripts, 
launching Lua 5.1
-#      in turn. Such references should be made to the 'lua51' binary, _not_ 
'lua' which might
-#      refer to other (more recent) Lua versions. Packages simply installing 
scripts under
-#      '%i/share/lua/5.1' do not need to bother, of course. :)
+# Note: Some script packages may sport their own command line shell scripts, 
+#       launching Lua 5.1 in turn. Such references should be made to the 
'lua51'
+#       binary, _not_ 'lua' which might refer to other (more recent) versions.
+#       Packages simply installing scripts under '%i/share/lua/5.1' do not need
+#       to bother, of course. :)
 #
 Package: lua51
-Version: 5.1.1
+Version: 5.1.2
 Revision: 3
+Depends: lua51-shlibs
 Conflicts: lua (<< 5.1)
 Replaces: lua (<< 5.1), lua51-sdl (<< 5.1.1-6)
 
 # vital for trying out Lua alpha/beta packages
 SourceRename: lua-%v.tar.gz
+
+# 5.1.2
 Source: http://www.lua.org/ftp/lua-%v.tar.gz
-Source-MD5: 22f4f912f20802c11006fe9b84d5c461
+Source-MD5: 687ce4c2a1ddff18f1008490fdc4e5e0
 
-# ---
-# 'lundump.patch' is directly from Lua mailing list, and is _not_ in the 
suggested Fink patch format
-# (neither do I care to transform it... :)
-#
-# It adds a conveniency, Intel/PowerPC transparency feature for precompiled 
scripts. This is NOT
-# required to have Lua 5.1 in working condition, but can be considered a nice 
extra. To switch it
-# off, just comment out the "PatchScript" line.
-#
-# When applying patch:
-#   pwd: /sw/src/fink.build/lua51-5.1.1-3/lua-5.1.1
-#   %a: /sw/fink/dists/local/main/finkinfo/
+# 5.1.2-rc1
+#Source: http://www.lua.org/work/lua-%v-rc1.tar.gz
+#Source-MD5: 6a54c2249e669e83993dabc57912d39d
+# 5.1.1
+#Source: http://www.lua.org/ftp/lua-%v.tar.gz
+#Source-MD5: 22f4f912f20802c11006fe9b84d5c461
+
+# LHF's token filter support (EXPERIMENTAL!)
+# AK 28-Mar-07: commented out
 #
-# 12nov2006 lrosengreen: patch removed, after discussion with maintainer
-# PatchScript: cd src && patch < %a/lundump.patch
+#Source2: http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/5.1/tokenf.tar.gz
+#Source2-MD5: 3cfacd74c1656136ac766c9ed04e0d44
 
 # ---
 Description: Small and fast embeddable scripting language
@@ -127,21 +145,35 @@
 # Comments are here to avoid unnecessary output when executing the script 
(-ev).
 #
 # 1. Change LUA_ROOT definition: "/usr/local/" -> "%p/"
-# 2. Allow use of either .so or .bundle as the binary module postfix (Lua 5.1 
only has .so)
+# 2. Allow use of either .so or .bundle as the binary module postfix (Lua 5.1 
+#    only has .so)
 # 3. >= 10.4: has built-in readline that we can (and should!) use
-#     < 10.4: no proper command line edit and history (but no dependencies, 
either)
+#     < 10.4: no proper command line edit and history (but no dependencies, 
+#             either)
 #
 # NOTE: Stock Lua compilation does not create dynamic libraries; we do it here.
 #       For some reason, cannot be done from 'liblua.a' directly, that will
 #       lose all the symbols. :(   (at least was so on 10.4-transitional)
 #
-# NOTE: Install name is BY PURPOSE "liblua.5.1.dylib" (N = 5.1) since Lua has 
5.1 and
-#       (potential) 5.2 binary incompatible (other than most OSS projects, 
where 
-#       5 and 6 would be). Use "current_version 5.2.0 -o liblua.5.2.0.dylib" 
for 5.2 
+# NOTE: Install name is BY PURPOSE "liblua.5.1.dylib" (N = 5.1) since Lua has 
+#       5.1 and (potential) 5.2 binary incompatible (other than most OSS 
+#       projects, where 5 and 6 would be). 
+#       Use "current_version 5.2.0 -o liblua.5.2.0.dylib" for 5.2 
 #
 # NOTE: Lua 5.1.1 sources themselves allow .lua files to be searched also in 
the 
-#       "/lib" (LUA_CDIR) paths. This should _not_ be so by Unix convention; 
we are 
-#       taking a stricter side here (script files into 'share', binaries into 
'lib').
+#       "/lib" (LUA_CDIR) paths. This should _not_ be so by Unix convention; 
we 
+#       are taking a stricter side here (script files into 'share', binaries 
+#       into 'lib').
+#
+# NOTE: We make 'lua' separately after the default compilation, linking it to
+#       the dylib just created. This is needed for proper behaviour with 
+#       multithreading & multiple Lua states (5.1.1-14).
+#
+# pwd:  /sw/src/fink.build/lua51-5.1.1-13/lua-5.1.1
+# src2: /sw/src/fink.build/lua51-5.1.1-13/tokenf
+#
+ #AK 28-Mar-07: commented out
+ #cp ../../tokenf/llex.c ../../tokenf/proxy.c ./
 #
 CompileScript: <<
 #!/bin/sh -ev
@@ -159,15 +191,16 @@
                        
"/usr/local/lib/lua/5.1/?.bundle;/usr/local/lib/lua/5.1/?.so;" \
                        
"/usr/local/lib/lua/5.1/loadall.bundle;/usr/local/lib/lua/5.1/loadall.so;"' \
     >> luaconf.h
+ make all MYCFLAGS="-fno-common -DLUA_USE_POSIX -DLUA_USE_DLOPEN"
+ rm -f lua.o luac.o
+ cc -dynamiclib -install_name %p/lib/liblua.5.1.dylib \
+    -compatibility_version 5.1 -current_version 5.1.2 \
+    -o liblua.5.1.2.dylib *.o
  if [ `uname -r` \< "8.7.0" ]; then 
-    make all MYCFLAGS="-fno-common -DLUA_USE_MACOSX"
+    cc -fno-common -DLUA_USE_POSIX -DLUA_USE_DLOPEN -L. -llua.5.1.2 lua.c -o 
lua
  else
-    make all MYCFLAGS="-fno-common -DLUA_USE_MACOSX -DLUA_USE_READLINE" 
MYLIBS="-lreadline"
+    cc -fno-common -DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE 
-lreadline -L. -llua.5.1.2 lua.c -o lua
  fi
- rm -f lua.o luac.o
- cc -dynamiclib -install_name %p/lib/liblua.5.1.dylib \
-    -compatibility_version 5.1 -current_version 5.1.1 \
-    -o liblua.5.1.1.dylib *.o
 <<
 
 InstallScript: <<
@@ -201,7 +234,7 @@
 
 These are in the lua51-dev package, which has "conflicts: lua (<< 5.1)"
 declared in it.  User can have several Lua versions installed, but will
-only be able to develop (C bindings) for one of them.
+only be able to develop C bindings with one of them (at a time).
 <<
 
 #---
@@ -217,9 +250,9 @@
 #
 PostInstScript: <<
  update-alternatives --install %p/bin/lua lua %p/bin/lua51 51 \
-                     --slave %p/share/man/man1/lua.1 lua.1 
%p/share/man/man1/lua51.1
+            --slave %p/share/man/man1/lua.1 lua.1 %p/share/man/man1/lua51.1
  update-alternatives --install %p/bin/luac luac %p/bin/luac51 51 \
-                     --slave %p/share/man/man1/luac.1 luac.1 
%p/share/man/man1/luac51.1
+            --slave %p/share/man/man1/luac.1 luac.1 %p/share/man/man1/luac51.1
 <<
 PreRmScript: <<
  if [ $1 != "upgrade" ]; then
@@ -233,8 +266,8 @@
 #
 # See "3.4 Shared libraries" at 
http://fink.sourceforge.net/doc/packaging/policy.php
 #
-# This package only installs the _versioned_ shared libraries, thus allowing 
co-existence
-# with other Lua shared library versions (s.a. 5.0, potential 5.2)
+# This package only installs the _versioned_ shared libraries, thus allowing 
+# co-existence with other Lua shared library versions (s.a. 5.0, potential 5.2)
 #
 SplitOff: <<
 Package: lua51-shlibs
@@ -252,17 +285,20 @@
       install
  rm -rf %i/bin %i/man %i/include
  rm %i/lib/*.a
- cp src/liblua.5.1.1.dylib       %i/lib/liblua.5.1.1.dylib
- ln -s %p/lib/liblua.5.1.1.dylib %i/lib/liblua.5.1.dylib
+ cp src/liblua.5.1.2.dylib       %i/lib/liblua.5.1.2.dylib
+ ln -s %p/lib/liblua.5.1.2.dylib %i/lib/liblua.5.1.dylib
 <<
 
 DocFiles: COPYRIGHT HISTORY INSTALL README
 
-# library with -install_name '%p/lib/liblua.5.1.dylib' and 
-compatibility_version 5.1.0 has been installed
-# since version 5.1.1-1 of the lua51 package. 
(http://fink.sourceforge.net/doc/packaging/policy.php)
+# library with -install_name '%p/lib/liblua.5.1.dylib' and 
-compatibility_version
+# 5.1.0 has been installed since version 5.1.1-0 of the lua51 package. 
+# (http://fink.sourceforge.net/doc/packaging/policy.php)
+#
+# DO _NOT_ UPDATE THESE VERSION NUMBERS - in 5.1.x version changes!
 #
 Shlibs: <<
-  %p/lib/liblua.5.1.dylib 5.1.0 lua51-shlibs (>= 5.1.1-1)
+  %p/lib/liblua.5.1.dylib 5.1.0 lua51-shlibs (>= 5.1.1-0)
 <<
 
 Description: Shared libraries for linking Lua 5.1 engine into an application
@@ -271,12 +307,12 @@
 
 # --- lua51-dev (development headers, static library, unversioned dynamic 
library link) ---
 #
-# Only one of these packages can exist on the system at any time, defining 
which Lua
-# version is 'seen' by C programs compiling for it. 
+# Only one of these packages can exist on the system at any time, defining 
which
+# Lua version is 'seen' by C programs compiling for it. 
 #
-# NOTE! With upcoming versions, do remember to add all earlier packages in the 
conflicts:
-# Conflicts: lua (<< 5.1), lua51-dev
-# Replaces: lua (<< 5.1), lua51-dev
+# NOTE! With upcoming versions, do remember to add all earlier packages in:
+#   Conflicts: lua (<< 5.1), lua51-dev
+#   Replaces: lua (<< 5.1), lua51-dev
 #
 SplitOff2: <<
 Package: lua51-dev
@@ -299,11 +335,12 @@
       install
  rm -rf %i/bin
  rm -rf %i/man
- ln -s %p/lib/liblua.5.1.1.dylib %i/lib/liblua.dylib
+ ln -s %p/lib/liblua.5.1.2.dylib %i/lib/liblua.dylib
  cp etc/lua.hpp %i/include/lua.hpp
  mkdir -p %i/lib
  mkdir -p %i/lib/pkgconfig
  cat etc/lua.pc | sed "s+/usr/local+%p+" > %i/lib/pkgconfig/lua.pc
+ ranlib %i/lib/liblua.a
 <<
 
 DocFiles: COPYRIGHT HISTORY INSTALL README
@@ -316,3 +353,5 @@
 <<
 <<
 
+
+                


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to