Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods
In directory vz-cvs-3.sog:/tmp/cvs-serv22521
Modified Files:
tk-pm.info
Added Files:
tk-pm.patch
Log Message:
new version; tons of cleanups
--- NEW FILE: tk-pm.patch ---
diff -Nurd -x'*~' Tk-804.030.orig/Makefile.PL Tk-804.030/Makefile.PL
--- Tk-804.030.orig/Makefile.PL 2011-02-24 17:18:42.000000000 -0500
+++ Tk-804.030/Makefile.PL 2011-12-15 11:57:03.000000000 -0500
@@ -48,7 +48,7 @@
else
{
my $plibs = $Config{'libs'};
- my $libs = "$xlib -lX11$xtra"; # Used to have -lpt in here as well.
+ my $libs = "$xtra $xlib -lX11"; # Used to have -lpt in here as well.
my @try = qw(-lsocket -lnsl -lm);
push(@try,'-lc') if $^O =~ /svr4/i;
my $lib;
diff -Nurd -x'*~' Tk-804.030.orig/myConfig Tk-804.030/myConfig
--- Tk-804.030.orig/myConfig 2011-06-13 13:37:19.000000000 -0400
+++ Tk-804.030/myConfig 2011-12-14 20:34:38.000000000 -0500
@@ -408,7 +408,7 @@
$gccopt .= " -isystem $1";
}
- $inc = ($xinc eq "-I/usr/include") ? "" : $xinc;
+ $inc .= " " . ($xinc eq "-I/usr/include") ? "" : $xinc;
if (!defined $XFT)
{
@@ -430,7 +430,7 @@
my $ftlib = '-L/usr/local/lib'; # XXX needed if freetype and xlibs are
in different lib directories, but should probably check if this is necessary
if
(try_run("config/xft.c",[$xinc,$ftinc],[$xlib,$ftlib,'-lXft','-lfontconfig'],$def))
{
- $inc .= " $ftinc";
+ $inc = "$ftinc $inc";
warn "Seem to have -lXft\n";
$define{USE_XFT_FONTS} = 1;
$xlib .= " -lXft";
diff -Nurd -x'*~' Tk-804.030.orig/pTk/Makefile.PL Tk-804.030/pTk/Makefile.PL
--- Tk-804.030.orig/pTk/Makefile.PL 2011-10-17 16:57:18.000000000 -0400
+++ Tk-804.030/pTk/Makefile.PL 2011-12-14 20:14:38.000000000 -0500
@@ -13,7 +13,7 @@
'OBJECT' => '$(O_FILES)',
macro => { WINARCH => $win_arch },
'DEFINE' => $define,
- 'INC' => "$inc -I. -Ibitmaps",
+ 'INC' => "-I. -Ibitmaps $inc",
'SKIP' => [qw( distclean dist makeaperl xs_o)],
'clean' => {'FILES' => 'libpTk$(LIB_EXT)'}
);
Index: tk-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/tk-pm.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tk-pm.info 15 Dec 2011 16:40:44 -0000 1.2
+++ tk-pm.info 16 Dec 2011 02:05:16 -0000 1.3
@@ -1,99 +1,119 @@
Info2: <<
Package: tk-pm%type_pkg[perl]
-Version: 804.029
-Revision: 19
+Version: 804.030
+Revision: 1
Distribution: (%type_pkg[perl] = 586) 10.5
-###
Depends: <<
encode-pm%type_pkg[perl],
+ fontconfig2-shlibs (>= 2.8.0-4),
+ freetype219-shlibs (>= 2.3.12-1),
libjpeg8-shlibs,
- libpng14-shlibs,
+ libpng15-shlibs,
perl%type_pkg[perl]-core,
- x11
+ x11,
+ xft2-shlibs (>= 2.2.0-1)
<<
BuildDepends: <<
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
libjpeg8,
- libpng14,
+ libpng15,
test-simple-pm%type_pkg[perl],
- x11-dev
+ x11-dev,
+ xft2-dev (>= 2.2.0-1)
+<<
+Replaces: <<
+ tk-pm (<< 804.026-1),
+ %N-man,
+ tk-pm560, tk-pm561, tk-pm580, tk-pm582, tk-pm581 (<< 804.026-1),
+ %{Ni}560-bin, %{Ni}561-bin, %{Ni}580-bin, %{Ni}581-bin, %{Ni}582-bin,
+ %{Ni}584-bin, %{Ni}586-bin, %{Ni}588-bin, %{Ni}5100-bin, %{Ni}5123-bin
+<<
+Conflicts: <<
+ %N-man,
+ %{Ni}560-bin, %{Ni}561-bin, %{Ni}580-bin, %{Ni}581-bin, %{Ni}582-bin,
+ %{Ni}584-bin, %{Ni}586-bin, %{Ni}588-bin, %{Ni}5100-bin, %{Ni}5123-bin
<<
-Replaces: tk-pm (<< 804.026-1), %N-man
-Conflicts: %N-man
-###
Source: mirror:cpan:authors/id/S/SR/SREZIC/Tk-%v.tar.gz
-Source-MD5: f4aebe6fcdb309a8480514f2ccf8117c
-###
+Source-MD5: 13275e85f99ee467a86d9598a437abff
Type: perl (5.8.6 5.8.8 5.10.0)
UpdatePOD: true
NoPerlTests: true
UseMaxBuildJobs: false
-###
+PatchFile: %{ni}.patch
+PatchFile-MD5: 2af635cd66aff030efac922560dd2a75
PatchScript: <<
+ %{default_script}
+
perl -pi -e 's,#!/usr/bin/env perl,#!/usr/local/bin/perl -w,'
demos/widget
- perl -pi -e 's,(-ljpeg),-L%p/lib \1,' JPEG/Makefile.PL
- perl -pi -e 's,(-lpng),-L%p/lib \1,' PNG/Makefile.PL
+
+ perl -pi -e 's,-I/usr/local/include,-I%p/include,g' JPEG/Makefile.PL
+ perl -pi -e 's,(-ljpeg),-L%p/lib \1,g' JPEG/Makefile.PL
+ perl -pi -e 's,-I/usr/local/include,-I%p/include,g' PNG/Makefile.PL
+ perl -pi -e 's,(-lpng),-L%p/lib \1,g' PNG/Makefile.PL
+ perl -pi -e 's,/usr/local/include,%p/include,g' myConfig
+ perl -pi -e 's,/usr/local/lib,%p/lib,g' myConfig
+ perl -pi -e 's,\$inc\s*=\s*"";,\$inc="-I%p/include";,' myConfig
# dependency-scanner doesn't always catch "above" local dirs for -I
# so Makefile dependencies need to be available in local dir itself
find * -maxdepth 0 -type d -exec ln -s ../pTk {} \;
rm pTk/pTk
+
+ # source tarball is not world-readable, makes debugging hard
+ find . -type d | xargs chmod a+r
+<<
+ConfigureParams: DEFINE=-MD
+CompileScript: <<
+#!/bin/sh -ev
+ # some configuration tests use FULLPERL to find headers
+ export FULLPERL=`perl -e 'print $ARGV[0]=~/PERL="(.*?)"/' '%c'`
+ %{default_script}
+ fink-package-precedence --depfile-ext='\.d' .
<<
InstallScript: <<
- %{default_script}
- mv %i/share/man %i/lib/perl5/%type_raw[perl]
+#!/bin/sh -ev
+ %{default_script}
+ mv %i/share/man %i/lib/perl5/%type_raw[perl]
+ for f in gedi ptked ptksh tkjpeg widget; do
+ mv %i/bin/$f %i/bin/$f-%type_raw[perl]
+ done
<<
-DocFiles: COPYING Changes INSTALL MANIFEST README*
-###
-SplitOff: <<
- Package: %N-bin
- Depends: perl%type_pkg[perl]-core, %N, x11
- Conflicts: <<
- %{Ni}560-bin, %{Ni}561-bin, %{Ni}580-bin, %{Ni}581-bin, %{Ni}582-bin,
- %{Ni}584-bin, %{Ni}586-bin, %{Ni}588-bin, %{Ni}5100-bin, %{Ni}5123-bin
- <<
- Replaces: <<
- tk-pm (<< 804.026-1),
- tk-pm560, tk-pm561, tk-pm580, tk-pm582, tk-pm581 (<< 804.026-1),
- %{Ni}560-bin, %{Ni}561-bin, %{Ni}580-bin, %{Ni}581-bin, %{Ni}582-bin,
- %{Ni}584-bin, %{Ni}586-bin, %{Ni}588-bin, %{Ni}5100-bin, %{Ni}5123-bin
- <<
- Files: bin lib/perl5/%type_raw[perl]/man/man1
- DocFiles: COPYING Changes INSTALL MANIFEST README*
+DocFiles: COPYING Changes README README.darwin
+PostInstScript: <<
+ if [ "$1" = "configure" ]; then
+ for f in gedi ptked ptksh tkjpeg widget; do
+ update-alternatives --install %p/bin/$f $f
%p/bin/$f-%type_raw[perl] %type_pkg[perl]
+ done
+ fi
<<
-###
-Description: Graphical User Interface ToolKit
-DescDetail: <<
- Graphical User Interface ToolKit
+PreRmScript: <<
+ if [ "$1" = "remove" ]; then
+ for f in gedi ptked ptksh tkjpeg widget; do
+ update-alternatives --remove $f
%p/bin/$f-%type_raw[perl]
+ done
+ fi
<<
+Description: Graphical User Interface ToolKit
DescPort: <<
- (monipol) -pm586 on 10.5 gives bus error, so disable it.
-
Had to disable 'make test' since it requires X11 to be running and with
fink there is no real way to verify or enforce this behavior.
<<
DescPackaging: <<
- Several different pkg layouts used in past, so need extra Replaces
- in the SplitOffs.
-
- There was an invalid %v string (containing underscore) in the
- 804.025 series; Conflicts/Replaces were raised slightly to we don't
- have to refer to a broken value.
-
- 804.026-13 moved share/man/man1 from -man to -bin, so -bin has to
- conflict with earlier revisions.
+ 804-030-1 merged -bin into %n (as was done with -man long
+ ago), now just keep C/R on old splitoffs to aid users who are
+ upgrading, but not need to worry about them going forward
+ because finally a unified package
- -14 moved manpages out of share/ for the first time. Now no longer
- need to worry about prior -man vs. -bin conflicts since the files
- never existed in the new location in any old version.
+ Lots of hacking to make sure fink's -I and -L flags are used
+ and early in compiler calls (hand-coded config tests and much
+ of the build system ignore CPPFLAGS and LDFLAGS and these
+ flags are not part of system-perl's defaults either)
Fix canonical #! perl interp in demos/widget so makemaker will
automaticlly replace with proper one
-
- Patch MakeDepend.pm to allow runtime env var to take
- precedence (prepend to) value used when building perl itself.
-
<<
-###
License: Artistic
Maintainer: None <fink-de...@lists.sourceforge.net>
Homepage: http://search.cpan.org/dist/Tk
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
