Update tex-xkeyval to 2.6a.

Changes since 2.5f:
- General: Altered policy for handling \XKV@rm in nested \setkeys*
  commands: all unknown keys will be recorded, not only the once from
  the outermost \setkeys*
- \XKV@s@tk@ys: Removed \global again for consistent approach of
  \XKV@rm and to allow groups to keep \XKV@rm local
- \XKV@setkeys: Avoid reset of \XKV@rm in nested \setkeys commands
- \XKV@srstate: Removed XKV@rm again on user request
- \@s@lective@sanitize: protecting assignments from #
- General: Added \KV@def to keyval.tex as it is used by some packages
- \XKV@addtomacro@n: protecting assignments from #
- \XKV@addtomacro@o: protecting assignments from #
- \XKV@ch@cksanitize: protecting assignments from #
- \XKV@f@r: protecting assignments from #
- \XKV@for@n: protecting assignments from #
- \XKVV@t@bulate: Solved bug occurring with empty prefix
- \@s@lective@sanitize: Use private scratch register
- \XKV@addtomacro@n: Use private scratch register
- \XKV@addtomacro@o: Use private scratch register
- \XKV@ch@cksanitize: Use private scratch register
- \XKV@f@r: Use private scratch register
- \XKV@for@n: Use private scratch register

3 files changed, 19 insertions, 47 deletions

diff --git a/print/tex-xkeyval/Makefile b/print/tex-xkeyval/Makefile
index 00fa719694b..a9370808b19 100644
--- a/print/tex-xkeyval/Makefile
+++ b/print/tex-xkeyval/Makefile
@@ -1,41 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/25 11:53:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/10 23:36:04 minskim Exp $
+# TeX Live Revision 10326
 
 DISTNAME=	xkeyval
-PKGNAME=	tex-${DISTNAME}-2.5f
-CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/latex/contrib/}
-EXTRACT_SUFX=	.zip
+PKGNAME=	tex-${DISTNAME}-2.6a
 
 MAINTAINER=	jmmv@NetBSD.org
-HOMEPAGE=	http://www.ctan.org/tex-archive/help/Catalogue/entries/xkeyval.html
 COMMENT=	Macros for setting keys and class or package options
 
-NO_BUILD=	yes
-USE_DIRS+=	texmf-1.4
-
-.include "../../print/teTeX/module.mk"
-
-do-install:
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/latex/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/doc/xkeyval.pdf \
-		${PKG_LOCALTEXMFPREFIX}/doc/latex/xkeyval
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/run/keyval.tex \
-		${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/run/pst-xkey.tex \
-		${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/run/xkeyval.tex \
-		${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/run/xkvtxhdr.tex \
-		${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/run/pst-xkey.sty \
-		${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/run/xkeyval.sty \
-		${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/run/xkvltxp.sty \
-		${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval
-	${INSTALL_DATA} ${WRKSRC}/run/xkvview.sty \
-		${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval
+CONFLICTS+=	teTeX-texmf<=3.0nb17
+DEPENDS+=	tex-tools-[0-9]*:../../print/tex-tools
 
+.include "../../print/texlive/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-xkeyval/PLIST b/print/tex-xkeyval/PLIST
index f61a3763d88..e4306949141 100644
--- a/print/tex-xkeyval/PLIST
+++ b/print/tex-xkeyval/PLIST
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:12:02 joerg Exp $
-${PKG_LOCALTEXMFPREFIX}/doc/latex/xkeyval/xkeyval.pdf
-${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval/keyval.tex
-${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval/pst-xkey.tex
-${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval/xkeyval.tex
-${PKG_LOCALTEXMFPREFIX}/tex/generic/xkeyval/xkvtxhdr.tex
-${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval/pst-xkey.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval/xkeyval.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval/xkvltxp.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/xkeyval/xkvview.sty
+@comment $NetBSD: PLIST,v 1.3 2009/07/10 23:36:04 minskim Exp $
+share/texmf-dist/tex/generic/xkeyval/keyval.tex
+share/texmf-dist/tex/generic/xkeyval/pst-xkey.tex
+share/texmf-dist/tex/generic/xkeyval/xkeyval.tex
+share/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
+share/texmf-dist/tex/latex/xkeyval/pst-xkey.sty
+share/texmf-dist/tex/latex/xkeyval/xkeyval.sty
+share/texmf-dist/tex/latex/xkeyval/xkvltxp.sty
+share/texmf-dist/tex/latex/xkeyval/xkvview.sty
diff --git a/print/tex-xkeyval/distinfo b/print/tex-xkeyval/distinfo
index 00e2ca49eb5..181b2056698 100644
--- a/print/tex-xkeyval/distinfo
+++ b/print/tex-xkeyval/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/25 11:53:15 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2009/07/10 23:36:04 minskim Exp $
 
-SHA1 (xkeyval.zip) = 87f354a6449efbeb2a3786e46e8907a59dcbc791
-RMD160 (xkeyval.zip) = 4e59b29399da5915e3a52caec420a0b6990995f8
-Size (xkeyval.zip) = 455774 bytes
+SHA1 (tex-xkeyval-2.6a/xkeyval.tar.lzma) = 7e24e2c4545a1a63b85255926804169d38638535
+RMD160 (tex-xkeyval-2.6a/xkeyval.tar.lzma) = 8a1443ac6fb30cec0ccde5c9699d1ad200cacf7c
+Size (tex-xkeyval-2.6a/xkeyval.tar.lzma) = 8774 bytes