[97087] trunk/dports/devel/omniORB

stromnov at macports.org stromnov at macports.org
Mon Aug 27 05:56:32 PDT 2012


Revision: 97087
          https://trac.macports.org/changeset/97087
Author:   stromnov at macports.org
Date:     2012-08-27 05:56:29 -0700 (Mon, 27 Aug 2012)
Log Message:
-----------
omniORB: fix typos (thanks to ryandesign), drop universal support, reenable python27 variant by default

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

Removed Paths:
-------------
    trunk/dports/devel/omniORB/files/include_omniORB4_acconfig.h.ed
    trunk/dports/devel/omniORB/files/include_omniconfig.h.in.ed
    trunk/dports/devel/omniORB/files/mk_beforeauto.mk.in.diff

Modified: trunk/dports/devel/omniORB/Portfile
===================================================================
--- trunk/dports/devel/omniORB/Portfile	2012-08-27 10:31:48 UTC (rev 97086)
+++ trunk/dports/devel/omniORB/Portfile	2012-08-27 12:56:29 UTC (rev 97087)
@@ -5,7 +5,7 @@
 
 name                omniORB
 version             4.1.6
-revision            1
+revision            2
 categories          devel
 platforms           darwin
 # executables are GPL, libs are LGPL
@@ -38,10 +38,9 @@
 configure.args      CC="${configure.cc}" \
                     CXX="${configure.cxx}" \
                     CCFLAGS="[get_canonical_archflags cc]" \
-                    EXTRA_GCC_CXXFLAGS="[get_canonical_archflags cc]" \
+                    EXTRA_GCC_CXXFLAGS="[get_canonical_archflags cxx]" \
                     --with-omniORB-config="${prefix}/etc/omniORB.cfg" \
                     --with-omniNames-logdir="${prefix}/var"
-configure.args-delete --disable-dependency-tracking
 
 if {$build_arch == "x86_64" && ${os.platform} == "darwin"} {
     configure.args-append --build=${build_arch}-apple-${os.platform}${os.version}
@@ -55,35 +54,22 @@
 }
 
 post-patch {
-    reinplace "s|\\(\$(CXXLINKOPTIONS)\\)|\\1 [get_canonical_archflags cc]|g" \
+    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
-    if {[variant_isset universal]} {
-#         system "cd ${worksrcpath} && ed - ./include/omniconfig.h.in < ${filespath}/include_omniconfig.h.in.ed"
-    }
 }
 
-if {[variant_isset universal]} {
-    # patchfiles-append mk_beforeauto.mk.in.diff
-    post-configure {
-#         system "cd ${worksrcpath} && ed - ./include/omniORB4/acconfig.h < ${filespath}/include_omniORB4_acconfig.h.ed"
-    }
-}
-
-# Need an empty universal variant defined to get the correct set of -arch arguments
-variant universal {}
-
 variant ssl description {Enable SSL support} {
     configure.args-append   --with-openssl
     depends_lib-append      port:openssl
 }
 
 if {![variant_isset python24] && ![variant_isset python25] && ![variant_isset python26] && ![variant_isset python27]} {
-    default_variants        +python24
+    default_variants        +python27
 }
 
 variant python24 description {Enable python support with python 2.4} {
@@ -110,11 +96,6 @@
     configure.python        ${prefix}/bin/python2.7
 }
 
-platform darwin 8 {
-    # needs -Xarch
-    universal_variant no
-}
-
 livecheck.type      regex
 livecheck.url       http://omniorb.sourceforge.net/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)"

Deleted: trunk/dports/devel/omniORB/files/include_omniORB4_acconfig.h.ed
===================================================================
--- trunk/dports/devel/omniORB/files/include_omniORB4_acconfig.h.ed	2012-08-27 10:31:48 UTC (rev 97086)
+++ trunk/dports/devel/omniORB/files/include_omniORB4_acconfig.h.ed	2012-08-27 12:56:29 UTC (rev 97087)
@@ -1,22 +0,0 @@
-/#define SIZEOF_BOOL/c
-#if defined(__LP64__) || !defined(__POWERPC__)
-#define SIZEOF_BOOL 1
-#else
-#define SIZEOF_BOOL 4
-#endif
-.
-/#define SIZEOF_LONG/c
-#if defined(__LP64__)
-#define SIZEOF_LONG 8
-#else
-#define SIZEOF_LONG 4
-#endif
-.
-/#define SIZEOF_VOIDP/c
-#if defined(__LP64__)
-#define SIZEOF_VOIDP 8
-#else
-#define SIZEOF_VOIDP 4
-#endif
-.
-w

Deleted: trunk/dports/devel/omniORB/files/include_omniconfig.h.in.ed
===================================================================
--- trunk/dports/devel/omniORB/files/include_omniconfig.h.in.ed	2012-08-27 10:31:48 UTC (rev 97086)
+++ trunk/dports/devel/omniORB/files/include_omniconfig.h.in.ed	2012-08-27 12:56:29 UTC (rev 97087)
@@ -1,8 +0,0 @@
-/#define @PROCESSOR_DEFINE@ 1/c
-#if defined(__i386__)
-#define __x86__ 1
-#elif defined(__POWERPC__)
-#define __powerpc__ 1
-#endif
-.
-w

Deleted: trunk/dports/devel/omniORB/files/mk_beforeauto.mk.in.diff
===================================================================
--- trunk/dports/devel/omniORB/files/mk_beforeauto.mk.in.diff	2012-08-27 10:31:48 UTC (rev 97086)
+++ trunk/dports/devel/omniORB/files/mk_beforeauto.mk.in.diff	2012-08-27 12:56:29 UTC (rev 97087)
@@ -1,53 +0,0 @@
---- mk/beforeauto.mk.in.orig	2009-06-18 18:45:32.000000000 +1000
-+++ mk/beforeauto.mk.in	2011-04-01 03:47:51.000000000 +1100
-@@ -1155,49 +1155,7 @@
- # Processor
- #
- 
--ifdef x86Processor
--IMPORT_CPPFLAGS += -D__x86__
--endif
--
--ifdef x8664Processor
--IMPORT_CPPFLAGS += -D__x86_64__
--endif
--
--ifdef SparcProcessor
--IMPORT_CPPFLAGS += -D__sparc__
--endif
--
--ifdef AlphaProcessor
--IMPORT_CPPFLAGS += -D__alpha__
--endif
--
--ifdef m68kProcessor
--IMPORT_CPPFLAGS += -D__m68k__
--endif
--
--ifdef IndigoProcessor
--IMPORT_CPPFLAGS += -D__mips__
--endif
--
--ifdef ArmProcessor
--IMPORT_CPPFLAGS += -D__arm__
--endif
--
--ifdef s390Processor
--IMPORT_CPPFLAGS += -D__s390__
--endif
--
--ifdef ia64Processor
--IMPORT_CPPFLAGS += -D__ia64__
--endif
--
--ifdef HppaProcessor
--IMPORT_CPPFLAGS += -D__hppa__
--endif
--
--ifdef PowerPCProcessor
--IMPORT_CPPFLAGS += -D__powerpc__
--endif
-+IMPORT_CPPFLAGS += -Xarch_i386 -D__x86__ -Xarch_ppc64 -D__powerpc__ -Xarch_ppc -D__powerpc__
- 
- 
- ###########################################################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120827/4b02422a/attachment.html>


More information about the macports-changes mailing list