[130906] trunk/dports/net/samba3

[ryandesign at macports.org]

Revision: 130906
          https://trac.macports.org/changeset/130906
Author:   ryandesign at macports.org
Date:     2015-01-03 16:37:32 -0800 (Sat, 03 Jan 2015)
Log Message:
-----------
samba3: fix and re-enable universal variant (#46385)

Modified Paths:
--------------
    trunk/dports/net/samba3/Portfile

Added Paths:
-----------
    trunk/dports/net/samba3/files/patch-Makefile.in.diff

Modified: trunk/dports/net/samba3/Portfile
===================================================================
--- trunk/dports/net/samba3/Portfile	2015-01-04 00:32:14 UTC (rev 130905)
+++ trunk/dports/net/samba3/Portfile	2015-01-04 00:37:32 UTC (rev 130906)
@@ -32,8 +32,6 @@
 
 depends_lib         port:popt port:zlib port:readline
 
-universal_variant   no
-
 conflicts_build     samba4
 
 configure.ldflags-append -lintl
@@ -47,7 +45,8 @@
                     --without-ldap \
                     --without-krb5
 
-patchfiles          patch-source_pkgconfig_all_pc_in.diff
+patchfiles          patch-Makefile.in.diff \
+                    patch-source_pkgconfig_all_pc_in.diff
 
 variant kerberos description "Enable Kerberos support" {
     configure.args-delete --without-krb5

Added: trunk/dports/net/samba3/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/net/samba3/files/patch-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/net/samba3/files/patch-Makefile.in.diff	2015-01-04 00:37:32 UTC (rev 130906)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2015-01-03 15:23:37.000000000 -0800
++++ Makefile.in	2015-01-03 15:23:46.000000000 -0800
+@@ -46,7 +46,7 @@
+ PICFLAG=@PICFLAG@
+ 
+ EXEEXT=@EXEEXT@
+-AR=@AR@
++AR=@AR@ -s
+ LDSHFLAGS=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
+ LDSHFLAGS_MODULES=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
+ LDFLAGS=@PIE_LDFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150103/5bbfd861/attachment.html>