diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/luasocket/Makefile | 50 | ||||
-rw-r--r-- | net/luasocket/distinfo | 6 | ||||
-rw-r--r-- | net/luasocket/files/patch-aa | 11 | ||||
-rw-r--r-- | net/luasocket/files/patch-config | 54 | ||||
-rw-r--r-- | net/luasocket/pkg-plist | 55 |
5 files changed, 116 insertions, 60 deletions
diff --git a/net/luasocket/Makefile b/net/luasocket/Makefile index 86fcaec42508..47a13908f0e1 100644 --- a/net/luasocket/Makefile +++ b/net/luasocket/Makefile @@ -6,42 +6,40 @@ # PORTNAME= luasocket -PORTVERSION= 1.4 +PORTVERSION= 2.0 CATEGORIES= net -MASTER_SITES= http://www.cs.princeton.edu/~diego/professional/luasocket/old/luasocket-1.4/ +MASTER_SITES= http://luaforge.net/frs/download.php/1097/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= andrew+ports@fubar.geek.nz COMMENT= IPv4 Sockets support for the Lua language -BUILD_DEPENDS= ${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua4 +BUILD_DEPENDS= ${LOCALBASE}/include/lua.h:${PORTSDIR}/lang/lua + +USE_GMAKE= yes post-extract: @ ${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile - -do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/luasocket ${PREFIX}/bin - @ ${MKDIR} ${PREFIX}/lib/lua - @ ${MKDIR} ${PREFIX}/lib/lua/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/lua/cl-compat.lua ${PREFIX}/lib/lua/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/lua/code.lua ${PREFIX}/lib/lua/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/lua/concat.lua ${PREFIX}/lib/lua/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/lua/ftp.lua ${PREFIX}/lib/lua/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/lua/http.lua ${PREFIX}/lib/lua/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/lua/README ${PREFIX}/lib/lua/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/lua/smtp.lua ${PREFIX}/lib/lua/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/lua/url.lua ${PREFIX}/lib/lua/luasocket + @ ${RM} ${WRKSRC}/src/compat-5.1r4/compat-5.1.o post-install: .if !defined(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/html/anybrowser.png ${PREFIX}/share/doc/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/html/func.html ${PREFIX}/share/doc/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/html/home.html ${PREFIX}/share/doc/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/html/idx.html ${PREFIX}/share/doc/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/html/intro.html ${PREFIX}/share/doc/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/html/luasocket.png ${PREFIX}/share/doc/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/html/mod.html ${PREFIX}/share/doc/luasocket - @ ${INSTALL_DATA} ${WRKSRC}/html/vim.png ${PREFIX}/share/doc/luasocket + @${MKDIR} ${PREFIX}/share/doc/luasocket + @${INSTALL_DATA} ${WRKSRC}/doc/dns.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/ftp.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/home.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/http.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/installation.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/introduction.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/ltn12.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/luasocket.png ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/mime.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/reference.css ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/reference.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/smtp.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/socket.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/tcp.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/udp.html ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/url.html ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/net/luasocket/distinfo b/net/luasocket/distinfo index 41e51973a995..0ede5be80abe 100644 --- a/net/luasocket/distinfo +++ b/net/luasocket/distinfo @@ -1,3 +1,3 @@ -MD5 (luasocket-1.4.tar.gz) = e3df9301739db7bc08b97e63cc3aaa43 -SHA256 (luasocket-1.4.tar.gz) = a1df659e51aa530391d0cca468dcaa5de3ef26c8d4b2b4e3425621fc206ae4f3 -SIZE (luasocket-1.4.tar.gz) = 79003 +MD5 (luasocket-2.0.tar.gz) = 64bddf8bbab296d1c1da7f34f3c2b5b5 +SHA256 (luasocket-2.0.tar.gz) = f626ad8df249791d3ad2bd2efcd1411aaa5d1f35c61812d18d2f70b51b098752 +SIZE (luasocket-2.0.tar.gz) = 120394 diff --git a/net/luasocket/files/patch-aa b/net/luasocket/files/patch-aa deleted file mode 100644 index 1448c15c0233..000000000000 --- a/net/luasocket/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig Tue Dec 17 10:15:00 2002 -+++ Makefile Tue Dec 17 10:16:08 2002 -@@ -12,7 +12,7 @@ - - # Set LUAINC to the Lua include directory and LUALIB to the - # Lua library directory --LUA = /home/i/diego/public/lib/lua-4.0 -+LUA = ${LOCALBASE} - LUAINC = $(LUA)/include - LUALIB = $(LUA)/lib/$(TEC_UNAME) - diff --git a/net/luasocket/files/patch-config b/net/luasocket/files/patch-config new file mode 100644 index 000000000000..983046625a1f --- /dev/null +++ b/net/luasocket/files/patch-config @@ -0,0 +1,54 @@ +--- config.orig Fri Nov 25 09:29:38 2005 ++++ config Mon Mar 6 19:46:29 2006 +@@ -15,8 +15,8 @@ + #------ + # Lua includes and libraries + # +-LUAINC=-Ilua-5.0.2/include +-LUALIB=-Llua-5.0.2/lib ++LUAINC=-I$(PREFIX)/include ++LUALIB=-L$(PREFIX)/lib + + #------ + # Compat-5.1 directory +@@ -27,8 +27,8 @@ + # Top of your Lua installation + # Relative paths will be inside the src tree + # +-INSTALL_TOP_SHARE=share +-INSTALL_TOP_LIB=lib ++INSTALL_TOP_SHARE=${PREFIX}/share/lua/5.0 ++INSTALL_TOP_LIB=${PREFIX}/lib/lua/5.0 + + INSTALL_DATA=cp + INSTALL_EXEC=cp +@@ -37,20 +37,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) -I$(COMPAT) $(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 ++CC?=gcc + #DEF=-DLUASOCKET_DEBUG +-#CFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic +-#LDFLAGS=-O -shared +-#LD=gcc ++CFLAGS+= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -fpic ++LDFLAGS=-O -shared ++LD=gcc + + #------ + # End of makefile configuration diff --git a/net/luasocket/pkg-plist b/net/luasocket/pkg-plist index a0472ea26377..0389f4c7efed 100644 --- a/net/luasocket/pkg-plist +++ b/net/luasocket/pkg-plist @@ -1,20 +1,35 @@ -bin/luasocket -lib/lua/luasocket/cl-compat.lua -lib/lua/luasocket/code.lua -lib/lua/luasocket/concat.lua -lib/lua/luasocket/ftp.lua -lib/lua/luasocket/http.lua -lib/lua/luasocket/README -lib/lua/luasocket/smtp.lua -lib/lua/luasocket/url.lua -%%PORTDOCS%%share/doc/luasocket/anybrowser.png -%%PORTDOCS%%share/doc/luasocket/func.html -%%PORTDOCS%%share/doc/luasocket/home.html -%%PORTDOCS%%share/doc/luasocket/idx.html -%%PORTDOCS%%share/doc/luasocket/intro.html -%%PORTDOCS%%share/doc/luasocket/luasocket.png -%%PORTDOCS%%share/doc/luasocket/mod.html -%%PORTDOCS%%share/doc/luasocket/vim.png -%%PORTDOCS%%@dirrm share/doc/luasocket -@dirrm lib/lua/luasocket -@dirrm lib/lua +share/lua/5.0/mime.lua +share/lua/5.0/socket.lua +share/lua/5.0/ltn12.lua +share/lua/5.0/compat-5.1.lua +share/lua/5.0/socket/smtp.lua +share/lua/5.0/socket/ftp.lua +share/lua/5.0/socket/tp.lua +share/lua/5.0/socket/url.lua +share/lua/5.0/socket/http.lua +lib/lua/5.0/socket/core.so +lib/lua/5.0/mime/core.so +%%PORTDOCS%%%%DOCSDIR%%/dns.html +%%PORTDOCS%%%%DOCSDIR%%/ftp.html +%%PORTDOCS%%%%DOCSDIR%%/home.html +%%PORTDOCS%%%%DOCSDIR%%/http.html +%%PORTDOCS%%%%DOCSDIR%%/installation.html +%%PORTDOCS%%%%DOCSDIR%%/introduction.html +%%PORTDOCS%%%%DOCSDIR%%/ltn12.html +%%PORTDOCS%%%%DOCSDIR%%/luasocket.png +%%PORTDOCS%%%%DOCSDIR%%/mime.html +%%PORTDOCS%%%%DOCSDIR%%/reference.css +%%PORTDOCS%%%%DOCSDIR%%/reference.html +%%PORTDOCS%%%%DOCSDIR%%/smtp.html +%%PORTDOCS%%%%DOCSDIR%%/socket.html +%%PORTDOCS%%%%DOCSDIR%%/tcp.html +%%PORTDOCS%%%%DOCSDIR%%/udp.html +%%PORTDOCS%%%%DOCSDIR%%/url.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/lua/5.0/socket +@dirrmtry share/lua/5.0 +@dirrmtry share/lua +@dirrm lib/lua/5.0/socket +@dirrm lib/lua/5.0/mime +@dirrmtry lib/lua/5.0 +@dirrmtry lib/lua |