Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1218
Modified Files:
xz.info
Added Files:
xz.patch
Log Message:
Move to stable. Actually got positive feedback!
--- NEW FILE: xz.patch ---
diff -ru xz-4.999.9beta.orig/configure xz-4.999.9beta/configure
--- xz-4.999.9beta.orig/configure 2009-08-27 11:37:29.000000000 -0400
+++ xz-4.999.9beta/configure 2009-09-01 20:14:19.000000000 -0400
@@ -16169,7 +16169,7 @@
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;
}
@@ -16266,7 +16266,7 @@
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 -ru xz-4.999.9beta.orig/src/common/cpucores.h
xz-4.999.9beta/src/common/cpucores.h
--- xz-4.999.9beta.orig/src/common/cpucores.h 2009-08-27 11:37:12.000000000
-0400
+++ xz-4.999.9beta/src/common/cpucores.h 2009-09-01 20:15:08.000000000
-0400
@@ -40,7 +40,7 @@
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 -ru xz-4.999.9beta.orig/src/common/physmem.h
xz-4.999.9beta/src/common/physmem.h
--- xz-4.999.9beta.orig/src/common/physmem.h 2009-08-27 11:37:12.000000000
-0400
+++ xz-4.999.9beta/src/common/physmem.h 2009-09-01 20:15:50.000000000 -0400
@@ -104,7 +104,7 @@
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.
Index: xz.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/utils/xz.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xz.info 26 Aug 2009 16:13:57 -0000 1.4
+++ xz.info 10 Nov 2009 00:25:16 -0000 1.5
@@ -1,5 +1,5 @@
Package: xz
-Version: 4.999.8
+Version: 4.999.9
Revision: 3
Description: LZMA file compressor
DescDetail: <<
@@ -32,41 +32,37 @@
Additional scripts: lzdiff, lzcmp, lzgrep, lzegrep, lzfgrep,
lzmore, lzless, lzcat, xzcat
<<
-# The zx and xzdec commands are Public Domain, but the scripts are GPL2.
-License: GPL
+# The zx and xzdec commands are Public Domain, but the scripts are GPL2+.
+License: GPL2+
Homepage: http://tukaani.org/xz/
Maintainer: Daniel Johnson <[email protected]>
-Source: http://tukaani.org/%n/%n-%vbeta.tar.gz
-Source-MD5: f00967331a487e88d51207fe17c56f52
+Source: http://tukaani.org/%n/%n-%vbeta.tar.bz2
+Source-MD5: cc4044fcc073b8bcf3164d1d0df82161
-BuildDepends: libiconv-dev, libgettext3-dev, gettext-tools, help2man
+PatchFile: %n.patch
+PatchFile-MD5: 9bd64c309599e89898e410846b9fa6b1
+
+BuildDepends: libiconv-dev, libgettext3-dev, gettext-tools, fink (>= 0.24.12)
Depends: liblzma-shlibs (= %v-%r)
Conflicts: lzip (<< 1.3-2), lzma (<< 4.999.8-1)
-Replaces: lzip (<< 1.3-2), lzma (<< 4.999.8-1)
+Replaces: lzip (<< 1.6-1), lzma (<< 4.999.8-1)
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-SetCFLAGS: -Os
-SetCXXFLAGS: -Os
+SetCFLAGS: -O3
+SetCXXFLAGS: -O3
ConfigureParams: <<
+ --build=%m-apple-darwin`uname -r` \
+ --host=%m-apple-darwin`uname -r` \
--with-libiconv-prefix=%p \
--with-libintl-prefix=%p \
--disable-static \
+ --enable-dynamic \
--disable-dependency-tracking
<<
-CompileScript: <<
- ./configure %c --build=%m-apple-darwin`uname -r`
--host=%m-apple-darwin`uname -r`
- make xzdec_LDFLAGS='' xz_LDFLAGS=''
-
- help2man --no-info --help-option=--long-help src/xz/xz >xz.1
- help2man --no-info --help-option=--help src/xzdec/xzdec >xzdec.1
- ln -sf xz.1 lzma.1
- ln -sf xzdec.1 lzmadec.1
-<<
-
InfoTest: TestScript: make check || exit 2
InstallScript: <<
@@ -76,19 +72,14 @@
binfiles="lzdiff lzgrep"
for binfile in $binfiles ; do
mv %i/bin/$binfile %i/bin/$binfile.%N
+ mv %i/share/man/man1/$binfile.1 %i/share/man/man1/$binfile.1.%N
done
-
- ln -sf lzdiff.%N %i/bin/lzcmp
- ln -sf lzgrep.%N %i/bin/lzegrep
- ln -sf lzgrep.%N %i/bin/lzfgrep
-
- install -m 644 xz.1 xzdec.1 lzma.1 lzmadec.1 %i/share/man/man1
<<
PostInstScript: <<
binfiles="lzdiff lzgrep"
for binfile in $binfiles ; do
- update-alternatives --install %p/bin/$binfile $binfile
%p/bin/$binfile.%N 30
+ update-alternatives --install %p/bin/$binfile $binfile
%p/bin/$binfile.%N 30 --slave %p/share/man/man1/$binfile.1 $binfile.1
%p/share/man/man1/$binfile.1.%N
done
<<
@@ -99,18 +90,17 @@
done
<<
-DocFiles: AUTHORS ChangeLog COPYING* NEWS README THANKS doc/* extra/*
+DocFiles: ChangeLog extra/*
SplitOff: <<
Package: liblzma-shlibs
License: Public Domain
Depends: libiconv, libgettext3-shlibs
Files: <<
- lib/liblzma.0.0.0.dylib
lib/liblzma.0.dylib
<<
Shlibs: %p/lib/liblzma.0.dylib 1.0.0 %n (>= 4.999.8-1)
- DocFiles: AUTHORS ChangeLog COPYING* NEWS README THANKS doc/*
+ DocFiles: AUTHORS ChangeLog COPYING* NEWS README THANKS
<<
SplitOff2: <<
@@ -126,7 +116,7 @@
lib/pkgconfig
include
<<
- DocFiles: AUTHORS ChangeLog COPYING* NEWS README THANKS doc/*
+ DocFiles: AUTHORS ChangeLog COPYING* NEWS README THANKS
<<
SplitOff3: <<
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
