Let lgrind honor the TeX Live directory structure.

9 files changed, 86 insertions, 69 deletions

diff --git a/print/lgrind/Makefile b/print/lgrind/Makefile
index b78643ca846..c169538182e 100644
--- a/print/lgrind/Makefile
+++ b/print/lgrind/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2009/08/20 15:24:59 jwise Exp $
+# $NetBSD: Makefile,v 1.33 2011/10/18 23:25:50 minskim Exp $
 
 DISTNAME=	lgrind
 PKGNAME=	lgrind-3.5
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,40 +10,55 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Source pretty printer for LaTeX
 
-WRKSRC=		${WRKDIR}/lgrind/source
+BUILD_DEPENDS+=	tex-tools-[0-9]*:../../print/tex-tools
+DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+WRKSRC=		${WRKDIR}/lgrind
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 NO_CONFIGURE=	yes
-TEX_ACCEPTED=	teTeX3
-
-.include "../../print/teTeX/module.mk"
 
+EVAL_PREFIX+=	LATEX_PREFIX=tex-latex-bin
 MAKE_ENV+=	PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:Q}
 
+.include "../../print/kpathsea/texmf.mk"
+
+INSTALLATION_DIRS=	bin man/man1 man/man5 \
+			share/texmf-dist/doc/latex/lgrind \
+			share/texmf-dist/tex/latex/lgrind
+
 pre-patch:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile-prepatch
-	${SED} -e '/Id/s|\$$||g' ${WRKSRC}/Makefile-prepatch > ${WRKSRC}/Makefile
+	${MV} ${WRKSRC}/source/Makefile ${WRKSRC}/source/Makefile-prepatch
+	${SED} -e '/Id/s|\$$||g' ${WRKSRC}/source/Makefile-prepatch > \
+		${WRKSRC}/source/Makefile
 
 pre-build:
-	(cd ${WRKSRC}/.. ; ${PREFIX}/bin/latex lgrind.ins)
-	(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' \
-		-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
-
-# The sources assume <malloc.h> exists.  Create a fake one for platforms
-# that don't have it.
-post-wrapper:
-	if ${TEST} ! -f /usr/include/malloc.h; then		\
-		${ECHO} "#include <stdlib.h>"			\
-			> ${BUILDLINK_DIR}/include/malloc.h;	\
-	fi
+	(cd ${WRKSRC} && ${LATEX_PREFIX}/bin/latex lgrind.ins)
+	(cd ${WRKSRC} && ${LATEX_PREFIX}/bin/pdflatex lgrind.dtx)
+	${MV} ${WRKSRC}/source/lgrind.1 ${WRKSRC}/source/lgrind.1.bak
+	${MV} ${WRKSRC}/source/lgrindef.5 ${WRKSRC}/source/lgrindef.5.bak
+	${SED} -e 's,@PREFIX@,${PREFIX},g' \
+		< ${WRKSRC}/source/lgrind.1.bak > ${WRKSRC}/source/lgrind.1
+	${SED} -e 's,@PREFIX@,${PREFIX},g' \
+		< ${WRKSRC}/source/lgrindef.5.bak > ${WRKSRC}/source/lgrindef.5
+
+do-build:
+	${RUN} cd ${WRKSRC}/source && \
+		${SETENV} ${MAKE_ENV} \
+		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/source/lgrind ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/source/lgrind.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_MAN} ${WRKSRC}/source/lgrindef.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/
+	${INSTALL_DATA} ${WRKSRC}/lgrind.pdf \
+		${DESTDIR}${PREFIX}/share/texmf-dist/doc/latex/lgrind/
+	${INSTALL_DATA} ${WRKSRC}/lgrindef \
+		${DESTDIR}${PREFIX}/share/texmf-dist/tex/latex/lgrind/
+	${INSTALL_DATA} ${WRKSRC}/lgrind.sty \
+		${DESTDIR}${PREFIX}/share/texmf-dist/tex/latex/lgrind/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/lgrind/PLIST b/print/lgrind/PLIST
index 9ea5e49e814..b530175113b 100644
--- a/print/lgrind/PLIST
+++ b/print/lgrind/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:11:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/10/18 23:25:50 minskim Exp $
 bin/lgrind
-${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind/lgrindef
-${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind/lgrind.dvi
-${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind/lgrind.sty
 man/man1/lgrind.1
 man/man5/lgrindef.5
+share/texmf-dist/doc/latex/lgrind/lgrind.pdf
+share/texmf-dist/tex/latex/lgrind/lgrindef
+share/texmf-dist/tex/latex/lgrind/lgrind.sty
diff --git a/print/lgrind/distinfo b/print/lgrind/distinfo
index b6136983670..4ee1baeff8b 100644
--- a/print/lgrind/distinfo
+++ b/print/lgrind/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2007/08/08 19:50:55 joerg Exp $
+$NetBSD: distinfo,v 1.8 2011/10/18 23:25:50 minskim Exp $
 
 SHA1 (lgrind.tar.bz2) = 152d92ccdcb9bc7342f6aec6c4c009d124f7e812
 RMD160 (lgrind.tar.bz2) = c32b0002d95e3dec58d03ba39e58dd798058e0eb
 Size (lgrind.tar.bz2) = 90624 bytes
-SHA1 (patch-aa) = fe4cfcebbfe2a4fb6f202cbbd9b3bc4c798c343d
-SHA1 (patch-ab) = a843a7bfda99fb073f809b42339c409a13864f70
-SHA1 (patch-ac) = 61ded0486a4f6c135fb26a4cf185a197f9ce1db3
-SHA1 (patch-ad) = a475dd078de2d92ffdd23592fd16ae489cec5dee
-SHA1 (patch-ae) = 1686f0a57a4e62a07907e5fa4e8a0339f5cdd36c
-SHA1 (patch-af) = 2c56072174c30d8d7c651785e0338a1b5b2ff879
+SHA1 (patch-aa) = c177a549849cc969aff816ea44a6ea76628beeeb
+SHA1 (patch-ab) = c9ff5febbc0e817e47c7131bb40045936fe38443
+SHA1 (patch-ac) = 5ae3bde4a03881a5fcbd25fd412b60dbb48e0d4e
+SHA1 (patch-ad) = 5bb2d85fc13b9dd8198f844947b20f3ded681afe
+SHA1 (patch-ae) = 974d1a921ddbdc43b164032116119653efd4dc8c
+SHA1 (patch-af) = 7ebf25eb5e59bb864d139232ca97fdfa909502ae
diff --git a/print/lgrind/patches/patch-aa b/print/lgrind/patches/patch-aa
index a1853234498..15e8a791937 100644
--- a/print/lgrind/patches/patch-aa
+++ b/print/lgrind/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2006/04/07 03:01:36 minskim Exp $
+$NetBSD: patch-aa,v 1.7 2011/10/18 23:25:50 minskim Exp $
 
---- Makefile.orig	2005-11-08 21:18:37.000000000 +0100
-+++ Makefile
+--- source/Makefile.orig	2005-11-08 21:18:37.000000000 +0100
++++ source/Makefile
 @@ -3,13 +3,13 @@
  # Id: Makefile,v 2.0 96/02/19 23:54:15 gvr Exp 
  
@@ -15,9 +15,9 @@ $NetBSD: patch-aa,v 1.6 2006/04/07 03:01:36 minskim Exp $
 -TEXINPUTS=${BASEDIR}/texmf/tex/latex/lgrind
 -DOC=${BASEDIR}/texmf/doc/latex/lgrind
 -MAN=${BASEDIR}/man
-+DEFSFILE=${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind/lgrindef
-+TEXINPUTS=${PKG_LOCALTEXMFPREFIX}/tex/latex/lgrind
-+DOC=${PKG_LOCALTEXMFPREFIX}/doc/latex/lgrind
++DEFSFILE=${BASEDIR}/texmf-dist/tex/latex/lgrind/lgrindef
++TEXINPUTS=${BASEDIR}/texmf-dist/tex/latex/lgrind
++DOC=${BASEDIR}/texmf-dist/doc/latex/lgrind
 +MAN=${PREFIX}/man
  
  CC=gcc
diff --git a/print/lgrind/patches/patch-ab b/print/lgrind/patches/patch-ab
index c7b640f2402..4d174a2b942 100644
--- a/print/lgrind/patches/patch-ab
+++ b/print/lgrind/patches/patch-ab
@@ -1,12 +1,13 @@
-$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
+$NetBSD: patch-ab,v 1.3 2011/10/18 23:25:50 minskim Exp $
+
+--- source/lgrind.1.orig	Tue Mar  9 13:20:17 1999
++++ source/lgrind.1	Tue Mar  9 13:21:38 1999
 @@ -43,7 +43,7 @@
  specifies text to go into the header.
  .IP "\fB\-d\fP"
  specifies the language definitions file (default is
 -\fB/usr/TeX/texmf/tex/latex/lgrind/lgrindef\fP).
-+\fB@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef\fP).
++\fB@PREFIX@/share/texmf-dist/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 +16,7 @@ $NetBSD: patch-ab,v 1.2 2006/04/07 03:01:36 minskim Exp $
  .PP
  For a more detailed explanation of these commands, refer to
 -\fC/usr/TeX/texmf/doc/latex/lgrind.dvi\fP.
-+\fC@LOCALTEXMFPREFIX@/doc/latex/lgrind.dvi\fP.
++\fC@PREFIX@/share/texmf-dist/doc/latex/lgrind.dvi\fP.
  .PP
  .SH "EMBEDDED PROGRAMS WITHIN A LaTeX FILE"
  (From Jerry Leichter's notes.)
@@ -28,15 +29,15 @@ $NetBSD: patch-ab,v 1.2 2006/04/07 03:01:36 minskim Exp $
  Executable
  .PP
 -.IP "\fC/usr/TeX/texmf/doc/latex/lgrind/lgrind.dvi\fP"
-+.IP "\fC@LOCALTEXMFPREFIX@/doc/latex/lgrind/lgrind.dvi\fP"
++.IP "\fC@PREFIX@/share/texmf-dist/doc/latex/lgrind/lgrind.dvi\fP"
  Documentation
  .PP
 -.IP "\fC/usr/TeX/texmf/tex/latex/lgrind/lgrind.sty\fP"
-+.IP "\fC@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrind.sty\fP"
++.IP "\fC@PREFIX@/share/texmf-dist/tex/latex/lgrind/lgrind.sty\fP"
  LaTeX style file
  .PP
 -.IP "\fC/usr/TeX/texmf/tex/latex/lgrind/lgrindef\fP"
-+.IP "\fC@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef\fP"
++.IP "\fC@PREFIX@/share/texmf-dist/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 3b03f9d88aa..f307b4fd35b 100644
--- a/print/lgrind/patches/patch-ac
+++ b/print/lgrind/patches/patch-ac
@@ -1,12 +1,13 @@
-$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
+$NetBSD: patch-ac,v 1.3 2011/10/18 23:25:50 minskim Exp $
+
+--- source/lgrindef.5.orig	Tue Mar  9 13:22:25 1999
++++ source/lgrindef.5	Tue Mar  9 13:23:12 1999
 @@ -17,7 +17,7 @@
  This man page is not yet much outdated, but might be soon except somebody
  asks me to work on it. Consider the LaTeX docs the real docs.
  .SH SYNOPSIS
 -.B /usr/TeX/texmf/tex/latex/lgrind/lgrindef
-+.B @LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef
++.B @PREFIX@/share/texmf-dist/tex/latex/lgrind/lgrindef
  .SH DESCRIPTION
  .IX  "lgrindef file"  ""  "\fLlgrindef\fP \(em LGrind language definitions"
  .B lgrindef
@@ -16,8 +17,8 @@ $NetBSD: patch-ac,v 1.2 2006/04/07 03:01:36 minskim 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'@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef   'u
-+\fB@LOCALTEXMFPREFIX@/tex/latex/lgrind/lgrindef\fR	file containing terminal descriptions
++.ta \w'@PREFIX@/share/texmf-dist/tex/latex/lgrind/lgrindef   'u
++\fB@PREFIX@/share/texmf-dist/tex/latex/lgrind/lgrindef\fR	file containing terminal descriptions
  .SH "SEE ALSO"
  .BR latex (1),
  .BR lgrind (1),
diff --git a/print/lgrind/patches/patch-ad b/print/lgrind/patches/patch-ad
index 2dc82b321ad..094ef6430fc 100644
--- a/print/lgrind/patches/patch-ad
+++ b/print/lgrind/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.2 2002/08/27 03:00:13 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.3 2011/10/18 23:25:50 minskim Exp $
 
 Add Verilog and Verilog-A
 
---- ../lgrindef.orig	Tue Aug  4 09:01:00 1998
-+++ ../lgrindef	Mon Aug 26 22:54:31 2002
+--- lgrindef.orig	Tue Aug  4 09:01:00 1998
++++ lgrindef	Mon Aug 26 22:54:31 2002
 @@ -685,4 +685,75 @@
  tk_popup tkwait toplevel trace unknown unset update uplevel upvar while winfo wm:
  
diff --git a/print/lgrind/patches/patch-ae b/print/lgrind/patches/patch-ae
index ecb3ded2743..6654ba36ea1 100644
--- a/print/lgrind/patches/patch-ae
+++ b/print/lgrind/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2007/08/08 19:50:55 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2011/10/18 23:25:50 minskim Exp $
 
---- lgrind.c.orig	2007-08-08 19:31:25.000000000 +0000
-+++ lgrind.c
+--- source/lgrind.c.orig	2007-08-08 19:31:25.000000000 +0000
++++ source/lgrind.c
 @@ -70,7 +70,6 @@ static char Version[] =
  #include <stdlib.h>
  #include <ctype.h>
diff --git a/print/lgrind/patches/patch-af b/print/lgrind/patches/patch-af
index c901493ec9f..e4a05a8fbfe 100644
--- a/print/lgrind/patches/patch-af
+++ b/print/lgrind/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.1 2007/08/08 19:50:55 joerg Exp $
+$NetBSD: patch-af,v 1.2 2011/10/18 23:25:50 minskim Exp $
 
---- regexp.c.orig	2007-08-08 19:31:27.000000000 +0000
-+++ regexp.c
+--- source/regexp.c.orig	2007-08-08 19:31:27.000000000 +0000
++++ source/regexp.c
 @@ -23,7 +23,7 @@ static char Version[] =