- Install files in contrib/ directory.

- Use share/texmf as installation directory instead of share/texmf-local.
- Remove WITHOUT_CJK knob.

2 files changed, 65 insertions, 30 deletions

diff --git a/print/latex-ucs/Makefile b/print/latex-ucs/Makefile
index d1bce0ded6c2..10d5d57aedb3 100644
--- a/print/latex-ucs/Makefile
+++ b/print/latex-ucs/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	latex-ucs
 PORTVERSION=	20041017
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.unruh.de/DniQ/latex/unicode/
 DISTNAME=	unicode
@@ -17,43 +17,40 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A LaTeX package for using UTF-8 as input encoding
 
 BUILD_DEPENDS=	mktexlsr:${PORTSDIR}/print/teTeX-base \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+		${TEXMFDIR_LSR}:${PORTSDIR}/print/tex-texmflocal
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base \
-		${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal
+		${TEXMFDIR_LSR}:${PORTSDIR}/print/tex-texmflocal
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
+PLIST_SUB=	MKTEXLSR="${MKTEXLSR}" CLASSDIR=${CLASSDIR}
 
-PLIST_SUB=	MKTEXLSR=${MKTEXLSR} CLASSDIR=${CLASSDIR}
-.if !defined(WITHOUT_CJK)
-PLIST_SUB+=	CJK=""
-.else
-PLIST_SUB+=	CJK="@comment "
-.endif
-
-TEXMFLOCAL=	share/texmf-local
-TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
-MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
-CLASSDIR=	${TEXMFLOCAL}/tex/latex/${PORTNAME:S/^latex-//}
+TEXMFDIR=	share/texmf
+TEXMFDIR_LSR=	${LOCALBASE}/${TEXMFDIR}/ls-R
+MKTEXLSR=	${LOCALBASE}/bin/mktexlsr ${PREFIX}/${TEXMFDIR}
+CLASSDIR=	${TEXMFDIR}/tex/latex/${PORTNAME:S/^latex-//}
 WRKSRC=		${WRKDIR}/${PORTNAME:S/^latex-//}
 
 CLASS_FILES=	ucs.sty utf8x.def ucsencs.def ucsutils.sty ucshyper.sty
-CJK_FILES=	c00enc.def c10enc.def c40enc.def c42enc.def c61enc.def
 PLSCRIPTS=	discovermacro.pl latexout.pl makeunidef.pl
 PORTDOCS=	FAQ INSTALL LICENSE README VERSION
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "If you don't need CJK characters, please define WITHOUT_CJK."
-	@${ECHO_MSG} ""
+CONTRIB_FILES= UnicodeT.sfd autofe.sty c00enc.def c10enc.def		\
+	c40enc.def c42enc.def c61enc.def cenccmn.tex cp1252.enc		\
+	ldvarial.fd ldvc2000.fd ldvenc.def letc2000.fd letenc.def	\
+	letgfzem.fd letjiret.fd lklenc.def lklkli.fd ltaarial.fd	\
+	ltac2000.fd ltaenc.def ltgc2000.fd ltgenc.def ltlcmr.fd		\
+	ltlenc.def ltwdsnol.fd ltwdsque.fd ltwdssin.fd ltwenc.def	\
+	lucarial.fd lucc2000.fd lucenc.def mkrenc.def mkrezra.fd	\
+	mkrhadas.fd mkromega.fd mkrrashi.fd t2dcmr.fd t2denc.def	\
+	tengwarDS.enc xscmr.fd xsenc.def
 
 do-install:
 	${INSTALL_SCRIPT} ${PLSCRIPTS:S@^@${WRKSRC}/@} ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/${CLASSDIR}
-	${INSTALL_DATA} ${CLASS_FILES:S@^@${WRKSRC}/@} ${PREFIX}/${CLASSDIR}
-.if !defined(WITHOUT_CJK)
-	${INSTALL_DATA} ${CJK_FILES:S@^@${WRKSRC}/contrib/@} ${PREFIX}/${CLASSDIR}
-.endif
+	${INSTALL_DATA} \
+		${CLASS_FILES:S@^@${WRKSRC}/@} \
+		${CONTRIB_FILES:S@^@${WRKSRC}/contrib/@} \
+		${PREFIX}/${CLASSDIR}
 	${CP} -R ${WRKSRC}/data ${PREFIX}/${CLASSDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -61,6 +58,6 @@ do-install:
 .endif
 
 post-install:
-	${MKTEXLSR}
+	${MKTEXLSR} ${PREFIX}/${TEXMFDIR}
 
 .include <bsd.port.mk>
diff --git a/print/latex-ucs/pkg-plist b/print/latex-ucs/pkg-plist
index 436f1f5017cb..5b7a8d3c27da 100644
--- a/print/latex-ucs/pkg-plist
+++ b/print/latex-ucs/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/discovermacro.pl
 bin/latexout.pl
 bin/makeunidef.pl
@@ -6,11 +7,48 @@ bin/makeunidef.pl
 %%CLASSDIR%%/ucsutils.sty
 %%CLASSDIR%%/ucshyper.sty
 %%CLASSDIR%%/utf8x.def
-%%CJK%%%%CLASSDIR%%/c00enc.def
-%%CJK%%%%CLASSDIR%%/c10enc.def
-%%CJK%%%%CLASSDIR%%/c40enc.def
-%%CJK%%%%CLASSDIR%%/c42enc.def
-%%CJK%%%%CLASSDIR%%/c61enc.def
+%%CLASSDIR%%/UnicodeT.sfd
+%%CLASSDIR%%/autofe.sty
+%%CLASSDIR%%/c00enc.def
+%%CLASSDIR%%/c10enc.def
+%%CLASSDIR%%/c40enc.def
+%%CLASSDIR%%/c42enc.def
+%%CLASSDIR%%/c61enc.def
+%%CLASSDIR%%/cenccmn.tex
+%%CLASSDIR%%/cp1252.enc
+%%CLASSDIR%%/ldvarial.fd
+%%CLASSDIR%%/ldvc2000.fd
+%%CLASSDIR%%/ldvenc.def
+%%CLASSDIR%%/letc2000.fd
+%%CLASSDIR%%/letenc.def
+%%CLASSDIR%%/letgfzem.fd
+%%CLASSDIR%%/letjiret.fd
+%%CLASSDIR%%/lklenc.def
+%%CLASSDIR%%/lklkli.fd
+%%CLASSDIR%%/ltaarial.fd
+%%CLASSDIR%%/ltac2000.fd
+%%CLASSDIR%%/ltaenc.def
+%%CLASSDIR%%/ltgc2000.fd
+%%CLASSDIR%%/ltgenc.def
+%%CLASSDIR%%/ltlcmr.fd
+%%CLASSDIR%%/ltlenc.def
+%%CLASSDIR%%/ltwdsnol.fd
+%%CLASSDIR%%/ltwdsque.fd
+%%CLASSDIR%%/ltwdssin.fd
+%%CLASSDIR%%/ltwenc.def
+%%CLASSDIR%%/lucarial.fd
+%%CLASSDIR%%/lucc2000.fd
+%%CLASSDIR%%/lucenc.def
+%%CLASSDIR%%/mkrenc.def
+%%CLASSDIR%%/mkrezra.fd
+%%CLASSDIR%%/mkrhadas.fd
+%%CLASSDIR%%/mkromega.fd
+%%CLASSDIR%%/mkrrashi.fd
+%%CLASSDIR%%/t2dcmr.fd
+%%CLASSDIR%%/t2denc.def
+%%CLASSDIR%%/tengwarDS.enc
+%%CLASSDIR%%/xscmr.fd
+%%CLASSDIR%%/xsenc.def
 %%CLASSDIR%%/data/uni-0.def
 %%CLASSDIR%%/data/uni-1.def
 %%CLASSDIR%%/data/uni-100.def