Tue Mar 16 09:53:02 2010 UTC ()
Updating textproc/p5-Text-BibTeX from 0.40 to 0.41

pkgsrc changes:
- Adjust patch to build-script to ensure rpath set

Upstream changes:
Release 0.41 - 14 March, 2010
-----------------------------
* tested under Solaris and FreeBSD.
* fixed compilation/installation under Mac OS X.
* fixed some C code on format-security (thanks to Jerome Quelin).
* fixed build system to check for dependencies.
* added patch from Philip Kime to fix names with commas handling.


(sno)
diff -r1.18 -r1.19 pkgsrc/textproc/p5-Text-BibTeX/Makefile
diff -r1.6 -r1.7 pkgsrc/textproc/p5-Text-BibTeX/distinfo
diff -r1.3 -r1.4 pkgsrc/textproc/p5-Text-BibTeX/patches/patch-aa
cvs diff -r1.18 -r1.19 pkgsrc/textproc/p5-Text-BibTeX/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/p5-Text-BibTeX/Makefile 2010/03/09 21:54:01 1.18
+++ pkgsrc/textproc/p5-Text-BibTeX/Makefile 2010/03/16 09:53:02 1.19
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.18 2010/03/09 21:54:01 sno Exp $ 1# $NetBSD: Makefile,v 1.19 2010/03/16 09:53:02 sno Exp $
2 2
3DISTNAME= Text-BibTeX-0.40 3DISTNAME= Text-BibTeX-0.41
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5SVR4_PKGNAME= p5tbt 5SVR4_PKGNAME= p5tbt
6CATEGORIES= textproc perl5 6CATEGORIES= textproc perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Text/} 7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Text/}
8DISTFILES+= ${DISTNAME}.tar.gz btparse-0.35.tar.gz 8DISTFILES+= ${DISTNAME}.tar.gz btparse-0.35.tar.gz
9SITES.btparse-0.35.tar.gz= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/A/AM/AMBS/btparse/} 9SITES.btparse-0.35.tar.gz= ${MASTER_SITE_PERL_CPAN:=../by-authors/id/A/AM/AMBS/btparse/}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.gerg.ca/software/btOOL/ 12HOMEPAGE= http://www.gerg.ca/software/btOOL/
13#HOMEPAGE= http://search.cpan.org/dist/Text-BibTeX/ 13#HOMEPAGE= http://search.cpan.org/dist/Text-BibTeX/
14COMMENT= Perl library for reading, parsing, and processing BibTeX files 14COMMENT= Perl library for reading, parsing, and processing BibTeX files
15LICENSE= ${PERL5_LICENSE} 15LICENSE= ${PERL5_LICENSE}
16 16
cvs diff -r1.6 -r1.7 pkgsrc/textproc/p5-Text-BibTeX/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/p5-Text-BibTeX/distinfo 2010/03/09 21:54:01 1.6
+++ pkgsrc/textproc/p5-Text-BibTeX/distinfo 2010/03/16 09:53:02 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.6 2010/03/09 21:54:01 sno Exp $ 1$NetBSD: distinfo,v 1.7 2010/03/16 09:53:02 sno Exp $
2 2
3SHA1 (Text-BibTeX-0.40.tar.gz) = 4b65b761cd5a7ed404f48aad292f6a6a4da37701 3SHA1 (Text-BibTeX-0.41.tar.gz) = f0b33fd831e7c2cff7391f4c4c901f145f98ef05
4RMD160 (Text-BibTeX-0.40.tar.gz) = f9a8e7fe676c3fa835308ed269ddb020ae86f85a 4RMD160 (Text-BibTeX-0.41.tar.gz) = 9264d764bcdb3af703a4ef48a21b0c3fadbc0093
5Size (Text-BibTeX-0.40.tar.gz) = 265444 bytes 5Size (Text-BibTeX-0.41.tar.gz) = 265974 bytes
6SHA1 (btparse-0.35.tar.gz) = bb52c5fc02c1326008bed31a3c8932dd832b8ea8 6SHA1 (btparse-0.35.tar.gz) = bb52c5fc02c1326008bed31a3c8932dd832b8ea8
7RMD160 (btparse-0.35.tar.gz) = afdf8cc2abd0beaa53b142d7277758a32e26d256 7RMD160 (btparse-0.35.tar.gz) = afdf8cc2abd0beaa53b142d7277758a32e26d256
8Size (btparse-0.35.tar.gz) = 470546 bytes 8Size (btparse-0.35.tar.gz) = 470546 bytes
9SHA1 (patch-aa) = 33ca774fe490a9c6e809ac17202badf9843e8aaf 9SHA1 (patch-aa) = 6c6193cd464e59b30f8405565cca566d089ca5c5
cvs diff -r1.3 -r1.4 pkgsrc/textproc/p5-Text-BibTeX/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/p5-Text-BibTeX/patches/Attic/patch-aa 2010/03/09 21:54:01 1.3
+++ pkgsrc/textproc/p5-Text-BibTeX/patches/Attic/patch-aa 2010/03/16 09:53:02 1.4
@@ -1,69 +1,63 @@ @@ -1,69 +1,63 @@
1$NetBSD: patch-aa,v 1.3 2010/03/09 21:54:01 sno Exp $ 1$NetBSD: patch-aa,v 1.4 2010/03/16 09:53:02 sno Exp $
2 2
3--- inc/MyBuilder.pm.orig 2010-03-07 18:53:31.000000000 +0000 3--- inc/MyBuilder.pm.orig 2010-03-14 18:20:38.000000000 +0000
4+++ inc/MyBuilder.pm 4+++ inc/MyBuilder.pm
5@@ -75,9 +75,10 @@ sub ACTION_compile_xscode { 5@@ -74,9 +74,10 @@ sub ACTION_compile_xscode {
6 # .o => .(a|bundle) 6 # .o => .(a|bundle)
7 my $lib_file = catfile( $archdir, "BibTeX.$Config{dlext}" ); 7 my $lib_file = catfile( $archdir, "BibTeX.$Config{dlext}" );
8 if ( !$self->up_to_date( [ @$objects ], $lib_file ) ) { 8 if ( !$self->up_to_date( [ @$objects ], $lib_file ) ) {
9+ my $btparselibdir = $self->install_path('usrlib'); 9+ my $btparselibdir = $self->install_path('usrlib');
10 $cbuilder->link( 10 $cbuilder->link(
11 module_name => 'Text::BibTeX', 11 module_name => 'Text::BibTeX',
12- extra_linker_flags => '-Lbtparse/src -lbtparse ', 12- extra_linker_flags => '-Lbtparse/src -lbtparse ',
13+ extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ", 13+ extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ",
14 objects => $objects, 14 objects => $objects,
15 lib_file => $lib_file, 15 lib_file => $lib_file,
16 ); 16 );
17@@ -142,24 +143,25 @@ sub ACTION_create_binaries { 17@@ -145,11 +146,12 @@ sub ACTION_create_binaries {
18  18 my $exe_file = catfile("btparse","progs","dumpnames$EXEEXT");
19 print STDERR "\n** Creating binaries (dumpnames$EXEEXT, biblex$EXEEXT, bibparse$EXEEXT)\n"; 19 push @toinstall, $exe_file;
20  20 my $object = catfile("btparse","progs","dumpnames.o");
21+ my $btparselibdir = $self->install_path('usrlib'); 21+ my $btparselibdir = $self->install_path('usrlib');
22 # NO INST? 22 if (!$self->up_to_date($object, $exe_file)) {
23 ## FIXME - uptodate 23 $CCL->($cbuilder,
24 $CCL->($cbuilder, 24 exe_file => $exe_file,
25 exe_file => "btparse/progs/dumpnames$EXEEXT", 25 objects => [ $object ],
26- extra_linker_flags => '-Lbtparse/src -lbtparse ', 26- extra_linker_flags => '-Lbtparse/src -lbtparse ');
27+ extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ", 27+ extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ");
28 objects => [ "btparse/progs/dumpnames.o" ]); 28 }
29  
30 # NO INST? 
31 ## FIXME - uptodate 
32 $CCL->($cbuilder, 
33 exe_file => "btparse/progs/biblex$EXEEXT", 
34- extra_linker_flags => '-Lbtparse/src -lbtparse ', 
35+ extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ", 
36 objects => [ "btparse/progs/biblex.o" ]); 
37  29
38 ## FIXME - uptodate 30 $exe_file = catfile("btparse","progs","biblex$EXEEXT");
39 $CCL->($cbuilder, 31@@ -159,7 +161,7 @@ sub ACTION_create_binaries {
40 exe_file => "btparse/progs/bibparse$EXEEXT", 32 $CCL->($cbuilder,
41- extra_linker_flags => '-Lbtparse/src -lbtparse ', 33 exe_file => $exe_file,
42+ extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ", 34 objects => [ $object ],
43 objects => [ map {"btparse/progs/$_.o"} (qw.bibparse args getopt getopt1.) ]); 35- extra_linker_flags => '-Lbtparse/src -lbtparse ');
 36+ extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ");
 37 }
44  38
45 $self->copy_if_modified( from => "btparse/progs/dumpnames$EXEEXT", 39 $exe_file = catfile("btparse","progs","bibparse$EXEEXT");
46@@ -187,7 +189,7 @@ sub ACTION_create_tests { 40@@ -168,7 +170,7 @@ sub ACTION_create_binaries {
47 ## FIXME - uptodate 41 if (!$self->up_to_date($object, $exe_file)) {
48 $CCL->($cbuilder, 42 $CCL->($cbuilder,
49 exe_file => "btparse/tests/simple_test$EXEEXT", 43 exe_file => $exe_file,
50- extra_linker_flags => '-Lbtparse/src -lbtparse ', 44- extra_linker_flags => '-Lbtparse/src -lbtparse ',
51+ extra_linker_flags => "-Lbtparse/src -Wl,-Rbtparse/src -lbtparse ", 45+ extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ",
52 objects => [ map "btparse/tests/$_.o", (qw.simple_test testlib.) ]); 46 objects => $object);
 47 }
53  48
54 ## FIXME - uptodate 49@@ -299,9 +301,13 @@ sub ACTION_test {
55@@ -264,9 +266,13 @@ sub ACTION_test { 
56 if ($^O =~ /darwin/i) { 50 if ($^O =~ /darwin/i) {
57 $ENV{DYLD_LIBRARY_PATH} = catdir($self->blib,"usrlib").":$ENV{DYLD_LIBRARY_PATH}"; 51 $ENV{DYLD_LIBRARY_PATH} = catdir($self->blib,"usrlib");
58 } 52 }
59- if ($^O =~ /linux/i) { 53- if ($^O =~ /(freebsd|solaris|linux)/i) {
60+ if ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix)/i) { 54+ elsif ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix)/i) {
61 $ENV{LD_LIBRARY_PATH} = catdir($self->blib,"usrlib").":$ENV{LD_LIBRARY_PATH}"; 55 $ENV{LD_LIBRARY_PATH} = catdir($self->blib,"usrlib");
62 } 56 }
63+ if ($^O =~ /aix/i) { 57+ elsif ($^O =~ /aix/i) {
64+ my $oldlibpath = $ENV{LIBPATH} || '/lib:/usr/lib'; 58+ my $oldlibpath = $ENV{LIBPATH} || '/lib:/usr/lib';
65+ $ENV{LIBPATH} = catdir($self->blib,"usrlib").":$oldlibpath"; 59+ $ENV{LIBPATH} = catdir($self->blib,"usrlib").":$oldlibpath";
66+ } 60+ }
67  61
68 $self->SUPER::ACTION_test 62 $self->SUPER::ACTION_test
69 } 63 }