Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods
In directory vz-cvs-3.sog:/tmp/cvs-serv3224
Modified Files:
perlqt-pm.info
Log Message:
fix build on i386; more canonical detection of perl interp-path; dep cleanups
Index: perlqt-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/perlqt-pm.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- perlqt-pm.info 3 Apr 2012 15:55:02 -0000 1.14
+++ perlqt-pm.info 5 Apr 2012 13:40:51 -0000 1.15
@@ -1,7 +1,7 @@
Info2: <<
Package: perlqt-pm%type_pkg[perl]
Version: 3.009
-Revision: 1035
+Revision: 1036
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4,
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] =
5100) 10.5, (%type_pkg[perl] = 5100) 10.6, (%type_pkg[perl] = 5123) 10.7,
(%type_pkg[perl] = 588) 10.4, (%type_pkg[perl] = 588) 10.5, (%type_pkg[perl] =
588) 10.6
Description: Qt language bindings for Perl
@@ -11,8 +11,10 @@
Depends: <<
perl%type_pkg[perl]-core,
+ libpng15-shlibs,
libsmoke-shlibs (>= 1:3.5.3-1),
- freeglut-shlibs (>= 2.4.0-1)
+ qt3-shlibs (>= 3.3.8-2000),
+ x11-shlibs
<<
BuildDepends: <<
arts-dev,
@@ -20,7 +22,7 @@
automake1.11,
kdelibs3-unified-dev (>= 3.5.10-10),
freeglut (>= 2.4.0-1),
- libpng14 (>= 1.4.1-2),
+ libpng15,
libsmoke (>= 1:3.5.2-1),
libtool2,
perl%type_pkg[perl]-core,
@@ -58,12 +60,7 @@
perl -pi -e 's,\\\@,,' PerlQt/Makefile.PL.in
perl -pi -e 's,(\${doc_dir}),%d\1,' PerlQt/Makefile.PL.in
- perlversion=%type_raw[perl]
- if dpkg --compare-versions "$perlversion" ">=" "5.10.0" && [ "%m" !=
"powerpc" ]; then
- export FULLPERL="/usr/bin/arch -%m perl$perlversion"
- else
- export FULLPERL="/usr/bin/env perl$perlversion"
- fi
+ export FULLPERL=`perl -e 'print $ARGV[0]=~/PERL="(.*?)"/' '%c'`
perl -pi -e 's,^#!/usr/bin/perl,#!'"$FULLPERL," PerlQT/bin/*
<<
@@ -74,14 +71,16 @@
#!/bin/sh -ev
export PREFIX="%p" PERL=perl%type_raw[perl]
+ export FULLPERL=`perl -e 'print $ARGV[0]=~/PERL="(.*?)"/' '%c'`
. ./environment-helper.sh
./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
./build-helper.sh configure %N %v %r ./configure --prefix=%p
--with-qt-dir=%p --with-qt-includes=%p/include/qt --with-extra-libs=%p/lib
--with-extra-includes=%p/include --enable-mt --with-pic --disable-rpath
--enable-shared=yes --enable-static=no --mandir=%p/share/man --with-xinerama
--disable-final --disable-dependency-tracking --enable-smoke --with-smoke=qt
pushd PerlQt
- $PERL Makefile.PL %c
- ../build-helper.sh make-perlqt %N %v %r make
+# $FULLPERL Makefile.PL %c
+# ../build-helper.sh make-perlqt %N %v %r make
+ %{default_script}
popd
pushd puic
../build-helper.sh make-puic %N %v %r make
@@ -103,8 +102,9 @@
#!/bin/sh -ev
export PREFIX="%p" PERL=perl%type_raw[perl]
+ export FULLPERL=`perl -e 'print $ARGV[0]=~/PERL="(.*?)"/' '%c'`
. ./environment-helper.sh
- eval "`$PERL -V:archname`"
+ eval "`$FULLPERL -V:archname`"
pushd PerlQt
../build-helper.sh install-perlqt %N %v %r make install \
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
