Update to latex2rtf-1.9.16a. Okayed by maintainer.

Changed order of MASTER_SITES -- use sourceforge first (said to be updated
first).

Remove post-extract and do-configure targets.

Get rid of do-install steps except for info file (use INSTALL_MAN
instead of INSTALL_DATA for that).

Remove man/man1 from INSTALLATION_DIRS as the install does this
already.

Add many configs to PLIST.

Now installs a latex2png executable.

Updated patch also honors PKGMANDIR.

The ChangeLog has:

Squash another compiler warning
Better error message when getTexUntil fails
Fix for \succ and \prec by Aleksey Cheusov
fix uninitialized warning messages under debian
new versions of derived files
Preparing for 1.9.16 release
support for compression of citations i.e., [1,2,3,4] is now [1-4]
support for sorted citations
Fixes for natbib style when numbers are used
support for \ensuremath
fix for bibliographic reference for non-alpha natbib entries
fixes for superscripted natbib style
update docs with information about bibliography styles
trying to check in
Change format of error messages Fix missing filename in error messages Change
        diagnostic level of warnings in a couple of places
Fix annoying extra page break at beginning of reports and books
Some support for \citealt and \citealp commands from natbib package.  Not
        thoroughly tested but it works ok for single authors.
Add support for \euro{amount} and \EUR{amount}
Added lines to babel_czech.tex to facilitate processing with latex Updated
        subsup.tex in tarball.`
add babel_spanish.tex and fig_size.tex to distribution fixes for \centering in
        table and figure environments
fix font handling in equations so that ${\rm A}$ typesets in roman. Update ToDo
        and ChangeLog
Fix for mis-numbering of figures and tables in reports
support for \bibpunct in the natbib package
Fix bizzare way that commands are searched.  It is now possible to replace
        command behavior by pushing a new Environment.
support for revtex \begin{acknowledge} \end{acknowledge} as well as \onlinecite
        and \citeonline (from RevTeX).  (This is untested currently) patches fro
m
        Marin Chicoine.
avoid possible overrun in cCommand in TranslateCommand security flaw pointed out
        by D. J. Bernstein
avoid buffer overruns in macro expansion that can be security holes reported by
        D. J. Bernstein
.... and many other changes ...

4 files changed, 102 insertions, 63 deletions

diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile
index 63fcd56fabf..8aadaf3de14 100644
--- a/converters/latex2rtf/Makefile
+++ b/converters/latex2rtf/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2005/06/16 06:57:43 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/09 07:17:04 reed Exp $
 #
 
-DISTNAME=	latex2rtf-1.8aa
-PKGNAME=	latex2rtf-1.8a
+DISTNAME=	latex2rtf-1.9.16a
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=support/latex2rtf/} \
-		${MASTER_SITE_SOURCEFORGE:=latex2rtf/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=latex2rtf/}	\
+		${MASTER_SITE_TEX_CTAN:=support/latex2rtf/}
 
 MAINTAINER=	brook@nmsu.edu
 HOMEPAGE=	http://latex2rtf.sourceforge.net/
@@ -14,29 +13,10 @@ COMMENT=	LaTeX to RTF converter
 MAKE_FLAGS+=	XCFLAGS="${CFLAGS}"
 
 INFO_FILES=	latex2rtf.info
-SUPPORT_FILES=	direct.cfg fonts.cfg ignore.cfg english.cfg german.cfg \
-		spanish.cfg
 
-INSTALLATION_DIRS=	bin ${INFO_DIR} man/man1
+INSTALLATION_DIRS=	share/doc/latex2rtf ${INFO_DIR}
 
-post-extract:
-	${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.in
-	${RM} -f ${WRKSRC}/*.o
-
-do-configure:
-	${SED} < ${WRKSRC}/Makefile.in > ${WRKSRC}/Makefile \
-		-e 's:@PREFIX@:${PREFIX}:'
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/latex2rtf ${PREFIX}/bin/latex2rtf
-	${INSTALL_MAN} ${WRKSRC}/latex2rtf.1 ${PREFIX}/man/man1/latex2rtf.1
-	${INSTALL_DATA} ${WRKSRC}/doc/latex2rtf.info ${PREFIX}/${INFO_DIR}/latex2rtf.info
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/latex2rtf
-	${INSTALL_DATA} ${WRKSRC}/doc/l2r.html ${PREFIX}/share/doc/latex2rtf/latex2rtf.html
-	${INSTALL_DATA} ${WRKSRC}/doc/l2r.pdf ${PREFIX}/share/doc/latex2rtf/latex2rtf.pdf
-	${INSTALL_DATA_DIR} ${PREFIX}/share/latex2rtf
-.for FILE in ${SUPPORT_FILES}
-	${INSTALL_DATA} ${WRKSRC}/cfg/${FILE} ${PREFIX}/share/latex2rtf/${FILE}
-.endfor
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/latex2rtf.info ${PREFIX}/${INFO_DIR}/latex2rtf.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/latex2rtf/PLIST b/converters/latex2rtf/PLIST
index 867b2e1bdd3..bf97869db2c 100644
--- a/converters/latex2rtf/PLIST
+++ b/converters/latex2rtf/PLIST
@@ -1,13 +1,54 @@
-@comment $NetBSD: PLIST,v 1.4 2004/01/12 21:50:29 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/11/09 07:17:04 reed Exp $
+bin/latex2png
 bin/latex2rtf
-share/latex2rtf/direct.cfg
-share/latex2rtf/english.cfg
-share/latex2rtf/fonts.cfg
-share/latex2rtf/german.cfg
-share/latex2rtf/ignore.cfg
-share/latex2rtf/spanish.cfg
+man/man1/latex2png.1
 man/man1/latex2rtf.1
+share/latex2rtf/cfg/afrikaans.cfg
+share/latex2rtf/cfg/bahasa.cfg
+share/latex2rtf/cfg/basque.cfg
+share/latex2rtf/cfg/brazil.cfg
+share/latex2rtf/cfg/breton.cfg
+share/latex2rtf/cfg/catalan.cfg
+share/latex2rtf/cfg/croatian.cfg
+share/latex2rtf/cfg/czech.cfg
+share/latex2rtf/cfg/danish.cfg
+share/latex2rtf/cfg/direct.cfg
+share/latex2rtf/cfg/dutch.cfg
+share/latex2rtf/cfg/english.cfg
+share/latex2rtf/cfg/esperanto.cfg
+share/latex2rtf/cfg/estonian.cfg
+share/latex2rtf/cfg/finnish.cfg
+share/latex2rtf/cfg/fonts.cfg
+share/latex2rtf/cfg/french.cfg
+share/latex2rtf/cfg/galician.cfg
+share/latex2rtf/cfg/german.cfg
+share/latex2rtf/cfg/icelandic.cfg
+share/latex2rtf/cfg/ignore.cfg
+share/latex2rtf/cfg/inc_test.tex
+share/latex2rtf/cfg/irish.cfg
+share/latex2rtf/cfg/italian.cfg
+share/latex2rtf/cfg/latin.cfg
+share/latex2rtf/cfg/lsorbian.cfg
+share/latex2rtf/cfg/magyar.cfg
+share/latex2rtf/cfg/norsk.cfg
+share/latex2rtf/cfg/nynorsk.cfg
+share/latex2rtf/cfg/polish.cfg
+share/latex2rtf/cfg/portuges.cfg
+share/latex2rtf/cfg/romanian.cfg
+share/latex2rtf/cfg/russian.cfg
+share/latex2rtf/cfg/samin.cfg
+share/latex2rtf/cfg/scottish.cfg
+share/latex2rtf/cfg/serbian.cfg
+share/latex2rtf/cfg/slovak.cfg
+share/latex2rtf/cfg/slovene.cfg
+share/latex2rtf/cfg/spanish.cfg
+share/latex2rtf/cfg/style.cfg
+share/latex2rtf/cfg/swedish.cfg
+share/latex2rtf/cfg/turkish.cfg
+share/latex2rtf/cfg/usorbian.cfg
+share/latex2rtf/cfg/welsh.cfg
 share/doc/latex2rtf/latex2rtf.html
 share/doc/latex2rtf/latex2rtf.pdf
-@dirrm share/doc/latex2rtf
+@dirrm share/latex2rtf/cfg
 @dirrm share/latex2rtf
+@dirrm share/doc/latex2rtf
diff --git a/converters/latex2rtf/distinfo b/converters/latex2rtf/distinfo
index 58f411a4a62..eab92766a24 100644
--- a/converters/latex2rtf/distinfo
+++ b/converters/latex2rtf/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 16:12:34 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/11/09 07:17:04 reed Exp $
 
-SHA1 (latex2rtf-1.8aa.tar.gz) = ab02cf1d069ba05400b2cb5df2182a1c139d4ae8
-RMD160 (latex2rtf-1.8aa.tar.gz) = 8641dd9df0e0709e93607b98a262b559eb16d5f7
-Size (latex2rtf-1.8aa.tar.gz) = 338481 bytes
-SHA1 (patch-aa) = 3ee116cc90138a17bf734b2e38a82c1e194119be
+SHA1 (latex2rtf-1.9.16a.tar.gz) = e4f522d600b0386fa544f0fe59a7024325d0b567
+RMD160 (latex2rtf-1.9.16a.tar.gz) = 0bea62eafdbd6c240d76e3d7d6bac5cf7a14f8fe
+Size (latex2rtf-1.9.16a.tar.gz) = 633884 bytes
+SHA1 (patch-aa) = 47e490a62a65473bd554d31660fc28e502187f98
diff --git a/converters/latex2rtf/patches/patch-aa b/converters/latex2rtf/patches/patch-aa
index e5a3182e38a..f9f85c57ada 100644
--- a/converters/latex2rtf/patches/patch-aa
+++ b/converters/latex2rtf/patches/patch-aa
@@ -1,24 +1,42 @@
-$NetBSD: patch-aa,v 1.2 2003/09/22 09:06:36 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/09 07:17:04 reed Exp $
 
---- ./Makefile.in.orig	Tue Mar  7 23:37:35 2000
-+++ ./Makefile.in	Tue Mar  7 23:45:10 2000
-@@ -115,8 +115,8 @@
- #
- # Where support files are searched for by the executable
- # prefix defaults to /usr/local, but may be set on the command line
--prefix=/usr/local
--LIBDIR=$(prefix)/lib/latex2rtf
-+prefix=@PREFIX@
-+LIBDIR=$(prefix)/share/latex2rtf
- # You can give several Directories separated by ':' for the following
- # install targets
- #
-@@ -165,7 +165,7 @@
-     debian.control debian.rules util.c util.h  ChangeLog parser.c parser.h
- SUPPORT=cfg/direct.cfg cfg/fonts.cfg cfg/ignore.cfg \
-     cfg/english.cfg cfg/german.cfg cfg/spanish.cfg \
--    l2r.bat l2r.exe
-+#   l2r.bat l2r.exe
- MANUALS=latex2rtf.1
- MSDOS=l2r.bat l2r.exe
- DOCS=doc/latex2rtf.info doc/l2r.html doc/l2r.pdf doc/l2r.txt\
+--- Makefile.orig	2004-11-07 18:59:18.000000000 -0800
++++ Makefile	2005-11-03 15:42:07.000000000 -0800
+@@ -1,6 +1,6 @@
+ # $Id: patch-aa,v 1.3 2005/11/09 07:17:04 reed Exp $
+ 
+-CC=gcc
++CC?=gcc
+ MKDIR=mkdir -p
+ 
+ CFLAGS:=-DUNIX
+@@ -18,14 +18,14 @@
+ #CFLAGS:=$(CFLAGS) -Zwin32  
+ 
+ #Base directory - adapt as needed
+-PREFIX=$(PREFIX_DRIVE)/usr/local
++PREFIX?=$(PREFIX_DRIVE)/usr/local
+ 
+ #Name of executable binary --- beware of 8.3 restriction under DOS
+ BINARY_NAME=latex2rtf$(EXE_SUFFIX)
+ 
+ # Location of binary, man, info, and support files - adapt as needed
+ BIN_INSTALL=$(PREFIX)/bin
+-MAN_INSTALL=$(PREFIX)/man/man1
++MAN_INSTALL=$(PREFIX)/$(PKGMANDIR)/man1
+ INFO_INSTALL=$(PREFIX)/info
+ SUPPORT_INSTALL=$(PREFIX)/share/latex2rtf
+ CFG_INSTALL=$(PREFIX)/share/latex2rtf/cfg
+@@ -176,9 +176,9 @@
+ 	cp doc/latex2rtf.1    $(MAN_INSTALL)
+ 	cp doc/latex2png.1    $(MAN_INSTALL)
+ 	cp $(CFGS)            $(CFG_INSTALL)
+-	cp doc/latex2rtf.html $(SUPPORT_INSTALL)
+-	cp doc/latex2rtf.pdf  $(SUPPORT_INSTALL)
+-	cp doc/latex2rtf.txt  $(SUPPORT_INSTALL)
++	cp doc/latex2rtf.html $(PREFIX)/share/doc/latex2rtf
++	cp doc/latex2rtf.pdf  $(PREFIX)/share/doc/latex2rtf
++#	cp doc/latex2rtf.txt  $(SUPPORT_INSTALL)
+ 	@echo "******************************************************************"
+ 	@echo "*** latex2rtf successfully installed as \"$(BINARY_NAME)\""
+ 	@echo "*** in directory \"$(BIN_INSTALL)\""