- Fix on 6.x -- does not hardcode gcc version in the Makefile

Submitted by:	maintainer

3 files changed, 28 insertions, 28 deletions

diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile
index 4f13dd662271..064608cafde8 100644
--- a/devel/boost-python-libs/Makefile
+++ b/devel/boost-python-libs/Makefile
@@ -59,15 +59,20 @@ do-build:
 
 # Remove non-python headers
 	cd ${WRKSRC} && \
-	${FIND} boost -not -path '*python*' -delete
+ 	${FIND} boost -not -path '*boost/python*' -delete
 
 do-install:
 # Install libraries
-	${INSTALL_DATA} ${WRKSRC}/bin.v2/libs/python/build/gcc-4.2.1/release/link-static/threading-multi/libboost_python.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/bin.v2/libs/python/build/gcc-4.2.1/release/threading-multi/libboost_python.so.${PORTVERSION} ${PREFIX}/lib/libboost_python.so.${BOOST_SHARED_LIB_VER}
+	${FIND} ${WRKSRC}/bin.v2/libs/python -type f -name "*.a"\
+ 		-exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
+
+	${FIND} -E ${WRKSRC}/bin.v2/libs/python -type f \
+ 		-regex '.*so' \
+		-exec ${INSTALL_DATA} \{\} ${PREFIX}/lib \;
 
 # Create symlink for shared library
 	cd ${PREFIX}/lib/ && \
+	${MV} "libboost_python.so" "libboost_python.so.${BOOST_SHARED_LIB_VER}" && \
 	${LN} -fs "libboost_python.so.${BOOST_SHARED_LIB_VER}" "libboost_python.so"
 
 # Install headers
diff --git a/devel/boost-python-libs/files/patch-Jamroot b/devel/boost-python-libs/files/patch-Jamroot
new file mode 100644
index 000000000000..3b8f07c6ec50
--- /dev/null
+++ b/devel/boost-python-libs/files/patch-Jamroot
@@ -0,0 +1,20 @@
+--- Jamroot.orig-orig	2009-07-06 20:50:54.000000000 +0400
++++ Jamroot	2009-07-06 20:52:21.000000000 +0400
+@@ -333,7 +333,7 @@
+             # suffixes either. Pgi compilers can not accept library with version
+             # suffix.
+             if $(type) = SHARED_LIB &&
+-              ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
++              ( ! ( [ $(property-set).get <target-os> ] in windows freebsd cygwin darwin aix ) &&
+                 ! ( [ $(property-set).get <toolset> ] in pgi ) )
+             {
+                 result = $(result).$(BOOST_VERSION)  ;
+@@ -356,7 +356,7 @@
+             # suffixes either. Pgi compilers can not accept library with version
+             # suffix.
+             if $(type) = SHARED_LIB &&
+-              ( ! ( [ $(property-set).get <target-os> ] in windows cygwin darwin aix ) &&
++              ( ! ( [ $(property-set).get <target-os> ] in windows freebsd cygwin darwin aix ) &&
+                 ! ( [ $(property-set).get <toolset> ] in pgi ) )
+             {
+                 result = $(result).$(BOOST_VERSION)  ;
diff --git a/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam b/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam
index f370c8237dae..9daa31f24d9c 100644
--- a/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam
+++ b/devel/boost-python-libs/files/patch-tools_build_v2_tools_gcc.jam
@@ -18,31 +18,6 @@
  toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
  
  toolset.flags gcc.compile OPTIONS <inlining>off  : -fno-inline ;
-@@ -349,15 +349,6 @@
-     }
- }
- 
--# FIXME: this should not use os.name.
--if [ os.name ] != NT && [ os.name ] != OSF && [ os.name ] != HPUX && [ os.name ] != AIX
--{
--    # OSF does have an option called -soname but it does not seem to work as
--    # expected, therefore it has been disabled.
--    HAVE_SONAME   = "" ;
--    SONAME_OPTION = -h ;
--}
--
- 
- toolset.flags gcc.compile USER_OPTIONS <cflags> ;
- toolset.flags gcc.compile.c++ USER_OPTIONS <cxxflags> ;
-@@ -793,7 +784,7 @@
- # Differs from 'link' above only by -shared.
- actions link.dll bind LIBRARIES
- {
--    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
-+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
- }
- 
- rule setup-threading ( targets * : sources * : properties * )
 @@ -811,7 +811,7 @@
              }        
              case *bsd :