[56883] trunk/dports
afb at macports.org
afb at macports.org
Wed Sep 2 15:15:23 PDT 2009
Revision: 56883
http://trac.macports.org/changeset/56883
Author: afb at macports.org
Date: 2009-09-02 15:15:18 -0700 (Wed, 02 Sep 2009)
Log Message:
-----------
port upgrade: XZ Utils 4.999.9beta (both library and programs)
Modified Paths:
--------------
trunk/dports/archivers/xz-devel/Portfile
trunk/dports/devel/liblzma/Portfile
trunk/dports/devel/liblzma/files/patch-bump-liblzma-major.diff
Added Paths:
-----------
trunk/dports/archivers/xz-devel/files/
trunk/dports/archivers/xz-devel/files/patch-sysctl-darwin.diff
trunk/dports/devel/liblzma/files/patch-sysctl-darwin.diff
Modified: trunk/dports/archivers/xz-devel/Portfile
===================================================================
--- trunk/dports/archivers/xz-devel/Portfile 2009-09-02 21:53:53 UTC (rev 56882)
+++ trunk/dports/archivers/xz-devel/Portfile 2009-09-02 22:15:18 UTC (rev 56883)
@@ -3,8 +3,7 @@
PortSystem 1.0
name xz-devel
-version 4.999.8beta
-revision 1
+version 4.999.9beta
categories archivers
platforms darwin
maintainers afb openmaintainer
@@ -18,12 +17,14 @@
homepage http://tukaani.org/xz/
master_sites ${homepage}
distname xz-${version}
-checksums md5 f00967331a487e88d51207fe17c56f52 \
- sha1 d282518518488c37ec268401e1b8247749279c44 \
- rmd160 41303aed49cfb976da54d7e3e88210b4eeaebbbd
+checksums md5 f2073579b6da2fe35d453adee1aaf1b2 \
+ sha1 9627de3997ddcdb02f8d327e84b2cf1941ecd230 \
+ rmd160 1253ce01746c748c8549effa5041224044919c4e
depends_lib port:libiconv port:gettext
+patchfiles patch-sysctl-darwin.diff
+
configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix}
# the internal "check.h" header conflicts with port check's <check.h>
Added: trunk/dports/archivers/xz-devel/files/patch-sysctl-darwin.diff
===================================================================
--- trunk/dports/archivers/xz-devel/files/patch-sysctl-darwin.diff (rev 0)
+++ trunk/dports/archivers/xz-devel/files/patch-sysctl-darwin.diff 2009-09-02 22:15:18 UTC (rev 56883)
@@ -0,0 +1,62 @@
+commit 27414daadf5727e8ab942374b5ec1c8990122878
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date: Sat Aug 29 13:39:21 2009 +0300
+
+ Fix sysctl() usage.
+
+ This fixes build on *BSDs and Darwin.
+
+ Thanks to Jukka Salmi for the patches.
+ Richard Koch reported the problem too.
+diff --git a/m4/lc_cpucores.m4 b/m4/lc_cpucores.m4
+index 2fae953..52f7c98 100644
+--- m4/lc_cpucores.m4
++++ m4/lc_cpucores.m4
+@@ -43,7 +43,7 @@ main(void)
+ int name[2] = { CTL_HW, HW_NCPU };
+ int cpus;
+ size_t cpus_size = sizeof(cpus);
+- sysctl(name, 2, &cpus, &cpus_size, NULL, NULL);
++ sysctl(name, 2, &cpus, &cpus_size, NULL, 0);
+ return 0;
+ }
+ ]])], [
+diff --git a/m4/lc_physmem.m4 b/m4/lc_physmem.m4
+index 78be136..5d9581e 100644
+--- m4/lc_physmem.m4
++++ m4/lc_physmem.m4
+@@ -45,7 +45,7 @@ main(void)
+ int name[2] = { CTL_HW, HW_PHYSMEM };
+ unsigned long mem;
+ size_t mem_ptr_size = sizeof(mem);
+- sysctl(name, 2, &mem, &mem_ptr_size, NULL, NULL);
++ sysctl(name, 2, &mem, &mem_ptr_size, NULL, 0);
+ return 0;
+ }
+ ]])], [
+diff --git a/src/common/cpucores.h b/src/common/cpucores.h
+index 704d8a2..330cd9c 100644
+--- src/common/cpucores.h
++++ src/common/cpucores.h
+@@ -40,7 +40,7 @@ cpucores(void)
+ int name[2] = { CTL_HW, HW_NCPU };
+ int cpus;
+ size_t cpus_size = sizeof(cpus);
+- if (!sysctl(name, &cpus, &cpus_size, NULL, NULL)
++ if (!sysctl(name, 2, &cpus, &cpus_size, NULL, 0)
+ && cpus_size == sizeof(cpus) && cpus > 0)
+ ret = (uint32_t)(cpus);
+ #endif
+diff --git a/src/common/physmem.h b/src/common/physmem.h
+index 63482c6..0dc77e9 100644
+--- src/common/physmem.h
++++ src/common/physmem.h
+@@ -104,7 +104,7 @@ physmem(void)
+ uint64_t u64;
+ } mem;
+ size_t mem_ptr_size = sizeof(mem.u64);
+- if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, NULL)) {
++ if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, 0)) {
+ // IIRC, 64-bit "return value" is possible on some 64-bit
+ // BSD systems even with HW_PHYSMEM (instead of HW_PHYSMEM64),
+ // so support both.
Property changes on: trunk/dports/archivers/xz-devel/files/patch-sysctl-darwin.diff
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: trunk/dports/devel/liblzma/Portfile
===================================================================
--- trunk/dports/devel/liblzma/Portfile 2009-09-02 21:53:53 UTC (rev 56882)
+++ trunk/dports/devel/liblzma/Portfile 2009-09-02 22:15:18 UTC (rev 56883)
@@ -3,7 +3,7 @@
PortSystem 1.0
name liblzma
-version 4.999.8beta
+version 4.999.9beta
categories devel
platforms darwin
maintainers afb openmaintainer
@@ -17,13 +17,13 @@
homepage http://tukaani.org/xz/
master_sites ${homepage}
distname xz-${version}
-checksums md5 f00967331a487e88d51207fe17c56f52 \
- sha1 d282518518488c37ec268401e1b8247749279c44 \
- rmd160 41303aed49cfb976da54d7e3e88210b4eeaebbbd
+checksums md5 f2073579b6da2fe35d453adee1aaf1b2 \
+ sha1 9627de3997ddcdb02f8d327e84b2cf1941ecd230 \
+ rmd160 1253ce01746c748c8549effa5041224044919c4e
depends_lib port:libiconv port:gettext
-patchfiles patch-bump-liblzma-major.diff
+patchfiles patch-sysctl-darwin.diff patch-bump-liblzma-major.diff
configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix}
Modified: trunk/dports/devel/liblzma/files/patch-bump-liblzma-major.diff
===================================================================
--- trunk/dports/devel/liblzma/files/patch-bump-liblzma-major.diff 2009-09-02 21:53:53 UTC (rev 56882)
+++ trunk/dports/devel/liblzma/files/patch-bump-liblzma-major.diff 2009-09-02 22:15:18 UTC (rev 56883)
@@ -1,22 +1,22 @@
---- src/liblzma/Makefile.am~ 2008-10-03 18:33:26.000000000 +0200
-+++ src/liblzma/Makefile.am 2008-10-17 14:08:01.835762077 +0200
-@@ -16,7 +16,7 @@ SUBDIRS = api common check
+--- src/liblzma//Makefile.am.orig 2009-08-27 17:37:12.000000000 +0200
++++ src/liblzma//Makefile.am 2009-09-02 23:54:40.000000000 +0200
+@@ -24,7 +24,7 @@ liblzma_la_CPPFLAGS = \
+ -I$(top_srcdir)/src/liblzma/delta \
+ -I$(top_srcdir)/src/liblzma/simple \
+ -I$(top_srcdir)/src/common
+-liblzma_la_LDFLAGS = -no-undefined -version-info 0:0:0
++liblzma_la_LDFLAGS = -no-undefined -version-info 1:0:0
- lib_LTLIBRARIES = liblzma.la
- liblzma_la_SOURCES =
--liblzma_la_LDFLAGS = -version-info 0:0:0
-+liblzma_la_LDFLAGS = -version-info 1:0:0
+ include $(srcdir)/common/Makefile.inc
+ include $(srcdir)/check/Makefile.inc
+--- src/liblzma//Makefile.in.orig 2009-08-27 17:37:31.000000000 +0200
++++ src/liblzma//Makefile.in 2009-09-02 23:54:49.000000000 +0200
+@@ -620,7 +620,7 @@ liblzma_la_CPPFLAGS = \
+ -I$(top_srcdir)/src/liblzma/simple \
+ -I$(top_srcdir)/src/common
- liblzma_la_LIBADD = \
- common/libcommon.la \
---- src/liblzma/Makefile.in.orig 2009-03-11 15:35:09.000000000 +0100
-+++ src/liblzma/Makefile.in 2009-03-11 15:38:27.000000000 +0100
-@@ -244,7 +244,7 @@
- $(am__append_5) $(am__append_7) $(am__append_9)
- lib_LTLIBRARIES = liblzma.la
- liblzma_la_SOURCES =
--liblzma_la_LDFLAGS = -version-info 0:0:0
-+liblzma_la_LDFLAGS = -version-info 1:0:0
- liblzma_la_LIBADD = common/libcommon.la check/libcheck.la \
- $(am__append_2) $(am__append_4) $(am__append_6) \
- $(am__append_8) $(am__append_10)
+-liblzma_la_LDFLAGS = -no-undefined -version-info 0:0:0 \
++liblzma_la_LDFLAGS = -no-undefined -version-info 1:0:0 \
+ $(am__append_40)
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = liblzma.pc
Added: trunk/dports/devel/liblzma/files/patch-sysctl-darwin.diff
===================================================================
--- trunk/dports/devel/liblzma/files/patch-sysctl-darwin.diff (rev 0)
+++ trunk/dports/devel/liblzma/files/patch-sysctl-darwin.diff 2009-09-02 22:15:18 UTC (rev 56883)
@@ -0,0 +1,62 @@
+commit 27414daadf5727e8ab942374b5ec1c8990122878
+Author: Lasse Collin <lasse.collin at tukaani.org>
+Date: Sat Aug 29 13:39:21 2009 +0300
+
+ Fix sysctl() usage.
+
+ This fixes build on *BSDs and Darwin.
+
+ Thanks to Jukka Salmi for the patches.
+ Richard Koch reported the problem too.
+diff --git a/m4/lc_cpucores.m4 b/m4/lc_cpucores.m4
+index 2fae953..52f7c98 100644
+--- m4/lc_cpucores.m4
++++ m4/lc_cpucores.m4
+@@ -43,7 +43,7 @@ main(void)
+ int name[2] = { CTL_HW, HW_NCPU };
+ int cpus;
+ size_t cpus_size = sizeof(cpus);
+- sysctl(name, 2, &cpus, &cpus_size, NULL, NULL);
++ sysctl(name, 2, &cpus, &cpus_size, NULL, 0);
+ return 0;
+ }
+ ]])], [
+diff --git a/m4/lc_physmem.m4 b/m4/lc_physmem.m4
+index 78be136..5d9581e 100644
+--- m4/lc_physmem.m4
++++ m4/lc_physmem.m4
+@@ -45,7 +45,7 @@ main(void)
+ int name[2] = { CTL_HW, HW_PHYSMEM };
+ unsigned long mem;
+ size_t mem_ptr_size = sizeof(mem);
+- sysctl(name, 2, &mem, &mem_ptr_size, NULL, NULL);
++ sysctl(name, 2, &mem, &mem_ptr_size, NULL, 0);
+ return 0;
+ }
+ ]])], [
+diff --git a/src/common/cpucores.h b/src/common/cpucores.h
+index 704d8a2..330cd9c 100644
+--- src/common/cpucores.h
++++ src/common/cpucores.h
+@@ -40,7 +40,7 @@ cpucores(void)
+ int name[2] = { CTL_HW, HW_NCPU };
+ int cpus;
+ size_t cpus_size = sizeof(cpus);
+- if (!sysctl(name, &cpus, &cpus_size, NULL, NULL)
++ if (!sysctl(name, 2, &cpus, &cpus_size, NULL, 0)
+ && cpus_size == sizeof(cpus) && cpus > 0)
+ ret = (uint32_t)(cpus);
+ #endif
+diff --git a/src/common/physmem.h b/src/common/physmem.h
+index 63482c6..0dc77e9 100644
+--- src/common/physmem.h
++++ src/common/physmem.h
+@@ -104,7 +104,7 @@ physmem(void)
+ uint64_t u64;
+ } mem;
+ size_t mem_ptr_size = sizeof(mem.u64);
+- if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, NULL)) {
++ if (!sysctl(name, 2, &mem.u64, &mem_ptr_size, NULL, 0)) {
+ // IIRC, 64-bit "return value" is possible on some 64-bit
+ // BSD systems even with HW_PHYSMEM (instead of HW_PHYSMEM64),
+ // so support both.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090902/5a68392d/attachment-0001.html>
More information about the macports-changes
mailing list