diff options
| -rw-r--r-- | converters/lua-iconv/Makefile | 25 | ||||
| -rw-r--r-- | converters/lua-iconv/distinfo | 4 | ||||
| -rw-r--r-- | converters/lua-iconv/files/patch-Makefile | 14 | ||||
| -rw-r--r-- | converters/lua-iconv/files/patch-luaiconv.c | 11 |
4 files changed, 16 insertions, 38 deletions
diff --git a/converters/lua-iconv/Makefile b/converters/lua-iconv/Makefile index 532b7789a1f9..d36e58cb1625 100644 --- a/converters/lua-iconv/Makefile +++ b/converters/lua-iconv/Makefile @@ -2,27 +2,30 @@ # $FreeBSD$ PORTNAME= iconv -PORTVERSION= 6 +PORTVERSION= 7 CATEGORIES= converters -MASTER_SITES= http://luaforge.net/frs/download.php/4181/ +MASTER_SITES= GHC PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} +DISTNAME= lua-${PORTNAME}-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org COMMENT= Iconv binding for Lua 5 WRKSRC= ${WRKDIR}/lua-${PORTNAME}-${PORTVERSION} -USE_LUA?= 5.1 -USES= pkgconfig iconv +USES= pkgconfig iconv lua -PLIST_FILES= %%LUA_MODLIBDIR%%/iconv.so +USE_GITHUB= yes +GH_ACCOUNT= ittner +GH_PROJECT= lua-${PORTNAME} -post-patch: - @${REINPLACE_CMD} -e 's|%%INCDIR%%|-I${PREFIX}/include| ; \ - s|%%LIBDIR%%|-L${PREFIX}/lib|; \ - s|%%ICONV_LIB%%|${ICONV_LIB}|' ${WRKSRC}/Makefile +PLIST_FILES= %%LUA_MODLIBDIR%%/iconv.so +CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` -I${LOCALBASE}/include +MAKE_ARGS= LUABIN=${LUA_CMD} CFLAGS="${CFLAGS}" +LDFLAGS= -shared ${ICONV_LIB} -L${LOCALBASE}/lib +CFLAGS_amd64= -fPIC do-install: - @if [ ! -d ${STAGEDIR}${LUA_MODLIBDIR} ]; then ${MKDIR} ${STAGEDIR}/${LUA_MODLIBDIR}; fi - @${INSTALL_PROGRAM} ${WRKSRC}/iconv.so ${STAGEDIR}/${LUA_MODLIBDIR} + @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} + ${INSTALL_LIB} ${WRKSRC}/iconv.so ${STAGEDIR}${LUA_MODLIBDIR} .include <bsd.port.mk> diff --git a/converters/lua-iconv/distinfo b/converters/lua-iconv/distinfo index 42beb009b19d..56330757c184 100644 --- a/converters/lua-iconv/distinfo +++ b/converters/lua-iconv/distinfo @@ -1,2 +1,2 @@ -SHA256 (iconv-6.tar.gz) = e3ca46cc4975d9dc496b282db217723d1b0b5277e6938be8797ea6e0ac4f77f4 -SIZE (iconv-6.tar.gz) = 6101 +SHA256 (lua-iconv-7.tar.gz) = c1db1915c754b5cfe7e45af61467bc6dfa4f0037d281ccbce6b53c974e2faf09 +SIZE (lua-iconv-7.tar.gz) = 7693 diff --git a/converters/lua-iconv/files/patch-Makefile b/converters/lua-iconv/files/patch-Makefile deleted file mode 100644 index ed29001d0b7d..000000000000 --- a/converters/lua-iconv/files/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile.orig 2009-12-04 12:50:49.000000000 +0800 -+++ Makefile 2009-12-04 12:54:18.000000000 +0800 -@@ -31,8 +31,9 @@ - OMIT_FRAME_POINTER = -fomit-frame-pointer - - # Name of .pc file. "lua5.1" on Debian/Ubuntu --LUAPKG = lua5.1 --CFLAGS = `pkg-config $(LUAPKG) --cflags` -fPIC -O3 -Wall -+LUAPKG = lua-5.1 -+CFLAGS += `pkg-config $(LUAPKG) --cflags` -fPIC %%INCDIR%% -+LIBS = `pkg-config $(LUAPKG) --libs` %%ICONV_LIB%% %%LIBDIR%% - LFLAGS = -shared $(OMIT_FRAME_POINTER) - INSTALL_PATH = `pkg-config $(LUAPKG) --variable=INSTALL_CMOD` - diff --git a/converters/lua-iconv/files/patch-luaiconv.c b/converters/lua-iconv/files/patch-luaiconv.c deleted file mode 100644 index 9f079728c973..000000000000 --- a/converters/lua-iconv/files/patch-luaiconv.c +++ /dev/null @@ -1,11 +0,0 @@ ---- luaiconv.c.orig 2009-12-04 12:57:38.000000000 +0800 -+++ luaiconv.c 2009-12-04 12:58:30.000000000 +0800 -@@ -102,7 +102,7 @@ static int Liconv_open(lua_State *L) { - static int Liconv(lua_State *L) { - iconv_t cd = get_iconv_t(L, 1); - size_t ibleft = lua_strlen(L, 2); -- char *inbuf = (char*) luaL_checkstring(L, 2); -+ const char *inbuf = luaL_checkstring(L, 2); - char *outbuf; - char *outbufs; - size_t obsize = (ibleft > 256) ? ibleft : 256; |