5 files changed, 28 insertions, 134 deletions

diff --git a/print/rtf2latex2e/Makefile b/print/rtf2latex2e/Makefile
index 107bf4171f71..42b6212b5bf3 100644
--- a/print/rtf2latex2e/Makefile
+++ b/print/rtf2latex2e/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	rtf2latex2e
-PORTVERSION=	1.0
+PORTVERSION=	2.0.1
 CATEGORIES=	print
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION}fc2
-DISTNAME=	${PORTNAME}Unix1
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix/2-0
+DISTNAME=	${PORTNAME}-${PORTVERSION:C|\.|-|g}
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	A newer filter that converts RTF (MS Rich Text Format) into LaTeX
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+LICENSE=	GPLv2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}Unix-${PORTVERSION}fc1/Unix
+USE_ZIP=	yes
+USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/print/rtf2latex2e/distinfo b/print/rtf2latex2e/distinfo
index 2cc9c77cb8ba..a55e7d447909 100644
--- a/print/rtf2latex2e/distinfo
+++ b/print/rtf2latex2e/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rtf2latex2eUnix1.tar.gz) = 56e9f5401407bdf9b260997ff01ab2511571c9584c96b1e953ae0a54676337a5
-SIZE (rtf2latex2eUnix1.tar.gz) = 540992
+SHA256 (rtf2latex2e-2-0-1.zip) = 74f97cbd2452413ad293ec1815cc7028b6e71e91c8747f04be28f738cac4a46b
+SIZE (rtf2latex2e-2-0-1.zip) = 1208376
diff --git a/print/rtf2latex2e/files/patch-Makefile.in b/print/rtf2latex2e/files/patch-Makefile.in
deleted file mode 100644
index 57406018c34f..000000000000
--- a/print/rtf2latex2e/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in~	2008-10-13 05:34:25.000000000 +0200
-+++ Makefile.in	2008-10-13 05:34:25.000000000 +0200
-@@ -6,7 +6,7 @@
- # IMPORTANT!!!!!
- # if you edit the install directory (INSTALL_DIR), 
- # make sure it ends with rtf2latex2e!!!!
--INSTALL_DIR = /usr/local/rtf2latex2e
-+INSTALL_DIR = ${PREFIX}/share/rtf2latex2e
- #----------------------------------------------------------------
- 
- 
-@@ -61,10 +61,10 @@
- 	cp -r ../pref $(INSTALL_DIR)/
- 	cp -r ../src $(INSTALL_DIR)/
- 	cp -r ../Unix $(INSTALL_DIR)/
--	ln -sf $(INSTALL_DIR)/rtf2latex2e.bin /usr/bin/rtf2latex2e
-+	ln -sf $(INSTALL_DIR)/rtf2latex2e.bin ${PREFIX}/bin/rtf2latex2e
- 	@echo
- 	@echo "rtf2latex2e has been installed in $(INSTALL_DIR)"
--	@echo "A symbolic link /usr/bin/rtf2latex2e has been created"
-+	@echo "A symbolic link ${PREFIX}/bin/rtf2latex2e has been created"
- 	@echo
- 	@echo "Please set the environment variable RTF2LATEX2E_DIR to $(INSTALL_DIR)."
- 	@echo
diff --git a/print/rtf2latex2e/files/patch-src-common-cole-oledecod.c b/print/rtf2latex2e/files/patch-src-common-cole-oledecod.c
deleted file mode 100644
index d361eda01d11..000000000000
--- a/print/rtf2latex2e/files/patch-src-common-cole-oledecod.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../src/common/cole/oledecod.c~	2008-10-13 05:21:28.000000000 +0200
-+++ ../src/common/cole/oledecod.c	2008-10-13 05:21:28.000000000 +0200
-@@ -44,7 +44,7 @@
- #if __GNUC__
- 	#if __APPLE__
- 	#else
--	#include <malloc.h>
-+	#include <stdlib.h>
- 	#endif
- 	#include <sys/types.h>
- #endif 
diff --git a/print/rtf2latex2e/pkg-plist b/print/rtf2latex2e/pkg-plist
index 8198cdf18cbd..a7e90d1cb4f3 100644
--- a/print/rtf2latex2e/pkg-plist
+++ b/print/rtf2latex2e/pkg-plist
@@ -1,93 +1,22 @@
 bin/rtf2latex2e
-%%DATADIR%%/rtf2latex2e.bin
-%%DATADIR%%/INSTALL
-%%DATADIR%%/Unix/Makefile
-%%DATADIR%%/Unix/mkinstalldirs
-%%DATADIR%%/Unix/Makefile.in
-%%DATADIR%%/Unix/install-sh
-%%DATADIR%%/Unix/config.status
-%%DATADIR%%/Unix/config.sub
-%%DATADIR%%/Unix/configure.in
-%%DATADIR%%/Unix/.DS_Store
-%%DATADIR%%/Unix/aclocal.m4
-%%DATADIR%%/Unix/Makefile.in.orig
-%%DATADIR%%/Unix/config.guess
-%%DATADIR%%/Unix/configure
-%%DATADIR%%/src/.DS_Store
-%%DATADIR%%/src/common/jpeg2eps.c
-%%DATADIR%%/src/common/LaTeX2e-writer.c
-%%DATADIR%%/src/common/rtf2LaTeX2e-driver.c
-%%DATADIR%%/src/common/cole/cole.c
-%%DATADIR%%/src/common/cole/internal.c
-%%DATADIR%%/src/common/cole/oledecod.c
-%%DATADIR%%/src/common/cole/version.c.in
-%%DATADIR%%/src/common/cole/support.c
-%%DATADIR%%/src/common/cole/olecod.c
-%%DATADIR%%/src/common/cole/version.c
-%%DATADIR%%/src/common/cole/oledecod.c.orig
-%%DATADIR%%/src/common/.DS_Store
-%%DATADIR%%/src/common/reader.c
-%%DATADIR%%/src/common/figure2eps.c
-%%DATADIR%%/src/common/tokenscan.c
-%%DATADIR%%/src/common/eqn.c
-%%DATADIR%%/src/include/internal.h
-%%DATADIR%%/src/include/rtf-namedef.h
-%%DATADIR%%/src/include/cole.h
-%%DATADIR%%/src/include/rtf-ctrldef.h
-%%DATADIR%%/src/include/eqn.h
-%%DATADIR%%/src/include/.DS_Store
-%%DATADIR%%/src/include/config.h
-%%DATADIR%%/src/include/jpeg2eps.h
-%%DATADIR%%/src/include/stdcharnames.h
-%%DATADIR%%/src/include/support.h
-%%DATADIR%%/src/include/tokenscan.h
-%%DATADIR%%/src/include/config.h.in
-%%DATADIR%%/src/include/rtf2LaTeX2e.h
-%%DATADIR%%/src/include/stamp-h
-%%DATADIR%%/src/include/cole.h.in
-%%DATADIR%%/src/include/rtf.h
-%%DATADIR%%/README
-%%DATADIR%%/examples/table.rtf
-%%DATADIR%%/examples/Equation.rtf
-%%DATADIR%%/examples/JPEG_Image.rtf
-%%DATADIR%%/examples/test.rtf
-%%DATADIR%%/doc/rtfReader.tex
-%%DATADIR%%/doc/rtf2LaTeX2eDoc.dvi
-%%DATADIR%%/doc/rtfReader.pdf
-%%DATADIR%%/doc/rtf2LaTeX2eDoc.tex
-%%DATADIR%%/doc/rtf2LaTeX2eDoc.pdf
-%%DATADIR%%/doc/rtfReader.dvi
-%%DATADIR%%/doc/Release-notes.txt
-%%DATADIR%%/doc/rtf2latex2eSWP.tex
-%%DATADIR%%/doc/rtf2LaTeX2eDoc.html
-%%DATADIR%%/doc/GPL_license
-%%DATADIR%%/pref/TeX-map.cp1252
-%%DATADIR%%/pref/TeX-map.default
-%%DATADIR%%/pref/TeX-map
-%%DATADIR%%/pref/pc-sym
-%%DATADIR%%/pref/cp1254.map
-%%DATADIR%%/pref/cp437.map
-%%DATADIR%%/pref/rtf-ctrl
-%%DATADIR%%/pref/applemac.map
-%%DATADIR%%/pref/r2l-map
-%%DATADIR%%/pref/ansi-sym
-%%DATADIR%%/pref/TeX-map.cp1250
-%%DATADIR%%/pref/mac-sym
-%%DATADIR%%/pref/cp850.map
-%%DATADIR%%/pref/cp1250.map
-%%DATADIR%%/pref/TeX-map.german
-%%DATADIR%%/pref/r2l-pref
-%%DATADIR%%/pref/TeX-map.applemac
-%%DATADIR%%/pref/TeX-map.latin1
-%%DATADIR%%/pref/r2l-head
-%%DATADIR%%/pref/cp1252.map
-%%DATADIR%%/pref/pca-sym
-@dirrm %%DATADIR%%/doc
-@dirrm %%DATADIR%%/src/common/cole
-@dirrm %%DATADIR%%/src/common
-@dirrm %%DATADIR%%/src/include
-@dirrm %%DATADIR%%/src
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%/Unix
-@dirrm %%DATADIR%%/pref
+%%DATADIR%%/latex-encoding
+%%DATADIR%%/latex-encoding.cp1250
+%%DATADIR%%/latex-encoding.cp1252
+%%DATADIR%%/latex-encoding.german
+%%DATADIR%%/latex-encoding.latin1
+%%DATADIR%%/latex-encoding.mac
+%%DATADIR%%/r2l-head
+%%DATADIR%%/r2l-map
+%%DATADIR%%/r2l-pref
+%%DATADIR%%/rtf-ctrl
+%%DATADIR%%/rtf-encoding.cp1250
+%%DATADIR%%/rtf-encoding.cp1251
+%%DATADIR%%/rtf-encoding.cp1252
+%%DATADIR%%/rtf-encoding.cp1254
+%%DATADIR%%/rtf-encoding.cp437
+%%DATADIR%%/rtf-encoding.cp850
+%%DATADIR%%/rtf-encoding.mac
+%%DATADIR%%/rtf-encoding.next
+%%DATADIR%%/rtf-encoding.symbolfont
+%%DATADIR%%/rtf2latexDoc.pdf
 @dirrm %%DATADIR%%