3 files changed, 27 insertions, 14 deletions

diff --git a/print/sgf2tex/Makefile b/print/sgf2tex/Makefile
index ee118fb0aa38..bb9aadedb70c 100644
--- a/print/sgf2tex/Makefile
+++ b/print/sgf2tex/Makefile
@@ -7,17 +7,22 @@
 
 PORTNAME=	sgf2tex
 PORTVERSION=	3.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://sporadic.stanford.edu/bump/
 
 MAINTAINER=	spcoltri@omcl.org
 COMMENT=	Convert a Go game record in SGF format into TeX and provide fonts to make a dvi
 
-BUILD_DEPENDS=	tex:${PORTSDIR}/print/teTeX
-RUN_DEPENDS=	tex:${PORTSDIR}/print/teTeX
+BUILD_DEPENDS=	${TEX_BIN}:${PORTSDIR}/print/teTeX-base
+RUN_DEPENDS=	${TEX_BIN}:${PORTSDIR}/print/teTeX-base
 
-BROKEN=		Incomplete pkg-plist
+PLIST_SUB=	MKTEXLSR=${MKTEXLSR}
+MAKE_ENV=	TEX_BIN=${TEX_BIN}
 
 MAN1=		sgf2tex.1 sgfsplit.1
 
+TEX_BIN=	${LOCALBASE}/bin/etex
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
+
 .include <bsd.port.mk>
diff --git a/print/sgf2tex/files/patch-aa b/print/sgf2tex/files/patch-aa
index 86601b9232ae..2a9507989ae9 100644
--- a/print/sgf2tex/files/patch-aa
+++ b/print/sgf2tex/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Jun 17 21:04:35 2001
-+++ Makefile	Wed Jun 20 12:59:39 2001
+--- Makefile.orig	Mon Jun 18 13:04:35 2001
++++ Makefile	Mon Mar 28 15:04:58 2005
 @@ -14,12 +14,18 @@
  # TEXHASH is MakeTeXls-R for WEB2C Unix distribution, texhash for TETEX, blank
  # for NTEX.
@@ -11,12 +11,12 @@
 -BINDIR=/usr/local/bin/
 +MFDIR=${PREFIX}/share/texmf/fonts/source/public/GOOE
 +TFMDIR=${PREFIX}/share/texmf/fonts/tfm/public/GOOE
-+TEXINPUTS=${PREFIX}/share/texmf/tex/GOOE
++TEXINPUTS=${PREFIX}/share/texmf/tex/generic/GOOE
 +MANDIR=${PREFIX}/man/man1/
 +BINDIR=${PREFIX}/bin/
-+.if exists(/usr/local/bin/MakeTeXls-R)
++.if exists(${LOCALBASE}/bin/MakeTeXls-R)
 +TEXHASH=MakeTeXls-R
-+.elif exists(/usr/local/bin/texhash)
++.elif exists(${LOCALBASE}/bin/texhash)
  TEXHASH=texhash
 +.else
 +TEXHASH=
@@ -24,7 +24,7 @@
  
  # PKFONTS may be left undefined for the initial installation. If you are
  # reinstalling fonts for which you have made modifications to the metafont
-@@ -45,6 +51,8 @@
+@@ -45,21 +51,23 @@
  
  .SUFFIXES : .mf .tfm .300pk .360pk .432pk .600pk .720pk .864pk .300gf .360gf .432gf .600gf .720gf .864gf
  
@@ -33,7 +33,9 @@
  sgfsplit: sgfsplit.c
  	cc -g -o sgfsplit sgfsplit.c
  
-@@ -53,13 +61,13 @@
+ manual.dvi: manual.tex
+-	tex manual
++	${TEX_BIN} manual
  
  install: sgfsplit 
  	rm -f $(PKFONTS)
@@ -49,7 +51,7 @@
 +	mkdir -p $(TEXINPUTS) && install -c -m 0644 gooemacs.tex gotcmacs.tex $(TEXINPUTS)
  	$(TEXHASH)
 -	tex manual
-+	install -c -m 0644 manual.dvi ${PREFIX}/share/doc/sgf2tex.dvi
++	install -c -m 0644 manual.dvi ${TEXINPUTS}/manual.dvi
  
  # The preferred method of installation is just to copy the metafont
  # sources and tfm files into appropriated directories in MakeTeXPK's
diff --git a/print/sgf2tex/pkg-plist b/print/sgf2tex/pkg-plist
index 5f9cb8084ac8..d89bcb1cdf96 100644
--- a/print/sgf2tex/pkg-plist
+++ b/print/sgf2tex/pkg-plist
@@ -1,6 +1,6 @@
+@comment $FreeBSD$
 bin/sgf2tex
 bin/sgfsplit
-share/doc/sgf2tex.dvi
 share/texmf/fonts/tfm/public/GOOE/gobl.tfm
 share/texmf/fonts/tfm/public/GOOE/goea.tfm
 share/texmf/fonts/tfm/public/GOOE/goeb.tfm
@@ -13,6 +13,7 @@ share/texmf/fonts/tfm/public/GOOE/good.tfm
 share/texmf/fonts/tfm/public/GOOE/gooegb.tfm
 share/texmf/fonts/tfm/public/GOOE/gooemt.tfm
 share/texmf/fonts/tfm/public/GOOE/gowl.tfm
+@dirrm share/texmf/fonts/tfm/public/GOOE
 share/texmf/fonts/source/public/GOOE/bodd.mf
 share/texmf/fonts/source/public/GOOE/gobas.mf
 share/texmf/fonts/source/public/GOOE/gobl.mf
@@ -37,5 +38,10 @@ share/texmf/fonts/source/public/GOOE/paramsbl.mf
 share/texmf/fonts/source/public/GOOE/paramsc.mf
 share/texmf/fonts/source/public/GOOE/romandg.mf
 share/texmf/fonts/source/public/GOOE/wodd.mf
-share/texmf/tex/GOOE/gooemacs.tex
-share/texmf/tex/GOOE/gotcmacs.tex
+@dirrm share/texmf/fonts/source/public/GOOE
+share/texmf/tex/generic/GOOE/gooemacs.tex
+share/texmf/tex/generic/GOOE/gotcmacs.tex
+share/texmf/tex/generic/GOOE/manual.dvi
+@dirrm share/texmf/tex/generic/GOOE
+@exec %%MKTEXLSR%%
+@unexec %%MKTEXLSR%%