Attachment #87676 for bug #124297

View | Details | Raw Unified | Return to bug 124297
Collapse All | Expand All

Lines 7-13 Link Here

(-)/usr/home/cherry/svk/ports/lang/lua/Makefile (-2 / +5 lines)
7		7
8	PORTNAME= lua	8	PORTNAME= lua
9	PORTVERSION= 5.1.3	9	PORTVERSION= 5.1.3
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= lang	11	CATEGORIES= lang
12	MASTER_SITES= http://www.lua.org/ftp/ \	12	MASTER_SITES= http://www.lua.org/ftp/ \
13	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \	13	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
Lines 23-28 Link Here
23	LUA_COMPS= # only define variables	23	LUA_COMPS= # only define variables
24	ALL_TARGET= freebsd	24	ALL_TARGET= freebsd
25	USE_GNOME= pkgconfig	25	USE_GNOME= pkgconfig
		26	USE_LDCONFIG= ${LUA_LIBDIR}
26		27
27	MAN1= lua-${LUA_VER}.1 luac-${LUA_VER}.1	28	MAN1= lua-${LUA_VER}.1 luac-${LUA_VER}.1
28	DOCSDIR= ${PREFIX}/share/doc/${LUA_SUBDIR}	29	DOCSDIR= ${PREFIX}/share/doc/${LUA_SUBDIR}
Lines 74-79 Link Here
74	# Libraries.	75	# Libraries.
75	${MKDIR} ${LUA_LIBDIR}	76	${MKDIR} ${LUA_LIBDIR}
76	${INSTALL_DATA} ${WRKSRC}/src/liblua.a ${LUA_LIBDIR}	77	${INSTALL_DATA} ${WRKSRC}/src/liblua.a ${LUA_LIBDIR}
		78	${INSTALL_PROGRAM} ${WRKSRC}/src/liblua.so ${LUA_LIBDIR}/liblua.so.1
		79	cd ${LUA_LIBDIR} && ${LN} -s liblua.so.1 liblua.so
77	# Manual pages.	80	# Manual pages.
78	.for f in ${LUA_MAN}	81	.for f in ${LUA_MAN}
79	${INSTALL_MAN} ${WRKSRC}/doc/${f} \	82	${INSTALL_MAN} ${WRKSRC}/doc/${f} \
Lines 95-101 Link Here
95	.endif	98	.endif
96	# lua.pc	99	# lua.pc
97	${MKDIR} ${LOCALBASE}/libdata/pkgconfig	100	${MKDIR} ${LOCALBASE}/libdata/pkgconfig
98	${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${LOCALBASE}/libdata/pkgconfig/lua-${LUA_VER}.pc	101	${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${PREFIX}/libdata/pkgconfig/lua-${LUA_VER}.pc
99	# Module directories.	102	# Module directories.
100	${MKDIR} ${LUA_MODLIBDIR}	103	${MKDIR} ${LUA_MODLIBDIR}
101	${MKDIR} ${LUA_MODSHAREDIR}	104	${MKDIR} ${LUA_MODSHAREDIR}




--- 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) $@

Lines 10-15 Link Here

(-)/usr/home/cherry/svk/ports/lang/lua/pkg-plist (+2 lines)
10	%%LUA_INCDIR%%/luaconf.h	10	%%LUA_INCDIR%%/luaconf.h
11	%%LUA_INCDIR%%/lualib.h	11	%%LUA_INCDIR%%/lualib.h
12	%%LUA_LIBDIR%%/liblua.a	12	%%LUA_LIBDIR%%/liblua.a
		13	%%LUA_LIBDIR%%/liblua.so
		14	%%LUA_LIBDIR%%/liblua.so.1
13	libdata/pkgconfig/lua-%%LUA_VER%%.pc	15	libdata/pkgconfig/lua-%%LUA_VER%%.pc
14	%%PORTDOCS%%%%DOCSDIR%%/README	16	%%PORTDOCS%%%%DOCSDIR%%/README
15	%%PORTDOCS%%%%DOCSDIR%%/amazon.gif	17	%%PORTDOCS%%%%DOCSDIR%%/amazon.gif

Return to bug 124297

Line 0 Link Here

(-)/usr/home/cherry/svk/ports/lang/lua/files/patch-src-Makefile (+27 lines)
	1	--- src/Makefile.orig 2008-05-29 19:24:46.000000000 +0900
	2	+++ src/Makefile 2008-05-29 19:27:30.000000000 +0900
	3	@@ -31,12 +31,13 @@
	4
	5	LUA_T= lua
	6	LUA_O= lua.o
	7	+LUA_SO= liblua.so
	8
	9	LUAC_T= luac
	10	LUAC_O= luac.o print.o
	11
	12	ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
	13	-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
	14	+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
	15	ALL_A= $(LUA_A)
	16
	17	default: $(PLAT)
	18	@@ -47,6 +48,9 @@
	19
	20	a: $(ALL_A)
	21
	22	+$(LUA_SO): $(CORE_O) $(LIB_O)
	23	+ $(CC) -o $@ $(MYLDFLAGS) -shared $?
	24	+
	25	$(LUA_A): $(CORE_O) $(LIB_O)
	26	$(AR) $@ $?
	27	$(RANLIB) $@