head	1.4;
access;
symbols
	RELEASE_8_3_0:1.3
	RELEASE_9_0_0:1.3
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.3
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2;
locks; strict;
comment	@# @;


1.4
date	2012.04.06.17.39.12;	author mandree;	state Exp;
branches;
next	1.3;

1.3
date	2010.09.16.13.54.16;	author garga;	state Exp;
branches;
next	1.2;

1.2
date	2008.08.10.19.29.43;	author alepulver;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.10.15.17.49;	author alepulver;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to bug-fix release 5.1.5.

Submitted by: ohauer
Feature safe: yes
PR:           ports/166540
@
text
@--- Makefile.orig	2008-01-19 17:37:58.000000000 -0200
+++ Makefile	2008-08-10 16:00:41.000000000 -0300
@@@@ -9,7 +9,8 @@@@
 
 CC= gcc
 CFLAGS= -O2 -Wall $(MYCFLAGS)
-AR= ar rcu
+ARFLAGS= rcu
+AR= ar
 RANLIB= ranlib
 RM= rm -f
 LIBS= -lm $(MYLIBS)
@@@@ -31,12 +32,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,8 +49,11 @@@@
 
 a:	$(ALL_A)
 
+$(LUA_SO):	$(CORE_O) $(LIB_O)
+	$(CC) -o $@@ $(CFLAGS) $(LDFLAGS) $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $?
+
 $(LUA_A): $(CORE_O) $(LIB_O)
-	$(AR) $@@ $(CORE_O) $(LIB_O)	# DLL needs all object files
+	$(AR) $(ARFLAGS) $@@ $?
 	$(RANLIB) $@@
 
 $(LUA_T): $(LUA_O) $(LUA_A)
@


1.3
log
@- Add upstream patches for version 1.5.4
- Bump PORTREVISION
@
text
@d36 1
a36 1
-	$(AR) $@@ $?
@


1.2
log
@- Merge patch-Makefile into patch-src-Makefile (both actually patch same file).
- Patch lang/lua to behave as expected by the framework.
- Add missing library dependency (only run before) when using lua 5.1.
- Add notes in bsd.lua.mk for updating lang/lua* ports describing how they are
  integrated into the ports tree.

PR:		ports/126207
Submitted by:	Daniel Roethlisberger <daniel@@roe.ch>
@
text
@d1 2
a2 2
--- ./src/Makefile.orig	2008-01-19 17:37:58.000000000 -0200
+++ ./src/Makefile	2008-08-10 16:00:41.000000000 -0300
d33 1
a33 1
+	$(CC) -o $@@ $(MYLDFLAGS) -shared -Wl,-soname=$(LUA_SONAME) $?
@


1.1
log
@- Split AR parameters to ARFLAGS variable to allow redefining AR for
  cross-compilation.

PR:		ports/121834
Submitted by:	John Hein <jhein@@timing.com>
Approved by:	maintainer (timeout)
@
text
@d1 2
a2 2
--- src/Makefile.orig	2006-03-21 17:41:49.000000000 -0700
+++ src/Makefile	2008-03-18 09:41:01.000000000 -0600
d13 17
a29 1
@@@@ -48,7 +49,7 @@@@
d32 3
@

