Date: Sun, 26 Mar 2006 10:26:30 GMT From: Andrew Turner <andrew@fubar.geek.nz> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/94947: Update net/luasocket 1.4 ->2.0 Message-ID: <200603261026.k2QAQUMR005347@www.freebsd.org> Resent-Message-ID: <200603261030.k2QAUDq9059522@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94947 >Category: ports >Synopsis: Update net/luasocket 1.4 ->2.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Mar 26 10:30:12 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Andrew Turner >Release: 6.1-PRERELEASE >Organization: >Environment: FreeBSD hermies.int.fubar.geek.nz 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #2: Sun Mar 12 21:30:28 NZDT 2006 root@hermies.int.fubar.geek.nz:/usr/obj/srctrees/RELENG_6/sys/GENERIC i386 >Description: Attached is a file to update net/luasocket from 1.4 -> 2.0 The current files/patch-aa needs to be removed. port-net-luasocket.diff needs to be applyed patch-config needs to be put in the port's files directory >How-To-Repeat: >Fix: --- port-net-luasocket.diff begins here --- Index: net/luasocket/Makefile =================================================================== RCS file: /cvsroot/ports/net/luasocket/Makefile,v retrieving revision 1.4 diff -u -3 -p -u -r1.4 Makefile --- net/luasocket/Makefile 9 Sep 2005 23:16:10 -0000 1.4 +++ net/luasocket/Makefile 6 Mar 2006 09:43:27 -0000 @@ -6,42 +6,44 @@ # 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 + @ ${RM} ${WRKSRC}/src/compat-5.1r4/compat-5.1.o -do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/luasocket ${PREFIX}/bin +pre-install: @ ${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 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> Index: net/luasocket/distinfo =================================================================== RCS file: /cvsroot/ports/net/luasocket/distinfo,v retrieving revision 1.3 diff -u -3 -p -u -r1.3 distinfo --- net/luasocket/distinfo 25 Nov 2005 16:48:13 -0000 1.3 +++ net/luasocket/distinfo 6 Mar 2006 05:47:56 -0000 @@ -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 Index: net/luasocket/pkg-plist =================================================================== RCS file: /cvsroot/ports/net/luasocket/pkg-plist,v retrieving revision 1.1 diff -u -3 -p -u -r1.1 pkg-plist --- net/luasocket/pkg-plist 30 Aug 2003 01:53:21 -0000 1.1 +++ net/luasocket/pkg-plist 6 Mar 2006 09:38:10 -0000 @@ -1,20 +1,34 @@ -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 +@dirrm share/lua/5.0 +@dirrm share/lua +@dirrm lib/lua/5.0/socket +@dirrm lib/lua/5.0/mime +@dirrm lib/lua/5.0 --- port-net-luasocket.diff ends here --- --- patch-config begins here --- --- 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 -O2 -fpic +LDFLAGS=-O -shared +LD=gcc #------ # End of makefile configuration --- patch-config begins here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603261026.k2QAQUMR005347>