Update tex-IEEEtran to 1.7a.

This is a bug fix release that corrects the problem of unwanted two
column peer review title page format.

3 files changed, 76 insertions, 65 deletions

diff --git a/print/tex-IEEEtran/Makefile b/print/tex-IEEEtran/Makefile
index a68257ebb39..23c9e06a417 100644
--- a/print/tex-IEEEtran/Makefile
+++ b/print/tex-IEEEtran/Makefile
@@ -1,52 +1,56 @@
-# $NetBSD: Makefile,v 1.11 2007/07/16 23:49:07 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2008/12/07 06:43:22 minskim Exp $
 #
 
 DISTNAME=	IEEEtran
-PKGNAME=	tex-IEEEtran-1.7
+PKGNAME=	tex-IEEEtran-1.7a
 CATEGORIES=	print
-MASTER_SITES=	http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/journmag/transactions/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} IEEEtranBST${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/latex/contrib/}
+EXTRACT_SUFX=	.zip
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://www.ieee.org/portal/pages/pubs/transactions/stylesheets.html
+HOMEPAGE=	http://www.michaelshell.org/tex/ieeetran/
 COMMENT=	LaTeX class for IEEE journals and conferences
 
-DIST_SUBDIR=	${PKGNAME_NOREV}
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-USE_DIRS+=	texmf-1.4
 
-LATEX_FILES=	IEEEtran.cls
-LATEX_DOCS=	IEEEtran_HOWTO.pdf README \
-		bare_adv.tex bare_conf.tex bare_jrnl.tex bare_jrnl_compsoc.tex
-BIB_FILES=	IEEEabrv.bib IEEEexample.bib IEEEfull.bib
-BST_FILES=	IEEEtran.bst IEEEtranS.bst
-BIBTEX_DOCS=	IEEEtran_bst_HOWTO.pdf
+TEXMFDIRS=	${TEXMFDIST}
 
 .include "../../print/teTeX/module.mk"
 
 do-install:
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/tex/latex/IEEEtran
-.for f in ${LATEX_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PKG_LOCALTEXMFPREFIX}/tex/latex/IEEEtran
-.endfor
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran
-.for f in ${LATEX_DOCS}
-		${INSTALL_DATA} ${WRKSRC}/${f} ${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran
-.endfor
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/bibtex/bib/IEEEtran
-.for f in ${BIB_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PKG_LOCALTEXMFPREFIX}/bibtex/bib/IEEEtran
-.endfor
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/bibtex/bst/IEEEtran
-.for f in ${BST_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PKG_LOCALTEXMFPREFIX}/bibtex/bst/IEEEtran
-.endfor
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/bibtex/IEEEtran
-.for f in ${BIBTEX_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PKG_LOCALTEXMFPREFIX}/doc/bibtex/IEEEtran
-.endfor
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXMFDIST}/bibtex/bib/${DISTNAME}
+	${FIND} ${WRKSRC} -name \*.bib -exec ${INSTALL_DATA} {} \
+		${DESTDIR}${TEXMFDIST}/bibtex/bib/${DISTNAME} \;
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXMFDIST}/bibtex/bst/${DISTNAME}
+	${FIND} ${WRKSRC} -name \*.bst -exec ${INSTALL_DATA} {} \
+		${DESTDIR}${TEXMFDIST}/bibtex/bst/${DISTNAME} \;
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME}
+	${FIND} ${WRKSRC} -name \*.pdf -exec ${INSTALL_DATA} {} \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME} \;
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME}
+	${INSTALL_DATA} ${WRKSRC}/bibtex/README \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME}/README.bibtex
+	${INSTALL_DATA} ${WRKSRC}/extras/README \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME}/README.extras
+	${INSTALL_DATA} ${WRKSRC}/testflow/README \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME}/README.testflow
+	${INSTALL_DATA} ${WRKSRC}/tools/README \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME}/README.tools
+	${FIND} ${WRKSRC} -name \*.txt -exec ${INSTALL_DATA} {} \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME} \;
+	${FIND} ${WRKSRC} -name \*.tex -exec ${INSTALL_DATA} {} \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME} \;
+	${FIND} ${WRKSRC} -name \*.eps -exec ${INSTALL_DATA} {} \
+		${DESTDIR}${TEXMFDIST}/doc/latex/${DISTNAME} \;
+	${INSTALL_DATA_DIR} ${DESTDIR}${TEXMFDIST}/tex/latex/${DISTNAME}
+	${FIND} ${WRKSRC} -name \*.cls -exec ${INSTALL_DATA} {} \
+		${DESTDIR}${TEXMFDIST}/tex/latex/${DISTNAME} \;
+	${FIND} ${WRKSRC} -name \*.sty -exec ${INSTALL_DATA} {} \
+		${DESTDIR}${TEXMFDIST}/tex/latex/${DISTNAME} \;
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-IEEEtran/PLIST b/print/tex-IEEEtran/PLIST
index 77d4ad97220..07e0999c1be 100644
--- a/print/tex-IEEEtran/PLIST
+++ b/print/tex-IEEEtran/PLIST
@@ -1,24 +1,34 @@
-@comment $NetBSD: PLIST,v 1.4 2007/07/16 23:49:07 minskim Exp $
-${PKG_LOCALTEXMFPREFIX}/bibtex/bib/IEEEtran/IEEEabrv.bib
-${PKG_LOCALTEXMFPREFIX}/bibtex/bib/IEEEtran/IEEEexample.bib
-${PKG_LOCALTEXMFPREFIX}/bibtex/bib/IEEEtran/IEEEfull.bib
-${PKG_LOCALTEXMFPREFIX}/bibtex/bst/IEEEtran/IEEEtran.bst
-${PKG_LOCALTEXMFPREFIX}/bibtex/bst/IEEEtran/IEEEtranS.bst
-${PKG_LOCALTEXMFPREFIX}/doc/bibtex/IEEEtran/IEEEtran_bst_HOWTO.pdf
-${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran/IEEEtran_HOWTO.pdf
-${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran/README
-${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran/bare_adv.tex
-${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran/bare_conf.tex
-${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran/bare_jrnl.tex
-${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran/bare_jrnl_compsoc.tex
-${PKG_LOCALTEXMFPREFIX}/tex/latex/IEEEtran/IEEEtran.cls
-@dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex/IEEEtran
-@comment In texmf-dirs: @dirrm ${PKG_LOCALTEXMFPREFIX}/tex/latex
-@dirrm ${PKG_LOCALTEXMFPREFIX}/doc/latex/IEEEtran
-@comment In texmf-dirs: @dirrm ${PKG_LOCALTEXMFPREFIX}/doc/latex
-@dirrm ${PKG_LOCALTEXMFPREFIX}/doc/bibtex/IEEEtran
-@comment In texmf-dirs: @dirrm ${PKG_LOCALTEXMFPREFIX}/doc/bibtex
-@dirrm ${PKG_LOCALTEXMFPREFIX}/bibtex/bst/IEEEtran
-@comment In texmf-dirs: @dirrm ${PKG_LOCALTEXMFPREFIX}/bibtex/bst
-@dirrm ${PKG_LOCALTEXMFPREFIX}/bibtex/bib/IEEEtran
-@comment In texmf-dirs: @dirrm ${PKG_LOCALTEXMFPREFIX}/bibtex/bib
+@comment $NetBSD: PLIST,v 1.5 2008/12/07 06:43:22 minskim Exp $
+${TEXMFDIST}/bibtex/bib/IEEEtran/IEEEabrv.bib
+${TEXMFDIST}/bibtex/bib/IEEEtran/IEEEexample.bib
+${TEXMFDIST}/bibtex/bib/IEEEtran/IEEEfull.bib
+${TEXMFDIST}/bibtex/bst/IEEEtran/IEEEtran.bst
+${TEXMFDIST}/bibtex/bst/IEEEtran/IEEEtranN.bst
+${TEXMFDIST}/bibtex/bst/IEEEtran/IEEEtranS.bst
+${TEXMFDIST}/bibtex/bst/IEEEtran/IEEEtranSA.bst
+${TEXMFDIST}/bibtex/bst/IEEEtran/IEEEtranSN.bst
+${TEXMFDIST}/doc/latex/IEEEtran/IEEEtran_HOWTO.pdf
+${TEXMFDIST}/doc/latex/IEEEtran/IEEEtran_bst_HOWTO.pdf
+${TEXMFDIST}/doc/latex/IEEEtran/IEEEtrantools_doc.txt
+${TEXMFDIST}/doc/latex/IEEEtran/README
+${TEXMFDIST}/doc/latex/IEEEtran/README.bibtex
+${TEXMFDIST}/doc/latex/IEEEtran/README.extras
+${TEXMFDIST}/doc/latex/IEEEtran/README.testflow
+${TEXMFDIST}/doc/latex/IEEEtran/README.tools
+${TEXMFDIST}/doc/latex/IEEEtran/bare_adv.tex
+${TEXMFDIST}/doc/latex/IEEEtran/bare_conf.tex
+${TEXMFDIST}/doc/latex/IEEEtran/bare_jrnl.tex
+${TEXMFDIST}/doc/latex/IEEEtran/bare_jrnl_compsoc.tex
+${TEXMFDIST}/doc/latex/IEEEtran/changelog.txt
+${TEXMFDIST}/doc/latex/IEEEtran/font_install_how.txt
+${TEXMFDIST}/doc/latex/IEEEtran/testflow.tex
+${TEXMFDIST}/doc/latex/IEEEtran/testflow_ctl_A4.pdf
+${TEXMFDIST}/doc/latex/IEEEtran/testflow_ctl_LTR.pdf
+${TEXMFDIST}/doc/latex/IEEEtran/testflow_doc.pdf
+${TEXMFDIST}/doc/latex/IEEEtran/tux.eps
+${TEXMFDIST}/tex/latex/IEEEtran/IEEEtran.cls
+${TEXMFDIST}/tex/latex/IEEEtran/IEEEtrantools.sty
+@dirrm ${TEXMFDIST}/tex/latex/IEEEtran
+@dirrm ${TEXMFDIST}/doc/latex/IEEEtran
+@dirrm ${TEXMFDIST}/bibtex/bst/IEEEtran
+@dirrm ${TEXMFDIST}/bibtex/bib/IEEEtran
diff --git a/print/tex-IEEEtran/distinfo b/print/tex-IEEEtran/distinfo
index cab2871a43c..e0443322b4a 100644
--- a/print/tex-IEEEtran/distinfo
+++ b/print/tex-IEEEtran/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.5 2007/07/16 23:49:07 minskim Exp $
+$NetBSD: distinfo,v 1.6 2008/12/07 06:43:22 minskim Exp $
 
-SHA1 (tex-IEEEtran-1.7/IEEEtran.tar.gz) = 9aebf908125d3b9d5cd4e89bf46549baed14a310
-RMD160 (tex-IEEEtran-1.7/IEEEtran.tar.gz) = b9e00b22ceffb93165f7883338c166953f29ba15
-Size (tex-IEEEtran-1.7/IEEEtran.tar.gz) = 669935 bytes
-SHA1 (tex-IEEEtran-1.7/IEEEtranBST.tar.gz) = d451408fc56980cc40b2d6f4a35c3a0c9b80c7d7
-RMD160 (tex-IEEEtran-1.7/IEEEtranBST.tar.gz) = 07c746288976ca50a2cd9a6ec73fb58cc3cbc1ea
-Size (tex-IEEEtran-1.7/IEEEtranBST.tar.gz) = 313786 bytes
+SHA1 (tex-IEEEtran-1.7a/IEEEtran.zip) = ca6bc7e24d1bed3f88c6c53e4e5158d1c8efb7de
+RMD160 (tex-IEEEtran-1.7a/IEEEtran.zip) = 26312fbbec36ce7fcb321f7cdabcc8c4c261e4d2
+Size (tex-IEEEtran-1.7a/IEEEtran.zip) = 1737630 bytes