[31398] trunk/dports/archivers/zlib

[nox at macports.org]

Revision: 31398
          http://trac.macosforge.org/projects/macports/changeset/31398
Author:   nox at macports.org
Date:     2007-11-22 02:43:34 -0800 (Thu, 22 Nov 2007)

Log Message:
-----------
zlib:
 * Removed universal variant patch, it now only uses {{{reinplace}}}.
 * Removed useless xinstall arguments.

Modified Paths:
--------------
    trunk/dports/archivers/zlib/Portfile

Removed Paths:
-------------
    trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff

Modified: trunk/dports/archivers/zlib/Portfile
===================================================================
--- trunk/dports/archivers/zlib/Portfile	2007-11-22 10:04:31 UTC (rev 31397)
+++ trunk/dports/archivers/zlib/Portfile	2007-11-22 10:43:34 UTC (rev 31398)
@@ -26,13 +26,11 @@
             rmd160 cfba9984b354dcc38da49331457e6bfc861c6f51
 
 patchfiles	patch-Makefile-static.diff
-if {[variant_isset universal]} {
-	patchfiles-append	patch-Makefile-universal.diff
-}
 
-post-patch {
-    # Add the universal CFLAGS, if they're needed
-    reinplace s|@UNIVERSAL_CFLAGS@|${configure.universal_cflags}|g ${worksrcpath}/Makefile.in
+post-configure {
+    if {[variant_isset universal]} {
+        reinplace -E "/^LDSHARED=/s|\$| ${configure.universal_cflags}|" ${worksrcpath}/Makefile
+    }
 }
 
 configure.args	--shared
@@ -45,7 +43,7 @@
 destroot.destdir prefix=${destroot}${prefix}
 
 post-destroot {
-    xinstall -m 0755 -d ${destroot}${docdir}
+    xinstall -d ${destroot}${docdir}
     xinstall -m 0644 -W ${worksrcpath} ChangeLog FAQ README ${destroot}${docdir}
 }
 
@@ -53,7 +51,7 @@
     post-destroot {
         set examplesdir ${docdir}/examples
 
-        xinstall -m 0755 -d ${destroot}${examplesdir}
+        xinstall -d ${destroot}${examplesdir}
         eval xinstall -m 0644 [glob ${worksrcpath}/example{.c,s/*}] ${destroot}${examplesdir}
     }
 }

Deleted: trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff
===================================================================
--- trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff	2007-11-22 10:04:31 UTC (rev 31397)
+++ trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff	2007-11-22 10:43:34 UTC (rev 31398)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2007-03-31 23:25:14.000000000 +0200
-+++ Makefile.in	2007-03-31 23:25:36.000000000 +0200
-@@ -78,7 +78,7 @@
- 	rm -f _match.s
- 
- $(SHAREDLIBV): libz.a $(OBJS)
--	$(LDSHARED) -o $@ $(OBJS)
-+	$(LDSHARED) @UNIVERSAL_CFLAGS@ -o $@ $(OBJS)
- 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
- 	ln -s $@ $(SHAREDLIB)
- 	ln -s $@ $(SHAREDLIBM)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071122/27bd4e3a/attachment.html