3 files changed, 28 insertions, 36 deletions

diff --git a/print/latex-bytefield/Makefile b/print/latex-bytefield/Makefile
index 69e3a27bfff2..f08e8aa8373d 100644
--- a/print/latex-bytefield/Makefile
+++ b/print/latex-bytefield/Makefile
@@ -6,38 +6,35 @@
 
 PORTNAME=	latex-bytefield
 PORTVERSION=	1.2.20050731
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	macros/latex/contrib/bytefield
-DISTFILES=	bytefield.dtx bytefield.ins ${DOC_FILES}
+DISTFILES=	bytefield.dtx bytefield.ins ${PORTDOCS}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package that utilization diagram of data fields
 
-BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
-RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base
+RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base
 
-PLIST_SUB=	TEXMFLOCAL=${TEXMFLOCAL} MKTEXLSR=${MKTEXLSR} \
+PLIST_SUB=	TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} \
 		CLASSDIR=${CLASSDIR}
-USE_GMAKE=	YES
 
-TEXMFLOCAL=	share/texmf-local
-TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
+TEXMFDIR=	share/texmf
+TEXMFDIR_LSR=	${LOCALBASE}/${TEXMFDIR}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 TEX_BIN=	${LOCALBASE}/bin/etex
-CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
+CLASSDIR=	${TEXMFDIR}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
 CLASS_FILES=	bytefield.dtx bytefield.sty bytefield.ins
-DOC_FILES=	README bytefield.pdf example.pdf example.tex
+PORTDOCS=	README bytefield.pdf example.pdf example.tex
 
 do-extract:
 	${MKDIR} ${WRKSRC}
-	cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} ${DISTFILES} ${WRKSRC}
+	cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${DISTFILES} ${WRKSRC}
 
 do-build:
 	cd ${WRKSRC} && ${TEX_BIN} bytefield.ins
@@ -47,10 +44,10 @@ do-install:
 	${INSTALL_DATA} ${CLASS_FILES:S@^@${WRKSRC}/@} ${PREFIX}/${CLASSDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES:S@^@${WRKSRC}/@} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S@^@${WRKSRC}/@} ${DOCSDIR}
 .endif
 
 post-install:
-	@${MKTEXLSR}
+	@${MKTEXLSR} ${TEXMFDIR}
 
 .include <bsd.port.mk>
diff --git a/print/latex-bytefield/distinfo b/print/latex-bytefield/distinfo
index f15a86262f20..ada9bfde8a01 100644
--- a/print/latex-bytefield/distinfo
+++ b/print/latex-bytefield/distinfo
@@ -1,18 +1,18 @@
-MD5 (latex-bytefield/bytefield.dtx) = 7f5cdee4379598822df4040197d8ba59
-SHA256 (latex-bytefield/bytefield.dtx) = c56d70796ba0888fe3f3b0488c3578b32480387f288361918cfc0dff166194fe
-SIZE (latex-bytefield/bytefield.dtx) = 56375
-MD5 (latex-bytefield/bytefield.ins) = e83edecc2f535c92732532dbd2d39d5f
-SHA256 (latex-bytefield/bytefield.ins) = 59e0ec778bd2fe48b00845bed121fcf239459cbc1e092784d2276c3376968800
+MD5 (latex-bytefield/bytefield.dtx) = 81b4f3d6e3b75b5c576840a009f33bbf
+SHA256 (latex-bytefield/bytefield.dtx) = e04ed7f4c1283b1c8ab40cb1a5237c803d13a25d95deeaa8a428f58ff3bef395
+SIZE (latex-bytefield/bytefield.dtx) = 60211
+MD5 (latex-bytefield/bytefield.ins) = bcd380c2d8e152da2b074310a21a3c8d
+SHA256 (latex-bytefield/bytefield.ins) = 94594d102ef98f7fca5fe510d4ca11f183110638e0fd9fe6e0e84c72dcb1ce39
 SIZE (latex-bytefield/bytefield.ins) = 1431
-MD5 (latex-bytefield/README) = 55fbe24f3e4dcfbcd3e199ff79615e34
-SHA256 (latex-bytefield/README) = dcf60f71df4dd07b0ef3de3a7b13f780ce52bd29ce4069b98d3eb2f2c6f98c25
-SIZE (latex-bytefield/README) = 1728
-MD5 (latex-bytefield/bytefield.pdf) = 840c593772d67888f5a10f223ef9098e
-SHA256 (latex-bytefield/bytefield.pdf) = d321b88ad705b27e36d44b921d52198055629c9d5305cf3241312a5f4c75bdcc
-SIZE (latex-bytefield/bytefield.pdf) = 354304
-MD5 (latex-bytefield/example.pdf) = 23806949d0ade9e8a51830bc2ae4c82e
-SHA256 (latex-bytefield/example.pdf) = c2f2366a36b25f9cd160e3836f06a56e41dec686d17c0bcfd1ed7c5c66eccbcc
-SIZE (latex-bytefield/example.pdf) = 167226
+MD5 (latex-bytefield/README) = 0e8801182bc9f8b61ed6efe9854f0d7e
+SHA256 (latex-bytefield/README) = 2f14c3f14b79ece49f359e95640ecee3d34ff12be2941c355c71fdc39b122d1a
+SIZE (latex-bytefield/README) = 1745
+MD5 (latex-bytefield/bytefield.pdf) = 1e63addcd59f43263aa7e63fe4aadeba
+SHA256 (latex-bytefield/bytefield.pdf) = 9afef72b641db41dc86102f4578d8a5ca770a678a13ae02ef9c830cd8215e55e
+SIZE (latex-bytefield/bytefield.pdf) = 273534
+MD5 (latex-bytefield/example.pdf) = 1c5aa7db6970fe970739859b5f004ad4
+SHA256 (latex-bytefield/example.pdf) = c323e167618be25a54e0142e2778c52834e89a1f17f1ed82a603f0d49717e345
+SIZE (latex-bytefield/example.pdf) = 124895
 MD5 (latex-bytefield/example.tex) = 2a892edd4a24b3dc7bb58f16c7af9575
 SHA256 (latex-bytefield/example.tex) = c9b303763ef5e6b564c7bb7e90e2939da13d0ebfb220da144ccf124d74df1c41
 SIZE (latex-bytefield/example.tex) = 23571
diff --git a/print/latex-bytefield/pkg-plist b/print/latex-bytefield/pkg-plist
index 6ffd65f1e5c7..80fe3aad6da6 100644
--- a/print/latex-bytefield/pkg-plist
+++ b/print/latex-bytefield/pkg-plist
@@ -1,12 +1,7 @@
 @comment $FreeBSD$
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/bytefield.pdf
-%%PORTDOCS%%%%DOCSDIR%%/example.pdf
-%%PORTDOCS%%%%DOCSDIR%%/example.tex
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%CLASSDIR%%/bytefield.dtx
 %%CLASSDIR%%/bytefield.sty
 %%CLASSDIR%%/bytefield.ins
 @dirrm %%CLASSDIR%%
-@exec %%MKTEXLSR%%
-@unexec %%MKTEXLSR%%
+@exec %%MKTEXLSR%% %D/%%TEXMFDIR%%
+@unexec %%MKTEXLSR%% %D/%%TEXMFDIR%%