Convert back to using texlive package. Bump PKGREVISION as PLIST changed.

7 files changed, 27 insertions, 53 deletions

diff --git a/print/tex-biblatex-doc/Makefile b/print/tex-biblatex-doc/Makefile
index 3433f05997b..841a68c784f 100644
--- a/print/tex-biblatex-doc/Makefile
+++ b/print/tex-biblatex-doc/Makefile
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2015/02/16 17:31:32 nros Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/21 22:45:53 markd Exp $
 
-.include "../../print/tex-biblatex/Makefile.common"
-
-PKGNAME=	tex-${DISTNAME:S/.tds//:S/-/-doc-/}
+DISTNAME=	biblatex.doc
+PKGNAME=	tex-${DISTNAME:S/./-/}-2.9a
+TEXLIVE_REV=	34433
+PKGREVISION=	1
 
+MAINTAINER=	markd@NetBSD.org
 COMMENT=	Documentation for tex-biblatex
+LICENSE=	lppl-1.3c
 
-do-install:
-	cd ${WRKSRC}/doc && \
-	${PAX} -rwpm latex \
-		${DESTDIR}${PREFIX}/share/texmf-dist/doc && \
-	${INSTALL_DATA} ${WRKSRC}/doc/biblatex.pdf \
-		${DESTDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex
-
-.include "../../print/kpathsea/texmf.mk"
+.include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-biblatex-doc/PLIST b/print/tex-biblatex-doc/PLIST
index aea92b5cf1d..4895a9a6d17 100644
--- a/print/tex-biblatex-doc/PLIST
+++ b/print/tex-biblatex-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/02/16 17:31:32 nros Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/04/21 22:45:53 markd Exp $
 share/texmf-dist/doc/latex/biblatex/README
 share/texmf-dist/doc/latex/biblatex/RELEASE
 share/texmf-dist/doc/latex/biblatex/biblatex.pdf
@@ -139,4 +139,3 @@ share/texmf-dist/doc/latex/biblatex/examples/91-sorting-schemes.tex
 share/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.pdf
 share/texmf-dist/doc/latex/biblatex/examples/92-bibliographylists.tex
 share/texmf-dist/doc/latex/biblatex/examples/biblatex-examples.bib
-share/texmf-dist/doc/latex/biblatex/notes.org
diff --git a/print/tex-biblatex-doc/distinfo b/print/tex-biblatex-doc/distinfo
index 90b091ee4f9..17dce47152e 100644
--- a/print/tex-biblatex-doc/distinfo
+++ b/print/tex-biblatex-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2015/02/16 17:31:32 nros Exp $
+$NetBSD: distinfo,v 1.3 2015/04/21 22:45:53 markd Exp $
 
-SHA1 (biblatex-2.9a.tds.tgz) = 7eab40e173664deb117dc06389df2d2f8764c6f4
-RMD160 (biblatex-2.9a.tds.tgz) = 8676972103bb0d9ba163aebf1a1a7d44707d9ce4
-Size (biblatex-2.9a.tds.tgz) = 17829003 bytes
+SHA1 (tex-biblatex-34433/biblatex.doc.tar.xz) = ace9511ba73905623545b4d0bdd7c44eabd4896a
+RMD160 (tex-biblatex-34433/biblatex.doc.tar.xz) = 201f25b46be80ce059b202ba2a31dac77abd3ae0
+Size (tex-biblatex-34433/biblatex.doc.tar.xz) = 6717428 bytes
diff --git a/print/tex-biblatex/Makefile b/print/tex-biblatex/Makefile
index 33335e4ad4e..f8913be52a8 100644
--- a/print/tex-biblatex/Makefile
+++ b/print/tex-biblatex/Makefile
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2015/02/16 17:27:44 nros Exp $
+# $NetBSD: Makefile,v 1.4 2015/04/21 22:45:53 markd Exp $
 
-.include "Makefile.common"
-
-PKGNAME=	tex-${DISTNAME:S/.tds//}
+DISTNAME=	biblatex
+PKGNAME=	tex-${DISTNAME}-2.9a
+TEXLIVE_REV=	34433
+PKGREVISION=	1
 
+MAINTAINER=	markd@NetBSD.org
 COMMENT=	Bibliographies in LaTeX using BibTeX for sorting only
+LICENSE=	lppl-1.3c
 
 DEPENDS+=	tex-etex-[0-9]*:../../print/tex-etex
 DEPENDS+=	tex-bibtex-[0-9]*:../../print/tex-bibtex
@@ -13,10 +16,5 @@ DEPENDS+=	tex-logreq>=1.0:../../print/tex-logreq
 DEPENDS+=	tex-url-[0-9]*:../../print/tex-url
 DEPENDS+=	p5-biblatex-biber>=1.9:../../print/p5-biblatex-biber
 
-do-install:
-	cd ${WRKSRC} && \
-	${PAX} -rwpm bibtex ${DESTDIR}${PREFIX}/share/texmf-dist && \
-	${PAX} -rwpm tex ${DESTDIR}${PREFIX}/share/texmf-dist
-
-.include "../../print/kpathsea/texmf.mk"
+.include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-biblatex/Makefile.common b/print/tex-biblatex/Makefile.common
deleted file mode 100644
index f32ef1e327a..00000000000
--- a/print/tex-biblatex/Makefile.common
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2015/02/16 17:27:44 nros Exp $
-#
-# Used by:
-# print/tex-biblatex/Makefile
-# print/tex-biblatex-doc/Makefile
-
-DISTNAME=	biblatex-2.9a.tds
-CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=biblatex/}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	markd@NetBSD.org
-LICENSE=	lppl-1.3c
-
-USE_TOOLS+=	pax
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}
-
-INSTALLATION_DIRS+=share/texmf-dist
diff --git a/print/tex-biblatex/PLIST b/print/tex-biblatex/PLIST
index 6237685cd7e..4fb6a1f3185 100644
--- a/print/tex-biblatex/PLIST
+++ b/print/tex-biblatex/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2015/02/16 17:27:44 nros Exp $
-share/texmf-dist/bibtex/bib/biblatex/biblatex-examples.bib
+@comment $NetBSD: PLIST,v 1.3 2015/04/21 22:45:53 markd Exp $
+share/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
 share/texmf-dist/bibtex/bst/biblatex/biblatex.bst
 share/texmf-dist/bibtex/csf/biblatex/latin1.csf
 share/texmf-dist/bibtex/csf/biblatex/latin1_at.csf
diff --git a/print/tex-biblatex/distinfo b/print/tex-biblatex/distinfo
index 9fb38421b17..5886cafb2c4 100644
--- a/print/tex-biblatex/distinfo
+++ b/print/tex-biblatex/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2015/02/16 17:27:44 nros Exp $
+$NetBSD: distinfo,v 1.3 2015/04/21 22:45:53 markd Exp $
 
-SHA1 (biblatex-2.9a.tds.tgz) = 7eab40e173664deb117dc06389df2d2f8764c6f4
-RMD160 (biblatex-2.9a.tds.tgz) = 8676972103bb0d9ba163aebf1a1a7d44707d9ce4
-Size (biblatex-2.9a.tds.tgz) = 17829003 bytes
+SHA1 (tex-biblatex-34433/biblatex.tar.xz) = abec032cdb16b4ce476b105d0294fe2e428493e3
+RMD160 (tex-biblatex-34433/biblatex.tar.xz) = 62caa532707331276e28e444719f2bff62aae1c1
+Size (tex-biblatex-34433/biblatex.tar.xz) = 166316 bytes