From 7b1c7bfcdc03f802468420f78f407ba0e7feb02e Mon Sep 17 00:00:00 2001 From: minskim Date: Fri, 7 Apr 2006 03:01:36 +0000 Subject: - Install files into PKG_LOCALTEXMFPREFIX, instead of PKG_TEXMFPREFIX, and fix manual pages accordingly. - Use teTeX/module.mk to properly update ls-R. - Use texmf-dirs to install into texmf-local. Bump PKGREVISION. --- print/lgrind/Makefile | 19 ++++++++++--------- print/lgrind/PLIST | 4 +--- print/lgrind/distinfo | 8 ++++---- print/lgrind/patches/patch-aa | 8 ++++---- print/lgrind/patches/patch-ab | 12 ++++++------ print/lgrind/patches/patch-ac | 8 ++++---- 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile index 31c5ad94038..93fb7dbcee7 100644 --- a/print/lgrind/Makefile +++ b/print/lgrind/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2006/02/05 23:10:38 joerg Exp $ +# $NetBSD: Makefile,v 1.27 2006/04/07 03:01:36 minskim Exp $ DISTNAME= lgrind PKGNAME= lgrind-3.5 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .tar.bz2 @@ -13,11 +13,13 @@ COMMENT= Source pretty printer for LaTeX WRKSRC= ${WRKDIR}/lgrind/source NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL NO_CONFIGURE= yes +USE_DIRS+= texmf-1.0 TEX_ACCEPTED= teTeX1 teTeX2 teTeX3 .include "../../mk/x11.buildlink3.mk" +.include "../../print/teTeX/module.mk" -MAKE_ENV+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:Q} +MAKE_ENV+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q} pre-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile-prepatch @@ -28,16 +30,16 @@ pre-build: (cd ${WRKSRC}/.. ; ${PREFIX}/bin/latex lgrind.dtx) ${MV} ${WRKSRC}/lgrind.1 ${WRKSRC}/lgrind.1.bak ${MV} ${WRKSRC}/lgrindef.5 ${WRKSRC}/lgrindef.5.bak - ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${WRKSRC}/lgrind.1.bak > ${WRKSRC}/lgrind.1 - ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${WRKSRC}/lgrindef.5.bak > ${WRKSRC}/lgrindef.5 + ${SED} -e 's,@PREFIX@,${PREFIX},g' \ + -e 's,@LOCALTEXMFPREFIX@,${PKG_LOCALTEXMFPREFIX},g' \ + < ${WRKSRC}/lgrind.1.bak > ${WRKSRC}/lgrind.1 + ${SED} -e 's,@LOCALTEXMFPREFIX@,${PKG_LOCALTEXMFPREFIX},g' \ + < ${WRKSRC}/lgrindef.5.bak > ${WRKSRC}/lgrindef.5 pre-install: -mkdir ${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind -mkdir ${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind -post-install: - ${PREFIX}/bin/texconfig rehash - # The sources assume exists. Create a fake one for platforms # that don't have it. post-wrapper: @@ -46,5 +48,4 @@ post-wrapper: > ${BUILDLINK_DIR}/include/malloc.h; \ fi -.include "../../mk/tex.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/lgrind/PLIST b/print/lgrind/PLIST index ddec5f8ae08..3efac786ad6 100644 --- a/print/lgrind/PLIST +++ b/print/lgrind/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2005/11/08 20:30:29 tonio Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/04/07 03:01:36 minskim Exp $ bin/lgrind ${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind/lgrindef ${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind/lgrind.dvi @@ -7,5 +7,3 @@ man/man1/lgrind.1 man/man5/lgrindef.5 @dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind @dirrm ${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind -@exec %D/bin/mktexlsr -@unexec %D/bin/mktexlsr diff --git a/print/lgrind/distinfo b/print/lgrind/distinfo index 251211df0b0..ec37159b24a 100644 --- a/print/lgrind/distinfo +++ b/print/lgrind/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2005/11/08 20:30:29 tonio Exp $ +$NetBSD: distinfo,v 1.6 2006/04/07 03:01:36 minskim Exp $ SHA1 (lgrind.tar.bz2) = 152d92ccdcb9bc7342f6aec6c4c009d124f7e812 RMD160 (lgrind.tar.bz2) = c32b0002d95e3dec58d03ba39e58dd798058e0eb Size (lgrind.tar.bz2) = 90624 bytes -SHA1 (patch-aa) = bc0ac18edfd1c7d0cbc2554d80cef62a60f38ec5 -SHA1 (patch-ab) = cf62c0aafe78806f2c83d8ba8410da9d692dcf7d -SHA1 (patch-ac) = e6fc5bdebe7c138aad45acd545b63acaed70d356 +SHA1 (patch-aa) = fe4cfcebbfe2a4fb6f202cbbd9b3bc4c798c343d +SHA1 (patch-ab) = a843a7bfda99fb073f809b42339c409a13864f70 +SHA1 (patch-ac) = 61ded0486a4f6c135fb26a4cf185a197f9ce1db3 SHA1 (patch-ad) = a475dd078de2d92ffdd23592fd16ae489cec5dee diff --git a/print/lgrind/patches/patch-aa b/print/lgrind/patches/patch-aa index aa17bc25a69..a1853234498 100644 --- a/print/lgrind/patches/patch-aa +++ b/print/lgrind/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2005/11/08 20:30:29 tonio Exp $ +$NetBSD: patch-aa,v 1.6 2006/04/07 03:01:36 minskim Exp $ --- Makefile.orig 2005-11-08 21:18:37.000000000 +0100 +++ Makefile @@ -15,9 +15,9 @@ $NetBSD: patch-aa,v 1.5 2005/11/08 20:30:29 tonio Exp $ -TEXINPUTS=${BASEDIR}/texmf/tex/latex/lgrind -DOC=${BASEDIR}/texmf/doc/latex/lgrind -MAN=${BASEDIR}/man -+DEFSFILE=${PKG_TEXMFPREFIX}/tex/latex/lgrind/lgrindef -+TEXINPUTS=${PKG_TEXMFPREFIX}/tex/latex/lgrind -+DOC=${PKG_TEXMFPREFIX}/doc/latex/lgrind ++DEFSFILE=${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind/lgrindef ++TEXINPUTS=${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind ++DOC=${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind +MAN=${PREFIX}/man CC=gcc diff --git a/print/lgrind/patches/patch-ab b/print/lgrind/patches/patch-ab index 9700f12657b..c7b640f2402 100644 --- a/print/lgrind/patches/patch-ab +++ b/print/lgrind/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/03/10 17:03:13 jwise Exp $ +$NetBSD: patch-ab,v 1.2 2006/04/07 03:01:36 minskim Exp $ --- lgrind.1.orig Tue Mar 9 13:20:17 1999 +++ lgrind.1 Tue Mar 9 13:21:38 1999 @@ -43,7 +43,7 @@ @@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/03/10 17:03:13 jwise Exp $ .IP "\fB\-d\fP" specifies the language definitions file (default is -\fB/usr/TeX/texmf/tex/latex/lgrind/lgrindef\fP). -+\fB@PREFIX@/share/texmf/tex/latex/lgrind/lgrindef\fP). ++\fB@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef\fP). .IP "\fB\-d!\fP" same as above, but do it for now and the future. .IP "\fB\-l\fP" @@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/03/10 17:03:13 jwise Exp $ .PP For a more detailed explanation of these commands, refer to -\fC/usr/TeX/texmf/doc/latex/lgrind.dvi\fP. -+\fC@PREFIX@/share/texmf/doc/latex/lgrind.dvi\fP. ++\fC@LOCALTEXMFPREFIX@/doc/latex/lgrind.dvi\fP. .PP .SH "EMBEDDED PROGRAMS WITHIN A LaTeX FILE" (From Jerry Leichter's notes.) @@ -28,15 +28,15 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/03/10 17:03:13 jwise Exp $ Executable .PP -.IP "\fC/usr/TeX/texmf/doc/latex/lgrind/lgrind.dvi\fP" -+.IP "\fC@PREFIX@/share/texmf/doc/latex/lgrind/lgrind.dvi\fP" ++.IP "\fC@LOCALTEXMFPREFIX@/doc/latex/lgrind/lgrind.dvi\fP" Documentation .PP -.IP "\fC/usr/TeX/texmf/tex/latex/lgrind/lgrind.sty\fP" -+.IP "\fC@PREFIX@/share/texmf/tex/latex/lgrind/lgrind.sty\fP" ++.IP "\fC@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrind.sty\fP" LaTeX style file .PP -.IP "\fC/usr/TeX/texmf/tex/latex/lgrind/lgrindef\fP" -+.IP "\fC@PREFIX@/share/texmf/tex/latex/lgrind/lgrindef\fP" ++.IP "\fC@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef\fP" Language descriptions .PP .SH AUTHOR diff --git a/print/lgrind/patches/patch-ac b/print/lgrind/patches/patch-ac index cef928bf89a..3b03f9d88aa 100644 --- a/print/lgrind/patches/patch-ac +++ b/print/lgrind/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/03/10 17:03:13 jwise Exp $ +$NetBSD: patch-ac,v 1.2 2006/04/07 03:01:36 minskim Exp $ --- lgrindef.5.orig Tue Mar 9 13:22:25 1999 +++ lgrindef.5 Tue Mar 9 13:23:12 1999 @@ -17,7 +17,7 @@ @@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/03/10 17:03:13 jwise Exp $ asks me to work on it. Consider the LaTeX docs the real docs. .SH SYNOPSIS -.B /usr/TeX/texmf/tex/latex/lgrind/lgrindef -+.B @PREFIX@/share/texmf/tex/latex/lgrind/lgrindef ++.B @LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef .SH DESCRIPTION .IX "lgrindef file" "" "\fLlgrindef\fP \(em LGrind language definitions" .B lgrindef @@ -16,8 +16,8 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/03/10 17:03:13 jwise Exp $ .SH FILES -.ta \w'/usr/TeX/texmf/tex/latex/lgrind/lgrindef 'u -\fB/usr/TeX/texmf/tex/latex/lgrind/lgrindef\fR file containing terminal descriptions -+.ta \w'@PREFIX@/share/texmf/tex/latex/lgrind/lgrindef 'u -+\fB@PREFIX@/share/texmf/tex/latex/lgrind/lgrindef\fR file containing terminal descriptions ++.ta \w'@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef 'u ++\fB@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef\fR file containing terminal descriptions .SH "SEE ALSO" .BR latex (1), .BR lgrind (1), -- cgit v1.2.3