[119354] trunk/dports/devel/lua-luasocket
snc at macports.org
snc at macports.org
Wed Apr 23 08:45:49 PDT 2014
Revision: 119354
https://trac.macports.org/changeset/119354
Author: snc at macports.org
Date: 2014-04-23 08:45:48 -0700 (Wed, 23 Apr 2014)
Log Message:
-----------
lua-luasocket: update to 3.0-rc1, #43462
Modified Paths:
--------------
trunk/dports/devel/lua-luasocket/Portfile
Added Paths:
-----------
trunk/dports/devel/lua-luasocket/files/patch-Makefiles.diff
Removed Paths:
-------------
trunk/dports/devel/lua-luasocket/files/patch-config.diff
Modified: trunk/dports/devel/lua-luasocket/Portfile
===================================================================
--- trunk/dports/devel/lua-luasocket/Portfile 2014-04-23 13:01:59 UTC (rev 119353)
+++ trunk/dports/devel/lua-luasocket/Portfile 2014-04-23 15:45:48 UTC (rev 119354)
@@ -4,8 +4,8 @@
PortSystem 1.0
name lua-luasocket
-version 2.0.2
-revision 1
+version 3.0_rc1
+revision 0
categories devel
license MIT
platforms darwin
@@ -19,30 +19,44 @@
homepage http://www.cs.princeton.edu/~diego/professional/luasocket/
-master_sites http://luaforge.net/frs/download.php/2664/
-checksums md5 41445b138deb7bcfe97bff957503da8e \
- sha1 5ce521fc5c6efb7c1eba7f36dfeafa9e4d745464 \
- rmd160 24d7e4fb1c9cf0c3d94f8b36e82d494ae922e268
-distname luasocket-${version}
+master_sites https://github.com/diegonehab/luasocket/archive/
+checksums md5 08bd2f265b244eb4bf5c2c36bf89b759 \
+ sha1 aff9122b26c01487c06a32133df78c1506af350f \
+ rmd160 27357eee7e52f091609f45a0b0fb7e04e9ea2bd8
+distname "v[regsub {_} $version {-}]"
+worksrcdir "luasocket-[regsub {_} $version {-}]"
depends_lib port:lua
+depends_build path:bin/pkg-config:pkgconfig
livecheck.type regex
livecheck.url http://luaforge.net/frs/?group_id=23
livecheck.regex {luasocket-([0-9.]+)\.tar\.gz}
-patchfiles patch-config.diff
+patchfiles patch-Makefiles.diff
use_configure no
post-patch {
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/config
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/makefile
+ reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/src/makefile
+ reinplace "s|@CFLAGS@|${configure.cppflags} ${configure.cflags}|g" ${worksrcpath}/src/makefile
}
+build {
+ set lua_version "[exec -- ${prefix}/bin/pkg-config --variable V lua]"
+ system "cd ${worksrcpath} && make DEBUG=DEBUG macosx LUAV=${lua_version}"
+}
+
+destroot {
+ set lua_version "[exec -- ${prefix}/bin/pkg-config --variable V lua]"
+ system "cd ${worksrcpath} && make DEBUG=DEBUG LUAV=${lua_version} DESTDIR=${destroot} PREFIX=${prefix} PLAT=macosx install-unix"
+}
+
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 755 -d ${destroot}${prefix}/share/examples/${name}
-
+
eval xinstall -m 644 [glob ${worksrcpath}/doc/*] ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 ${worksrcpath}/LICENSE ${worksrcpath}/NEW \
${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}
Added: trunk/dports/devel/lua-luasocket/files/patch-Makefiles.diff
===================================================================
--- trunk/dports/devel/lua-luasocket/files/patch-Makefiles.diff (rev 0)
+++ trunk/dports/devel/lua-luasocket/files/patch-Makefiles.diff 2014-04-23 15:45:48 UTC (rev 119354)
@@ -0,0 +1,37 @@
+diff -ur src/makefile.old src/makefile
+--- src/makefile.old 2014-04-22 22:37:30.000000000 +0200
++++ src/makefile 2014-04-23 00:09:31.000000000 +0200
+@@ -32,11 +32,11 @@
+ # where lua headers are found for macosx builds
+ # LUAINC_macosx:
+ # /opt/local/include
+-LUAINC_macosx_base?=/opt/local/include
+-LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV)
++LUAINC_macosx_base?=@PREFIX@/include
++LUAINC_macosx?=$(LUAINC_macosx_base)
+ # FIXME default should this default to fink or to macports?
+ # What happens when more than one Lua version is installed?
+-LUAPREFIX_macosx?=/opt/local
++LUAPREFIX_macosx?=@PREFIX@
+ CDIR_macosx?=lib/lua/$(LUAV)
+ LDIR_macosx?=share/lua/$(LUAV)
+
+@@ -128,15 +128,15 @@
+ # for Mac OS X
+ SO_macosx=so
+ O_macosx=o
+-CC_macosx=gcc
++CC_macosx=@CC@
+ DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN -DLUA_$(COMPAT)_MODULE \
+ -DLUASOCKET_API='__attribute__((visibility("default")))' \
+ -DUNIX_API='__attribute__((visibility("default")))' \
+ -DMIME_API='__attribute__((visibility("default")))'
+ CFLAGS_macosx= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \
+- -fvisibility=hidden
++ -fvisibility=hidden @CFLAGS@
+ LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
+-LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
++LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; @CC@
+ SOCKET_macosx=usocket.o
+
+ #------
Deleted: trunk/dports/devel/lua-luasocket/files/patch-config.diff
===================================================================
--- trunk/dports/devel/lua-luasocket/files/patch-config.diff 2014-04-23 13:01:59 UTC (rev 119353)
+++ trunk/dports/devel/lua-luasocket/files/patch-config.diff 2014-04-23 15:45:48 UTC (rev 119354)
@@ -1,57 +0,0 @@
---- config.old 2009-09-16 10:42:22.000000000 +0200
-+++ config 2009-09-16 10:44:04.000000000 +0200
-@@ -15,9 +15,7 @@
- #------
- # Lua includes and libraries
- #
--#LUAINC=-I/usr/local/include/lua50
--#LUAINC=-I/usr/local/include/lua5.1
--#LUAINC=-Ilua-5.1.1/src
-+LUAINC=-I at PREFIX@/include
-
- #------
- # Compat-5.1 directory
-@@ -28,10 +26,8 @@
- # Top of your Lua installation
- # Relative paths will be inside the src tree
- #
--#INSTALL_TOP_SHARE=/usr/local/share/lua/5.0
--#INSTALL_TOP_LIB=/usr/local/lib/lua/5.0
--INSTALL_TOP_SHARE=/usr/local/share/lua/5.1
--INSTALL_TOP_LIB=/usr/local/lib/lua/5.1
-+INSTALL_TOP_SHARE=$(DESTDIR)@PREFIX@/share/lua/5.1
-+INSTALL_TOP_LIB=$(DESTDIR)@PREFIX@/lib/lua/5.1
-
- INSTALL_DATA=cp
- INSTALL_EXEC=cp
-@@ -40,20 +36,20 @@
- # Compiler and linker settings
- # for Mac OS X
- #
--#CC=gcc
--#DEF= -DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN
--#CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fno-common
--#LDFLAGS=-bundle -undefined dynamic_lookup
--#LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
-+CC=gcc
-+DEF= -DLUASOCKET_DEBUG -DUNIX_HAS_SUN_LEN
-+CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common
-+LDFLAGS=-bundle -undefined dynamic_lookup
-+LD=export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
-
- #------
- # Compiler and linker settings
- # for Linux
--CC=gcc
--DEF=-DLUASOCKET_DEBUG
--CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
--LDFLAGS=-O -shared -fpic
--LD=gcc
-+#CC=gcc
-+#DEF=-DLUASOCKET_DEBUG
-+#CFLAGS= $(LUAINC) $(DEF) -pedantic -Wall -O2 -fpic
-+#LDFLAGS=-O -shared -fpic
-+#LD=gcc
-
- #------
- # End of makefile configuration
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140423/4498c87a/attachment.html>
More information about the macports-changes
mailing list