svn commit: r390259 - in head/devel/lua-lpeg: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sun Jun 21 17:12:29 UTC 2015
Author: sunpoet
Date: Sun Jun 21 17:12:27 2015
New Revision: 390259
URL: https://svnweb.freebsd.org/changeset/ports/390259
Log:
- Allow build with lua53
- Remove superfluous slash after STAGEDIR
- Use bsd.port.mk instead of bsd.port.pre.mk + bsd.port.post.mk
- Simplify Makefile
PR: 200406
Submitted by: sunpoet (myself)
Approved by: maintainer (timeout, 4 weeks)
Modified:
head/devel/lua-lpeg/Makefile
head/devel/lua-lpeg/files/patch-makefile
Modified: head/devel/lua-lpeg/Makefile
==============================================================================
--- head/devel/lua-lpeg/Makefile Sun Jun 21 17:12:23 2015 (r390258)
+++ head/devel/lua-lpeg/Makefile Sun Jun 21 17:12:27 2015 (r390259)
@@ -11,21 +11,16 @@ COMMENT= Parsing Expression Grammars For
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>
Modified: head/devel/lua-lpeg/files/patch-makefile
==============================================================================
--- head/devel/lua-lpeg/files/patch-makefile Sun Jun 21 17:12:23 2015 (r390258)
+++ head/devel/lua-lpeg/files/patch-makefile Sun Jun 21 17:12:27 2015 (r390259)
@@ -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
More information about the svn-ports-head
mailing list