- Fix shared lib support

8 files changed, 40 insertions, 20 deletions

diff --git a/lang/tolua++/Makefile b/lang/tolua++/Makefile
index af7717ffb755..a1303c6c7731 100644
--- a/lang/tolua++/Makefile
+++ b/lang/tolua++/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tolua++
 PORTVERSION=	1.0.92
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang devel
 MASTER_SITES=	http://www.codenix.com/~tolua/ \
 		http://www.amdmi3.ru/distfiles/
@@ -18,7 +18,7 @@ COMMENT=	An extended version of tolua, a tool to integrate C/C++ code with Lua
 USE_BZIP2=	yes
 USE_LUA=	5.1
 USE_SCONS=	yes
-SCONS_ARGS=	prefix=${PREFIX}
+SCONS_ARGS=	prefix=${PREFIX} SONAME="libtolua++-${LUA_VER}.so"
 
 CFLAGS+=	-I${LUA_INCDIR}
 LDFLAGS+=	-L${LUA_LIBDIR}
@@ -32,5 +32,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/tolua++.h ${LUA_INCDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.a ${LUA_LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${LUA_LIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${PREFIX}/lib/libtolua++-${LUA_VER}.so
 
 .include <bsd.port.mk>
diff --git a/lang/tolua++/files/patch-SConstruct b/lang/tolua++/files/patch-SConstruct
index fc35d15f2166..2b30c2c34c30 100644
--- a/lang/tolua++/files/patch-SConstruct
+++ b/lang/tolua++/files/patch-SConstruct
@@ -1,11 +1,21 @@
---- SConstruct.orig	Sat Dec 23 14:21:33 2006
-+++ SConstruct	Sat Dec 23 14:21:46 2006
-@@ -128,7 +128,7 @@
+--- SConstruct.orig	2006-04-10 13:45:44.000000000 +0400
++++ SConstruct	2008-08-22 01:43:56.000000000 +0400
+@@ -17,6 +17,7 @@
+ opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])
+ opts.Add('LINK', 'The linker.')
+ opts.Add('LINKFLAGS', 'Linker flags.', [])
++opts.Add('SONAME', 'Shared library name.')
+ opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0)
+ opts.Add('LIBS', 'libraries', [])
+ opts.Add('LIBPATH', 'library path', [])
+@@ -128,7 +129,9 @@
  ########### end of helper builders
  
  env['CPPPATH'] = '#/include'
 -env['LIBPATH'] =  ['#/lib'] + env['LIBPATH']
 +env['LIBPATH'] =  ['#/lib'] + env['LIBPATH'].split(" ")
++
++env['SHLINKFLAGS'] += ' -Wl,-soname='+env['SONAME']
  
  if env['no_cygwin']:
  
diff --git a/lang/tolua++/files/patch-src-lib-SCsub b/lang/tolua++/files/patch-src-lib-SCsub
index 5b755fb8dd0a..736f807b34b1 100644
--- a/lang/tolua++/files/patch-src-lib-SCsub
+++ b/lang/tolua++/files/patch-src-lib-SCsub
@@ -1,10 +1,8 @@
 --- src/lib/SCsub.orig	2005-11-28 16:51:15.000000000 +0300
-+++ src/lib/SCsub	2008-08-19 22:57:11.000000000 +0400
-@@ -9,5 +9,6 @@
- 	'tolua_to.c',
++++ src/lib/SCsub	2008-08-22 01:44:24.000000000 +0400
+@@ -10,4 +10,5 @@
  	]
  
--env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
-+env.lib_target  = env.Library('#/lib/'+env['tolua_lib'], sources)
+ env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
 +env.lib_target += env.SharedLibrary('#/lib/'+env['tolua_lib'], sources)
  
diff --git a/lang/tolua++/pkg-plist b/lang/tolua++/pkg-plist
index a0d273d2f3f0..942de3c54270 100644
--- a/lang/tolua++/pkg-plist
+++ b/lang/tolua++/pkg-plist
@@ -2,4 +2,5 @@
 bin/tolua++-%%LUA_VER%%
 %%LUA_LIBDIR%%/libtolua++.a
 %%LUA_LIBDIR%%/libtolua++.so
+lib/libtolua++-%%LUA_VER%%.so
 %%LUA_INCDIR%%/tolua++.h
diff --git a/lang/tolua++50/Makefile b/lang/tolua++50/Makefile
index 4ba102c4a6ea..eb3b2abeacdb 100644
--- a/lang/tolua++50/Makefile
+++ b/lang/tolua++50/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tolua++
 PORTVERSION=	1.0.92
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	50
 CATEGORIES=	lang devel
 MASTER_SITES=	http://www.codenix.com/~tolua/ \
@@ -19,7 +19,7 @@ COMMENT=	An extended version of tolua, a tool to integrate C/C++ code with Lua
 USE_BZIP2=	yes
 USE_LUA=	5.0
 USE_SCONS=	yes
-SCONS_ARGS=	prefix=${PREFIX}
+SCONS_ARGS=	prefix=${PREFIX} SONAME="libtolua++-${LUA_VER}.so"
 
 CFLAGS+=	-I${LUA_INCDIR}
 LDFLAGS+=	-L${LUA_LIBDIR}
@@ -30,5 +30,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/tolua++.h ${LUA_INCDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.a ${LUA_LIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${LUA_LIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/libtolua++.so ${PREFIX}/lib/libtolua++-${LUA_VER}.so
 
 .include <bsd.port.mk>
diff --git a/lang/tolua++50/files/patch-SConstruct b/lang/tolua++50/files/patch-SConstruct
index fc35d15f2166..2b30c2c34c30 100644
--- a/lang/tolua++50/files/patch-SConstruct
+++ b/lang/tolua++50/files/patch-SConstruct
@@ -1,11 +1,21 @@
---- SConstruct.orig	Sat Dec 23 14:21:33 2006
-+++ SConstruct	Sat Dec 23 14:21:46 2006
-@@ -128,7 +128,7 @@
+--- SConstruct.orig	2006-04-10 13:45:44.000000000 +0400
++++ SConstruct	2008-08-22 01:43:56.000000000 +0400
+@@ -17,6 +17,7 @@
+ opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall'])
+ opts.Add('LINK', 'The linker.')
+ opts.Add('LINKFLAGS', 'Linker flags.', [])
++opts.Add('SONAME', 'Shared library name.')
+ opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0)
+ opts.Add('LIBS', 'libraries', [])
+ opts.Add('LIBPATH', 'library path', [])
+@@ -128,7 +129,9 @@
  ########### end of helper builders
  
  env['CPPPATH'] = '#/include'
 -env['LIBPATH'] =  ['#/lib'] + env['LIBPATH']
 +env['LIBPATH'] =  ['#/lib'] + env['LIBPATH'].split(" ")
++
++env['SHLINKFLAGS'] += ' -Wl,-soname='+env['SONAME']
  
  if env['no_cygwin']:
  
diff --git a/lang/tolua++50/files/patch-src-lib-SCsub b/lang/tolua++50/files/patch-src-lib-SCsub
index 5b755fb8dd0a..736f807b34b1 100644
--- a/lang/tolua++50/files/patch-src-lib-SCsub
+++ b/lang/tolua++50/files/patch-src-lib-SCsub
@@ -1,10 +1,8 @@
 --- src/lib/SCsub.orig	2005-11-28 16:51:15.000000000 +0300
-+++ src/lib/SCsub	2008-08-19 22:57:11.000000000 +0400
-@@ -9,5 +9,6 @@
- 	'tolua_to.c',
++++ src/lib/SCsub	2008-08-22 01:44:24.000000000 +0400
+@@ -10,4 +10,5 @@
  	]
  
--env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
-+env.lib_target  = env.Library('#/lib/'+env['tolua_lib'], sources)
+ env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
 +env.lib_target += env.SharedLibrary('#/lib/'+env['tolua_lib'], sources)
  
diff --git a/lang/tolua++50/pkg-plist b/lang/tolua++50/pkg-plist
index a0d273d2f3f0..942de3c54270 100644
--- a/lang/tolua++50/pkg-plist
+++ b/lang/tolua++50/pkg-plist
@@ -2,4 +2,5 @@
 bin/tolua++-%%LUA_VER%%
 %%LUA_LIBDIR%%/libtolua++.a
 %%LUA_LIBDIR%%/libtolua++.so
+lib/libtolua++-%%LUA_VER%%.so
 %%LUA_INCDIR%%/tolua++.h