[94807] trunk/dports/security/cyrus-sasl2

30 Jun 2012

Revision: 94807
          https://trac.macports.org/changeset/94807
Author:   jmr@macports.org
Date:     2012-06-30 00:41:31 -0700 (Sat, 30 Jun 2012)
Log Message:
-----------
cyrus-sasl2: fix library version (#32391)

Modified Paths:
--------------
    trunk/dports/security/cyrus-sasl2/Portfile
    trunk/dports/security/cyrus-sasl2/files/patch-config_ltconfig

Added Paths:
-----------
    trunk/dports/security/cyrus-sasl2/files/patch-saslauthd_config_ltconfig

Modified: trunk/dports/security/cyrus-sasl2/Portfile
===================================================================

--- trunk/dports/security/cyrus-sasl2/Portfile	2012-06-30 04:42:34 UTC (rev 94806)
+++ trunk/dports/security/cyrus-sasl2/Portfile	2012-06-30 07:41:31 UTC (rev 94807)
@@ -6,6 +6,7 @@
 
 name                    cyrus-sasl2
 version                 2.1.25
+revision                1
 categories              security net
 platforms               darwin
 # license is BSD plus a fourth (almost redundant) acknowledgement clause
@@ -37,6 +38,7 @@
 default_variants        +kerberos
 
 patchfiles              patch-config_ltconfig \
+                        patch-saslauthd_config_ltconfig \
                         patch-utils_Makefile.in.diff
 
 configure.args          --mandir=${prefix}/share/man \

Modified: trunk/dports/security/cyrus-sasl2/files/patch-config_ltconfig
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-config_ltconfig	2012-06-30 04:42:34 UTC (rev 94806)
+++ trunk/dports/security/cyrus-sasl2/files/patch-config_ltconfig	2012-06-30 07:41:31 UTC (rev 94807)
@@ -1,20 +1,11 @@
---- config/ltconfig.orig	2009-06-11 17:23:23.000000000 -0700
-+++ config/ltconfig	2009-06-11 17:23:46.000000000 -0700
-@@ -1374,7 +1374,7 @@
+--- config/ltconfig.orig	2011-09-02 22:58:00.000000000 +1000
++++ config/ltconfig	2012-06-30 17:07:31.000000000 +1000
+@@ -1372,7 +1372,7 @@
+     hardcode_shlibpath_var=no
+     ;;
  
-   darwin[15]* | rhapsody*)
+-  darwin[15]* | rhapsody*)
++  darwin[15].* | rhapsody*)
      allow_undefined_flag='-undefined error'
--    archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
-+    archive_cmds='$CC $(test x$module = xyes && echo -dynamiclib || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+     archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
      # We need to add '_' to the symbols in $export_symbols first
-     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
-     hardcode_direct=yes
-@@ -1385,7 +1385,7 @@
-   # Mac OS X v10.2 uses bash for /bin/sh instead of zsh, and the quoting syntax is incompatible
-   darwin*)
-     allow_undefined_flag='-undefined error'
--    archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)'
-+    archive_cmds='$CC $(test x$module = xyes && echo -dynamiclib || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)'
-     # We need to add '_' to the symbols in $export_symbols first
-     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
-     hardcode_direct=yes

Added: trunk/dports/security/cyrus-sasl2/files/patch-saslauthd_config_ltconfig
===================================================================
--- trunk/dports/security/cyrus-sasl2/files/patch-saslauthd_config_ltconfig	                        (rev 0)
+++ trunk/dports/security/cyrus-sasl2/files/patch-saslauthd_config_ltconfig	2012-06-30 07:41:31 UTC (rev 94807)
@@ -0,0 +1,11 @@
+--- saslauthd/config/ltconfig.orig	2011-09-02 22:58:02.000000000 +1000
++++ saslauthd/config/ltconfig	2012-06-30 17:09:03.000000000 +1000
+@@ -1372,7 +1372,7 @@
+     hardcode_shlibpath_var=no
+     ;;
+ 
+-  darwin[15]* | rhapsody*)
++  darwin[15].* | rhapsody*)
+     allow_undefined_flag='-undefined error'
+     archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
+     # We need to add '_' to the symbols in $export_symbols first

    

jmr＠macports.org

tags

participants (1)