@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2010/03/09 21:54:01 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/16 09:53:02 sno Exp $
 
-DISTNAME=	Text-BibTeX-0.40
+DISTNAME=	Text-BibTeX-0.41
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5tbt
 CATEGORIES=	textproc perl5

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2010/03/09 21:54:01 sno Exp $
+$NetBSD: distinfo,v 1.7 2010/03/16 09:53:02 sno Exp $
 
-SHA1 (Text-BibTeX-0.40.tar.gz) = 4b65b761cd5a7ed404f48aad292f6a6a4da37701
-RMD160 (Text-BibTeX-0.40.tar.gz) = f9a8e7fe676c3fa835308ed269ddb020ae86f85a
-Size (Text-BibTeX-0.40.tar.gz) = 265444 bytes
+SHA1 (Text-BibTeX-0.41.tar.gz) = f0b33fd831e7c2cff7391f4c4c901f145f98ef05
+RMD160 (Text-BibTeX-0.41.tar.gz) = 9264d764bcdb3af703a4ef48a21b0c3fadbc0093
+Size (Text-BibTeX-0.41.tar.gz) = 265974 bytes
 SHA1 (btparse-0.35.tar.gz) = bb52c5fc02c1326008bed31a3c8932dd832b8ea8
 RMD160 (btparse-0.35.tar.gz) = afdf8cc2abd0beaa53b142d7277758a32e26d256
 Size (btparse-0.35.tar.gz) = 470546 bytes
-SHA1 (patch-aa) = 33ca774fe490a9c6e809ac17202badf9843e8aaf
+SHA1 (patch-aa) = 6c6193cd464e59b30f8405565cca566d089ca5c5

@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2010/03/09 21:54:01 sno Exp $
+$NetBSD: patch-aa,v 1.4 2010/03/16 09:53:02 sno Exp $
 
---- inc/MyBuilder.pm.orig	2010-03-07 18:53:31.000000000 +0000
+--- inc/MyBuilder.pm.orig	2010-03-14 18:20:38.000000000 +0000
 +++ inc/MyBuilder.pm
-@@ -75,9 +75,10 @@ sub ACTION_compile_xscode {
+@@ -74,9 +74,10 @@ sub ACTION_compile_xscode {
      # .o => .(a|bundle)
      my $lib_file = catfile( $archdir, "BibTeX.$Config{dlext}" );
      if ( !$self->up_to_date( [ @$objects ], $lib_file ) ) {
@@ -14,54 +14,48 @@
                          objects     => $objects,
                          lib_file    => $lib_file,
                         );
-@@ -142,24 +143,25 @@ sub ACTION_create_binaries {
- 
-     print STDERR "\n** Creating binaries (dumpnames$EXEEXT, biblex$EXEEXT, bibparse$EXEEXT)\n";
- 
+@@ -145,11 +146,12 @@ sub ACTION_create_binaries {
+     my $exe_file = catfile("btparse","progs","dumpnames$EXEEXT");
+     push @toinstall, $exe_file;
+     my $object   = catfile("btparse","progs","dumpnames.o");
 +    my $btparselibdir = $self->install_path('usrlib');
-     # NO INST?
-     ## FIXME - uptodate
-     $CCL->($cbuilder,
-            exe_file => "btparse/progs/dumpnames$EXEEXT",
--           extra_linker_flags => '-Lbtparse/src -lbtparse ',
-+	   extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ",
-            objects => [ "btparse/progs/dumpnames.o" ]);
+     if (!$self->up_to_date($object, $exe_file)) {
+         $CCL->($cbuilder,
+                exe_file => $exe_file,
+                objects  => [ $object ],
+-               extra_linker_flags => '-Lbtparse/src -lbtparse ');
++               extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ");
+     }
  
-     # NO INST?
-     ## FIXME - uptodate
-     $CCL->($cbuilder,
-            exe_file => "btparse/progs/biblex$EXEEXT",
--           extra_linker_flags => '-Lbtparse/src -lbtparse ',
-+	   extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ",
-            objects => [ "btparse/progs/biblex.o" ]);
+     $exe_file = catfile("btparse","progs","biblex$EXEEXT");
+@@ -159,7 +161,7 @@ sub ACTION_create_binaries {
+         $CCL->($cbuilder,
+                exe_file => $exe_file,
+                objects  => [ $object ],
+-               extra_linker_flags => '-Lbtparse/src -lbtparse ');
++               extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ");
+     }
  
-     ## FIXME - uptodate
-     $CCL->($cbuilder,
-            exe_file => "btparse/progs/bibparse$EXEEXT",
--           extra_linker_flags => '-Lbtparse/src -lbtparse ',
-+	   extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ",
-            objects => [ map {"btparse/progs/$_.o"} (qw.bibparse args getopt getopt1.) ]);
+     $exe_file = catfile("btparse","progs","bibparse$EXEEXT");
+@@ -168,7 +170,7 @@ sub ACTION_create_binaries {
+     if (!$self->up_to_date($object, $exe_file)) {
+         $CCL->($cbuilder,
+                exe_file => $exe_file,
+-               extra_linker_flags => '-Lbtparse/src -lbtparse ',
++               extra_linker_flags => "-Lbtparse/src -Wl,-R${btparselibdir} -lbtparse ",
+                objects => $object);
+     }
  
-     $self->copy_if_modified( from    => "btparse/progs/dumpnames$EXEEXT",
-@@ -187,7 +189,7 @@ sub ACTION_create_tests {
-     ## FIXME - uptodate
-     $CCL->($cbuilder,
-            exe_file => "btparse/tests/simple_test$EXEEXT",
--           extra_linker_flags => '-Lbtparse/src -lbtparse ',
-+           extra_linker_flags => "-Lbtparse/src -Wl,-Rbtparse/src -lbtparse ",
-            objects => [ map "btparse/tests/$_.o", (qw.simple_test testlib.) ]);
- 
-     ## FIXME - uptodate
-@@ -264,9 +266,13 @@ sub ACTION_test {
+@@ -299,9 +301,13 @@ sub ACTION_test {
      if ($^O =~ /darwin/i) {
-         $ENV{DYLD_LIBRARY_PATH} = catdir($self->blib,"usrlib").":$ENV{DYLD_LIBRARY_PATH}";
+         $ENV{DYLD_LIBRARY_PATH} = catdir($self->blib,"usrlib");
      }
--    if ($^O =~ /linux/i) {
-+    if ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix)/i) {
-         $ENV{LD_LIBRARY_PATH} = catdir($self->blib,"usrlib").":$ENV{LD_LIBRARY_PATH}";
+-    if ($^O =~ /(freebsd|solaris|linux)/i) {
++    elsif ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix)/i) {
+         $ENV{LD_LIBRARY_PATH} = catdir($self->blib,"usrlib");
      }
-+    if ($^O =~ /aix/i) {
-+	my $oldlibpath = $ENV{LIBPATH} || '/lib:/usr/lib';
++    elsif ($^O =~ /aix/i) {
++        my $oldlibpath = $ENV{LIBPATH} || '/lib:/usr/lib';
 +        $ENV{LIBPATH} = catdir($self->blib,"usrlib").":$oldlibpath";
 +    }