Update tex-fixme to 4.1.

Switched to the version in TeX Live.  Many new features were added in 4.x,
including support for tex-pdfcomment.

4 files changed, 43 insertions, 41 deletions

diff --git a/print/tex-fixme/DESCR b/print/tex-fixme/DESCR
index 45ffc6fe5a7..d409aba16e5 100644
--- a/print/tex-fixme/DESCR
+++ b/print/tex-fixme/DESCR
@@ -1,8 +1,7 @@
-This package provides you with a way of inserting fixme notes in your
-documents.  Such notes can appear inline, as marginal notes,
-footnotes, index entries, in the log file and as warnings on stdout.
-It is also possible to summarize them in a list.  When you switch from
-draft to final mode, any remaining fixme note will be logged, but
-removed from the document's body.  Additionally, critical notes will
-abort compilation with an informative message.  FiXme also comes with
+This package provides a way to insert fixme notes in documents
+being developed (in draft mode). Such notes can appear in the
+margin of the document, as index entries, in the log file and
+as warnings on stdout. It is also possible to summarize them in
+a list. If your document is in a final version, any remaining
+fixme notes will produce an error. FiXme also comes with
 support for AUC-TeX.
diff --git a/print/tex-fixme/Makefile b/print/tex-fixme/Makefile
index 7aab99d588e..e4433dbd630 100644
--- a/print/tex-fixme/Makefile
+++ b/print/tex-fixme/Makefile
@@ -1,31 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2010/01/27 16:14:26 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2011/01/12 17:07:10 minskim Exp $
 
 DISTNAME=	fixme
-PKGNAME=	tex-${DISTNAME}-3.2
-CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/latex/contrib/}
-EXTRACT_SUFX=	.zip
+PKGNAME=	tex-${DISTNAME}-4.1
+TEXLIVE_REV=	16169
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://tug.ctan.org/tex-archive/macros/latex/contrib/fixme/
 COMMENT=	Insert "fixme" notes into draft documents
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-DIST_SUBDIR=	${PKGNAME}
-
-.include "../../print/teTeX/module.mk"
-
-INSTALLATION_DIRS+=	${PKG_LOCALTEXMFPREFIX}/doc/latex/fixme \
-			${PKG_LOCALTEXMFPREFIX}/tex/latex/fixme
-
-do-build:
-	cd ${WRKSRC} && latex fixme.ins
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/README ${WRKSRC}/fixme.pdf \
-	    ${WRKSRC}/fixme.el ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/doc/latex/fixme
-	${INSTALL_DATA} ${WRKSRC}/fixme.sty \
-	    ${DESTDIR}${PKG_LOCALTEXMFPREFIX}/tex/latex/fixme
-
+DEPENDS+=	tex-changebar-[0-9]*:../../print/tex-changebar
+DEPENDS+=	tex-graphics>=1.0onb1:../../print/tex-graphics
+DEPENDS+=	tex-latex>=2009:../../print/tex-latex
+DEPENDS+=	tex-latex-bin>=2009nb1:../../print/tex-latex-bin
+DEPENDS+=	tex-marginnote-[0-9]*:../../print/tex-marginnote
+DEPENDS+=	tex-pdfcomment-[0-9]*:../../print/tex-pdfcomment
+DEPENDS+=	tex-tools>=2010:../../print/tex-tools
+DEPENDS+=	tex-xcolor>=2.11:../../print/tex-xcolor
+DEPENDS+=	tex-xkeyval>=2.6a:../../print/tex-xkeyval
+
+.include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-fixme/PLIST b/print/tex-fixme/PLIST
index dea97cad711..cca31cafaf3 100644
--- a/print/tex-fixme/PLIST
+++ b/print/tex-fixme/PLIST
@@ -1,6 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:12:01 joerg Exp $
-${PKG_LOCALTEXMFPREFIX}/doc/latex/fixme/NEWS
-${PKG_LOCALTEXMFPREFIX}/doc/latex/fixme/README
-${PKG_LOCALTEXMFPREFIX}/doc/latex/fixme/fixme.el
-${PKG_LOCALTEXMFPREFIX}/doc/latex/fixme/fixme.pdf
-${PKG_LOCALTEXMFPREFIX}/tex/latex/fixme/fixme.sty
+@comment $NetBSD: PLIST,v 1.3 2011/01/12 17:07:10 minskim Exp $
+share/texmf-dist/tex/latex/fixme/fixme.sty
+share/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolor.sty
+share/texmf-dist/tex/latex/fixme/layouts/env/fxenvlayoutcolorsig.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutmarginnote.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcmargin.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcnote.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsigmargin.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfcsignote.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfmargin.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfnote.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsigmargin.sty
+share/texmf-dist/tex/latex/fixme/layouts/fxlayoutpdfsignote.sty
+share/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutchangebar.sty
+share/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolor.sty
+share/texmf-dist/tex/latex/fixme/layouts/target/fxtargetlayoutcolorcb.sty
+share/texmf-dist/tex/latex/fixme/themes/fxthemecolor.sty
+share/texmf-dist/tex/latex/fixme/themes/fxthemecolorsig.sty
+share/texmf-dist/tex/latex/fixme/themes/fxthemesignature.sty
diff --git a/print/tex-fixme/distinfo b/print/tex-fixme/distinfo
index d283bbb23a0..3e7ff536a8e 100644
--- a/print/tex-fixme/distinfo
+++ b/print/tex-fixme/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/05/01 18:32:26 minskim Exp $
+$NetBSD: distinfo,v 1.3 2011/01/12 17:07:10 minskim Exp $
 
-SHA1 (tex-fixme-3.2/fixme.zip) = 5cd4c60ed9cab56a1909d9105cb1f8d89b856b65
-RMD160 (tex-fixme-3.2/fixme.zip) = 8c3972225a48a27329f9d702cffcbb8a76e5b8af
-Size (tex-fixme-3.2/fixme.zip) = 94650 bytes
+SHA1 (tex-fixme-16169/fixme.tar.xz) = f6db30e50515965a34604e09bd4ff27a16070a02
+RMD160 (tex-fixme-16169/fixme.tar.xz) = 9d9cc15194886da0ac084fdb76be66652887191b
+Size (tex-fixme-16169/fixme.tar.xz) = 8264 bytes