Attachment 157069 Details for Bug 200406 – lua-lpeg diff

[patch] lua-lpeg diff

lua-lpeg.diff (text/plain), 1.67 KB, created by Po-Chuan Hsieh on 2015-05-23 06:55:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2015-05-23 06:55:10 UTC

Size: 1.67 KB

patch

obsolete

>Index: devel/lua-lpeg/Makefile
>===================================================================
>--- devel/lua-lpeg/Makefile	(revision 386920)
>+++ devel/lua-lpeg/Makefile	(working copy)
>@@ -11,21 +11,16 @@
> 
> LICENSE=	MIT
> 
>-USES?=		lua
>-
> ALL_TARGET=	linux
>+CFLAGS+=	-DLUA_32BITS
>+MAKE_ARGS=	CC=${CC} LUADIR=${LUA_INCDIR}
> MAKEFILE=	${WRKSRC}/makefile
>+USES=		lua
> 
> PLIST_FILES=	%%LUA_MODLIBDIR%%/lpeg.so
> 
>-.include <bsd.port.pre.mk>
>-
>-post-patch:
>-	${REINPLACE_CMD} -e \
>-		"s|%%INCDIR%%|${LUA_INCDIR}|" ${WRKSRC}/makefile
>-
> do-install:
> 	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
>-	${INSTALL_LIB} ${WRKSRC}/${PORTNAME}.so ${STAGEDIR}/${LUA_MODLIBDIR}
>+	${INSTALL_LIB} ${WRKSRC}/${PORTNAME}.so ${STAGEDIR}${LUA_MODLIBDIR}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: devel/lua-lpeg/files/patch-makefile
>===================================================================
>--- devel/lua-lpeg/files/patch-makefile	(revision 386920)
>+++ devel/lua-lpeg/files/patch-makefile	(working copy)
>@@ -1,18 +1,20 @@
>---- makefile.orig	2015-01-17 20:16:06.330635290 +0300
>-+++ makefile	2015-01-17 20:16:18.745634849 +0300
>+--- makefile.orig	2013-04-12 16:31:19 UTC
>++++ makefile
> @@ -1,5 +1,5 @@
>  LIBNAME = lpeg
> -LUADIR = /usr/include/lua5.1/
>-+LUADIR = %%INCDIR%%
>++LUADIR ?= /usr/include/lua5.1/
>  
>  COPT = -O2
>  # COPT = -DLPEG_DEBUG -g
>-@@ -23,7 +23,7 @@
>+@@ -22,8 +22,8 @@ CWARNS = -Wall -Wextra -pedantic \
>+ # -Wunreachable-code \
>  
>  
>- CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
>+-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
> -CC = gcc
>-+CC? = gcc
>++CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
>++CC ?= gcc
>  
>  FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
>

Actions: View | Diff

Attachments on bug 200406: 157069