[23421] trunk/dports/archivers/zlib

[source_changes at macosforge.org]

Revision: 23421
          http://trac.macosforge.org/projects/macports/changeset/23421
Author:   landonf at macports.org
Date:     2007-03-31 13:44:19 -0700 (Sat, 31 Mar 2007)

Log Message:
-----------
Remove toby's "double-build" hack -- we can just tweak the Makefile to build and install both the static and shared libraries.

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

Added Paths:
-----------
    trunk/dports/archivers/zlib/files/
    trunk/dports/archivers/zlib/files/patch-Makefile-static

Modified: trunk/dports/archivers/zlib/Portfile
===================================================================
--- trunk/dports/archivers/zlib/Portfile	2007-03-31 19:35:09 UTC (rev 23420)
+++ trunk/dports/archivers/zlib/Portfile	2007-03-31 20:44:19 UTC (rev 23421)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name		zlib
 version		1.2.3
+revision	1
 categories	archivers
 maintainers	landonf at macports.org
 description	zlib lossless data-compression library
@@ -20,14 +21,10 @@
 use_bzip2	yes
 checksums	md5 dee233bf288ee795ac96a98cc2e369b6
 
+patchfiles	patch-Makefile-static
+
 configure.args	--shared
 
 test.run	yes
 
 destroot.destdir prefix=${destroot}${prefix}
-
-post-destroot {
-	system "cd ${worksrcpath} && ./configure"
-	system "cd ${worksrcpath} && make"
-	xinstall ${worksrcpath}/libz.a ${destroot}${prefix}/lib
-}

Added: trunk/dports/archivers/zlib/files/patch-Makefile-static
===================================================================
--- trunk/dports/archivers/zlib/files/patch-Makefile-static	                        (rev 0)
+++ trunk/dports/archivers/zlib/files/patch-Makefile-static	2007-03-31 20:44:19 UTC (rev 23421)
@@ -0,0 +1,19 @@
+--- Makefile.in.orig	2007-03-31 13:43:59.000000000 -0700
++++ Makefile.in	2007-03-31 13:45:02.000000000 -0700
+@@ -77,7 +77,7 @@
+ 	mv _match.o match.o
+ 	rm -f _match.s
+ 
+-$(SHAREDLIBV): $(OBJS)
++$(SHAREDLIBV): libz.a $(OBJS)
+ 	$(LDSHARED) -o $@ $(OBJS)
+ 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
+ 	ln -s $@ $(SHAREDLIB)
+@@ -97,6 +97,7 @@
+ 	cp zlib.h zconf.h $(includedir)
+ 	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+ 	cp $(LIBS) $(libdir)
++	cp libz.a $(libdir)
+ 	cd $(libdir); chmod 755 $(LIBS)
+ 	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+ 	cd $(libdir); if test -f $(SHAREDLIBV); then \

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070331/0b7d6e03/attachment.html