- Update BibTool to 2.57

- Provide docs as PDF rather than DVI
- Remove patch files no longer needed
- Adopt port

6 files changed, 10 insertions, 50 deletions

diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index cdd5e8069e6e..9a2bbbe1e7a5 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -2,33 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	bibtool
-PORTVERSION=	2.48
-PORTREVISION=	5
+PORTVERSION=	2.57
 CATEGORIES=	textproc print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	biblio/bibtex/utils/${PORTNAME}
 DISTNAME=	BibTool-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Command line manipulation of BibTeX files
 
 USE_TEX=	latex:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-kpathsea
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
+WRKSRC=		${WRKDIR}/BibTool
 
 MAKEFILE=	makefile
 INSTALL_TARGET=	install install.man
 
-PORTDOCS=	bibtool.dvi ref_card.dvi c_lib.dvi
+PORTDOCS=	bibtool.pdf ref_card.pdf c_lib.pdf
 
 post-build:
 	cd ${WRKSRC} && ${MAKE} doc && ${MAKE} doc
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	for f in ${PORTDOCS}; do \
-	  ${INSTALL_MAN} ${WRKSRC}/Doc/$$f ${STAGEDIR}${DOCSDIR}; \
-	done
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/textproc/bibtool/distinfo b/textproc/bibtool/distinfo
index 0f61a2da46ad..a9f72ab30598 100644
--- a/textproc/bibtool/distinfo
+++ b/textproc/bibtool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (BibTool-2.48.tar.gz) = a649a195a033cd37a58c10b8b47d8f91484b24954af8a5fa3303efe0031cc9f9
-SIZE (BibTool-2.48.tar.gz) = 634267
+SHA256 (BibTool-2.57.tar.gz) = be2c77f1a22b191831ed6282841fdb01d9d800befe74cc668d04bc65b9c77ebc
+SIZE (BibTool-2.57.tar.gz) = 749797
diff --git a/textproc/bibtool/files/patch-AutoConf__makefile.in b/textproc/bibtool/files/patch-AutoConf__makefile.in
index daa5be52184e..d0642e9f64cc 100644
--- a/textproc/bibtool/files/patch-AutoConf__makefile.in
+++ b/textproc/bibtool/files/patch-AutoConf__makefile.in
@@ -31,7 +31,7 @@
  # 	   optimizer is turned on.
  # 
  
--CFLAGS     =
+-CFLAGS     = @CFLAGS@
 +CFLAGS     += -DHAVE_PROTOTYPES
  # CFLAGS = -O
  #  GNU C
diff --git a/textproc/bibtool/files/patch-configure b/textproc/bibtool/files/patch-configure
deleted file mode 100644
index f859335184a0..000000000000
--- a/textproc/bibtool/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./configure.orig	2004-02-08 09:35:23.000000000 +0000
-+++ ./configure	2014-01-25 23:08:47.000000000 +0000
-@@ -4566,12 +4566,12 @@
- 	kpathsea_dir=
- 	kpathsea_lib=
- 	kpathsea_def=
--	for cand in .. ../kpse3-2 kpse3-2 .
-+	for cand in ${LOCALBASE}
- 	do
--		if test -f $cand/kpathsea/tex-file.h ; then
--			kpathsea_dir=$cand
--			kpathsea_lib=$cand/kpathsea/STATIC/libkpathsea.a
--			kpathsea_def="-DHAVE_LIBKPATHSEA -I$cand"
-+		if test -f $cand/include/kpathsea/tex-file.h ; then
-+			kpathsea_dir=$cand/include
-+			kpathsea_lib=$cand/lib/libkpathsea.a
-+			kpathsea_def="-DHAVE_LIBKPATHSEA -I$cand/include"
- 		fi
- 	done
- 	if test -z "$kpathsea_dir"; then
diff --git a/textproc/bibtool/files/patch-main.c b/textproc/bibtool/files/patch-main.c
deleted file mode 100644
index b8b4648a62b4..000000000000
--- a/textproc/bibtool/files/patch-main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./main.c.orig	2004-02-08 09:41:38.000000000 +0000
-+++ ./main.c	2014-01-25 23:08:47.000000000 +0000
-@@ -331,17 +331,6 @@
- 
- 
- /*-----------------------------------------------------------------------------
--** Function:	true()
--** Type:	static int
--** Purpose:	
--**		
--** Arguments:
--**		
--** Returns:	
--**___________________________________________________			     */
--static int true() { return TRUE; }
--
--/*-----------------------------------------------------------------------------
- ** Function:	keep_selected()
- ** Type:	static int
- ** Purpose:	
diff --git a/textproc/bibtool/pkg-plist b/textproc/bibtool/pkg-plist
index fb54ab00408f..d5fda1920665 100644
--- a/textproc/bibtool/pkg-plist
+++ b/textproc/bibtool/pkg-plist
@@ -1,4 +1,5 @@
 bin/bibtool
+lib/BibTool/biblatex.rsc
 lib/BibTool/braces.rsc
 lib/BibTool/check_y.rsc
 lib/BibTool/default.rsc