3 files changed, 68 insertions, 47 deletions

diff --git a/print/latex-caption/Makefile b/print/latex-caption/Makefile
index 413ccdcb905f..7e58a104dc4c 100644
--- a/print/latex-caption/Makefile
+++ b/print/latex-caption/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	latex-caption
-PORTVERSION=	3.0.20060112
-PORTREVISION=	1
+PORTVERSION=	3.1.20071213
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.ctan.org/tex-archive/%SUBDIR%/ \
 		${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	macros/latex/contrib/caption
-DISTFILES=	caption.dtx caption2.dtx caption.ins ${DOC_FILES}
+DISTFILES=	${SRC_FILES} ${PORTDOCS}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	hrs@FreeBSD.org
@@ -23,22 +22,26 @@ RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
 		${TEXMF_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 PLIST_SUB=	MKTEXLSR=${MKTEXLSR} \
-		CLASSDIR=${CLASSDIR}
-USE_GMAKE=	YES
+		TEXMFDIR=${TEXMFDIR}
 
 TEXMFDIR=	share/texmf
-TEXMFLOCALDIR=	share/texmf-local
 TEXMF_LSR=	${LOCALBASE}/${TEXMFDIR}/ls-R
-TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
 MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
 TEX_BIN=	${LOCALBASE}/bin/etex
 YES_CMD=	/usr/bin/yes
 CLASSDIR=	${TEXMFDIR}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
+PLIST_FILES=	${SRC_FILES:S,^,${CLASSDIR}/,} \
+		${CLASS_FILES:S,^,${CLASSDIR}/,}
 
-CLASS_FILES=	caption.dtx caption.sty caption.ins \
-		caption2.dtx caption2.sty caption3.sty
-DOC_FILES=	anleitung.pdf anleitung.tex caption.pdf caption2.pdf
+SRC_FILES=	caption.dtx caption2.dtx caption.ins \
+		ltcaption.dtx subcaption.dtx
+CLASS_FILES=	caption.sty caption2.sty caption3.sty \
+		ltcaption.sty subcaption.sty
+PORTDOCS=	README caption.pdf caption2.pdf \
+		ltcaption.pdf subcaption.pdf \
+		caption-eng.pdf caption-deu.pdf caption-rus.pdf \
+		caption-eng.tex caption-deu.tex caption-rus.tex
 
 do-extract:
 	${MKDIR} ${WRKSRC}
@@ -49,13 +52,15 @@ do-build:
 
 do-install:
 	${MKDIR} ${PREFIX}/${CLASSDIR}
-	${INSTALL_DATA} ${CLASS_FILES:S@^@${WRKSRC}/@} ${PREFIX}/${CLASSDIR}
+	${INSTALL_DATA} ${SRC_FILES:S@^@${WRKSRC}/@} \
+		${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} ${LOCALBASE}/${TEXMFDIR}
 
 .include <bsd.port.mk>
diff --git a/print/latex-caption/distinfo b/print/latex-caption/distinfo
index 90f7240b4fae..95cf100d474b 100644
--- a/print/latex-caption/distinfo
+++ b/print/latex-caption/distinfo
@@ -1,21 +1,48 @@
-MD5 (latex-caption/caption.dtx) = a687ed9c254fcdc06328c010bbef84bb
-SHA256 (latex-caption/caption.dtx) = cdd8f3abbef4f0b03d50eb59268dcaf3df1a8827437be6368228523adcac2630
-SIZE (latex-caption/caption.dtx) = 171696
-MD5 (latex-caption/caption2.dtx) = d09adef6297a2a8c7bd0a1ae928fa548
-SHA256 (latex-caption/caption2.dtx) = 88b53b7943c67a3e5d648f5bdac29a18e6bc961940fb8c8ff68d778d66811102
-SIZE (latex-caption/caption2.dtx) = 46904
-MD5 (latex-caption/caption.ins) = b90a1256a3fa6a3fb88424299be25a2a
-SHA256 (latex-caption/caption.ins) = 9ee736bb8ed17205dc8d403cbd68995c976d6e9d92b919054c593565d0b22eda
-SIZE (latex-caption/caption.ins) = 1597
-MD5 (latex-caption/anleitung.pdf) = 14855936cc6b44ff454cdc0763352581
-SHA256 (latex-caption/anleitung.pdf) = 3f66d25d3c3be52ee22a68d8ca9a350b5048f31a391f8a0b5f43646fc7ac4043
-SIZE (latex-caption/anleitung.pdf) = 215011
-MD5 (latex-caption/anleitung.tex) = 3632def4600bb9b8de8d8d7ed71b270e
-SHA256 (latex-caption/anleitung.tex) = 09ec79946f456edf4171a83e4deac3bb531a6764190d2386e259257c99b18510
-SIZE (latex-caption/anleitung.tex) = 67797
-MD5 (latex-caption/caption.pdf) = b222d6fa9fdb30ede3154869973e5cfd
-SHA256 (latex-caption/caption.pdf) = 4f6e4c006ea95a0eb0f0059e2050aa166aaa55591f1253b73743f1e3ee1848a8
-SIZE (latex-caption/caption.pdf) = 333460
-MD5 (latex-caption/caption2.pdf) = 066382297cae78d4e090e9e03acb41d2
-SHA256 (latex-caption/caption2.pdf) = fdfd56b311a8b75720e3cec7ac198379de35df24d7230cf83d18501bd2e74786
-SIZE (latex-caption/caption2.pdf) = 125143
+MD5 (latex-caption/caption.dtx) = 681a7fec930d99a6da17ae222d4eae15
+SHA256 (latex-caption/caption.dtx) = 19bfa6feebad8ce47a6fd97bedb4a6bb0f07b1388fd0ca459fe3dbceff3c8a02
+SIZE (latex-caption/caption.dtx) = 254999
+MD5 (latex-caption/caption2.dtx) = 28a739e6e2c5f4a5589e20a6a7d49d3d
+SHA256 (latex-caption/caption2.dtx) = fddbeb2e28c43071f8090f36a34f021e37e20ed9f0c640aed98a2ba7ef2b413d
+SIZE (latex-caption/caption2.dtx) = 48944
+MD5 (latex-caption/caption.ins) = e84cf32aadcba6351806be89d0266c68
+SHA256 (latex-caption/caption.ins) = 74c0cce45ce00890594188eacafe17016c45120c502eb2432465b3798452969d
+SIZE (latex-caption/caption.ins) = 1861
+MD5 (latex-caption/ltcaption.dtx) = 41a17ced0d3bb38dffe00b2cc15c0a0d
+SHA256 (latex-caption/ltcaption.dtx) = 064a249eeca873d42a8d529ae76ddc1f9acfa1f535916c0356b21f50857bcdd8
+SIZE (latex-caption/ltcaption.dtx) = 25393
+MD5 (latex-caption/subcaption.dtx) = 8b0efce86c33943b34c4cadeee69532e
+SHA256 (latex-caption/subcaption.dtx) = 0221180bfe9c6fcce13dcf332bc7ead659133e69da23493429685609e6691c8f
+SIZE (latex-caption/subcaption.dtx) = 30941
+MD5 (latex-caption/README) = deb65d6f2fd58f581db34e5373546bd9
+SHA256 (latex-caption/README) = 1b0d885c7e3781bd776f13c6a41f424561fd5a11ae5fa451424353eae0b407d6
+SIZE (latex-caption/README) = 1916
+MD5 (latex-caption/caption.pdf) = 4f1ce281dc7a97427a6a88037f181cdd
+SHA256 (latex-caption/caption.pdf) = 4958984ce0ead1d7446b041758d60ad22052fa06bd11adf3d8fc40770566e092
+SIZE (latex-caption/caption.pdf) = 347050
+MD5 (latex-caption/caption2.pdf) = 7b4984488989709d5644256684b50610
+SHA256 (latex-caption/caption2.pdf) = 0d4f2fb0c2acfe382e062a62b76ce62dcf35010f2f19d8c58df4be9d6390ae46
+SIZE (latex-caption/caption2.pdf) = 136128
+MD5 (latex-caption/ltcaption.pdf) = ec6ede1c96ec1b7a1c37c5c9232dfd1e
+SHA256 (latex-caption/ltcaption.pdf) = 6187b62334a527fedc0144e49519887b8a4a28d14c48e64b4ad4c5d31ec99703
+SIZE (latex-caption/ltcaption.pdf) = 116692
+MD5 (latex-caption/subcaption.pdf) = 421bbbcf2a9bb82627b3308de64ca7cd
+SHA256 (latex-caption/subcaption.pdf) = 0bac542e1cde2919def9272e0a16dd0d6f902bd48e9dce7c429f6269728b0d2f
+SIZE (latex-caption/subcaption.pdf) = 133171
+MD5 (latex-caption/caption-eng.pdf) = 41f6288823ab2765b777f2433c8fdf68
+SHA256 (latex-caption/caption-eng.pdf) = 4a9e1bcd918fe9644a94e74a2062ed4ce5235dea6ab3425dd7a96339914b8bf3
+SIZE (latex-caption/caption-eng.pdf) = 366539
+MD5 (latex-caption/caption-deu.pdf) = 3d892a7fa3378834f8537375ae005fc2
+SHA256 (latex-caption/caption-deu.pdf) = 19dab7e2b980ae7a86e2c46f1c1c9ad2161b01aa6b5ab76c4576fbd42652ecfe
+SIZE (latex-caption/caption-deu.pdf) = 301230
+MD5 (latex-caption/caption-rus.pdf) = 7ef0f8f792ba2aca7347e278907748c1
+SHA256 (latex-caption/caption-rus.pdf) = 4d4a96e4da9c9d9779af6e590fae6b59692e174ab1420aaaf2a87f796d7cb677
+SIZE (latex-caption/caption-rus.pdf) = 429149
+MD5 (latex-caption/caption-eng.tex) = f98b151d64cd8677ec20e8c03f67d3c4
+SHA256 (latex-caption/caption-eng.tex) = e14e800617708dadd2312d37858eb64b5fb210e4ff924a82f2f5e208a65e94ec
+SIZE (latex-caption/caption-eng.tex) = 148174
+MD5 (latex-caption/caption-deu.tex) = 3388f21bc0549273f9fb81b5dc952cde
+SHA256 (latex-caption/caption-deu.tex) = 836750bf4e74132a158c602f9fad1436fe9aaa960e11822d636d0178bb961cf1
+SIZE (latex-caption/caption-deu.tex) = 106241
+MD5 (latex-caption/caption-rus.tex) = c81e2e648a233ad04cc092d6f82b23b9
+SHA256 (latex-caption/caption-rus.tex) = 0ae46d3f5be0451e9803e458dbc4d82f1ae8b3e6a2c58762e339f217fa70d884
+SIZE (latex-caption/caption-rus.tex) = 99927
diff --git a/print/latex-caption/pkg-plist b/print/latex-caption/pkg-plist
index 7ee17f1fd296..3d716edd0b07 100644
--- a/print/latex-caption/pkg-plist
+++ b/print/latex-caption/pkg-plist
@@ -1,14 +1,3 @@
 @comment $FreeBSD$
-%%PORTDOCS%%%%DOCSDIR%%/anleitung.pdf
-%%PORTDOCS%%%%DOCSDIR%%/anleitung.tex
-%%PORTDOCS%%%%DOCSDIR%%/caption.pdf
-%%PORTDOCS%%%%DOCSDIR%%/caption2.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%CLASSDIR%%/caption.dtx
-%%CLASSDIR%%/caption.sty
-%%CLASSDIR%%/caption.ins
-%%CLASSDIR%%/caption2.dtx
-%%CLASSDIR%%/caption2.sty
-%%CLASSDIR%%/caption3.sty
-@exec %%MKTEXLSR%%
-@unexec %%MKTEXLSR%%
+@exec %%MKTEXLSR%% %D/%%TEXMFDIR%%
+@unexec %%MKTEXLSR%% %D/%%TEXMFDIR%%