Attachment #157069 for bug #200406

View | Details | Raw Unified | Return to bug 200406
Collapse All | Expand All





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}

.include <bsd.port.mk>




--- makefile.orig	2013-04-12 16:31:19 UTC
+++ makefile
@@ -1,5 +1,5 @@
 LIBNAME = lpeg
-LUADIR = /usr/include/lua5.1/
+LUADIR ?= /usr/include/lua5.1/
 
 COPT = -O2
 # COPT = -DLPEG_DEBUG -g
@@ -22,8 +22,8 @@ CWARNS = -Wall -Wextra -pedantic \
 # -Wunreachable-code \
 
 
-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
-CC = gcc
+CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
+CC ?= gcc
 
 FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
 

Return to bug 200406

Lines 11-31 Link Here

(-)devel/lua-lpeg/Makefile (-10 / +5 lines)
11		11
12	LICENSE= MIT	12	LICENSE= MIT
13		13
14	USES?= lua
15
16	ALL_TARGET= linux	14	ALL_TARGET= linux
		15	CFLAGS+= -DLUA_32BITS
		16	MAKE_ARGS= CC=${CC} LUADIR=${LUA_INCDIR}
17	MAKEFILE= ${WRKSRC}/makefile	17	MAKEFILE= ${WRKSRC}/makefile
		18	USES= lua
18		19
19	PLIST_FILES= %%LUA_MODLIBDIR%%/lpeg.so	20	PLIST_FILES= %%LUA_MODLIBDIR%%/lpeg.so
20		21
21	.include <bsd.port.pre.mk>
22
23	post-patch:
24	${REINPLACE_CMD} -e \
25	"s\|%%INCDIR%%\|${LUA_INCDIR}\|" ${WRKSRC}/makefile
26
27	do-install:	22	do-install:
28	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}	23	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
29	${INSTALL_LIB} ${WRKSRC}/${PORTNAME}.so ${STAGEDIR}/${LUA_MODLIBDIR}	24	${INSTALL_LIB} ${WRKSRC}/${PORTNAME}.so ${STAGEDIR}${LUA_MODLIBDIR}
30		25
31	.include <bsd.port.post.mk>	26	.include <bsd.port.mk>

Lines 1-18 Link Here

(-)devel/lua-lpeg/files/patch-makefile (-6 / +8 lines)
1	--- makefile.orig 2015-01-17 20:16:06.330635290 +0300	1	--- makefile.orig 2013-04-12 16:31:19 UTC
2	+++ makefile 2015-01-17 20:16:18.745634849 +0300	2	+++ makefile
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	LIBNAME = lpeg	4	LIBNAME = lpeg
5	-LUADIR = /usr/include/lua5.1/	5	-LUADIR = /usr/include/lua5.1/
6	+LUADIR = %%INCDIR%%	6	+LUADIR ?= /usr/include/lua5.1/
7		7
8	COPT = -O2	8	COPT = -O2
9	# COPT = -DLPEG_DEBUG -g	9	# COPT = -DLPEG_DEBUG -g
10	@@ -23,7 +23,7 @@	10	@@ -22,8 +22,8 @@ CWARNS = -Wall -Wextra -pedantic \
		11	# -Wunreachable-code \
11		12
12		13
13	CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC	14	-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
14	-CC = gcc	15	-CC = gcc
15	+CC? = gcc	16	+CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR) -fPIC
		17	+CC ?= gcc
16		18
17	FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o	19	FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
18		20