10 files changed, 25 insertions, 139 deletions

diff --git a/textproc/bibutils/Makefile b/textproc/bibutils/Makefile
index 5758c4edfabf..2ebe1c9a1de0 100644
--- a/textproc/bibutils/Makefile
+++ b/textproc/bibutils/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:	bibutils
-# Date created:		May 14, 2010
-# Whom:			Gabor Pali <pgj@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	bibutils
-PORTVERSION=	4.12
+PORTVERSION=	5.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.scripps.edu/~cdputnam/software/bibutils/
+MASTER_SITES=	SF/${PORTNAME}/
+
 DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 EXTRACT_SUFX=	.tgz
 
@@ -21,14 +17,18 @@ USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} 's|make |gmake |g' \
-		${WRKSRC}/Makefile_start
-
 do-configure:
 	@cd ${WRKSRC} && ./configure --install-dir ${PREFIX}/bin
 
 test: all
 	cd ${WRKSRC}/test && ${GMAKE} all test
 
+BINARIES=	bib2xml biblatex2xml copac2xml ebi2xml end2xml endx2xml \
+		isi2xml med2xml modsclean ris2xml wordbib2xml xml2ads \
+		xml2bib xml2end xml2isi xml2ris xml2wordbib
+
+.for binary in ${BINARIES}
+PLIST_FILES+=	bin/${binary}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/textproc/bibutils/distinfo b/textproc/bibutils/distinfo
index 0665ded962fb..e4ee4a233c59 100644
--- a/textproc/bibutils/distinfo
+++ b/textproc/bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bibutils_4.12_src.tgz) = 2b19875f9a525350e0a7ca5f3b95a1408fb3530fac11276d42e0b2e6c0dfe648
-SIZE (bibutils_4.12_src.tgz) = 816430
+SHA256 (bibutils_5.0_src.tgz) = 0a3f1dfc8f3ee98c2f6507e68358678fe355c5a3b3d0157dcab5d4fa2e6c662b
+SIZE (bibutils_5.0_src.tgz) = 458532
diff --git a/textproc/bibutils/files/patch-Makefile_start b/textproc/bibutils/files/patch-Makefile_start
deleted file mode 100644
index 9403ddd7000e..000000000000
--- a/textproc/bibutils/files/patch-Makefile_start
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./Makefile_start.orig	2010-10-10 19:42:50.000000000 +0200
-+++ ./Makefile_start	2011-07-31 01:06:08.000000000 +0200
-@@ -1,6 +1,6 @@
- POSTFIX=REPLACE_POSTFIX
--CC = REPLACE_CC
--RANLIB=REPLACE_RANLIB
-+%%SET_CC%%
-+%%SET_RANLIB%%
- INSTALLDIR=REPLACE_INSTALLDIR
- LIBINSTALLDIR=REPLACE_LIBINSTALLDIR
- 
-@@ -12,8 +12,8 @@
- 	xml2ads xml2bib xml2end xml2isi xml2ris xml2wordbib modsclean
- 
- all : FORCE
--	cd lib; make -k $(CC) -k $(RANLIB); cd ..
--	cd bin; make -k $(CC) -k VERSION="$(VERSION)" -k DATE="$(DATE)"; cd ..
-+	cd lib; make ; cd ..
-+	cd bin; make VERSION="$(VERSION)" DATE="$(DATE)"; cd ..
- 
- clean: FORCE
- 	cd lib     ; make clean ; cd ..
-@@ -31,11 +31,12 @@
- 	cd bin    ; make test; cd ..
- 
- install: all FORCE
--	cd lib ; make -k LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd ..
-+	cd lib ; make LIBINSTALLDIR=$(LIBINSTALLDIR) install; cd ..
- 	sed 's/VERSION/${VERSION}/g' packageconfig_start > lib/bibutils.pc
- 	@for p in ${PROGRAMS}; \
- 		do ( cp bin/$$p ${INSTALLDIR}/$$p ); \
- 	done
-+	cp lib/libbibutils.a ${INSTALLDIR}/../lib
- 
- package: all FORCE
- 	csh -f maketgz.csh ${VERSION} ${POSTFIX}
diff --git a/textproc/bibutils/files/patch-bin__Makefile b/textproc/bibutils/files/patch-bin__Makefile
deleted file mode 100644
index 041aa21928e5..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.orig	2010-10-10 19:49:05.000000000 +0200
-+++ ./bin/Makefile	2011-07-31 01:05:18.000000000 +0200
-@@ -2,7 +2,7 @@
- # bibutils converters MAKEFILE
- #
- 
--CFLAGS     = -I ../lib
-+CFLAGS     += -I ../lib
- LIBDIR     = -L../lib
- 
- TOMODS     = bibprog.o tomods.o args.o ../lib/modsout.o
diff --git a/textproc/bibutils/files/patch-bin__Makefile.dynamic b/textproc/bibutils/files/patch-bin__Makefile.dynamic
deleted file mode 100644
index fafe20bac3d2..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile.dynamic
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.dynamic.orig	2010-10-10 19:07:17.000000000 +0200
-+++ ./bin/Makefile.dynamic	2011-07-31 01:05:18.000000000 +0200
-@@ -4,7 +4,7 @@
- # dynamic linkage version
- #
- 
--CFLAGS     = -I ../lib
-+CFLAGS     += -I ../lib
- LDFLAGS    = -L ../lib
- LDLIBS     = -lbibutils
- 
diff --git a/textproc/bibutils/files/patch-bin__Makefile.static b/textproc/bibutils/files/patch-bin__Makefile.static
deleted file mode 100644
index ab69b1a81e23..000000000000
--- a/textproc/bibutils/files/patch-bin__Makefile.static
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./bin/Makefile.static.orig	2010-10-08 01:57:09.000000000 +0200
-+++ ./bin/Makefile.static	2011-07-31 01:05:18.000000000 +0200
-@@ -2,7 +2,7 @@
- # bibutils converters MAKEFILE
- #
- 
--CFLAGS     = -I ../lib
-+CFLAGS     += -I ../lib
- LIBDIR     = -L../lib
- 
- TOMODS     = bibprog.o tomods.o args.o ../lib/modsout.o
diff --git a/textproc/bibutils/files/patch-configure b/textproc/bibutils/files/patch-configure
index 8de3874cff3d..c0b5f708301b 100644
--- a/textproc/bibutils/files/patch-configure
+++ b/textproc/bibutils/files/patch-configure
@@ -1,13 +1,11 @@
---- ./configure.orig	2010-10-10 19:38:32.000000000 +0200
-+++ ./configure	2011-07-31 01:05:18.000000000 +0200
-@@ -153,8 +153,8 @@
- endif
- 
- cat $INPUT_FILE | \
--sed "s/REPLACE_CC/CC=${CC}/" | \
--sed "s/REPLACE_RANLIB/RANLIB=${RANLIB}/" | \
-+sed "s/%%SET_CC%%/CC?=${CC}/" | \
-+sed "s/%%SET_RANLIB%%/RANLIB?=${RANLIB}/" | \
- sed "s|REPLACE_INSTALLDIR|${INSTALLDIR}|" | \
- sed "s|REPLACE_LIBINSTALLDIR|${LIBINSTALLDIR}|" | \
- sed "s/REPLACE_POSTFIX/${POSTFIX}/" > $OUTPUT_FILE
+--- ./configure.orig	2013-05-28 07:21:47.000000000 +0200
++++ ./configure	2013-06-03 01:00:10.000000000 +0200
+@@ -247,7 +247,7 @@
+ 	RANLIB='ranlib'
+ 	POSTFIX='_netbsd'
+ elif [ "$type" = "FreeBSD" ] ; then
+-	CC='gcc'
++	CC='cc'
+ 	CFLAGS='-Wall'
+ 	if [ "$LIBTYPE" = "dynamic" ] ; then
+ 		CLIBFLAGS='-Wall -fPIC'
diff --git a/textproc/bibutils/files/patch-lib__Makefile.static b/textproc/bibutils/files/patch-lib__Makefile.static
deleted file mode 100644
index b37dfc308f13..000000000000
--- a/textproc/bibutils/files/patch-lib__Makefile.static
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./lib/Makefile.static.orig	2010-10-08 01:57:00.000000000 +0200
-+++ ./lib/Makefile.static	2011-07-31 01:05:18.000000000 +0200
-@@ -1,5 +1,5 @@
- #CC = gcc -Wall 
--RANLIB = echo
-+#RANLIB = echo
- 
- SIMPLE_OBJS   = is_ws.o strsearch.o charsets.o
- 
-@@ -31,12 +31,10 @@
- all: libbibcore.a libbibutils.a
- 
- libbibcore.a: $(BIBCORE_OBJS)
--	ar -cr $@ $^
--	$(RANLIB) $@
-+	$(AR) -cr $@ $^
- 
- libbibutils.a: $(BIBUTILS_OBJS)
--	ar -cr $@ $^
--	$(RANLIB) $@
-+	$(AR) -cr $@ $^
- 
- clean: 
- 	/bin/rm -f *.o core
diff --git a/textproc/bibutils/pkg-descr b/textproc/bibutils/pkg-descr
index 7aa3e4f84efd..b91ce0091214 100644
--- a/textproc/bibutils/pkg-descr
+++ b/textproc/bibutils/pkg-descr
@@ -5,4 +5,4 @@ RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N
 programs are required and not N^2-N. These programs operate on the
 command line and are styled after standard UNIX-like filters.
 
-WWW: http://www.scripps.edu/~cdputnam/software/bibutils/
+WWW: http://sourceforge.net/p/bibutils/home/Bibutils/
diff --git a/textproc/bibutils/pkg-plist b/textproc/bibutils/pkg-plist
deleted file mode 100644
index 3813820ebbd6..000000000000
--- a/textproc/bibutils/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $FreeBSD$
-bin/bib2xml
-bin/biblatex2xml
-bin/copac2xml
-bin/ebi2xml
-bin/end2xml
-bin/endx2xml
-bin/isi2xml
-bin/med2xml
-bin/modsclean
-bin/ris2xml
-bin/wordbib2xml
-bin/xml2ads
-bin/xml2bib
-bin/xml2end
-bin/xml2isi
-bin/xml2ris
-bin/xml2wordbib
-lib/libbibutils.a