Update to version 1.06.

No functional changes since last packaged version (1.04).

While here update HOMEPAGE, MAINTAINER and add test target support.

3 files changed, 22 insertions, 43 deletions

diff --git a/textproc/bibparse/Makefile b/textproc/bibparse/Makefile
index 535d600ef89..a43d3ec76bb 100644
--- a/textproc/bibparse/Makefile
+++ b/textproc/bibparse/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2004/04/13 02:24:05 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/23 16:30:10 seb Exp $
 #
 
-DISTNAME=	bibparse-1.04
+DISTNAME=	bibparse-1.06
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.math.utah.edu/pub/tex/bib/
+MASTER_SITES=	http://www.math.utah.edu/pub/bibparse/
 
-MAINTAINER=	seb@pbox.org
+MAINTAINER=	seb@NetBSD.org
 HOMEPAGE=	http://www.math.utah.edu/pub/bibparse/
 COMMENT=	Syntax checking tools for BibTeX bibliography databases
 
@@ -14,4 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=	YES
 USE_BUILDLINK3=	YES
 
+TEST_TARGET=	check
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/bibparse/distinfo b/textproc/bibparse/distinfo
index 1e00561ea9a..65d4b14552b 100644
--- a/textproc/bibparse/distinfo
+++ b/textproc/bibparse/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/07/24 13:47:34 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/12/23 16:30:10 seb Exp $
 
-SHA1 (bibparse-1.04.tar.gz) = 807702fd74965a3dc3ea2236a9677d47676fef95
-Size (bibparse-1.04.tar.gz) = 837735 bytes
-SHA1 (patch-aa) = 971dbda54d4586c1feaf4f220a582c8ee0c2b57f
+SHA1 (bibparse-1.06.tar.gz) = 74e356264cb8c11b212d8a61c503bbf915a0729c
+Size (bibparse-1.06.tar.gz) = 856432 bytes
+SHA1 (patch-aa) = b9fd8a0d82d8ee2d4a0b19b68558184e38572a75
 SHA1 (patch-ab) = facf719e4ea6ad2857b08145857246d4ee871138
diff --git a/textproc/bibparse/patches/patch-aa b/textproc/bibparse/patches/patch-aa
index 6f6c50e9eff..8bee91e1d70 100644
--- a/textproc/bibparse/patches/patch-aa
+++ b/textproc/bibparse/patches/patch-aa
@@ -1,22 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/24 13:47:34 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/23 16:30:10 seb Exp $
 
---- Makefile.in.orig	Thu Oct 21 18:08:35 1999
+--- Makefile.in.orig	2004-09-23 21:15:48.000000000 +0000
 +++ Makefile.in
-@@ -62,7 +62,12 @@
- # [16-Jan-1993]
- # ======================================================================
- 
--prefix		= /usr/local
-+prefix		= @prefix@
-+
-+srcdir		= @srcdir@
-+VPATH		= @srcdir@
-+
-+top_builddir	= .
- 
- # Change these to suit local conventions:
- BINDIR		= $(prefix)/bin
-@@ -213,6 +218,15 @@
+@@ -213,6 +213,14 @@ MV		= @MV@
  
  NROFF		= @NROFF@
  
@@ -28,41 +14,32 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/24 13:47:34 wiz Exp $
 +INSTALL_MAN_DIR		= $(BSD_INSTALL_MAN_DIR)
 +INSTALL_DATA_DIR	= $(BSD_INSTALL_DATA_DIR)
 +
-+
  # This variable defined to be empty, with the intent that the user can
  # set it on the make command line at build time to choose fancy
  # compiler-dependent optimization switches.
-@@ -387,16 +401,13 @@
- 
+@@ -388,11 +396,7 @@ TXT-FILES	= $(MAN-FILES:.man=.txt)
  all:	programs
  
--bibdup.sh:	bibdup.sin Makefile
+ bibdup.sh:	bibdup.sin Makefile
 -	-$(RM) -f $@
 -	$(SED)  -e 's=_LIBDIR_=$(SHRLIBDIR)=g' \
 -		-e 's=_BINDIR_=$(BINDIR)=g' \
 -		-e 's=_AWK_=$(AWK)=g' \
 -		<bibdup.sin >$@
-+bibdup.sh:	$(srcdir)/bibdup.sin $(top_builddir)/config.status
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$@:bibdup.sin CONFIG_HEADERS= $(SHELL) ./config.status
++	CONFIG_FILES=$@:bibdup.sin CONFIG_HEADERS= $(SHELL) ./config.status
  	$(CHMOD) 555 $@
  
  biblex:	lexmain.c biblex.c args.h bibyydcl.h token.h
--	$(CC) $(CFLAGS) -o biblex lexmain.c biblex.c $(LDFLAGS) $(LIBS)
-+	$(CC) $(CFLAGS) -o biblex $(srcdir)/lexmain.c biblex.c $(LDFLAGS) $(LIBS)
- 
- biblex.c:	biblex.l
- 
-@@ -555,7 +566,7 @@
+@@ -560,7 +564,7 @@ dw:
  
  html-files:	$(HTML-FILES)
  
 -install:	install-programs install-lib install-man install-show
 +install:	install-programs install-lib install-man
  
- install-ftp:	bibparse.jar bibparse.shr bibparse.tar bibparse.zip \
- 		bibparse.zoo uninstall-ftp
-@@ -572,25 +583,23 @@
+ install-ftp:	dist uninstall-ftp
+ 	$(CP) bibparse-$(VERSION).jar $(FTPDIR)
+@@ -576,25 +580,23 @@ install-ftp:	dist uninstall-ftp
  	$(LS) -l $(FTPDIR)/bibparse-$(VERSION)*
  
  install-lib:	uninstall-lib
@@ -70,7 +47,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/24 13:47:34 wiz Exp $
 -	$(CP) bibdup.awk $(SHRLIBDIR)/bibdup.awk
 -	$(CHMOD) 664 $(SHRLIBDIR)/bibdup.awk
 +	-$(INSTALL_DATA_DIR) $(SHRLIBDIR)
-+	$(INSTALL_DATA) $(srcdir)/bibdup.awk $(SHRLIBDIR)/bibdup.awk
++	$(INSTALL_DATA) bibdup.awk $(SHRLIBDIR)/bibdup.awk
  
  install-man:	uninstall-man
 +	-$(INSTALL_MAN_DIR) $(MANDIR)/man$(MANEXT)
@@ -78,7 +55,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/24 13:47:34 wiz Exp $
  	do \
 -		$(CP) $$program.man $(MANDIR)/man$(MANEXT)/$$program.1 ; \
 -		$(CHMOD) 664 $(MANDIR)/man$(MANEXT)/$$program.1 ; \
-+		$(INSTALL_MAN) $(srcdir)/$$program.man $(MANDIR)/man$(MANEXT)/$$program.1 ; \
++		$(INSTALL_MAN) $$program.man $(MANDIR)/man$(MANEXT)/$$program.1 ; \
  	done
  
  install-programs:	$(PROGRAMS) bibdup.sh uninstall-programs