[59190] trunk/dports/devel/lua-luaexpat
and.damore at macports.org
and.damore at macports.org
Sun Oct 11 02:31:49 PDT 2009
Revision: 59190
http://trac.macports.org/changeset/59190
Author: and.damore at macports.org
Date: 2009-10-11 02:31:46 -0700 (Sun, 11 Oct 2009)
Log Message:
-----------
fixed makefile ${prefix} patch, closing #21978
Modified Paths:
--------------
trunk/dports/devel/lua-luaexpat/Portfile
Added Paths:
-----------
trunk/dports/devel/lua-luaexpat/files/config-patch.diff
trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff
Removed Paths:
-------------
trunk/dports/devel/lua-luaexpat/files/patch-luaexpat.diff
Modified: trunk/dports/devel/lua-luaexpat/Portfile
===================================================================
--- trunk/dports/devel/lua-luaexpat/Portfile 2009-10-11 09:10:00 UTC (rev 59189)
+++ trunk/dports/devel/lua-luaexpat/Portfile 2009-10-11 09:31:46 UTC (rev 59190)
@@ -16,32 +16,11 @@
checksums md5 6ecb895ccf5cff1e7f2facd438b1f8d0 \
sha1 ea359bdbd346ee378c47179a17ac3ee410be5c9d \
rmd160 f661c0e7f22363f51862187e96306498addea9d9
-patchfiles patch-luaexpat.diff
+patchfiles config-patch.diff \
+ makefile-patch.diff
patch.pre_args -p1
+post-patch {
+ reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/config
+}
depends_lib port:expat
build.target
-destroot {
- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
- file copy ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
- foreach doc [glob doc/us/*] {
- xinstall -m 0644 ${doc} ${destroot}${prefix}/share/doc/${name}
- }
-
- # Binaries
- xinstall -m 755 -d ${destroot}${prefix}/lib/lua/5.1
- foreach lib [glob src/*.so.*] {
- xinstall -m 0644 ${lib} ${destroot}${prefix}/lib/lua/5.1
- }
-
- # Lua libraries
- xinstall -m 755 -d ${destroot}${prefix}/share/lua/5.1/lxp
- foreach luadat [glob src/lxp/*.lua] {
- xinstall -m 0644 ${luadat} ${destroot}${prefix}/share/lua/5.1/lxp
- }
-
- # Lua includes
- xinstall -m 755 -d ${destroot}${prefix}/include/lua5.1
- foreach inc [glob src/*.h] {
- xinstall -m 0644 ${inc} ${destroot}${prefix}/include/lua5.1
- }
-}
Copied: trunk/dports/devel/lua-luaexpat/files/config-patch.diff (from rev 59185, trunk/dports/devel/lua-luaexpat/files/patch-luaexpat.diff)
===================================================================
--- trunk/dports/devel/lua-luaexpat/files/config-patch.diff (rev 0)
+++ trunk/dports/devel/lua-luaexpat/files/config-patch.diff 2009-10-11 09:31:46 UTC (rev 59190)
@@ -0,0 +1,34 @@
+diff -ru luaexpat-1.1/config.orig luaexpat-1.1/config
+--- luaexpat-1.1/config.orig 2006-06-08 22:41:48.000000000 +0200
++++ luaexpat-1.1/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.1
+ # System's lua directory (where Lua libraries are installed)
+-LUA_DIR= /usr/local/share/lua/5.0
++LUA_DIR= %PREFIX%/share/lua/5.1
+ # 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= 501
+ COMPAT_DIR= ../compat/src
+
+ # Compilation parameters
Added: trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff
===================================================================
--- trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff (rev 0)
+++ trunk/dports/devel/lua-luaexpat/files/makefile-patch.diff 2009-10-11 09:31:46 UTC (rev 59190)
@@ -0,0 +1,19 @@
+--- luaexpat-1.1/makefile.orig 2009-10-11 11:19:55.000000000 +0200
++++ luaexpat-1.1/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)
Deleted: trunk/dports/devel/lua-luaexpat/files/patch-luaexpat.diff
===================================================================
--- trunk/dports/devel/lua-luaexpat/files/patch-luaexpat.diff 2009-10-11 09:10:00 UTC (rev 59189)
+++ trunk/dports/devel/lua-luaexpat/files/patch-luaexpat.diff 2009-10-11 09:31:46 UTC (rev 59190)
@@ -1,34 +0,0 @@
-diff -ru luaexpat-1.1-orig/config luaexpat-1.1/config
---- luaexpat-1.1-orig/config 2006-06-08 22:41:48.000000000 +0200
-+++ luaexpat-1.1/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= /opt/local/lib/lua/5.1
- # System's lua directory (where Lua libraries are installed)
--LUA_DIR= /usr/local/share/lua/5.0
-+LUA_DIR= /opt/local/share/lua/5.1
- # Lua includes directory
--LUA_INC= /usr/local/include
-+LUA_INC= /opt/local/include
- # Expat includes directory
--EXPAT_INC= /usr/local/include
-+EXPAT_INC= /opt/local/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= 513
- COMPAT_DIR= ../compat/src
-
- # Compilation parameters
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091011/f3f2c33d/attachment.html>
More information about the macports-changes
mailing list