[118488] trunk/dports/devel/lua-luaexpat
and.damore at macports.org
and.damore at macports.org
Thu Apr 3 02:42:53 PDT 2014
Revision: 118488
https://trac.macports.org/changeset/118488
Author: and.damore at macports.org
Date: 2014-04-03 02:42:52 -0700 (Thu, 03 Apr 2014)
Log Message:
-----------
port lua-expat: upgrade to 1.3.0 version compatible with lua 5.2, fix #41119, nomaintainer
Modified Paths:
--------------
trunk/dports/devel/lua-luaexpat/Portfile
Added Paths:
-----------
trunk/dports/devel/lua-luaexpat/files/patch-Makefile.diff
Removed Paths:
-------------
trunk/dports/devel/lua-luaexpat/files/config-patch.diff
trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff
Modified: trunk/dports/devel/lua-luaexpat/Portfile
===================================================================
--- trunk/dports/devel/lua-luaexpat/Portfile 2014-04-03 09:10:05 UTC (rev 118487)
+++ trunk/dports/devel/lua-luaexpat/Portfile 2014-04-03 09:42:52 UTC (rev 118488)
@@ -4,8 +4,10 @@
PortSystem 1.0
name lua-luaexpat
-version 1.2.0
-set buildhash 30c2491fe44a
+version 1.3.0
+set hash 1adb0c435b54
+# this binds lua-expat to 5.2 since this is the current port:lua version in dports tree
+set lua_version 5.2
categories devel
license MIT
platforms darwin
@@ -15,17 +17,37 @@
LuaExpat is free software and uses the same license as Lua 5.1.
homepage http://www.keplerproject.org/luaexpat/index.html
master_sites http://code.matthewwild.co.uk/lua-expat/archive
-distname ${buildhash}
+distname ${hash}
use_configure no
-checksums sha1 c8de19c12f9d0899c3ecf5bf3c679910ea5d1c32 \
- rmd160 d1b6c8de59cfe1de814fb28f753ff850298ac735
-worksrcdir lua-expat-${buildhash}
-patchfiles config-patch.diff \
- makefile-patch.diff
-post-patch {
- reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/config
- reinplace s|luaL_reg|luaL_Reg|g ${worksrcpath}/src/lxplib.c
-}
+checksums sha1 794426889ddfdfe08d552495012b1d6a05826c6b \
+ rmd160 113e88216cfd9d379ba76c11fb6fc6902478d888
+worksrcdir lua-expat-${hash}
depends_build port:lua
depends_lib port:expat
build.target
+build.args CC=${configure.cc} \
+ CFLAGS="${configure.cppflags} ${configure.cflags} [get_canonical_archflags cc]" \
+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld] -llua" \
+ LUA_INC="" \
+ EXPAT_INC="" \
+ COMMON_LDFLAGS="-bundle -undefined dynamic_lookup"
+
+destroot.args LUA_LDIR=${prefix}/share/lua/${lua_version} \
+ LUA_CDIR=${prefix}/lib/lua/${lua_version}
+
+patchfiles patch-Makefile.diff
+
+post-destroot {
+ # install docs
+ xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
+ xinstall -m 0644 -W ${worksrcpath} README \
+ ${destroot}${prefix}/share/doc/${name}
+ foreach f [glob ${worksrcpath}/doc/us/*] {
+ xinstall -m 0644 $f ${destroot}${prefix}/share/doc/${name}
+ }
+
+ # install tests
+ xinstall -d -m 0755 ${destroot}${prefix}/share/examples
+ copy ${worksrcpath}/tests ${destroot}${prefix}/share/examples/${name}
+}
+
Deleted: trunk/dports/devel/lua-luaexpat/files/config-patch.diff
===================================================================
--- trunk/dports/devel/lua-luaexpat/files/config-patch.diff 2014-04-03 09:10:05 UTC (rev 118487)
+++ trunk/dports/devel/lua-luaexpat/files/config-patch.diff 2014-04-03 09:42:52 UTC (rev 118488)
@@ -1,33 +0,0 @@
---- config.orig 2006-06-08 22:41:48.000000000 +0200
-+++ config 2008-05-14 23:27:14.000000000 +0200
-@@ -1,23 +1,23 @@
- # Installation directories
- # System's libraries directory (where binary libraries are installed)
--LUA_LIBDIR= /usr/local/lib/lua/5.0
-+LUA_LIBDIR= %PREFIX%/lib/lua/5.2
- # System's lua directory (where Lua libraries are installed)
--LUA_DIR= /usr/local/share/lua/5.0
-+LUA_DIR= %PREFIX%/share/lua/5.2
- # Lua includes directory
--LUA_INC= /usr/local/include
-+LUA_INC= %PREFIX%/include
- # Expat includes directory
--EXPAT_INC= /usr/local/include
-+EXPAT_INC= %PREFIX%/include
-
- # OS dependent
--LIB_OPTION= -shared #for Linux
--#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
-+#LIB_OPTION= -shared #for Linux
-+LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
-
- LIBNAME= $T.so.$V
- # Lua version number
- # (according to Lua 5.1 definition:
- # first version digit * 100 + second version digit
- # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501)
--LUA_VERSION_NUM= 500
-+LUA_VERSION_NUM= 502
- COMPAT_DIR= ../compat/src
-
- # Compilation parameters
Deleted: trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff
===================================================================
--- trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff 2014-04-03 09:10:05 UTC (rev 118487)
+++ trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff 2014-04-03 09:42:52 UTC (rev 118488)
@@ -1,19 +0,0 @@
---- makefile.orig 2009-10-11 11:19:55.000000000 +0200
-+++ makefile 2009-10-11 11:20:43.000000000 +0200
-@@ -18,11 +18,11 @@
- $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-
- install:
-- mkdir -p $(LUA_LIBDIR)
-- cp src/$(LIBNAME) $(LUA_LIBDIR)
-- cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-- mkdir -p $(LUA_DIR)/$T
-- cp src/$T/lom.lua $(LUA_DIR)/$T
-+ mkdir -p $(DESTDIR)/$(LUA_LIBDIR)
-+ cp src/$(LIBNAME) $(DESTDIR)/$(LUA_LIBDIR)
-+ cd $(DESTDIR)/$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-+ mkdir -p $(DESTDIR)/$(LUA_DIR)/$T
-+ cp src/$T/lom.lua $(DESTDIR)/$(LUA_DIR)/$T
-
- clean:
- rm -f src/$(LIBNAME) $(OBJS)
Added: trunk/dports/devel/lua-luaexpat/files/patch-Makefile.diff
===================================================================
--- trunk/dports/devel/lua-luaexpat/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/devel/lua-luaexpat/files/patch-Makefile.diff 2014-04-03 09:42:52 UTC (rev 118488)
@@ -0,0 +1,15 @@
+--- Makefile.orig 2014-04-03 11:32:44.000000000 +0200
++++ Makefile 2014-04-03 11:33:27.000000000 +0200
+@@ -27,8 +27,10 @@
+ $(CC) $(CF) -o $@ src/$(T)lib.c $(LF)
+
+ install:
+- $(INSTALL_PROGRAM) -D src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
+- $(INSTALL_PROGRAM) -D src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
++ $(INSTALL_PROGRAM) -d $(DESTDIR)$(LUA_CDIR)/
++ $(INSTALL_PROGRAM) -d $(DESTDIR)$(LUA_LDIR)/$T
++ $(INSTALL_DATA) src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME)
++ $(INSTALL_DATA) src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua
+
+ clean:
+ $(RM) src/$(LIBNAME) $(OBJS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140403/ae38501e/attachment.html>
More information about the macports-changes
mailing list