[125163] trunk/dports/devel/omniORB

[ryandesign at macports.org]

Revision: 125163
          https://trac.macports.org/changeset/125163
Author:   ryandesign at macports.org
Date:     2014-09-08 01:35:37 -0700 (Mon, 08 Sep 2014)
Log Message:
-----------
omniORB: convert some reinplaces to patchfiles

Modified Paths:
--------------
    trunk/dports/devel/omniORB/Portfile

Added Paths:
-----------
    trunk/dports/devel/omniORB/files/patch-configure.diff
    trunk/dports/devel/omniORB/files/patch-mk-beforeauto.mk.in.diff

Modified: trunk/dports/devel/omniORB/Portfile
===================================================================
--- trunk/dports/devel/omniORB/Portfile	2014-09-08 08:01:35 UTC (rev 125162)
+++ trunk/dports/devel/omniORB/Portfile	2014-09-08 08:35:37 UTC (rev 125163)
@@ -26,7 +26,9 @@
 
 use_bzip2           yes
 
-patchfiles          src_tool_omniidl_cxx_cccp_config-darwin.h.diff
+patchfiles          patch-configure.diff \
+                    patch-mk-beforeauto.mk.in.diff \
+                    src_tool_omniidl_cxx_cccp_config-darwin.h.diff
 
 universal_variant   no
 
@@ -46,19 +48,9 @@
     configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
 }
 
-pre-patch {
-    reinplace "s|-bind_at_load||g" \
-        ${worksrcpath}/mk/beforeauto.mk.in
-}
-
 post-patch {
     reinplace "s|\\(\$(CXXLINKOPTIONS)\\)|\\1 [get_canonical_archflags cxx]|g" \
         ${worksrcpath}/mk/beforeauto.mk.in
-
-    reinplace "s|get_python_lib(0,\[^)\]*)|get_python_lib()|g" \
-        ${worksrcpath}/configure
-    reinplace "s|get_python_lib(1,\[^)\]*)|get_python_lib()|g" \
-        ${worksrcpath}/configure
 }
 
 variant ssl description {Enable SSL support} {

Added: trunk/dports/devel/omniORB/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/omniORB/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/devel/omniORB/files/patch-configure.diff	2014-09-08 08:35:37 UTC (rev 125163)
@@ -0,0 +1,20 @@
+--- configure.orig	2014-04-28 11:44:19.000000000 -0500
++++ configure	2014-09-08 03:12:48.000000000 -0500
+@@ -4354,7 +4354,7 @@
+     sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+ else:
+     from distutils import sysconfig
+-    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
++    sitedir = sysconfig.get_python_lib()
+ sys.stdout.write(sitedir)"`
+      case $am_cv_python_pythondir in
+      $am_py_prefix*)
+@@ -4398,7 +4398,7 @@
+     sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+ else:
+     from distutils import sysconfig
+-    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
++    sitedir = sysconfig.get_python_lib()
+ sys.stdout.write(sitedir)"`
+      case $am_cv_python_pyexecdir in
+      $am_py_exec_prefix*)

Added: trunk/dports/devel/omniORB/files/patch-mk-beforeauto.mk.in.diff
===================================================================
--- trunk/dports/devel/omniORB/files/patch-mk-beforeauto.mk.in.diff	                        (rev 0)
+++ trunk/dports/devel/omniORB/files/patch-mk-beforeauto.mk.in.diff	2014-09-08 08:35:37 UTC (rev 125163)
@@ -0,0 +1,21 @@
+--- mk/beforeauto.mk.in.orig	2014-04-17 10:40:15.000000000 -0500
++++ mk/beforeauto.mk.in	2014-09-08 03:21:00.000000000 -0500
+@@ -1053,7 +1053,7 @@
+ OMNITHREAD_POSIX_CPPFLAGS = -DPthreadDraftVersion=10 \
+                             -DPthreadSupportThreadPriority -DNoNanoSleep
+ 
+-CXXOPTIONS = -fno-common -bind_at_load @EXTRA_GCC_CXXFLAGS@
++CXXOPTIONS = -fno-common @EXTRA_GCC_CXXFLAGS@
+ SHAREDLIB_SUFFIX = dylib
+ 
+ SharedLibraryFullNameTemplate = lib$$1$$2.$$3.$$4.$(SHAREDLIB_SUFFIX)
+@@ -1064,8 +1064,7 @@
+                                          -flat_namespace \
+                                          -undefined suppress
+ PythonLibraryPlatformLinkFlagsTemplate = -bundle -flat_namespace \
+-                                         -undefined suppress \
+-                                         -bind_at_load
++                                         -undefined suppress
+ PythonSHAREDLIB_SUFFIX = so
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140908/aeba15cf/attachment-0001.html>