pkglint- and other cleanups.

2 files changed, 11 insertions, 55 deletions

diff --git a/print/p5-biblatex-biber/DESCR b/print/p5-biblatex-biber/DESCR
index 3ce8c7a6278..3ef85f24284 100644
--- a/print/p5-biblatex-biber/DESCR
+++ b/print/p5-biblatex-biber/DESCR
@@ -1,43 +1,5 @@
-Biber is a BibTeX replacement for users of biblatex, with full Unicode
-support.
+Biber is a BibTeX replacement for users of biblatex, with full
+Unicode support.
 
-REQUIREMENTS
-
-  Biber is written in Perl with the aim of providing a
-  customised and sophisticated data preparation backend for biblatex.
-
-  The pkgsrc package has the necessary dependencies.
-
-SUPPORT AND DOCUMENTATION
-
-  After installing, biber --help will give you the basic documentation.
-  The latest PDF documentation can be found here:
-
-  https://sourceforge.net/projects/biblatex-biber/files/biblatex-biber
-
-  More information, bugfix releases, forums and bug tracker are available at:
-
-      http://biblatex-biber.sourceforge.net
-
-BUGS
-
-  Please report any bugs or feature requests on our sourceforge tracker at
-    https://sourceforge.net/tracker2/?func=browse&group_id=228270
-
-
-==========================
-
-COPYRIGHT AND LICENCE
-
-  Copyright (C) 2009--2012 François Charette and Philip Kime
-
-  This program is free software; you can redistribute it and/or
-  modify it under the terms of either:
-
-    * the GNU General Public License as published by the Free
-    Software Foundation; either version 1, or (at your option) any
-    later version, or
-
-    * the Artistic License version 2.0.
-
-==========================
+Biber is written in Perl with the aim of providing a customised
+and sophisticated data preparation backend for biblatex.
diff --git a/print/p5-biblatex-biber/Makefile b/print/p5-biblatex-biber/Makefile
index 1f78cf3bdfe..8e3a9cb724a 100644
--- a/print/p5-biblatex-biber/Makefile
+++ b/print/p5-biblatex-biber/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/05/29 23:37:17 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.9 2014/10/04 12:32:03 wiz Exp $
 
 VER=		0.9.9
 DISTNAME=	biblatex-biber
@@ -7,18 +6,14 @@ PKGNAME=	p5-biblatex-biber-${VER}
 PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/${VER}/
-# TODO: can I express this with MASTER_SITES_SOURCEFORGE ?
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://biblatex-biber.sourceforge.net/
 COMMENT=	Replacement of bibtex for users of BibLaTeX
-DIST_SUBDIR=	${DISTNAME}-${VER}
 LICENSE=	gnu-gpl-v1 OR artistic-2.0
 
-# TODO: Look for the dependencies in Build.PL.
-# no - that's for building the self-contained binary, which we won't.
-
-WRKSRC=			${WRKDIR}/biblatex-biber-v0.9.9	# XXX not ${VER} - that only works for >= 1.0
+DIST_SUBDIR=		${DISTNAME}-${VER}
+WRKSRC=			${WRKDIR}/${DISTNAME}-v${VER}
 
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/Biber/Config/.packlist
@@ -52,11 +47,10 @@ DEPENDS+=		p5-libwww-[0-9]*:../../www/p5-libwww
 BUILD_DEPENDS+=		p5-ExtUtils-LibBuilder>=0.4:../../devel/p5-ExtUtils-LibBuilder
 BUILD_DEPENDS+=		p5-Config-AutoConf>=0.1:../../devel/p5-Config-AutoConf
 
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
-
+INSTALLATION_DIRS=	bin
 
 post-install:
-		${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-		${INSTALL_SCRIPT} ${WRKSRC:Q}/bin/biber ${DESTDIR}${PREFIX}/bin
+		${INSTALL_SCRIPT} ${WRKSRC}/bin/biber ${DESTDIR}${PREFIX}/bin
 
+.include "../../lang/perl5/module.mk"
+.include "../../mk/bsd.pkg.mk"