diff options
| author | araujo <araujo@FreeBSD.org> | 2008-07-04 08:55:59 +0800 |
|---|---|---|
| committer | araujo <araujo@FreeBSD.org> | 2008-07-04 08:55:59 +0800 |
| commit | 116710afe98b4b14fb0a01bb5d471b5cd79db4ff (patch) | |
| tree | b125e17ea04ffc9173c76c38fa71f301e6cb0557 /lang | |
| parent | 8225488fa833bdded2cb85495008cfe6fd9acf6b (diff) | |
| download | freebsd-ports-gnome-116710afe98b4b14fb0a01bb5d471b5cd79db4ff.tar.gz freebsd-ports-gnome-116710afe98b4b14fb0a01bb5d471b5cd79db4ff.tar.zst freebsd-ports-gnome-116710afe98b4b14fb0a01bb5d471b5cd79db4ff.zip | |
- liblua.so is required in building mod_security, wireshark and possibly others with lua support, now create a shared lib is needed.
- Bump PORTREVISION.
PR: ports/124297
Submitted by: Tomoyuki Sakurai <cherry@trombik.org>
Approved by: maintainer timeout ( > 2 weeks)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/lua/Makefile | 7 | ||||
| -rw-r--r-- | lang/lua/files/patch-Makefile | 27 | ||||
| -rw-r--r-- | lang/lua/pkg-plist | 2 |
3 files changed, 34 insertions, 2 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile index 45197b55c700..66eff64e0460 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -7,7 +7,7 @@ PORTNAME= lua PORTVERSION= 5.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ \ ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \ @@ -23,6 +23,7 @@ USE_LUA= 5.1 LUA_COMPS= # only define variables ALL_TARGET= freebsd USE_GNOME= pkgconfig +USE_LDCONFIG= ${LUA_LIBDIR} MAN1= lua-${LUA_VER}.1 luac-${LUA_VER}.1 DOCSDIR= ${PREFIX}/share/doc/${LUA_SUBDIR} @@ -74,6 +75,8 @@ do-install: # Libraries. ${MKDIR} ${LUA_LIBDIR} ${INSTALL_DATA} ${WRKSRC}/src/liblua.a ${LUA_LIBDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/src/liblua.so ${LUA_LIBDIR}/liblua.so.1 + cd ${LUA_LIBDIR} && ${LN} -s liblua.so.1 liblua.so # Manual pages. .for f in ${LUA_MAN} ${INSTALL_MAN} ${WRKSRC}/doc/${f} \ @@ -95,7 +98,7 @@ do-install: .endif # lua.pc ${MKDIR} ${LOCALBASE}/libdata/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${LOCALBASE}/libdata/pkgconfig/lua-${LUA_VER}.pc + ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${PREFIX}/libdata/pkgconfig/lua-${LUA_VER}.pc # Module directories. ${MKDIR} ${LUA_MODLIBDIR} ${MKDIR} ${LUA_MODSHAREDIR} diff --git a/lang/lua/files/patch-Makefile b/lang/lua/files/patch-Makefile new file mode 100644 index 000000000000..8b46a595bcd5 --- /dev/null +++ b/lang/lua/files/patch-Makefile @@ -0,0 +1,27 @@ +--- src/Makefile.orig 2008-05-29 19:24:46.000000000 +0900 ++++ src/Makefile 2008-05-29 19:27:30.000000000 +0900 +@@ -31,12 +31,13 @@ + + LUA_T= lua + LUA_O= lua.o ++LUA_SO= liblua.so + + LUAC_T= luac + LUAC_O= luac.o print.o + + ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + default: $(PLAT) +@@ -47,6 +48,9 @@ + + a: $(ALL_A) + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@ $(MYLDFLAGS) -shared $? ++ + $(LUA_A): $(CORE_O) $(LIB_O) + $(AR) $@ $? + $(RANLIB) $@ diff --git a/lang/lua/pkg-plist b/lang/lua/pkg-plist index 70baca4ceff9..68844115afd6 100644 --- a/lang/lua/pkg-plist +++ b/lang/lua/pkg-plist @@ -10,6 +10,8 @@ bin/luac-%%LUA_VER%% %%LUA_INCDIR%%/luaconf.h %%LUA_INCDIR%%/lualib.h %%LUA_LIBDIR%%/liblua.a +%%LUA_LIBDIR%%/liblua.so +%%LUA_LIBDIR%%/liblua.so.1 libdata/pkgconfig/lua-%%LUA_VER%%.pc %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/amazon.gif |