[30304] trunk/dports/archivers/zlib

[source_changes at macosforge.org]

Revision: 30304
          http://trac.macosforge.org/projects/macports/changeset/30304
Author:   ryandesign at macports.org
Date:     2007-10-24 00:33:15 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
zlib: change names of patchfiles to match recommendations

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

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

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

Modified: trunk/dports/archivers/zlib/Portfile
===================================================================
--- trunk/dports/archivers/zlib/Portfile	2007-10-24 07:32:04 UTC (rev 30303)
+++ trunk/dports/archivers/zlib/Portfile	2007-10-24 07:33:15 UTC (rev 30304)
@@ -25,9 +25,9 @@
             sha1 967e280f284d02284b0cd8872a8e2e04bfdc7283 \
             rmd160 cfba9984b354dcc38da49331457e6bfc861c6f51
 
-patchfiles	patch-Makefile-static
+patchfiles	patch-Makefile-static.diff
 if {[variant_isset universal]} {
-	patchfiles-append	patch-Makefile-universal
+	patchfiles-append	patch-Makefile-universal.diff
 }
 
 configure.args	--shared

Deleted: trunk/dports/archivers/zlib/files/patch-Makefile-static
===================================================================
--- trunk/dports/archivers/zlib/files/patch-Makefile-static	2007-10-24 07:32:04 UTC (rev 30303)
+++ trunk/dports/archivers/zlib/files/patch-Makefile-static	2007-10-24 07:33:15 UTC (rev 30304)
@@ -1,19 +0,0 @@
---- 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 \

Copied: trunk/dports/archivers/zlib/files/patch-Makefile-static.diff (from rev 30297, trunk/dports/archivers/zlib/files/patch-Makefile-static)
===================================================================
--- trunk/dports/archivers/zlib/files/patch-Makefile-static.diff	                        (rev 0)
+++ trunk/dports/archivers/zlib/files/patch-Makefile-static.diff	2007-10-24 07:33:15 UTC (rev 30304)
@@ -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 \

Deleted: trunk/dports/archivers/zlib/files/patch-Makefile-universal
===================================================================
--- trunk/dports/archivers/zlib/files/patch-Makefile-universal	2007-10-24 07:32:04 UTC (rev 30303)
+++ trunk/dports/archivers/zlib/files/patch-Makefile-universal	2007-10-24 07:33:15 UTC (rev 30304)
@@ -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) -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -o $@ $(OBJS)
- 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
- 	ln -s $@ $(SHAREDLIB)
- 	ln -s $@ $(SHAREDLIBM)

Copied: trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff (from rev 30297, trunk/dports/archivers/zlib/files/patch-Makefile-universal)
===================================================================
--- trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff	                        (rev 0)
+++ trunk/dports/archivers/zlib/files/patch-Makefile-universal.diff	2007-10-24 07:33:15 UTC (rev 30304)
@@ -0,0 +1,11 @@
+--- 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) -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -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/20071024/43b417cf/attachment-0001.html