Hi,
Et voilà, fink-10.4.info + fink-10.4.patch with the requested changes.
The individual commits that fink-10.4.patch consists of are here:
https://github.com/l1k/fink/commits/branch_0_38_tenfour
I've tested this by downgrading to 0.30.2, removing the symlink from
/sw/bin/perl to /usr/bin/perl (so that system perl is at 5.8.6 again,
but leaving the fink-provided 5.18.2 installed), then rebuilding 0.38.3.
Worked for me.
If there's anything else that needs fixing just let me know.
Thanks,
Lukas
Info4: <<
Package: fink
Version: 0.38.3
Revision: 31
Distribution: 10.4
Depends: base-files, perl5182-core
BuildDepends: perl5182-core
Recommends: <<
apt (>= 0.5.4-41)
<<
Conflicts: gcc3.1 (= 1175-6)
Replaces: gcc3.1 (= 1175-6)
Essential: yes
Source: mirror:custom:fink/%n-%v.tar.gz
Source-MD5: 70472425b59b0775a5c66384f63fd854
PatchFile: %n-10.4.patch
PatchFile-MD5: 1e18f656a12161100e3f702268dbb606
NoSetPATH: true
BuildAsNobody: false
PatchScript: <<
patch -p1 < %{PatchFile}
grep -l -r /usr/bin/perl . | xargs -t -L 1 \
perl -lpi -e 's@/usr/bin/perl(?!5)@%p/bin/perl5.18.2@;'
<<
CompileScript: <<
./pre-build-test.sh
make test PREFIX=%p ARCHITECTURE=%m DISTRIBUTION=10.4
./setup.sh %p %m
<<
InstallScript: <<
./install.sh %i %m
install -c -p -m 644 fink.shlibs "%d/DEBIAN/shlibs"
<<
PostInstScript: <<
%p/lib/fink/postinstall.pl %m
%p/bin/fink --no-use-binary-dist index
# try to clean up left-overs from previous versions (old location)
rm -f %p/var/db/fink.db
rm -f %p/var/db/shlibs.db
rm -f %p/var/lib/fink/fink.db
<<
PreRmScript: <<
# clean up package indexes
[ \! -d %p/var/lib/fink/finkinfodb ] || touch
%p/var/lib/fink/finkinfodb/invalidate
rm -f %p/var/lib/fink/index.db
rm -f %p/var/lib/fink/index.db.lock
rm -f %p/var/lib/fink/infolist
rm -f %p/var/lib/fink/shlibs.db
rm -f %p/var/lib/fink/shlibs.db.lock
<<
#
Description: Open-source software package manager
DescPackaging: <<
Don't use mirror:sourceforge so that older package manager versions
which do not know that mirror can still selfupdate.
Must put "make test" before "./setup.sh %p %m", because make test runs
the setup script itself, but pointed at the testing directory.
The second run of setup.sh properly points fink at the installed
configuration file.
We are using Conflicts/Replaces against gcc3.1 so that the Fink gcc3.1
package is removed (in favor of an Apple-supplied gcc 3.1, represented
by a virtual package).
The last Perl version shipped with 10.4.11 was 5.8.6, which is missing
version.pm. To enable newer Fink releases on 10.4, have people bootstrap
with fink-0.30.2, then have the first "fink selfupdate" bring in Perl
5.18.2 and patch this newer Fink release to use the fink-provided Perl.
<<
DescDetail: <<
fink is the Fink project's package manager. It is responsible for
downloading and compiling source and building binary packages from
it. Binary package handling is then delegated to dpkg.
<<
License: GPL
Maintainer: Fink Core Group <fink-core@lists.sourceforge.net>
Homepage: http://www.finkproject.org/
CustomMirror: <<
Primary: http://downloads.sourceforge.net
afr-KE: http://liquidtelecom.dl.sourceforge.net/sourceforge
afr-ZA: http://tenet.dl.sourceforge.net/sourceforge
asi-JP: http://jaist.dl.sourceforge.net/sourceforge
asi-KZ: http://kaz.dl.sourceforge.net/sourceforge
asi-SG: http://softlayer-sng.dl.sourceforge.net/sourceforge
asi-TW: http://nchc.dl.sourceforge.net/sourceforge
asi-TW: http://ncu.dl.sourceforge.net/sourceforge
aus-AU: http://aarnet.dl.sourceforge.net/sourceforge
aus-AU: http://internode.dl.sourceforge.net/sourceforge
aus-AU: http://waia.dl.sourceforge.net/sourceforge
eur-CH: http://switch.dl.sourceforge.net/sourceforge
eur-CZ: http://cznic.dl.sourceforge.net/sourceforge
eur-CZ: http://ignum.dl.sourceforge.net/sourceforge
eur-DE: http://netcologne.dl.sourceforge.net/sourceforge
eur-DE: http://optimate.dl.sourceforge.net/sourceforge
eur-DE: http://skylink.dl.sourceforge.net/sourceforge
eur-FR: http://freefr.dl.sourceforge.net/sourceforge
eur-IE: http://heanet.dl.sourceforge.net/sourceforge
eur-IT: http://garr.dl.sourceforge.net/sourceforge
eur-RU: http://citylan.dl.sourceforge.net/sourceforge
eur-SE: http://sunet.dl.sourceforge.net/sourceforge
eur-UK: http://kent.dl.sourceforge.net/sourceforge
eur-UK: http://vorboss.dl.sourceforge.net/sourceforge
nam-CA: http://iweb.dl.sourceforge.net/sourceforge
nam-US: http://colocrossing.dl.sourceforge.net/sourceforge
nam-US: http://downloads.sourceforge.net
nam-US: http://softlayer-ams.dl.sourceforge.net/sourceforge
nam-US: http://softlayer-dal.dl.sourceforge.net/sourceforge
nam-US: http://superb-dca2.dl.sourceforge.net/sourceforge
nam-US: http://tcpdiag.dl.sourceforge.net/sourceforge
sam-BR: http://ufpr.dl.sourceforge.net/sourceforge
<<
<<
diff --git a/perlmod/Fink/Bootstrap.pm b/perlmod/Fink/Bootstrap.pm
index 3f0784c..4d459f8 100644
--- a/perlmod/Fink/Bootstrap.pm
+++ b/perlmod/Fink/Bootstrap.pm
@@ -177,19 +177,18 @@ GCC_MSG
"for current versions of fink. Please use fink 0.24.7
or earlier.\n");
$distribution = "10.2"; # or 10.2-gcc3.3, but it doesn't matter
as we refuse running anyway
} elsif ($host =~ /^(powerpc|i386)-apple-darwin7\./) {
- &print_breaking("This system no longer supported " .
+ &print_breaking("This system is no longer supported " .
"for current versions of fink. Please use fink 0.28.5
or earlier.\n");
$distribution = "10.3";
} elsif ($host =~ /^(powerpc|i386)-apple-darwin8\./) {
- &print_breaking("This system no longer supported " .
- "for current versions of fink. Please use fink 0.30.2
or earlier.\n");
+ &print_breaking("This system is supported and tested.");
$distribution = "10.4";
} elsif ($host =~ /^(powerpc|i386)-apple-darwin9\./) {
- &print_breaking("This system no longer supported " .
+ &print_breaking("This system is no longer supported " .
"for current versions of fink. Please use fink 0.34.10
or earlier.\n");
$distribution = "10.5";
} elsif ($host =~ /^i386-apple-darwin10\./) {
- &print_breaking("This system no longer supported " .
+ &print_breaking("This system is no longer supported " .
"for current versions of fink. Please use fink 0.34.10
or earlier.\n");
$distribution = "10.6";
} elsif ($host =~ /^i386-apple-darwin11\.[0-4]\.[0-2]/) {
diff --git a/perlmod/Fink/PkgVersion.pm b/perlmod/Fink/PkgVersion.pm
index 6612936..a342694 100644
--- a/perlmod/Fink/PkgVersion.pm
+++ b/perlmod/Fink/PkgVersion.pm
@@ -5180,7 +5180,9 @@ sub get_env {
# use path-prefix-* to give magic to 'gcc' and related commands
# Clang isn't the default compiler for Xcode 4.x, so wrapping
mandatory on 10.7 and 10.8/Xcode 4.x .
# Includes unused argument error suppression for clang-5's C
compiler for 10.8 and 10.9 .
- $script_env{'PATH'} = ensure_clang_prefix() . ':' .
$script_env{'PATH'};
+ if ( $distro ge version->parse ("v10.7") ) {
+ $script_env{'PATH'} = ensure_clang_prefix() . ':' .
$script_env{'PATH'};
+ }
if ( $distro ge version->parse ("v10.9") ) {
# Use -stdlib=libc++ for c++/g++/clang++ on 10.9 and
later.
# Also includes unused argument error suppression for
clang-5's C++ compiler for 10.9.
@@ -5195,7 +5197,11 @@ sub get_env {
my ($JAVA_HOME, $subtype, $dir, $versions_dir, @dirs);
if ($subtype = $self->get_subtype('java')) {
$subtype = '' if ($subtype eq 'java');
- chomp ($JAVA_HOME=`/usr/libexec/java_home`);
+ if (-x '/usr/libexec/java_home') {
+ chomp
($JAVA_HOME=`/usr/libexec/java_home`);
+ } else {
+ chomp ($JAVA_HOME=`/usr/bin/strings
/usr/bin/java | /usr/bin/grep /Home\$`);
+ }
}
$script_env{'JAVA_HOME'} = $JAVA_HOME unless
$self->has_param('SetJAVA_HOME');
$script_env{'PATH'} = $JAVA_HOME . '/bin:' .
$script_env{'PATH'} unless $self->has_param('SetPATH');
diff --git a/perlmod/Fink/VirtPackage.pm b/perlmod/Fink/VirtPackage.pm
index 1370773..a4bf7c6 100644
--- a/perlmod/Fink/VirtPackage.pm
+++ b/perlmod/Fink/VirtPackage.pm
@@ -407,7 +407,9 @@ directories exist.
# add hardcoded patterns for Javas which are known to be available
# on supported OS X so that their system-* packages will show up as
# potentially installable.
- my @jdktest = ( split (/\n/, `/usr/libexec/java_home -V 2>&1`),
+ my @jdktest = ( ( -x '/usr/libexec/java_home' ) ?
+ split (/\n/, `/usr/libexec/java_home -V
2>&1`) :
+ '1.4.2_AB-bCD-EFG.H, ' .
Fink::FinkVersion::get_arch() . ': "Java SE 6" ' . `/usr/bin/strings
/usr/bin/java | /usr/bin/grep /Home\$`,
'1.4.2_AB-bCD-EFG.H, x86_64: "Java
SE 6" /System/Library/Java/JavaVirtualMachines/1.4.2.jdk/Contents/Home',
'1.5.0_AB-bCD-EFG.H, x86_64: "Java
SE 6" /System/Library/Java/JavaVirtualMachines/1.5.0.jdk/Contents/Home',
'1.6.0_AB-bCD-EFG.H, x86_64: "Java
SE 6" /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home',
@@ -753,6 +755,7 @@ END
$hash->{compilescript} = &gen_compile_script($hash);
chomp(my $xcodepath=`xcode-select -print-path 2>/dev/null`);
+ $xcodepath='/Developer' if !$xcodepath;
# Xcode 4.3+ is relocatable
my $result=`defaults read $xcodepath/../version
CFBundleShortVersionString 2>&1`;
my $xcode_app_version; # to use in the next entry
diff --git a/setup.sh b/setup.sh
index 042f5fe..ed9ca21 100755
--- a/setup.sh
+++ b/setup.sh
@@ -85,8 +85,11 @@ sed "s|@PREFIX@|$basepath|g" <fink-dpkg-status-cleanup.in
>fink-dpkg-status-clea
# apt-get-lockwait
# set arguments for pack() up in an architecture-appropriate manner
-# These are appropriate for x86_64:
-packargs='"qqiss", 0, 0'
+if [ "$architecture" = "x86_64" -o "$architecture" = "powerpc64" ]; then
+ packargs='"qqiss", 0, 0'
+else
+ packargs='"lllliss", (0, 0), (0, 0)'
+fi
echo "Creating lockwait wrappers..."
for prog in dpkg; do
Package: perl5182
Version: 5.18.2
Revision: 1
Distribution: 10.7, 10.8, 10.9, 10.4
Depends: %n-core (>= %v-%r)
Conflicts: perl5123, perl5124, perl5162, perl5182
Replaces: perl5123, perl5124, perl5162, perl5182
License: Artistic
Description: The Perl programming language, v. 5.18.2
DescDetail: <<
Perl is a high-level programming language with roots in C, sed, awk
and shell scripting. Perl is good at handling processes and files,
and is especially good at handling text. Perl's hallmarks are
practicality and efficiency. While it is used to do a lot of
different things, Perl's most common applications are system
administration utilities and web programming. A large proportion of
the CGI scripts on the web are written in Perl.
Fink's perl packages retain the perl version subdirectories in the
lib tree. Without these, upgrading or downgrading Perl breaks all of
the binary modules.
<<
DescPort: <<
Disabled 'make test', since one test fails.
Because the perl build system is designed to download source files for
"extra" perlmodules directly from CPAN, we do not include those "extra"
perlmodules in this package. For that reason, the following packages
which are Provided by Apple's build of perl5.18.2 on 10.10 are not provided
here:
convert-tnef-pm5182, html-parser-pm5182,
perl-objcbridge-pm5182, scalar-list-utils-pm5182, uri-pm5182,
algorithm-diff-pm5182, class-autouse-pm5182, corefoundation-pm5182,
data-hierarcy-pm5182, freezethaw-pm5182, io-pager-pm5182,
locale-maketext-lexicon-pm5182, perlio-eol-pm5182
"be_BY" locales are known broken on Darwin (at least through Darwin 12), so
disable testing them.
http://grokbase.com/t/perl/perl5-porters/1289z1msea/whats-blocking-5-14-3
perl bug #35895
radar://4139653 (?)
<<
DescUsage: <<
Most perl scripts start with #!/usr/bin/perl which will invoke Apple's
/usr/bin/perl. This package does not alter /usr/bin/perl. If you wish
to use this version of perl in scripts, the script should begin with
#!%p/bin/perl5.18.2 instead of #!/usr/bin/perl
<<
Source: mirror:cpan:src/5.0/perl-%v.tar.bz2
Source-MD5: d549b16ee4e9210988da39193a9389c1
CompileScript: <<
#!/bin/sh -ev
sh Configure -desr -Dcc="gcc" -Dcpp="-gcc -E" -Dprefix=%p
-Dccflags=-I%p/include -Dldflags=-L%p/lib -Dperladmin=none -Uinstallusrbinperl
-Dprivlib="%p/lib/perl5-core/5.18.2"
-Darchlib="%p/lib/perl5-core/5.18.2/darwin-thread-multi-2level"
-Dman3dir="%p/lib/perl5-core/5.18.2/man/man3" -Dman3ext=3pm
-Dscriptdir="%p/bin" -Duseithreads -Dinc_version_list=none
-Adefine:startperl="#!%p/bin/perl5.18.2" -Adefine:perlpath="%p/bin/perl5.18.2"
make
<<
DocFiles: README Copying
InfoTest: <<
TestScript: <<
make test || exit 2
<<
<<
InstallScript: <<
make install DESTDIR=%d
mkdir -p %i/etc/profile.d
echo "append_path MANPATH %p/lib/perl5-core/5.18.2/man" >>
%i/etc/profile.d/%N-core.csh
echo "append_path MANPATH %p/lib/perl5/5.18.2/man" >>
%i/etc/profile.d/%N-core.csh
echo "append_path MANPATH %p/lib/perl5-core/5.18.2/man" >>
%i/etc/profile.d/%N-core.sh
echo "append_path MANPATH %p/lib/perl5/5.18.2/man" >>
%i/etc/profile.d/%N-core.sh
echo "export MANPATH" >> %i/etc/profile.d/%N-core.sh
chmod 755 %i/etc/profile.d/%N-core.*
<<
SplitOff: <<
Package: %N-core
Conflicts: compress-zlib-pm (<= 1.19-2), crypt-ssleay-pm (<= 0.45-2),
dbd-mysql-pm (<= 2.1026-1), dbd-pg-pm (<= 1.21-4), dbd-pg-pm-ssl (<= 1.21-4),
dbi-pm (<= 1:1.35-1), digest-md5-pm (<= 2.24-1), digest-sha1-pm (<= 2.02-1),
egd (<= 0.8-3), eperl-pm (<= 2.2.14-2), filter-util-pm (<= 1.26-1), fribidi-pm
(<= 0.05-2), ftlib-pm (<= 1.2-1), gd-pm (<= 2.06-5), gimp-perl (<= 1.211-4),
gtk-perl-pm (<= 0.7008-7), html-parser-pm (<= 3.27-1), http-ghttp-pm (<=
1.07-1), irssi-ssl (<= 0.8.6-3), irssi (<= 0.8.6-2), jcode-pm (<= 0.82-1),
libapreq-pm (<= 1.0-1), mac-carbon-pm (<= 0.05-1), macosx-file-pm (<= 0.64-1),
mime-base64-pm (<= 2.18-1), net-ssleay-pm (<= 1.22-2), nkf (<= 1.92-1),
params-validate-pm (<= 0.57-1), pdl (<= 2.3.2-1), perlmagick-pm (<= 5.5.4-1),
pgplot-perl (<= 2.18-4), postgresql-perl (<= 7.3.2-7), postgresql-ssl-perl (<=
7.3.2-7), rrdtool-perl (<= 1.0.41-1), scalar-list-utils-pm (<= 1.11-1), sha-pm
(<= 1.2-2), shout-pm (<= 1.0-1), storable-pm (<= 1.0.14-1), string-approx-pm
(<= 3.19-1), template-notex-pm (<= 2.08-13), template-pm (<= 2.08-13),
term-readkey-pm (<= 2.21-1), term-readline-gnu-pm (<= 1.13-1), text-iconv-pm
(<= 1.2-1), time-hires-pm (<= 1.46-1), time-piece-pm (<= 1.08-1), tk-pm (<=
800.024-2), tk-tablematrix-pm (<= 1.01-1), unicode-string-pm (<= 2.07-1),
xml-parser-pm (<= 2.31-4), xmms-pm (<= 0.12-2)
Provides: <<
archive-tar-pm5182,
attribute-handlers-pm5182,
carp-pm5182,
cgi-pm5182,
compress-raw-bzip2-pm5182,
compress-raw-zlib-pm5182,
compress-zlib-pm5182,
cpanplus-dist-build-pm5182,
cpanplus-pm5182,
cpan-meta-requirements-pm5182,
data-dumper-pm5182,
db-pm5182,
devel-peek-pm5182,
digest-md5-pm5182,
digest-pm5182,
digest-sha-pm5182,
extutils-cbuilder-pm5182,
extutils-makemaker-pm5182,
extutils-parsexs-pm5182,
file-find-pm5182,
file-path-pm5182,
file-spec-pm5182,
file-temp-pm5182,
filter-simple-pm5182,
getopt-long-pm5182,
http-tiny-pm5182,
i18n-langtags-pm5182,
io-zlib-pm5182,
libnet-pm5182,
list-util-pm5182,
locale-maketext-pm5182,
locale-maketext-simple-pm5182,
math-bigint-pm5182,
memoize-pm5182,
mime-base64-pm5182,
module-build-pm5182,
module-corelist-pm5182,
module-load-conditional-pm5182,
module-load-pm5182,
module-pluggable-pm5182,
package-constants-pm5182,
params-check-pm5182,
perl-ostype-pm5182,
pod-escapes-pm5182,
pod-parser-pm5182,
pod-simple-pm5182,
sys-syslog-pm5182,
term-readline-pm5182,
test-harness-pm5182,
test-simple-pm5182,
text-tabs-pm5182,
text-wrap-pm5182,
time-hires-pm5182,
unicode-normalize-pm5182
<<
Files: bin/perl5.18.2 etc lib/perl5 lib/perl5-core
Description: Core files for perl, v. 5.18.2
DocFiles: README Copying
<<
DescPackaging: <<
We split the perl5.18.2 binary and the files in lib/perl5* off as a separate
"core" package which does not conflict with other versions of perl.
%p/bin/perl and other binaries remain in the perl5182 package, and
different versions of perl can be selected by installing a different
package instead.
We now use lib/perl5-core as the main installation directory to avoid
conflicts with fink-installed perl modules.
We do not supply perl5182 on 10.10, since that's the one supplied by Apple.
<<
Homepage: http://www.cpan.org/
Maintainer: Fink Core Group <fink-core@lists.sourceforge.net>
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
fink-core mailing list
fink-core@lists.sourceforge.net
List archive:
http://news.gmane.org/gmane.os.apple.fink.core
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-core
