From b22f1d6ea5b5782eddc1d65891737c87a68fabe9 Mon Sep 17 00:00:00 2001
From: alnsn <alnsn>
Date: Thu, 13 Jun 2013 22:13:58 +0000
Subject: Update lua-lpeg to version 0.12.

What is LPeg? LPeg is a new (well, not that new now) pattern-matching
library for Lua, based on Parsing Expression Grammars (PEGs).

What is new in version 0.12?
  + no "unsigned short" limit for pattern sizes
  + mathtime captures considered nullable  (*)
  + some bugs and compiler warnings fixed

Where to get it?

  http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-0.12-rc1.tar.gz


(*) Although this change can be considered logically a bug fix, it can
lead to some old patterns being refused with a "loop body may accept
empty string" error. It should be easy to fix these patterns.
---
 devel/lua-lpeg/Makefile | 29 ++++++++++++++++++-----------
 devel/lua-lpeg/PLIST    |  4 +++-
 devel/lua-lpeg/distinfo |  8 ++++----
 3 files changed, 25 insertions(+), 16 deletions(-)

(limited to 'devel')

diff --git a/devel/lua-lpeg/Makefile b/devel/lua-lpeg/Makefile
index 533ae3d0594..e53761d75b1 100644
--- a/devel/lua-lpeg/Makefile
+++ b/devel/lua-lpeg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2013/01/06 13:49:26 alnsn Exp $
+# $NetBSD: Makefile,v 1.2 2013/06/13 22:13:58 alnsn Exp $
 #
 
-DISTNAME=	lpeg-0.10.2
+DISTNAME=	lpeg-0.12
 PKGNAME=	${DISTNAME:S/lpeg/lua-lpeg/}
 CATEGORIES=	devel
 MASTER_SITES=	http://www.inf.puc-rio.br/~roberto/lpeg/
@@ -14,17 +14,20 @@ LICENSE=	mit
 NO_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 MAKE_FILE=	makefile
-BUILD_TARGET=	lpeg.so
+BUILD_TARGET=	linux
+TEST_TARGET=	test
 
-LPEG_PIC=	-fPIC
-CFLAGS+=	${LPEG_PIC}
+SUBST_CLASSES+=		inc-path
+SUBST_STAGE.inc-path=	pre-build
+SUBST_MESSAGE.inc-path=	Fixing Lua include path.
+SUBST_FILES.inc-path=	makefile
+SUBST_SED.inc-path=	-e 's|^LUADIR[ \].*|LUADIR = ${PREFIX}/include|'
 
-SUBST_CLASSES+=		pic
-SUBST_STAGE.pic=	pre-build
-SUBST_MESSAGE.pic=	Fixing PIC flag.
-SUBST_FILES.pic=	makefile
-SUBST_SED.pic=		-e 's/-fpic/${LPEG_PIC}/g'
-SUBST_SED.pic+=		-e 's/^CFLAGS[ ]*=/CFLAGS+=/'
+SUBST_CLASSES+=		interp
+SUBST_STAGE.interp=	pre-build
+SUBST_MESSAGE.interp=	Fixing Lua include path.
+SUBST_FILES.interp=	test.lua
+SUBST_SED.interp=	-e 's|^\#!.*|\#!${PREFIX}/bin/lua|'
 
 LPEG_HTML_DIR=		share/doc/${PKGBASE}
 INSTALLATION_DIRS+=	${LUA_CDIR} ${LUA_LDIR} ${LPEG_HTML_DIR}
@@ -36,6 +39,10 @@ do-install:
 	                ${DESTDIR}${PREFIX}/${LUA_LDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html \
 	                ${DESTDIR}${PREFIX}/${LPEG_HTML_DIR}
+	${INSTALL_DATA} ${WRKSRC}/lpeg-128.gif \
+	                ${DESTDIR}${PREFIX}/${LPEG_HTML_DIR}
+	${INSTALL_DATA} ${WRKSRC}/HISTORY \
+	                ${DESTDIR}${PREFIX}/${LPEG_HTML_DIR}
 
 .include "../../lang/lua/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lua-lpeg/PLIST b/devel/lua-lpeg/PLIST
index 3a6b54eb763..87a4bf2d3e7 100644
--- a/devel/lua-lpeg/PLIST
+++ b/devel/lua-lpeg/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2013/01/06 13:49:26 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/13 22:13:58 alnsn Exp $
 lib/lua/5.1/lpeg.so
 share/doc/lua-lpeg/lpeg.html
 share/doc/lua-lpeg/re.html
+share/doc/lua-lpeg/lpeg-128.gif
+share/doc/lua-lpeg/HISTORY
 share/lua/5.1/re.lua
diff --git a/devel/lua-lpeg/distinfo b/devel/lua-lpeg/distinfo
index e6ba49827a6..2a2747f8895 100644
--- a/devel/lua-lpeg/distinfo
+++ b/devel/lua-lpeg/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2013/01/06 13:49:26 alnsn Exp $
+$NetBSD: distinfo,v 1.2 2013/06/13 22:13:58 alnsn Exp $
 
-SHA1 (lpeg-0.10.2.tar.gz) = f2cd5857efb6e1bb02dfb9fbd68e74a451467462
-RMD160 (lpeg-0.10.2.tar.gz) = 77dc2f7ca88ac84e6f185cf6077aaf88a130c3af
-Size (lpeg-0.10.2.tar.gz) = 53887 bytes
+SHA1 (lpeg-0.12.tar.gz) = a75233c73b75f7e51e25ee67bba4de9fb0433b23
+RMD160 (lpeg-0.12.tar.gz) = 662d0e642c35f1f6ec0af0de1f27d5522381b112
+Size (lpeg-0.12.tar.gz) = 66649 bytes
-- 
cgit v1.2.3