Make tex-bagpipetex build with recent pdftex

- Use pdftex and musixtex to generate PDF directly.

2 files changed, 41 insertions, 53 deletions

diff --git a/print/tex-bagpipetex/Makefile b/print/tex-bagpipetex/Makefile
index 6c98ab5fe81..ddd5ea52415 100644
--- a/print/tex-bagpipetex/Makefile
+++ b/print/tex-bagpipetex/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2012/12/24 05:17:51 dholland Exp $
+# $NetBSD: Makefile,v 1.15 2013/11/13 19:23:27 minskim Exp $
 #
 
 DISTNAME=	bagpipetex-3.01
 PKGNAME=	tex-${DISTNAME}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	http://www.stanford.edu/~wrinnes/bagpipe.tex/distribution/
 DISTFILES=	bagpipe301.tar.gz
@@ -12,53 +12,45 @@ MAINTAINER=	dgriffi@cs.csubak.edu
 HOMEPAGE=	http://www.stanford.edu/~wrinnes/bagpipe.tex/
 COMMENT=	MusixTeX macros to typeset bagpipe music
 
-BUILD_DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
+BUILD_DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
 DEPENDS+=	tex-musixtex>=1.15:../../print/tex-musixtex
 
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 
-INSTALLATION_DIRS=	share/texmf/doc/bagpipetex \
-			share/texmf/doc/bagpipetex/examples \
-			share/texmf/fonts/tfm/bagpipetex \
-			share/texmf/fonts/source/bagpipetex \
-			share/texmf/tex/latex/bagpipetex
+INSTALLATION_DIRS=	share/texmf-dist/doc/bagpipetex \
+			share/texmf-dist/doc/bagpipetex/examples \
+			share/texmf-dist/fonts/tfm/bagpipetex \
+			share/texmf-dist/fonts/source/bagpipetex \
+			share/texmf-dist/tex/latex/bagpipetex
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/README \
-		${WRKSRC}/bagdoc.dvi \
-		${WRKSRC}/bagdoc.ps \
-		${WRKSRC}/bagdoc.tex \
-		${WRKSRC}/quickref.dvi \
-		${WRKSRC}/quickref.ps \
-		${WRKSRC}/quickref.tex \
-		${DESTDIR}${PREFIX}/share/texmf/doc/bagpipetex
+		${WRKSRC}/bagdoc.pdf \
+		${WRKSRC}/quickref.pdf \
+		${DESTDIR}${PREFIX}/share/texmf-dist/doc/bagpipetex
 	${INSTALL_DATA} ${WRKSRC}/Green.tex \
-		${DESTDIR}${PREFIX}/share/texmf/doc/bagpipetex/examples
+		${DESTDIR}${PREFIX}/share/texmf-dist/doc/bagpipetex/examples
 	${INSTALL_DATA} ${WRKSRC}/GreenTwo.tex \
-		${DESTDIR}${PREFIX}/share/texmf/doc/bagpipetex/examples
+		${DESTDIR}${PREFIX}/share/texmf-dist/doc/bagpipetex/examples
 	${INSTALL_DATA} ${WRKSRC}/Bonnets.tex \
-		${DESTDIR}${PREFIX}/share/texmf/doc/bagpipetex/examples
+		${DESTDIR}${PREFIX}/share/texmf-dist/doc/bagpipetex/examples
 	${INSTALL_DATA} ${WRKSRC}/Washer.tex \
-		${DESTDIR}${PREFIX}/share/texmf/doc/bagpipetex/examples
+		${DESTDIR}${PREFIX}/share/texmf-dist/doc/bagpipetex/examples
 	${INSTALL_DATA} ${WRKSRC}/BlackDonald.tex \
-		${DESTDIR}${PREFIX}/share/texmf/doc/bagpipetex/examples
+		${DESTDIR}${PREFIX}/share/texmf-dist/doc/bagpipetex/examples
 	${INSTALL_DATA} ${WRKSRC}/*.mf \
-		${DESTDIR}${PREFIX}/share/texmf/fonts/source/bagpipetex
+		${DESTDIR}${PREFIX}/share/texmf-dist/fonts/source/bagpipetex
 	${INSTALL_DATA} ${WRKSRC}/*.tfm \
-		${DESTDIR}${PREFIX}/share/texmf/fonts/tfm/bagpipetex
+		${DESTDIR}${PREFIX}/share/texmf-dist/fonts/tfm/bagpipetex
 	${INSTALL_DATA} ${WRKSRC}/bagpipe.tex \
-		${DESTDIR}${PREFIX}/share/texmf/tex/latex/bagpipetex
+		${DESTDIR}${PREFIX}/share/texmf-dist/tex/latex/bagpipetex
 	${INSTALL_DATA} ${WRKSRC}/*.ini \
-		${DESTDIR}${PREFIX}/share/texmf/tex/latex/bagpipetex
+		${DESTDIR}${PREFIX}/share/texmf-dist/tex/latex/bagpipetex
 
 do-build:
-	cd ${WRKDIR} && tex bagdoc
-	cd ${WRKDIR} && dvips bagdoc.dvi -o bagdoc.ps
+	cd ${WRKDIR} && pdftex bagdoc
 	cd ${WRKDIR} && musixtex quickref
-	cd ${WRKDIR} && musixflx quickref
-	cd ${WRKDIR} && musixtex quickref
-	cd ${WRKDIR} && dvips quickref.dvi -o quickref.ps
 
 .include "../../print/kpathsea/texmf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-bagpipetex/PLIST b/print/tex-bagpipetex/PLIST
index 5ec16e0f5ec..30844a2314c 100644
--- a/print/tex-bagpipetex/PLIST
+++ b/print/tex-bagpipetex/PLIST
@@ -1,24 +1,20 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:12:00 joerg Exp $
-share/texmf/doc/bagpipetex/README
-share/texmf/doc/bagpipetex/bagdoc.dvi
-share/texmf/doc/bagpipetex/bagdoc.ps
-share/texmf/doc/bagpipetex/bagdoc.tex
-share/texmf/doc/bagpipetex/examples/BlackDonald.tex
-share/texmf/doc/bagpipetex/examples/Bonnets.tex
-share/texmf/doc/bagpipetex/examples/Green.tex
-share/texmf/doc/bagpipetex/examples/GreenTwo.tex
-share/texmf/doc/bagpipetex/examples/Washer.tex
-share/texmf/doc/bagpipetex/quickref.dvi
-share/texmf/doc/bagpipetex/quickref.ps
-share/texmf/doc/bagpipetex/quickref.tex
-share/texmf/fonts/source/bagpipetex/beamn09.mf
-share/texmf/fonts/source/bagpipetex/musicd09.mf
-share/texmf/fonts/source/bagpipetex/musikd09.mf
-share/texmf/fonts/source/bagpipetex/musikn09.mf
-share/texmf/fonts/source/bagpipetex/musix09.mf
-share/texmf/fonts/tfm/bagpipetex/beamn09.tfm
-share/texmf/fonts/tfm/bagpipetex/musikn09.tfm
-share/texmf/fonts/tfm/bagpipetex/musix09.tfm
-share/texmf/tex/latex/bagpipetex/bagpipe.ini
-share/texmf/tex/latex/bagpipetex/bagpipex.ini
-share/texmf/tex/latex/bagpipetex/bagpipe.tex
+@comment $NetBSD: PLIST,v 1.6 2013/11/13 19:23:27 minskim Exp $
+share/texmf-dist/doc/bagpipetex/README
+share/texmf-dist/doc/bagpipetex/bagdoc.pdf
+share/texmf-dist/doc/bagpipetex/examples/BlackDonald.tex
+share/texmf-dist/doc/bagpipetex/examples/Bonnets.tex
+share/texmf-dist/doc/bagpipetex/examples/Green.tex
+share/texmf-dist/doc/bagpipetex/examples/GreenTwo.tex
+share/texmf-dist/doc/bagpipetex/examples/Washer.tex
+share/texmf-dist/doc/bagpipetex/quickref.pdf
+share/texmf-dist/fonts/source/bagpipetex/beamn09.mf
+share/texmf-dist/fonts/source/bagpipetex/musicd09.mf
+share/texmf-dist/fonts/source/bagpipetex/musikd09.mf
+share/texmf-dist/fonts/source/bagpipetex/musikn09.mf
+share/texmf-dist/fonts/source/bagpipetex/musix09.mf
+share/texmf-dist/fonts/tfm/bagpipetex/beamn09.tfm
+share/texmf-dist/fonts/tfm/bagpipetex/musikn09.tfm
+share/texmf-dist/fonts/tfm/bagpipetex/musix09.tfm
+share/texmf-dist/tex/latex/bagpipetex/bagpipe.ini
+share/texmf-dist/tex/latex/bagpipetex/bagpipex.ini
+share/texmf-dist/tex/latex/bagpipetex/bagpipe.tex