Update to 2.7.2 from 2.4.0

* Use custom BSDmakefile instead of luarocks.
  It seems that luarocks lacks destdir support.

Changelog:
2013-01-08  Release 2.7.2

  * Fixed the use of alternative allocators, and a memory leak.
  * Simplify the build system further.
  * Change rockspec to build from git now that github no longer
    supports downloads.

2012-10-18  Release 2.7.1

  * Fixed Lua 5.1 compatibility, broken in 2.7.0.
  * Added ability to specify no replacement to gsub with a nil or
    false replacement argument.

2012-10-04  Release 2.7.0

  * Added support for searching raw memory buffers (e.g. made with
    alien).
  * Fixed possible invalid code generation in C (thanks, Michael
    Tautschnig).
  * Generate LuaRock rockspecs for all modules.
  * Greatly simplify UNIX build system, relying on LuaRocks.
  * Allow POSIX REG_STARTEND to be used on any system supporting it.
  * Add a test set for POSIX regex engine (thanks, Enrico Tassi).
  * Simplify some code.
  * Always use Lua state memory allocator.

2012-04-13  Release 2.6.0

  * Added support for Lua 5.2.

2010-12-15  Release 2.5.3

  * Bug fix to rex.split.
  * Support for new flags in PCRE 8.11.

2010-11-10  Release 2.5.2

  * Important bug fix (thanks to Enrico Tassi for the report)
    affecting platforms with certain alignment requirements.
  * Improved build system for Windows.
  * Minor improvements to the manual.

2010-10-04  Release 2.5.1

  * Minor improvements and fixes, no changes to library code.


2010-10-03  Release 2.5.0

  * Added bindings of the TRE and GNU regex APIs.

  * Improved and simplified the build system.

7 files changed, 94 insertions, 85 deletions

diff --git a/devel/lua-lrexlib/Makefile.common b/devel/lua-lrexlib/Makefile.common
index 7fe28137804..fd8814b0c29 100644
--- a/devel/lua-lrexlib/Makefile.common
+++ b/devel/lua-lrexlib/Makefile.common
@@ -1,27 +1,32 @@
-# $NetBSD: Makefile.common,v 1.2 2012/10/31 11:17:26 asau Exp $
+# $NetBSD: Makefile.common,v 1.3 2013/01/25 22:02:18 ryoon Exp $
 # used by devel/lua-lrexlib-posix/Makefile
 # used by devel/lua-lrexlib-pcre/Makefile
 # used by devel/lua-lrexlib-onig/Makefile
 #
 .include "../../devel/lua-lrexlib/Makefile.version"
 
-DISTNAME=	lrexlib-${VERSION}
+DISTNAME=	lrexlib-rel-${VERSION:S/./-/g}
 PKGNAME=	${LUA_PKGPREFIX}-lrexlib-${ENGINE}-${VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	http://luaforge.net/frs/download.php/3599/
+MASTER_SITES=	-https://github.com/rrthomas/lrexlib/archive/rel-${VERSION:S/./-/g}.zip
 EXTRACT_SUFX=	.zip
 
 HOMEPAGE=	http://luaforge.net/projects/lrexlib
 
 LICENSE=		mit
 
-USE_TOOLS+=		gmake
+# Force using "curl" for fetching the distribution file. It is only available
+# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
+FETCH_USING=	curl
+
+#USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 BUILD_TARGET=		build_${ENGINE}
-TEST_TARGET=		test_${ENGINE}
+#TEST_TARGET=		test_${ENGINE}
+INSTALL_TARGET=		install_${ENGINE}
 
-#MAKE_FILE=		makefile
+MAKE_FILE=		BSDmakefile
 
 #
 PATCHDIR=		${.CURDIR}/../../devel/lua-lrexlib/patches
@@ -31,9 +36,11 @@ DESCR_SRC=		${.CURDIR}/../../devel/lua-lrexlib/DESCR.common
 MAKE_FLAGS+=		LIBS=${LIBS:Q}
 MAKE_FLAGS+=		LIBTOOL=${LIBTOOL:Q}
 MAKE_FLAGS+=		MODULES_DIR=${PREFIX}/${LUA_CDIR}
+MAKE_FLAGS+=		VERSION=\"${V}\"
+MAKE_FLAGS+=		LUA_CDIR=${LUA_CDIR}
 
 INSTALLATION_DIRS+=	${LUA_CDIR}
 
-do-install:
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
-	    ${WRKSRC}/src/${ENGINE_DIR}/rex_${ENGINE}.la ${DESTDIR}${PREFIX}/${LUA_CDIR}
+#do-install:
+#	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
+#	    ${WRKSRC}/src/${ENGINE_DIR}/rex_${ENGINE}.la ${DESTDIR}${PREFIX}/${LUA_CDIR}
diff --git a/devel/lua-lrexlib/Makefile.version b/devel/lua-lrexlib/Makefile.version
index 04873071a4e..b13d0b149d3 100644
--- a/devel/lua-lrexlib/Makefile.version
+++ b/devel/lua-lrexlib/Makefile.version
@@ -1,3 +1,5 @@
-# $NetBSD: Makefile.version,v 1.1.1.1 2011/07/24 08:51:26 cheusov Exp $
+# $NetBSD: Makefile.version,v 1.2 2013/01/25 22:02:18 ryoon Exp $
 
-VERSION=2.4.0
+V=	2.7
+MINORV=	.2
+VERSION=${V}${MINORV}
diff --git a/devel/lua-lrexlib/distinfo b/devel/lua-lrexlib/distinfo
index e0beec11f47..d2a70016cea 100644
--- a/devel/lua-lrexlib/distinfo
+++ b/devel/lua-lrexlib/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/07/24 08:51:26 cheusov Exp $
+$NetBSD: distinfo,v 1.2 2013/01/25 22:02:18 ryoon Exp $
 
-SHA1 (lrexlib-2.4.0.zip) = efcf3de1cfba875e3f6d384d616f1591b1dc1519
-RMD160 (lrexlib-2.4.0.zip) = 6494022558dde0657dc3eb4aa819f9f0aec1f307
-Size (lrexlib-2.4.0.zip) = 62655 bytes
-SHA1 (patch-aa) = 2008bf77b50fa4408568dff563d176e1b8691a6e
-SHA1 (patch-ab) = 201eb8d48d951180509bd75665855777764ecadd
-SHA1 (patch-ac) = 7be874ce9dd62d71eae04a964ed8c046ac35a1d1
+SHA1 (lrexlib-rel-2-7-2.zip) = c353b1dacb7b1ecbd6e0dd0a32e701ceec0b88d1
+RMD160 (lrexlib-rel-2-7-2.zip) = 269d33666b8095305589634b2ea76bf2c4720de6
+Size (lrexlib-rel-2-7-2.zip) = 78058 bytes
+SHA1 (patch-BSDmakefile) = a37a165cfc268ded28bd846bdcea0c1cb0f95818
diff --git a/devel/lua-lrexlib/patches/patch-BSDmakefile b/devel/lua-lrexlib/patches/patch-BSDmakefile
new file mode 100644
index 00000000000..a06f986f943
--- /dev/null
+++ b/devel/lua-lrexlib/patches/patch-BSDmakefile
@@ -0,0 +1,69 @@
+$NetBSD: patch-BSDmakefile,v 1.1 2013/01/25 22:02:18 ryoon Exp $
+
+--- BSDmakefile.orig	2012-12-31 07:40:50.000000000 +0000
++++ BSDmakefile
+@@ -0,0 +1,64 @@
++# Written for lrexlib-* 2.7.1, based on 2.4.0's Makefile and luarspec file.
++# I (ryoon) cannot handle luarocks properly...
++
++POSIX=	src/posix
++PCRE=	src/pcre
++ONIG=	src/oniguruma
++GNU=	src/gnu
++TRE=	src/tre
++
++CFLAGS+=	-O2 -fPIC -DVERSION=\"${VERSION}\"
++INC_LUA+=
++LIB_LUA+=
++
++CC?=		cc
++LIBTOOL?=	libtool
++
++LIBS=		
++
++LOBJS=		${OBJS:R:S/$/.lo/g}
++
++.SUFFIXES: .c .lo
++
++.c.lo:
++	${LIBTOOL} --tag=CC --mode=compile ${CC} -c ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
++
++all: build
++
++build: build_posix build_pcre build_onig build_gnu build_tre
++
++install: install_posix install_pcre install_onig install_gnu install_tre
++
++# POSIX
++build_posix: rex_posix.la 
++
++rex_posix.la: ${POSIX}/lposix.lo src/common.lo
++	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} \
++		src/common.lo ${POSIX}/lposix.lo -module -version-info 0:0 -rpath ${PREFIX}/lib
++
++install_posix:
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} rex_posix.la \
++		${DESTDIR}${PREFIX}/${LUA_CDIR}
++
++# PCRE
++build_pcre: rex_pcre.la 
++
++rex_pcre.la: ${PCRE}/lpcre.lo ${PCRE}/lpcre_f.lo src/common.lo
++	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} \
++		src/common.lo ${PCRE}/lpcre.lo ${PCRE}/lpcre_f.lo -module -version-info 0:0 -rpath ${PREFIX}/lib
++
++install_pcre:
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} rex_pcre.la \
++		${DESTDIR}${PREFIX}/${LUA_CDIR}
++
++# ONIG
++build_onig: rex_onig.la 
++
++rex_onig.la: ${ONIG}/lonig.lo ${ONIG}/lonig_f.lo src/common.lo
++	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} \
++		src/common.lo ${ONIG}/lonig.lo ${ONIG}/lonig_f.lo -module -version-info 0:0 -rpath ${PREFIX}/lib
++
++install_onig:
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} rex_onig.la \
++		${DESTDIR}${PREFIX}/${LUA_CDIR}
++
diff --git a/devel/lua-lrexlib/patches/patch-aa b/devel/lua-lrexlib/patches/patch-aa
deleted file mode 100644
index d4dcf70a093..00000000000
--- a/devel/lua-lrexlib/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/07/24 08:51:26 cheusov Exp $
-
-# libtool-ization
---- src/common.mak.orig	2008-06-14 20:11:08.000000000 +0300
-+++ src/common.mak
-@@ -3,11 +3,11 @@
- V = 2.4
- 
- DEFS   = -DREX_OPENLIB=luaopen_$(TRG) -DREX_LIBNAME=\"$(TRG)\"
--CFLAGS = $(MYCFLAGS) $(DEFS) $(INC)
-+CFLAGS+= $(DEFS)
- TRG_AR = lib$(TRG).a
--TRG_SO = $(TRG).so
-+TRG_SO = $(TRG).la
- LD     = ld
--LDFLAGS= -shared
-+#LDFLAGS= -shared
- 
- all: $(TRG_AR) $(TRG_SO)
- 
-@@ -15,8 +15,11 @@ $(TRG_AR): $(OBJ)
- 	$(AR) $@ $^
- 
- $(TRG_SO): $(OBJ)
--	$(LD) -o $@.$V $(LDFLAGS) $^ $(LIB) $(LIB_LUA)
--	ln -fs $@.$V $@
-+	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -module \
-+	    -rpath ${MODULES_DIR} $(OBJ:.o=.lo) $(LDFLAGS) $(LIBS)
- 
- clean:
- 	rm -f $(OBJ) $(TRG_AR) $(TRG_SO)*
-+
-+.c.o:
-+	$(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
diff --git a/devel/lua-lrexlib/patches/patch-ab b/devel/lua-lrexlib/patches/patch-ab
deleted file mode 100644
index 27524548f68..00000000000
--- a/devel/lua-lrexlib/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/07/24 08:51:26 cheusov Exp $
-
-# libtool-ization
---- Makefile.orig	2008-07-30 12:44:00.000000000 +0300
-+++ Makefile
-@@ -24,13 +24,13 @@ build_onig:
- 	make -C $(ONIG) -f rex_onig.mak
- 
- test_pcre:
--	cd test && lua ./runtest.lua -d../$(PCRE) pcre
-+	cd test && lua ./runtest.lua -d../$(PCRE)/.libs pcre
- 
- test_posix:
--	cd test && lua ./runtest.lua -d../$(POSIX) posix
-+	cd test && lua ./runtest.lua -d../$(POSIX)/.libs posix
- 
- test_onig:
--	cd test && lua ./runtest.lua -d../$(ONIG) onig
-+	cd test && lua ./runtest.lua -d../$(ONIG)/.libs onig
- 
- clean_pcre:
- 	make -C $(PCRE) -f rex_pcre.mak clean
diff --git a/devel/lua-lrexlib/patches/patch-ac b/devel/lua-lrexlib/patches/patch-ac
deleted file mode 100644
index d00e57853cc..00000000000
--- a/devel/lua-lrexlib/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/07/24 08:51:26 cheusov Exp $
-
-# accept CC from environment
---- src/defaults.mak.orig	2007-04-21 13:29:10.000000000 +0300
-+++ src/defaults.mak
-@@ -10,4 +10,4 @@ LIB_LUA  =
- 
- MYCFLAGS = -W -Wall -g $(INC_LUA) $(INC_PCRE)
- AR = ar rcu
--CC = gcc
-+#CC = gcc