Index: head/textproc/bibtool/Makefile
===================================================================
--- head/textproc/bibtool/Makefile	(revision 389340)
+++ head/textproc/bibtool/Makefile	(revision 389341)
@@ -1,33 +1,33 @@
 # Created by: Rong-En Fan <rafan@infor.org>
 # $FreeBSD$
 
 PORTNAME=	bibtool
-PORTVERSION=	2.59
+PORTVERSION=	2.60
 CATEGORIES=	textproc print
 MASTER_SITES=	TEX_CTAN/biblio/bibtex/utils/${PORTNAME}
 DISTNAME=	BibTool-${PORTVERSION}
 
 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
-EXTRACT_AFTER_ARGS=-k		# work around bad symlink in 2.58 tarfile
+EXTRACT_AFTER_ARGS=-k		# work around bad symlink in 2.60 tarfile
 INSTALL_TARGET=	install install.man
 
 PORTDOCS=	bibtool.pdf ref_card.pdf c_lib.pdf
 
 post-build:
 	cd ${WRKSRC} && ${MAKE} doc && ${MAKE} doc
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
Index: head/textproc/bibtool/distinfo
===================================================================
--- head/textproc/bibtool/distinfo	(revision 389340)
+++ head/textproc/bibtool/distinfo	(revision 389341)
@@ -1,2 +1,2 @@
-SHA256 (BibTool-2.59.tar.gz) = 26dcf100400fe26b614301b49c4f775f458390e088faa659057cbc173f6f0cd8
-SIZE (BibTool-2.59.tar.gz) = 705387
+SHA256 (BibTool-2.60.tar.gz) = e53b14a05ecf143a1de9ea21ae9d10709438fff48b70a97d930542003a8a0ef9
+SIZE (BibTool-2.60.tar.gz) = 705777
Index: head/textproc/bibtool/files/patch-AutoConf__makefile.in
===================================================================
--- head/textproc/bibtool/files/patch-AutoConf__makefile.in	(revision 389340)
+++ head/textproc/bibtool/files/patch-AutoConf__makefile.in	(revision 389341)
@@ -1,47 +1,47 @@
---- ./AutoConf/makefile.in.orig	2004-02-08 09:46:11.000000000 +0000
-+++ ./AutoConf/makefile.in	2014-01-25 23:08:47.000000000 +0000
-@@ -25,7 +25,7 @@
+--- AutoConf/makefile.in.orig	2015-02-09 19:29:03 UTC
++++ AutoConf/makefile.in
+@@ -23,7 +23,7 @@
  #  Configuration Section
  # =============================================================================
  # 
 -prefix	    = @prefix@
 +prefix	    = $(DESTDIR)@prefix@
  exec_prefix = @exec_prefix@
  
  # -------------------------------------------------------
-@@ -42,7 +42,7 @@
+@@ -48,7 +48,7 @@ BINDIR     = @bindir@
  #  Additionally name the section of the man pages to use.
  #  This should be 1 (user commands), l (local), or n (new)
  # 
 -MANDIR     = @mandir@
 +MANDIR     = $(DESTDIR)@mandir@
  MANSECT    = 1
  
  # -------------------------------------------------------
-@@ -67,7 +67,7 @@
+@@ -73,7 +73,7 @@ INCLUDEDIR = @includedir@/bibtool
  #  Name the C compiler
  # 
  
 -CC         = @CC@
 +CC         ?= @CC@
  
  # -------------------------------------------------------
  #  CFLAGS are the flags for the C compiler.
-@@ -78,7 +78,7 @@
+@@ -84,7 +84,7 @@ CC         = @CC@
  # 	   optimizer is turned on.
  # 
  
 -CFLAGS     = @CFLAGS@
 +CFLAGS     += -DHAVE_PROTOTYPES
  # CFLAGS = -O
  #  GNU C
  # CFLAGS = -g -Wall
-@@ -461,7 +461,7 @@
+@@ -478,7 +478,7 @@ $(OFILES): $(MAKEFILE)
  #  Targets from the GNU Regular Expression Library.
  
  regex$(OBJ): $(REGEX_DIR)$(DIR_SEP)regex.c $(MAKEFILE)
 -	$(CC) $(C_FLAGS) -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@
 +	$(CC) $(C_FLAGS) -DSTDC_HEADERS -I$(REGEX_DIR) -I.. $(NON_ANSI_DEFS) $(REGEX_DIR)$(DIR_SEP)regex.c $(DONT_LINK) -o $@
  
  
  bibtcl: