 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.44 2009/11/05 18:03:49 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2011/01/19 13:46:13 adam Exp $
 DISTNAME=	lua-${LUA_VERSION}
 PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/ \
 		ftp://ftp.u-aizu.ac.jp/pub/lang/lua/ \
 		ftp://ftp.chg.ru/pub/lang/lua/ \
 		http://www.lua.org/ftp/ \
 		http://www.tecgraf.puc-rio.br/lua/ftp/ \
 		http://ftp.gwdg.de/pub/languages/lua/ \
 		http://mirrors.sunsite.dk/lua/ \
 		http://ftp.chg.ru/pub/lang/lua/
 @@ -44,44 +44,45 @@ BUILD_TARGET=	bsd
 BUILD_TARGET=	linux
 .elif ${OPSYS} == "Darwin"
 BUILD_TARGET=	macosx
 .elif ${OPSYS} == "SunOS"
 BUILD_TARGET=	solaris
 .elif ${OPSYS} == "AIX"
 BUILD_TARGET=	aix
 .else
 BUILD_TARGET=	generic
 .endif
 PKGCONFIG_OVERRIDE=	${WRKSRC}/etc/lua.pc
 INSTALLATION_DIRS+=	lib/pkgconfig
 SUBST_CLASSES+=		pc-prefix
 SUBST_FILES.pc-prefix+=	${WRKSRC}/etc/lua.pc
 SUBST_SED.pc-prefix+=	-e "s,/usr/local,${PREFIX},"
 SUBST_STAGE.pc-prefix=	post-build
 post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	set -e; \
 	cd ${WRKSRC}; for f in README COPYRIGHT HISTORY; do		\
 		${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR};		\
 	done
 	set -e; \
 	cd ${WRKSRC}/doc; for f in *.html *.gif; do			\
 		${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR};		\
 	done
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	set -e; \
 	cd ${WRKSRC}/test; for f in README *.lua; do			\
 		${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR};		\
 	done
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/etc
 	set -e; \
 	cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \
 		${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc;		\
 	done
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
 	${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/05/20 00:58:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2011/01/19 13:46:13 adam Exp $
 BUILDLINK_TREE+=	lua
 .if !defined(LUA_BUILDLINK3_MK)
 LUA_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.lua+=	lua>=5.1.1
-BUILDLINK_ABI_DEPENDS.lua?=	lua>=5.1.4nb1
+BUILDLINK_ABI_DEPENDS.lua+=	lua>=5.1.4nb1
 BUILDLINK_PKGSRCDIR.lua?=	../../lang/lua
 .include "../../devel/readline/buildlink3.mk"
 .endif # LUA_BUILDLINK3_MK
 BUILDLINK_TREE+=	-lua

 @@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2010/05/28 05:35:50 dholland Exp $
+$NetBSD: distinfo,v 1.27 2011/01/19 13:46:13 adam Exp $
 SHA1 (lua-5.1.4.tar.gz) = 2b11c8e60306efb7f0734b747588f57995493db7
 RMD160 (lua-5.1.4.tar.gz) = c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef
 Size (lua-5.1.4.tar.gz) = 216679 bytes
 SHA1 (patch-aa) = 25bcd22d3fc319c51356b7f976d0215eb04900db
-SHA1 (patch-ab) = c5d35cbef2be7c3e2d41209c6656beacc0aa0415
+SHA1 (patch-ab) = b1a68274b67d985dd23d9eb031a7f36acefe6adf
 SHA1 (patch-ac) = a7cd4d0cce86b511481a6ef681aec64d97e3414e

 @@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.12 2009/12/17 16:42:46 jmmv Exp $
+$NetBSD: patch-ab,v 1.13 2011/01/19 13:46:14 adam Exp $
 --- src/Makefile.orig	2008-01-19 19:37:58.000000000 +0000
 +++ src/Makefile	2009-12-17 16:36:51.000000000 +0000
 @@ -7,8 +7,8 @@
  # Your platform. See PLATS for possible values.
  PLAT= none
 -CC= gcc
 -CFLAGS= -O2 -Wall $(MYCFLAGS)
 +CC?= gcc
 +CFLAGS+= -Wall $(MYCFLAGS)
  AR= ar rcu
  RANLIB= ranlib
 @@ -51,30 +51,30 @@ $NetBSD: patch-ab,v 1.12 2009/12/17 16:4
  ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
  ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
 @@ -48,14 +58,13 @@ o:	$(ALL_O)
  a:	$(ALL_A)
  $(LUA_A): $(CORE_O) $(LIB_O)
 -	$(AR) $@ $?
 -	$(RANLIB) $@
 +	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} -o $@ ${CORE_O} ${LIB_O} -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS}
  $(LUA_T): $(LUA_O) $(LUA_A)
 -	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+	${LIBTOOL} --tag=CC --mode=link $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++	${LIBTOOL} --tag=CC --mode=link $(CC) -o $@ ${LDFLAGS} $(LUA_O) $(LUA_A) $(LIBS)
  $(LUAC_T): $(LUAC_O) $(LUA_A)
 -	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-+	${LIBTOOL} --tag=CC --mode=link $(CC) -static -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++	${LIBTOOL} --tag=CC --mode=link $(CC) -static -o $@ ${LDFLAGS} $(LUAC_O) $(LUA_A) $(LIBS)
  clean:
  	$(RM) $(ALL_T) $(ALL_O)
 @@ -87,7 +96,7 @@ ansi:
  	$(MAKE) all MYCFLAGS=-DLUA_ANSI
  bsd:
 -	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
 +	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE" MYLIBS="-Wl,-E -lreadline -lhistory"
  freebsd:
  	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"