(pkgsrc)

 - Remove patch-main.c (it was for 'Remove wrong casts.').
(upstream)
 - update 2.48 to 2.57
----------------------------------------------
Release 2.57 (January 24, 2015, Gerd Neugebauer)
 - Segfault in deTeX fixed.
 - Compiler warnings silenced.

Release 2.56
 - Disambiguating numbers adapted to fit to documentation.
 - Configuration of regex fixed to work on Linux.
 - Documentation typos fixed.
 - Signed characters fro translation tables changed to unsigned.
 - Autoconf configuration improved.

Release 2.55
 - Library biblatex.rsc added. It contains capitalizations of fields used in bibLATEX.
 - Fix for a misbehaviour when selecting entries according to an aux file with deeply
nested @strings.

Release 2.54
 - Command line parameter -V documented.
 - Resource key.make.alias added to create new @ALIAS records for any newly generated key.
 - Resource apply.alias added to expand the @ALIAS records.
 - Resource apply.include added to expand the @INCLUDE records.
 - Resource apply.modify added to expand the @MODIFY records.
 - Error message for -o without parameter added.
 - @ALIAS and @INCLUDE records where not printed. This has been fixed.
 - A test suite for BibTool has been integrated. It requires Perl to be present on
the system on which the tests should be run.

Release 2.53
 - In tex.define spaces before the = are ignored instead of leading to unwanted
   definitions.
 - An intialization error showed up on MacOS. This has been fixed.
 - The prepared makefiles for various operating systems missed an entry for crossref.[cho].
 - Typo in help text and copyright year fixed.

Release 2.52
 - A few incompatibilities with signed and unsigned characters which showed up on
MacOS only have been fixed.
 - A few compiler warnings have been fixed.

Release 2.51
 - Bugfix in names.c: The classification of name parts erroneously has used a wrong
translation under certain circumstances.

Release 2.50
 - Bugfix in names.c: The classification of name parts erroneously has used a wrong
   translation under certain circumstances.
 - Bugfix in key.c: The classification of name parts erroneously has considered, to be
   a first name under certain circumstances. This has been improved.
 - Improvement in names.c and key.c concerning printing in debug mode.

Release 2.49
 - New resource expand.crossref introduced. This resource enables the expansion
   of fields inherited via the crossref mechanism.
 - Bugfix in names.c: The classification of name parts erroneously has considered the
   initials V., I., and X. to be Roman numerals belonging to the jr part under special
   circumstances. This has been improved.
 - Name formatting now uses a fractional part to restrict the number of name parts
   considered.
 - New resource expand.crossref introduced. This resource enables the expansion
   of fields inherited via the crossref mechanism.
 - Bugfix in print.c: Some national characters have been lost. It was necessary to use
   an unsigned character as elsewhere.

7 files changed, 46 insertions, 39 deletions

diff --git a/print/bibtool/Makefile b/print/bibtool/Makefile
index 9186861c3b7..651fc628ae4 100644
--- a/print/bibtool/Makefile
+++ b/print/bibtool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2012/12/24 01:51:20 dholland Exp $
+# $NetBSD: Makefile,v 1.14 2015/01/24 13:40:14 mef Exp $
 
-DISTNAME=	BibTool-2.48
-PKGREVISION=	1
+DISTNAME=	BibTool-2.57
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=biblio/bibtex/utils/bibtool/}
 
@@ -18,6 +17,8 @@ BUILD_DEPENDS+=	makeindexk-[0-9]*:../../textproc/makeindexk
 GNU_CONFIGURE=		yes
 MAKE_FILE=	makefile
 #CONFIGURE_DIRS=	${WRKSRC} ${WRKSRC}/BibTcl
+WRKSRC=		${WRKDIR}/${PKGBASE}
+USE_TOOLS+=	perl
 
 REPLACE_INTERPRETER+=	tcl
 REPLACE.tcl.old=	/usr/local/bin/tclsh
@@ -38,11 +39,11 @@ INSTALLATION_DIRS=	${DOCDIR} ${EXAMPLEDIR}
 #	mv ${WRKSRC}/BibTcl/Makefile.in ${WRKSRC}/BibTcl/makefile.in
 
 post-build:
-	cd ${WRKSRC}/Doc && ${MAKE}
+	cd ${WRKSRC}/doc && ${MAKE}
 #	cd ${WRKSRC}/BibTcl && ${MAKE}
 
 post-install:
-	set -e; for i in ${WRKSRC}/Doc/*.dvi; do \
+	set -e; for i in ${WRKSRC}/doc/*.pdf; do \
 		${INSTALL_DATA} "$$i" ${DESTDIR}${DOCDIR}; \
 	 done
 	${INSTALL_DATA} ${WRKSRC}/Perl/bibtool.pl ${DESTDIR}${EXAMPLEDIR}
diff --git a/print/bibtool/PLIST b/print/bibtool/PLIST
index ff4a6b5b4af..371b9c652a1 100644
--- a/print/bibtool/PLIST
+++ b/print/bibtool/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:11:54 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/01/24 13:40:14 mef Exp $
 bin/bibtool
+lib/BibTool/biblatex.rsc
 lib/BibTool/braces.rsc
 lib/BibTool/check_y.rsc
 lib/BibTool/default.rsc
@@ -11,8 +12,8 @@ lib/BibTool/opt.rsc
 lib/BibTool/sort_fld.rsc
 lib/BibTool/tex_def.rsc
 man/man1/bibtool.1
-share/doc/BibTool/bibtool.dvi
-share/doc/BibTool/c_lib.dvi
-share/doc/BibTool/ref_card.dvi
+share/doc/BibTool/bibtool.pdf
+share/doc/BibTool/c_lib.pdf
+share/doc/BibTool/ref_card.pdf
 share/examples/BibTool/bibtool.pl
 share/examples/BibTool/bibtool.tcl
diff --git a/print/bibtool/distinfo b/print/bibtool/distinfo
index 9c11f23224b..2b9012a5ab6 100644
--- a/print/bibtool/distinfo
+++ b/print/bibtool/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.2 2012/12/24 01:50:57 dholland Exp $
+$NetBSD: distinfo,v 1.3 2015/01/24 13:40:14 mef Exp $
 
-SHA1 (BibTool-2.48.tar.gz) = ed4d20823be38f4b90179613049a3be83dc51ab2
-RMD160 (BibTool-2.48.tar.gz) = 7928faf26316ec1e014a4f8234f9510a32d0e6b9
-Size (BibTool-2.48.tar.gz) = 634267 bytes
-SHA1 (patch-aa) = c145084288db91c4fc32ecc45c4205c9ee0a5ff3
-SHA1 (patch-ab) = a57258c20dea53c924f4ecafcb9881db2ac9ee93
-SHA1 (patch-configure) = 6762349941de9086711fe9ec988f4f5784dd5d65
-SHA1 (patch-main.c) = 26fa84025ae93002ae73d42d78f52640d713f705
-SHA1 (patch-parse.c) = 5e9371428c4fe8324703ed97bff0283d03f6d441
+SHA1 (BibTool-2.57.tar.gz) = a6e80c86d347a39f3883e552db2dd4deb72b0e86
+RMD160 (BibTool-2.57.tar.gz) = d3a85e9b1271da26a7149cdb8cfd95d97ef5c24a
+Size (BibTool-2.57.tar.gz) = 749797 bytes
+SHA1 (patch-aa) = 8c374a2825f4874ce701ab62d87afe8a3a6ab057
+SHA1 (patch-ab) = 8c464aec252c9535939e36ff48b2a0a659eef1cd
+SHA1 (patch-configure) = dc729041f85dcb602b80aa107fb1673da666e202
+SHA1 (patch-parse.c) = cb58de4aad9a42db633929b701e40dc5622e594a
 SHA1 (patch-regex-0.12_regex.c) = ebffe11aec2c1ff40b4f4c41c3b9342c9426ea7a
diff --git a/print/bibtool/patches/patch-aa b/print/bibtool/patches/patch-aa
index f9baf70d6f8..e9add432ee0 100644
--- a/print/bibtool/patches/patch-aa
+++ b/print/bibtool/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/03/31 03:11:56 smb Exp $
+$NetBSD: patch-aa,v 1.2 2015/01/24 13:40:14 mef Exp $
+
+Correction to filename Makefile -> makefile
 
 --- BibTcl/configure.orig	2006-03-19 11:48:19.000000000 -0500
 +++ BibTcl/configure
diff --git a/print/bibtool/patches/patch-ab b/print/bibtool/patches/patch-ab
index af4866609ac..d0efebe146d 100644
--- a/print/bibtool/patches/patch-ab
+++ b/print/bibtool/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/03/31 03:11:56 smb Exp $
+$NetBSD: patch-ab,v 1.2 2015/01/24 13:40:14 mef Exp $
+
+Correction to filename Makefile -> makefile
 
 --- BibTcl/configure.in.orig	2006-03-19 11:48:23.000000000 -0500
 +++ BibTcl/configure.in
diff --git a/print/bibtool/patches/patch-configure b/print/bibtool/patches/patch-configure
index 82ebd15e815..4054753ad83 100644
--- a/print/bibtool/patches/patch-configure
+++ b/print/bibtool/patches/patch-configure
@@ -1,17 +1,17 @@
-$NetBSD: patch-configure,v 1.1 2012/12/24 01:50:57 dholland Exp $
+$NetBSD: patch-configure,v 1.2 2015/01/24 13:40:14 mef Exp $
 
 Disable a highly obsolete configure test that exercises undefined
 behavior.
 
---- configure~	2012-12-24 01:44:27.000000000 +0000
-+++ configure
-@@ -2789,7 +2789,8 @@ fi
+--- configure.orig	2014-04-15 03:24:53.000000000 +0900
++++ configure	2015-01-24 22:09:47.000000000 +0900
+@@ -3457,7 +3457,8 @@ fi
  
  if test $ac_cv_header_stdc = yes; then
    # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then
+-  if test "$cross_compiling" = yes; then :
 +  # disabled 20121222, IRIX 4 is long dead and this test exercises UB.
 +  if true; then
    :
  else
-   cat >conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/print/bibtool/patches/patch-parse.c b/print/bibtool/patches/patch-parse.c
index 4f6aaff9e4c..2a6a5062b7b 100644
--- a/print/bibtool/patches/patch-parse.c
+++ b/print/bibtool/patches/patch-parse.c
@@ -1,23 +1,25 @@
-$NetBSD: patch-parse.c,v 1.1 2012/12/24 01:50:58 dholland Exp $
+$NetBSD: patch-parse.c,v 1.2 2015/01/24 13:40:14 mef Exp $
 
 Fix bug handling EOF, detected by gcc.
 
---- parse.c~	2004-02-08 09:41:45.000000000 +0000
-+++ parse.c
-@@ -533,13 +533,15 @@ static void parse_number()			   /*			   
+--- parse.c.orig	2014-01-14 04:16:16.000000000 +0900
++++ parse.c	2015-01-24 22:13:12.000000000 +0900
+@@ -536,14 +536,16 @@ static void parse_number()			   /*			   
  static int parse_string(quotep)			   /*			     */
-   int   quotep;				   	   /*			     */
- { Uchar c;					   /*                        */
-+  int   c1;					   /*                        */
-   int   left;				   	   /*			     */
-   int   start_flno = flno;			   /*                        */
+   int quotep;				   	   /*			     */
+ { int c;					   /*                        */
++  int c1;
+   int left;				   	   /*			     */
+   int start_flno = flno;			   /*                        */
  						   /*			     */
    left = 0;					   /*			     */
    if ( quotep ) (void)sbputchar('"',parse_sb);	   /*"			     */
    do						   /*			     */
 -  { switch ( c=skip_nl() )			   /*			     */
-+  { c=c1=skip_nl();				   /*                        */
+-    { case EOF:					   /*                        */
++  { c=c1=skip_nl();				   /*			     */
 +    switch ( c1 )				   /*			     */
-     { case EOF:					   /*                        */
- 	UnterminatedError("Unterminated double quote",
- 			  start_flno);
++    { case EOF:					   /*			     */
+ 	UnterminatedError("Unterminated double quote",/*                     */
+ 			  start_flno);		   /*                        */
+ 	return(FALSE);	   			   /*			     */