OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 15-Nov-2009 11:36:53
Branch: HEAD Handle: 2009111510365300
Added files:
openpkg-src/mm mm.patch
Modified files:
openpkg-src/mm mm.spec
Log:
modifying package: mm-1.4.2 20091105 -> 20091115
Summary:
Revision Changes Path
1.1 +42 -0 openpkg-src/mm/mm.patch
1.53 +5 -6 openpkg-src/mm/mm.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mm/mm.patch
============================================================================
$ cvs diff -u -r0 -r1.1 mm.patch
--- /dev/null 2009-11-15 11:36:53 +0100
+++ mm.patch 2009-11-15 11:36:53 +0100
@@ -0,0 +1,42 @@
+Index: IPC-MMA-0.59005/Makefile.PL
+--- IPC-MMA-0.59005/Makefile.PL.orig 2009-11-15 11:31:02 +0100
++++ IPC-MMA-0.59005/Makefile.PL 2009-11-15 11:33:14 +0100
+@@ -3,31 +3,8 @@
+ use Config;
+ use ExtUtils::MakeMaker;
+
+-my $binpath = 'mm-config';
+-if (system "which $binpath>/dev/null") {
+-
+- # mm-config is not in PATH, but maybe it's installed outside PATH
+- print "$binpath not in PATH: trying to find it...\n";
+- my $found;
+- DIR: for ('/usr', glob("~")) {
+- my $result = `find $_ -maxdepth 6 -name "$binpath" 2>/dev/null`;
+- while ($result =~ m"^(\S*?/$binpath)$"mg) {
+- if ($found = -X $1) {$binpath = $1; last DIR}
+- } }
+- if (!$found) {
+- print "IPC::MMA requires the mm library, including its $binpath
utility\n";
+- $binpath = prompt("Please enter path to $binpath (or just return to
quit):");
+- chomp $binpath;
+- $binpath =~ s"(.)(/(mm-config)?)?$"$1/mm-config";
+-
+- if (!$binpath || !-e $binpath || !-X $binpath) {
+- if ($binpath) {warn "'$binpath' not found or not executable\n"}
+- warn "The mm library is available at
http://www.ossp.org/pkg/lib/mm/\n";;
+- exit 0;
+-} } }
+-# mm-config provides parameters to link with the mm library
+-my $cflags = `$binpath --cflags`;
+-my $libs = `$binpath --ldflags --libs`;
++my $cflags = "-I..";
++my $libs = "-L../.libs -lmm";
+ chomp $cflags, $libs;
+
+ # test cc optimize by size (OK in gcc, possibly others)
+@@ -54,3 +31,4 @@
+ 'PREREQ_PM' => {'Test::Warn'=>'0.11',
'ExtUtils::ParseXS'=>'2.200401'},
+ 'VERSION_FROM' => 'MMA.pm', # finds $VERSION
+ @moreStuff);
++
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mm/mm.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 mm.spec
--- openpkg-src/mm/mm.spec 5 Nov 2009 16:58:40 -0000 1.52
+++ openpkg-src/mm/mm.spec 15 Nov 2009 10:36:53 -0000 1.53
@@ -24,7 +24,7 @@
# package version
%define V_mm 1.4.2
%define V_ipc_mm 0.03
-%define V_ipc_mma 0.58001
+%define V_ipc_mma 0.59005
# package information
Name: mm
@@ -37,7 +37,7 @@
Group: Libraries
License: BSD
Version: 1.4.2
-Release: 20091105
+Release: 20091115
# package options
%option with_perl no
@@ -46,6 +46,7 @@
Source0: ftp://ftp.ossp.org/pkg/lib/mm/mm-%{V_mm}.tar.gz
Source1:
http://www.cpan.org/authors/id/A/AC/ACHOUNG/IPC-MM-%{V_ipc_mm}.tar.gz
Source2:
http://www.cpan.org/authors/id/M/MA/MACKENNA/IPC-MMA-%{V_ipc_mma}.tar.gz
+Patch0: mm.patch
# build information
Prefix: %{l_prefix}
@@ -88,10 +89,9 @@
%prep
%setup -q
-%if "%{with_perl}" == "yes"
%setup -q -T -D -a 1
%setup -q -T -D -a 2
-%endif
+ %patch -p0
%{l_shtool} subst \
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
@@ -100,8 +100,7 @@
-e 's;`mm-config --cflags`;"-I..";' \
-e 's;`mm-config --ldflags`;"-L../.libs";' \
-e 's;`mm-config --libs`;"-lmm";' \
- IPC-MM-%{V_ipc_mm}/Makefile.PL \
- IPC-MMA-%{V_ipc_mma}/Makefile.PL
+ IPC-MM-%{V_ipc_mm}/Makefile.PL
%endif
%build
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
