From owner-svn-ports-all@FreeBSD.ORG Sun Jun 21 17:12:29 2015 Return-Path: Delivered-To: svn-ports-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3E3349BE; Sun, 21 Jun 2015 17:12:29 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1275BAB7; Sun, 21 Jun 2015 17:12:29 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5LHCS1t069200; Sun, 21 Jun 2015 17:12:28 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5LHCSU2069198; Sun, 21 Jun 2015 17:12:28 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201506211712.t5LHCSU2069198@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 21 Jun 2015 17:12:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390259 - in head/devel/lua-lpeg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2015 17:12:29 -0000 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 - -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 +.include 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