- update lpeg to 0.9

based on a diff by scott vokes

devel/lpeg/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2008/06/11 05:04:37 landry Exp $
+# $OpenBSD: Makefile,v 1.5 2010/05/06 20:57:35 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	parsing expression grammars library for lua
-DISTNAME=	lpeg-0.6
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	lpeg-0.9
 CATEGORIES=	devel
-MASTER_SITES=	http://www.inf.puc-rio.br/~roberto/
+MASTER_SITES=	http://www.inf.puc-rio.br/~roberto/lpeg/
 
 HOMEPAGE=	http://www.inf.puc-rio.br/~roberto/lpeg.html
 
@@ -18,14 +17,21 @@ PERMIT_PACKAGE_FTP=	Yes
 
 MODULES=	lang/lua
 
+USE_LIBTOOL=	yes
+
 ALL_TARGET=	lpeg.so
 MAKE_FILE=	makefile
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/makefile
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/lua/5.1
+	${INSTALL_DATA_DIR} ${PREFIX}/share/lua/5.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lpeg
 	${INSTALL_DATA} ${WRKBUILD}/lpeg.so ${PREFIX}/lib/lua/5.1
-	${INSTALL_DATA} ${WRKSRC}/doc.html ${PREFIX}/share/doc/lpeg
+	${INSTALL_DATA} ${WRKSRC}/{lpeg,re}.html ${PREFIX}/share/doc/lpeg
+	${INSTALL_DATA} ${WRKSRC}/re.lua ${PREFIX}/share/lua/5.1
 
 do-regress:
 	cd ${WRKDIST} && ${LOCALBASE}/bin/lua test.lua

devel/lpeg/distinfo

@@ -1,5 +1,5 @@
-MD5 (lpeg-0.6.tar.gz) = 4OdgDqC/vzGotF/TGtyL7w==
-RMD160 (lpeg-0.6.tar.gz) = f5JX7BaMKnfd14XWIQ317fw9QK4=
-SHA1 (lpeg-0.6.tar.gz) = nau1tDN8suzy+9ezWoOUtV8QOPI=
-SHA256 (lpeg-0.6.tar.gz) = Tcv6D9XnuNmw8atMkC/3J+sTZd42rYeU6WOA64Hhmnk=
-SIZE (lpeg-0.6.tar.gz) = 35749
+MD5 (lpeg-0.9.tar.gz) = hKT1+0uHuQuxtyhOxrtpvA==
+RMD160 (lpeg-0.9.tar.gz) = Z7pbOid5ZfphqOUpdJzpnjKb5D0=
+SHA1 (lpeg-0.9.tar.gz) = xXs/dp2NpCFURn9sSWKmOvno7lU=
+SHA256 (lpeg-0.9.tar.gz) = VhMEr7tkUh0QPf4a8rqR9/0M0M9Bcfj9Sz6xErjlXcM=
+SIZE (lpeg-0.9.tar.gz) = 47999

devel/lpeg/patches/patch-makefile

@@ -1,18 +1,36 @@
-$OpenBSD: patch-makefile,v 1.1.1.1 2007/03/26 13:03:57 jolan Exp $
---- makefile.orig	Wed Mar 21 16:48:17 2007
-+++ makefile	Mon Mar 26 03:45:58 2007
-@@ -10,11 +10,11 @@ CWARNS = -Wall -Wextra -pedantic \
+$OpenBSD: patch-makefile,v 1.2 2010/05/06 20:57:35 jasper Exp $
+--- makefile.orig	Sat Oct 11 22:21:05 2008
++++ makefile	Thu May  6 22:54:55 2010
+@@ -1,13 +1,13 @@
+-LUADIR = /usr/include/lua5.1/
++LUADIR = ${LOCALBASE}/include/
  
- LUADIR = ..
- COPT = -O2 -DNDEBUG
--CFLAGS = $(CWARNS) -ansi -I$(LUADIR)/lua -shared -o lpeg.so
+-COPT = -O2 -DNDEBUG
++COPT = -O2 -DNDEBUG -fPIC -shared
+ 
+-CWARNS = -Wall -Wextra -pedantic \
++CWARNS = -Wall -pedantic \
+         -Waggregate-return \
+ 	-Wbad-function-cast \
+         -Wcast-align \
+         -Wcast-qual \
+-	-Wdeclaration-after-statement \
++# 	-Wdeclaration-after-statement \
+ 	-Wdisabled-optimization \
+         -Wmissing-prototypes \
+         -Wnested-externs \
+@@ -17,12 +17,11 @@ CWARNS = -Wall -Wextra -pedantic \
+ 	-Wstrict-prototypes \
+ 	-Wundef \
+         -Wwrite-strings \
+-	#  -Wunreachable-code \
++#	-Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -ansi -I$(LUADIR)
++CFLAGS += $(CWARNS) $(COPT) -ansi -I$(LUADIR)
+ DLLFLAGS = -shared
 -CC = gcc
-+#CFLAGS = $(CWARNS) -ansi -I$(LUADIR)/lua -shared -o lpeg.so
-+#CC = gcc
  
- lpeg.so: lpeg.c
--	$(CC) $(COPT) $(CFLAGS) lpeg.c
-+	$(CC) $(CFLAGS) -DNDEBUG -I${LOCALBASE}/include -fPIC -shared -o lpeg.so lpeg.c
- 
- deb:	lpeg.c	
- 	$(CC) -g $(CFLAGS) lpeg.c; touch deb; rm -f opt
+ lpeg.so: lpeg.o
+ 	$(CC) $(DLLFLAGS) lpeg.o -o lpeg.so

devel/lpeg/pkg/PLIST

@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/03/26 13:03:57 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.2 2010/05/06 20:57:35 jasper Exp $
 lib/lua/5.1/lpeg.so
 share/doc/lpeg/
-share/doc/lpeg/doc.html
+share/doc/lpeg/lpeg.html
+share/doc/lpeg/re.html
+share/lua/5.1/re.lua