Date: Thu, 18 Oct 2012 18:17:09 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306079 - in head/lang/luajit: . files Message-ID: <201210181817.q9IIH9u1095146@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Thu Oct 18 18:17:09 2012 New Revision: 306079 URL: http://svn.freebsd.org/changeset/ports/306079 Log: Update from 2.0.0-beta10 to 2.0.0-beta11. Remove needless patch. ChangeLog: http://luajit.org/changes.html Feature safe: yes Modified: head/lang/luajit/Makefile head/lang/luajit/distinfo head/lang/luajit/files/patch-Makefile head/lang/luajit/files/patch-src_Makefile head/lang/luajit/pkg-plist Modified: head/lang/luajit/Makefile ============================================================================== --- head/lang/luajit/Makefile Thu Oct 18 17:56:01 2012 (r306078) +++ head/lang/luajit/Makefile Thu Oct 18 18:17:09 2012 (r306079) @@ -6,7 +6,7 @@ # PORTNAME= luajit -DISTVERSION= 2.0.0-beta10 +DISTVERSION= 2.0.0-beta11 CATEGORIES= lang MASTER_SITES= http://luajit.org/download/ DISTNAME= LuaJIT-${DISTVERSION} Modified: head/lang/luajit/distinfo ============================================================================== --- head/lang/luajit/distinfo Thu Oct 18 17:56:01 2012 (r306078) +++ head/lang/luajit/distinfo Thu Oct 18 18:17:09 2012 (r306079) @@ -1,4 +1,2 @@ -SHA256 (LuaJIT-2.0.0-beta10.tar.gz) = 750e9317ca2c61fa17e739abc582c55c1fe69749ba65442dfd7f04ce20cf9ff6 -SIZE (LuaJIT-2.0.0-beta10.tar.gz) = 890830 -SHA256 (beta9_hotfix1.patch) = 468234a723c3a2bb7fe8caafc3aac0443473df2790b547a166babaf9b58cc671 -SIZE (beta9_hotfix1.patch) = 1823 +SHA256 (LuaJIT-2.0.0-beta11.tar.gz) = 1e9e1d657774b33f287ac08310c0de1e89ff7b8f89ee7dc31eefb86ead9814de +SIZE (LuaJIT-2.0.0-beta11.tar.gz) = 836244 Modified: head/lang/luajit/files/patch-Makefile ============================================================================== --- head/lang/luajit/files/patch-Makefile Thu Oct 18 17:56:01 2012 (r306078) +++ head/lang/luajit/files/patch-Makefile Thu Oct 18 18:17:09 2012 (r306079) @@ -1,6 +1,6 @@ ---- Makefile.orig 2011-12-14 18:15:00.000000000 +0400 -+++ Makefile 2012-01-13 09:09:42.000000000 +0400 -@@ -26,26 +26,27 @@ +--- Makefile.orig 2012-10-16 22:30:00.000000000 +0400 ++++ Makefile 2012-10-18 22:11:09.000000000 +0400 +@@ -25,14 +25,16 @@ # Change the installation path as needed. This automatically adjusts # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path! # @@ -16,9 +16,12 @@ INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) +INSTALL_MAN= $(DPREFIX)/man/man1 - INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit - INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER) - INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER) + INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit +@@ -40,14 +42,13 @@ + INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) + INSTALL_CMODD= $(INSTALL_LIB)/lua + INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) -INSTALL_MAN= $(INSTALL_SHARE)/man/man1 -INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig +INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig @@ -29,21 +32,23 @@ INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) -INSTALL_SOSHORT= libluajit-$(ABIVER).so +INSTALL_SOSHORT= libluajit-$(ABIVER).so.$(MAJVER) - INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib - INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib - INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib -@@ -59,8 +60,8 @@ + INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib + INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib + INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib +@@ -61,10 +62,8 @@ INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) -INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ - $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) +-UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \ +- $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) +INSTALL_DIRS= $(INSTALL_INC) \ + $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) RM= rm -f MKDIR= mkdir -p -@@ -105,10 +106,8 @@ +@@ -111,10 +110,8 @@ $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) cd src && test -f $(FILE_SO) && \ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ @@ -54,3 +59,11 @@ cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ $(RM) $(FILE_PC).tmp +@@ -137,7 +134,6 @@ + for file in $(FILES_INC); do \ + $(UNINSTALL) $(INSTALL_INC)/$$file; \ + done +- $(LDCONFIG) $(INSTALL_LIB) + test -f $(INSTALL_TSYM) || $(UNINSTALL) $(INSTALL_TSYM) + $(RMDIR) $(UNINSTALL_DIRS) || : + @echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ====" Modified: head/lang/luajit/files/patch-src_Makefile ============================================================================== --- head/lang/luajit/files/patch-src_Makefile Thu Oct 18 17:56:01 2012 (r306078) +++ head/lang/luajit/files/patch-src_Makefile Thu Oct 18 18:17:09 2012 (r306079) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2011-12-14 18:15:00.000000000 +0400 -+++ src/Makefile 2012-01-09 19:33:28.000000000 +0400 +--- src/Makefile.orig 2012-10-16 22:30:00.000000000 +0400 ++++ src/Makefile 2012-10-18 22:06:48.000000000 +0400 @@ -25,7 +25,7 @@ # with "make clean", followed by "make" if you change any options. # @@ -18,12 +18,13 @@ # Use this if you want to generate a smaller binary (but it's slower): #CCOPT= -Os -fomit-frame-pointer # Note: it's no longer recommended to use -O3 with GCC 4.x. -@@ -49,7 +49,7 @@ +@@ -48,7 +48,8 @@ # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute # the binaries to a different machine you could also use: -march=native # --CCOPT_X86= -march=i686 -+CCOPT_X86= - CCOPT_X64= - CCOPT_ARM= - CCOPT_PPC= +-CCOPT_x86= -march=i686 ++#CCOPT_x86= -march=i686 ++CCOPT_x86= + CCOPT_x64= + CCOPT_arm= + CCOPT_ppc= Modified: head/lang/luajit/pkg-plist ============================================================================== --- head/lang/luajit/pkg-plist Thu Oct 18 17:56:01 2012 (r306078) +++ head/lang/luajit/pkg-plist Thu Oct 18 18:17:09 2012 (r306079) @@ -1,5 +1,5 @@ bin/luajit -bin/luajit-2.0.0-beta10 +bin/luajit-2.0.0-beta11 include/luajit-2.0/lua.h include/luajit-2.0/luaconf.h include/luajit-2.0/luajit.h @@ -10,17 +10,17 @@ lib/libluajit-5.1.a lib/libluajit-5.1.so.2 lib/libluajit-5.1.so.2.0.0 libdata/pkgconfig/luajit.pc -share/luajit-2.0.0-beta10/jit/bc.lua -share/luajit-2.0.0-beta10/jit/bcsave.lua -share/luajit-2.0.0-beta10/jit/dis_arm.lua -share/luajit-2.0.0-beta10/jit/dis_mips.lua -share/luajit-2.0.0-beta10/jit/dis_mipsel.lua -share/luajit-2.0.0-beta10/jit/dis_x64.lua -share/luajit-2.0.0-beta10/jit/dis_x86.lua -share/luajit-2.0.0-beta10/jit/dis_ppc.lua -share/luajit-2.0.0-beta10/jit/dump.lua -share/luajit-2.0.0-beta10/jit/v.lua -share/luajit-2.0.0-beta10/jit/vmdef.lua -@dirrm share/luajit-2.0.0-beta10/jit -@dirrm share/luajit-2.0.0-beta10 +share/luajit-2.0.0-beta11/jit/bc.lua +share/luajit-2.0.0-beta11/jit/bcsave.lua +share/luajit-2.0.0-beta11/jit/dis_arm.lua +share/luajit-2.0.0-beta11/jit/dis_mips.lua +share/luajit-2.0.0-beta11/jit/dis_mipsel.lua +share/luajit-2.0.0-beta11/jit/dis_x64.lua +share/luajit-2.0.0-beta11/jit/dis_x86.lua +share/luajit-2.0.0-beta11/jit/dis_ppc.lua +share/luajit-2.0.0-beta11/jit/dump.lua +share/luajit-2.0.0-beta11/jit/v.lua +share/luajit-2.0.0-beta11/jit/vmdef.lua +@dirrm share/luajit-2.0.0-beta11/jit +@dirrm share/luajit-2.0.0-beta11 @dirrm include/luajit-2.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210181817.q9IIH9u1095146>