Author: ranger
Date: Tue May 19 20:13:30 2009
New Revision: 1539
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1539&repname=user%3a+ranger>
Log:
rrd and oil updates
Modified:
trunk/experimental/10.4/main/finkinfo/database/rrdtool.info
trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info
trunk/experimental/common/main/finkinfo/database/rrdtool.info
trunk/experimental/common/main/finkinfo/libs/liboil-0.3.info
trunk/experimental/common/main/finkinfo/libs/liboil-0.3.patch
trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info
trunk/experimental/generate-infofiles.pl
Modified: trunk/experimental/10.4/main/finkinfo/database/rrdtool.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/database/rrdtool.info&rev=1539&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/database/rrdtool.info (original)
+++ trunk/experimental/10.4/main/finkinfo/database/rrdtool.info Tue May 19
20:13:30 2009
@@ -1,6 +1,6 @@
Info4: <<
Package: rrdtool
-Version: 1.3.7
+Version: 1.3.8
Revision: 1
Description: Fixed-size "round-robin" database storage
License: GPL
@@ -29,7 +29,7 @@
Replaces: %N-bin
Source: http://oss.oetiker.ch/%n/pub/%n-%v.tar.gz
-Source-MD5: e2e0da2a83e58ba2fcefba932a3cbb72
+Source-MD5: 0de79494ab969cebfbfae3d237de18fe
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
ConfigureParams: <<
Modified: trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info&rev=1539&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/perlmods/rrd-pm.info Tue May 19
20:13:30 2009
@@ -1,9 +1,9 @@
Info4: <<
Package: rrd-pm%type_pkg[perl]
-Version: 1.3.7
+Version: 1.3.8
Revision: 1
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
-Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4,
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
+Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4,
(%type_pkg[perl] = 5100) 10.5, (%type_pkg[perl] = 5100) 10.6
Description: RRDTool Perl bindings module
Type: perl(5.8.1 5.8.4 5.8.6 5.8.8 5.10.0)
License: GPL
@@ -37,7 +37,7 @@
Suggests: rrdtool
Source: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%v.tar.gz
-Source-MD5: e2e0da2a83e58ba2fcefba932a3cbb72
+Source-MD5: 0de79494ab969cebfbfae3d237de18fe
PatchFile: rrd-pm.patch
PatchFile-MD5: 2042cea1692e4c2fde35f3b31e928167
Modified: trunk/experimental/common/main/finkinfo/database/rrdtool.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/database/rrdtool.info&rev=1539&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/database/rrdtool.info (original)
+++ trunk/experimental/common/main/finkinfo/database/rrdtool.info Tue May 19
20:13:30 2009
@@ -1,6 +1,6 @@
Info4: <<
Package: rrdtool
-Version: 1.3.7
+Version: 1.3.8
Revision: 1
Conflicts: %N-bin
Replaces: %N-bin
@@ -24,7 +24,7 @@
xft2-dev,
<<
Source: http://oss.oetiker.ch/%n/pub/%n-%v.tar.gz
-Source-MD5: e2e0da2a83e58ba2fcefba932a3cbb72
+Source-MD5: 0de79494ab969cebfbfae3d237de18fe
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
ConfigureParams: <<
--disable-dependency-tracking \
Modified: trunk/experimental/common/main/finkinfo/libs/liboil-0.3.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/liboil-0.3.info&rev=1539&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/liboil-0.3.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/liboil-0.3.info Tue May 19
20:13:30 2009
@@ -1,24 +1,42 @@
+Info4: <<
Package: liboil-0.3
-Version: 0.3.15
-Revision: 2
+Version: 0.3.16
+Revision: 1
BuildDependsOnly: true
-BuildDepends: glib2-dev (>= 2.14.0-1), gtk-doc (>= 1.2-1), libgettext3-dev,
libiconv-dev, pkgconfig (>= 0.22-3)
+BuildDepends: <<
+ autoconf (>= 2.63-1),
+ automake1.10,
+ fink (>= 0.28.0-1),
+ glib2-dev (>= 2.14.0-1),
+ gtk-doc (>= 1.2-1),
+ libgettext3-dev,
+ libiconv-dev,
+ libtool2,
+ pkgconfig (>= 0.22-3),
+<<
Depends: %N-shlibs (>= %v-%r)
Source: http://liboil.freedesktop.org/download/liboil-%v.tar.gz
SourceDirectory: liboil-%v
-Source-MD5: 11dd39b1ca13ce2e0618d4df8303f137
+Source-MD5: febb1d9f9bc4c440fcf622dc90f8b6b7
+PatchFile: %n.patch
+PatchFile-MD5: 23c02923347ce0b87c8c6a3f3a4d01b0
+SetCPPFLAGS: -Os
+SetCFLAGS: -Os
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
PatchScript: <<
- perl -pi -e 's/-Wa,-maltivec/-maltivec/g' configure
+ %{default_script}
+ autoreconf -fvi
<<
-SetMAKEFLAGS: -j1
-NoSetMAKEFLAGS: true
-SetCPPFLAGS: -Os -force_cpusubtype_ALL
-SetCFLAGS: -Os
-ConfigureParams: --enable-gtk-doc --mandir=%p/share/man
--infodir=%p/share/info --disable-dependency-tracking
--enable-prototype-checking
+ConfigureParams: --build=%m-apple-darwin`uname -r|cut -f1 -d.`
--enable-gtk-doc --mandir=%p/share/man --infodir=%p/share/info
--disable-dependency-tracking --enable-prototype-checking
CompileScript: <<
#!/bin/sh -ex
- export CCACHE_DISABLE=1 CC=/usr/bin/gcc CXX=/usr/bin/g++
+ if [ "%m" = "powerpc" ]; then
+ export CPPFLAGS="$CPPFLAGS -force_cpusubtype_ALL"
+ fi
+
+ export CCACHE_DISABLE=1
./configure %c
make
pushd testsuite
@@ -51,3 +69,4 @@
Maintainer: Benjamin Reed <lib...@fink.racoonfink.com>
Homepage: http://liboil.freedesktop.org/wiki/
License: BSD
+<<
Modified: trunk/experimental/common/main/finkinfo/libs/liboil-0.3.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/liboil-0.3.patch&rev=1539&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/liboil-0.3.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/liboil-0.3.patch Tue May 19
20:13:30 2009
@@ -1,64 +1,37 @@
-diff -uNr liboil-0.3.12/configure liboil-0.3.12-new/configure
---- liboil-0.3.12/configure 2007-05-29 02:13:44.000000000 -0400
-+++ liboil-0.3.12-new/configure 2007-06-19 11:06:02.000000000 -0400
-@@ -15193,7 +15193,7 @@
+--- liboil-0.3.16/configure.ac 2009-03-19 01:41:04.000000000 -0400
++++ liboil-0.3.16-new/configure.ac 2009-05-19 13:49:01.000000000 -0400
+@@ -1,5 +1,6 @@
+ AC_PREREQ([2.58])
+ AC_INIT(liboil,0.3.16)
++AC_CONFIG_MACRO_DIR([m4])
- SSE_CFLAGS="-msse"
- if test "X$flag_ok" = Xyes ; then
-- HAVE_SSE_INTRINSICS=yes
-+ HAVE_SSE_INTRINSICS=no
- true
- else
- HAVE_SSE_INTRINSICS=no
-@@ -15253,7 +15253,7 @@
+ AS_NANO(LIBOIL_CVS=no,LIBOIL_CVS=yes)
- SSE2_CFLAGS="-msse2"
- if test "X$flag_ok" = Xyes ; then
-- HAVE_SSE2_INTRINSICS=yes
-+ HAVE_SSE2_INTRINSICS=no
- true
- else
- HAVE_SSE2_INTRINSICS=no
-@@ -15313,7 +15313,7 @@
+@@ -24,6 +25,7 @@
+ AC_LIBTOOL_TAGS([])
+ AC_PROG_LIBTOOL
+ AM_PROG_AS
++AM_PROG_CC_C_O
- SSE3_CFLAGS="-msse3"
- if test "X$flag_ok" = Xyes ; then
-- HAVE_SSE3_INTRINSICS=yes
-+ HAVE_SSE3_INTRINSICS=no
- true
- else
- HAVE_SSE3_INTRINSICS=no
-diff -uNr liboil-0.3.12/liboil/liboilcpu.c liboil-0.3.12-new/liboil/liboilcpu.c
---- liboil-0.3.12/liboil/liboilcpu.c 2007-04-11 02:25:16.000000000 -0400
-+++ liboil-0.3.12-new/liboil/liboilcpu.c 2007-06-19 10:43:49.000000000
-0400
-@@ -42,7 +42,7 @@
- #include <sys/time.h>
- #include <time.h>
+ AC_CONFIG_SRCDIR([liboil/liboil.h])
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__APPLE__)
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
-@@ -578,7 +578,7 @@
- static void
- oil_cpu_detect_kernel_support (void)
- {
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__APPLE__)
- int ret, enabled;
- size_t len;
+@@ -114,7 +116,7 @@
+ AS_UNALIGNED_ACCESS
-diff -uNr liboil-0.3.12/testsuite/stack_align.c
liboil-0.3.12-new/testsuite/stack_align.c
---- liboil-0.3.12/testsuite/stack_align.c 2007-04-11 02:25:19.000000000
-0400
-+++ liboil-0.3.12-new/testsuite/stack_align.c 2007-06-19 11:17:08.000000000
-0400
-@@ -235,7 +235,8 @@
+ AC_LTDL_SYMBOL_USCORE
+-if test x${ac_cv_sys_symbol_underscore} = xyes ; then
++if test x${lt_cv_sys_symbol_underscore} = xyes ; then
+ AC_DEFINE(HAVE_SYMBOL_UNDERSCORE, 1, [Define if C symbols have leading
underscore])
+ fi
- void realign(int align)
- {
--#ifdef HAVE_GCC_ASM
-+/* not sure about this test on osx, but the asm is clobbering things I guess?
*/
-+#ifndef __APPLE__
- #ifdef HAVE_I386
- __asm__ __volatile__ (
- " sub %%ebx, %%esp\n"
+@@ -173,8 +175,8 @@
+ AS_COMPILER_FLAG(-Werror, LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Werror")
+ fi
+ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then
+- AS_COMPILER_FLAG(["-Wa,-maltivec"],
+- [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Wa,-maltivec"],
++ AS_COMPILER_FLAG(["-maltivec"],
++ [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -maltivec"],
+ true)
+ AS_COMPILER_FLAG(["-Wa,-mregnames"],
+ [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Wa,-mregnames"],
Modified: trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info&rev=1539&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/perlmods/rrd-pm.info Tue May
19 20:13:30 2009
@@ -1,6 +1,6 @@
Info4: <<
Package: rrd-pm%type_pkg[perl]
-Version: 1.3.7
+Version: 1.3.8
Revision: 1
BuildDepends: <<
fink (>= 0.28.0-1),
@@ -19,7 +19,7 @@
Replaces: rrd-pm560, rrd-pm561, rrd-pm580, rrd-pm581, rrd-pm584, rrd-pm585,
rrd-pm586, rrd-pm588, rrdtool-perl-pm%type_pkg[perl] (<< %v-%r)
Suggests: rrdtool
Source: http://oss.oetiker.ch/rrdtool/pub/rrdtool-%v.tar.gz
-Source-MD5: e2e0da2a83e58ba2fcefba932a3cbb72
+Source-MD5: 0de79494ab969cebfbfae3d237de18fe
SetCPPFLAGS: -fno-common -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
ConfigureParams: --disable-static --enable-shared --with-tcllib=%p/lib
--mandir=%p/share/man --enable-perl --disable-python
PatchFile: rrd-pm.patch
Modified: trunk/experimental/generate-infofiles.pl
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=1539&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/generate-infofiles.pl (original)
+++ trunk/experimental/generate-infofiles.pl Tue May 19 20:13:30 2009
@@ -378,7 +378,7 @@
if (exists $properties->{'Distribution'}) {
warn "type = perl, but distribution is already set!\n";
} else {
- $properties->{'Distribution'} = '(%type_pkg[perl] =
581) 10.3, (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.3,
(%type_pkg[perl] = 584) 10.4';
+ $properties->{'Distribution'} = '(%type_pkg[perl] =
581) 10.4, (%type_pkg[perl] = 584) 10.4, (%type_pkg[perl] = 5100) 10.5,
(%type_pkg[perl] = 5100) 10.6';
}
}
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
