From d9c9a9f791a8e2803d25151a522734da8131707d Mon Sep 17 00:00:00 2001
From: edd <edd@openbsd.org>
Date: Sun, 14 Nov 2010 16:58:39 +0000
Subject: [PATCH] Fix WANTLIB, new style README, fix typo in README (noticed by
 Nicholas Fleisher).

OK kili@
---
 print/texlive/base/Makefile                       | 15 ++++++---------
 print/texlive/base/pkg/MESSAGE                    |  2 +-
 print/texlive/base/pkg/PLIST                      |  5 ++---
 .../base/{files/README.OpenBSD => pkg/README}     |  4 ++--
 4 files changed, 11 insertions(+), 15 deletions(-)
 rename print/texlive/base/{files/README.OpenBSD => pkg/README} (91%)

diff --git a/print/texlive/base/Makefile b/print/texlive/base/Makefile
index 406fe6a538f..44991b5ccc9 100755
--- a/print/texlive/base/Makefile
+++ b/print/texlive/base/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.39 2010/11/11 18:34:59 espie Exp $
+# $OpenBSD: Makefile,v 1.40 2010/11/14 16:58:39 edd Exp $
 
 COMMENT =		base binaries for TeXLive typesetting distribution
 
 DISTNAME = 		texlive-${DIST_V}-source
 PKGNAME =		texlive_base-${V}
-REVISION =		6
+REVISION =		7
 SHARED_LIBS =		kpathsea	2.0
 
-WANTLIB =		m X11 ICE freetype Xt c Xext fontconfig Xpm SM Xmu z \
-			ncurses Xaw Xau Xdmcp expat iconv jpeg lcms pthread \
-			pthread-stubs stdc++ xcb xml2 t1.>=4 png.>=3 gd ttf \
-			poppler
+WANTLIB =		m X11 ICE freetype Xt c Xext fontconfig Xpm SM Xmu gd \
+			ncurses openjpeg Xaw Xau Xdmcp expat iconv jpeg lcms \
+			png.>=3	poppler pthread pthread-stubs stdc++ t1.>=4 \
+			ttf xcb	xml2 z
 
 RUN_DEPENDS =		:ghostscript-*:print/ghostscript/gnu \
 			:detex-*:print/detex \
@@ -111,9 +111,6 @@ pre-install:
 	mkdir ${WRKSRC}/inst
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/texlive
-	${INSTALL_DATA} ${FILESDIR}/README.OpenBSD \
-		${PREFIX}/share/doc/texlive
 	${INSTALL_SCRIPT} ${FILESDIR}/tl-link-config ${PREFIX}/bin
 	${SUBST_CMD} ${PREFIX}/bin/tl-link-config
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf/web2c
diff --git a/print/texlive/base/pkg/MESSAGE b/print/texlive/base/pkg/MESSAGE
index 59a8ef32af1..11d16ffeb0c 100644
--- a/print/texlive/base/pkg/MESSAGE
+++ b/print/texlive/base/pkg/MESSAGE
@@ -1,2 +1,2 @@
-Please see ${PREFIX}/share/doc/texlive/README.OpenBSD for information on
+Please see ${PREFIX}/share/doc/pkg-readmes/${FULLPKGNAME} for information on
 running TeX Live on OpenBSD.
diff --git a/print/texlive/base/pkg/PLIST b/print/texlive/base/pkg/PLIST
index 47841df521a..fefcfedf535 100644
--- a/print/texlive/base/pkg/PLIST
+++ b/print/texlive/base/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.14 2010/03/21 13:22:55 edd Exp $
+@comment $OpenBSD: PLIST,v 1.15 2010/11/14 16:58:39 edd Exp $
 @conflict teTeX_base-*
 @conflict ht-<2
 @pkgpath print/teTeX/base
@@ -459,8 +459,7 @@ lib/libkpathsea.la
 @man man/man5/fmtutil.cnf.5
 @man man/man5/synctex.5
 @man man/man5/updmap.cfg.5
-share/doc/texlive/
-share/doc/texlive/README.OpenBSD
+share/doc/pkg-readmes/${FULLPKGNAME}
 share/lcdf-typetools/
 share/texmf/
 share/texmf/web2c/
diff --git a/print/texlive/base/files/README.OpenBSD b/print/texlive/base/pkg/README
similarity index 91%
rename from print/texlive/base/files/README.OpenBSD
rename to print/texlive/base/pkg/README
index 56221cf4f5b..63e02858363 100644
--- a/print/texlive/base/files/README.OpenBSD
+++ b/print/texlive/base/pkg/README
@@ -1,5 +1,5 @@
 TeX Live for OpenBSD (PuffTeX) - Notes
-$OpenBSD: README.OpenBSD,v 1.7 2010/03/21 13:22:55 edd Exp $
+$OpenBSD: README,v 1.1 2010/11/14 16:58:39 edd Exp $
 ----------------------------
 
 There are a number of texmf trees in the OpenBSD packages:
@@ -19,7 +19,7 @@ All sizes are compressed package sizes.
 The texmf package contents do not overlap.
 
 Individual users may override or add to the tex class and style files
-supplied by TeX Live by installing them into ~/.texmf and running
+supplied by TeX Live by installing them into ~/texmf and running
 mktexlsr(1) (as themselves). After this you can test the installation by
 searching for the files using kpsewhich(1).