Attachment 145856 Details for Bug 192699 – patch for luajit-2.0.3

[patch] patch for luajit-2.0.3

luajit-2.0.3.patch (text/plain), 4.13 KB, created by Muhammad Moinur Rahman on 2014-08-16 08:30:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2014-08-16 08:30:06 UTC

Size: 4.13 KB

patch

obsolete

>diff -ruN /usr/ports//lang/luajit/Makefile ./Makefile
>--- /usr/ports//lang/luajit/Makefile	2014-07-06 01:27:03.000000000 +0600
>+++ ./Makefile	2014-08-16 03:21:01.717006497 +0600
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/lang/luajit/Makefile 360810 2014-07-05 19:27:03Z olgeni $
> 
> PORTNAME=	luajit
>-DISTVERSION=	2.0.2
>+DISTVERSION=	2.0.3
> CATEGORIES=	lang
> MASTER_SITES=	http://luajit.org/download/
> DISTNAME=	LuaJIT-${DISTVERSION}
>@@ -10,6 +10,8 @@
> MAINTAINER=	osa@FreeBSD.org
> COMMENT=	Just-In-Time Compiler for Lua
> 
>+LICENSE=	MIT
>+
> WRKSRC=		${WRKDIR}/LuaJIT-${DISTVERSION}
> USES=		gmake
> USE_LDCONFIG=	yes
>diff -ruN /usr/ports//lang/luajit/distinfo ./distinfo
>--- /usr/ports//lang/luajit/distinfo	2014-01-22 21:30:13.000000000 +0600
>+++ ./distinfo	2014-08-16 03:17:05.218023976 +0600
>@@ -1,2 +1,2 @@
>-SHA256 (LuaJIT-2.0.2.tar.gz) = c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38
>-SIZE (LuaJIT-2.0.2.tar.gz) = 843031
>+SHA256 (LuaJIT-2.0.3.tar.gz) = 55be6cb2d101ed38acca32c5b1f99ae345904b365b642203194c585d27bebd79
>+SIZE (LuaJIT-2.0.3.tar.gz) = 844927
>diff -ruN /usr/ports//lang/luajit/files/patch-Makefile ./files/patch-Makefile
>--- /usr/ports//lang/luajit/files/patch-Makefile	2014-01-22 23:40:44.000000000 +0600
>+++ ./files/patch-Makefile	2014-08-16 14:55:01.470136436 +0600
>@@ -1,29 +1,27 @@
> --- Makefile.orig	2013-02-20 00:15:00.000000000 +0400
> +++ Makefile	2013-04-16 11:00:30.120967135 +0400
>-@@ -24,14 +24,16 @@
>+@@ -24,13 +24,13 @@
>  # Change the installation path as needed. This automatically adjusts
>  # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
>  #
> -export PREFIX= /usr/local
>-+#export PREFIX= /usr/local
>+ export MULTILIB= lib
>  ##############################################################################
>  
>  DPREFIX= $(DESTDIR)$(PREFIX)
>  INSTALL_BIN=   $(DPREFIX)/bin
>- INSTALL_LIB=   $(DPREFIX)/lib
>+ INSTALL_LIB=   $(DPREFIX)/$(MULTILIB)
> +INSTALL_LIBD=  $(DPREFIX)/libdata
>  INSTALL_SHARE= $(DPREFIX)/share
>  INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
>-+INSTALL_MAN=   $(DPREFIX)/man/man1
>  
>- INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
>- INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
>-@@ -39,14 +41,14 @@
>+@@ -40,14 +40,15 @@
>  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_MAN= $(DPREFIX)/man/man1
> +INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig
>  
>  INSTALL_TNAME= luajit-$(VERSION)
>@@ -36,23 +34,23 @@
>  INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
>  INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
>  INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
>-@@ -56,12 +58,13 @@
>+@@ -56,13 +57,12 @@
>+ INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
>  INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME)
>  INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
>- INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
>-+INSTALL_SHORT3= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
>+-INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
>++INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
>  INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
>  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)
>-+INSTALL_DIRS= $(INSTALL_INC) \
>-+  $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB)
>++INSTALL_DIRS= $(INSTALL_INC) $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB)
>  UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
>    $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
>  
>-@@ -110,10 +113,9 @@
>+@@ -112,10 +112,9 @@
>  	$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
>  	cd src && test -f $(FILE_SO) && \
>  	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
>@@ -65,7 +63,7 @@
>  	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
>  	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
>  	  $(RM) $(FILE_PC).tmp
>-@@ -131,7 +133,6 @@
>+@@ -133,7 +132,6 @@
>  	for file in $(FILES_INC); do \
>  	  $(UNINSTALL) $(INSTALL_INC)/$$file; \
>  	  done

Actions: View | Diff

Attachments on bug 192699: 145855 | 145856