11 files changed, 163 insertions, 0 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index d5c80f59ca1d..e9fb6808a582 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -78,6 +78,7 @@
     SUBDIR += urlview
     SUBDIR += wdiff
     SUBDIR += word2x
+    SUBDIR += xlhtml
     SUBDIR += xls2xml
     SUBDIR += xml4j
     SUBDIR += xp
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
new file mode 100644
index 000000000000..348110dba609
--- /dev/null
+++ b/textproc/xlhtml/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:	xlHtml
+# Version required:			0.2.6
+# Date created:				27 March 2000
+# Whom:					Maxim Sobolev <sobomax@altavista.net>
+#
+# $FreeBSD$
+#
+
+DISTNAME=	xlHtml-${VERSION}
+PKGNAME=	xlhtml-${VERSION}
+CATEGORIES=	textproc
+MASTER_SITES=	http://www.gate.net/~ddata/xlHtml/
+
+MAINTAINER=	sobomax@altavista.net
+
+LIB_DEPENDS=	cole.2:${PORTSDIR}/textproc/cole
+
+VERSION=	0.2.6
+USE_LIBTOOL=	yes
+
+do-install:
+	(cd ${WRKSRC}/xlHtml && ${MAKE} ${INSTALL_TARGET})
+	(cd ${WRKSRC}/pptHtml && ${MAKE} ${INSTALL_TARGET})
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/xlHtml
+	${INSTALL_MAN} ${WRKSRC}/xlHtml/README \
+		${PREFIX}/share/doc/xlHtml/README.xlHtml
+	${INSTALL_MAN} ${WRKSRC}/pptHtml/README \
+		${PREFIX}/share/doc/xlHtml/README.pptHtml
+.endif
+
+.include <bsd.port.mk>
diff --git a/textproc/xlhtml/distinfo b/textproc/xlhtml/distinfo
new file mode 100644
index 000000000000..f7052e208020
--- /dev/null
+++ b/textproc/xlhtml/distinfo
@@ -0,0 +1 @@
+MD5 (xlHtml-0.2.6.tar.gz) = d34d2571bf7f78dd840632071bb5800e
diff --git a/textproc/xlhtml/files/patch-aa b/textproc/xlhtml/files/patch-aa
new file mode 100644
index 000000000000..be34ad03305f
--- /dev/null
+++ b/textproc/xlhtml/files/patch-aa
@@ -0,0 +1,28 @@
+--- xlHtml/Makefile.in.orig	Mon Mar 27 21:36:41 2000
++++ xlHtml/Makefile.in	Mon Mar 27 21:39:25 2000
+@@ -84,8 +84,8 @@
+ 
+ EXTRA_DIST = README ChangeLog TODO THANKS Test.xls Test.html xlHtml.ide
+ 
+-INCLUDES = -I$(top_srcdir)
+-LDADD = $(top_builddir)/libcole.la
++INCLUDES = -I$(LOCALBASE)/include
++LDADD = -L$(LOCALBASE)/lib -lcole
+ 
+ noinst_PROGRAMS = dump 
+ bin_SCRIPTS = nsopen nsxlview
+@@ -103,12 +103,12 @@
+ xlHtml_SOURCES = xlHtml.c
+ xlHtml_OBJECTS =  xlHtml.o
+ xlHtml_LDADD = $(LDADD)
+-xlHtml_DEPENDENCIES =  $(top_builddir)/libcole.la
++xlHtml_DEPENDENCIES =  
+ xlHtml_LDFLAGS = 
+ dump_SOURCES = dump.c
+ dump_OBJECTS =  dump.o
+ dump_LDADD = $(LDADD)
+-dump_DEPENDENCIES =  $(top_builddir)/libcole.la
++dump_DEPENDENCIES =  
+ dump_LDFLAGS = 
+ SCRIPTS =  $(bin_SCRIPTS)
+ 
diff --git a/textproc/xlhtml/files/patch-ab b/textproc/xlhtml/files/patch-ab
new file mode 100644
index 000000000000..72a637c1b9f4
--- /dev/null
+++ b/textproc/xlhtml/files/patch-ab
@@ -0,0 +1,28 @@
+--- pptHtml/Makefile.in.orig	Tue Mar 28 09:52:11 2000
++++ pptHtml/Makefile.in	Tue Mar 28 09:54:17 2000
+@@ -84,8 +84,8 @@
+ 
+ EXTRA_DIST = README ChangeLog TODO THANKS test.ppt
+ 
+-INCLUDES = -I$(top_srcdir)
+-LDADD = $(top_builddir)/libcole.la
++INCLUDES = -I$(LOCALBASE)/include
++LDADD = -L$(LOCALBASE)/lib -lcole
+ 
+ noinst_PROGRAMS = pptdump 
+ bin_SCRIPTS = nspptview
+@@ -103,12 +103,12 @@
+ pptHtml_SOURCES = pptHtml.c
+ pptHtml_OBJECTS =  pptHtml.o
+ pptHtml_LDADD = $(LDADD)
+-pptHtml_DEPENDENCIES =  $(top_builddir)/libcole.la
++pptHtml_DEPENDENCIES =
+ pptHtml_LDFLAGS = 
+ pptdump_SOURCES = pptdump.c
+ pptdump_OBJECTS =  pptdump.o
+ pptdump_LDADD = $(LDADD)
+-pptdump_DEPENDENCIES =  $(top_builddir)/libcole.la
++pptdump_DEPENDENCIES =
+ pptdump_LDFLAGS = 
+ SCRIPTS =  $(bin_SCRIPTS)
+ 
diff --git a/textproc/xlhtml/files/patch-ac b/textproc/xlhtml/files/patch-ac
new file mode 100644
index 000000000000..22bc187c92ab
--- /dev/null
+++ b/textproc/xlhtml/files/patch-ac
@@ -0,0 +1,17 @@
+--- xlHtml/xlHtml.c.orig	Tue Mar 28 09:56:24 2000
++++ xlHtml/xlHtml.c	Mon Mar 27 23:06:47 2000
+@@ -645,8 +645,13 @@
+ 					ws_array[i]->ws_title.str, ws_array[i]->biggest_row, ws_array[i]->biggest_col);
+ 			}
+ 		}
+-		else if (Xtract)
++		else if (Xtract) {
++			if(xr2 == MAX_ROWS)
++				xr2 = ws_array[xp]->biggest_row;
++			if(xc2 == MAX_COLS)
++				xc2 = ws_array[xp]->biggest_col;
+ 			OutputTableGnuPlot();
++		}
+ 	}
+ 	else
+ 	{
diff --git a/textproc/xlhtml/files/patch-ad b/textproc/xlhtml/files/patch-ad
new file mode 100644
index 000000000000..438de2eb9627
--- /dev/null
+++ b/textproc/xlhtml/files/patch-ad
@@ -0,0 +1,16 @@
+ --- xlHtml/nsopen.orig	Tue Mar 28 13:48:58 2000
+ +++ xlHtml/nsopen	Tue Mar 28 14:27:14 2000
+ @@ -1,4 +1,4 @@
+ -#!/bin/tcsh
+ +#!/bin/csh
+  
+  if ($#argv != 1) then
+      echo "Usage: $0 file"
+ @@ -7,7 +7,7 @@
+  
+  set file = $argv[1]
+  if (!(-r $file)) then
+ -    echo "$0: File $file cannot be read"
+ +    echo "$0"": File $file cannot be read"
+      exit 1
+  endif
diff --git a/textproc/xlhtml/files/patch-ae b/textproc/xlhtml/files/patch-ae
new file mode 100644
index 000000000000..75c74e152ee5
--- /dev/null
+++ b/textproc/xlhtml/files/patch-ae
@@ -0,0 +1,23 @@
+ --- xlHtml/nsxlview.orig	Tue Mar 28 13:49:06 2000
+ +++ xlHtml/nsxlview	Tue Mar 28 14:34:35 2000
+ @@ -1,4 +1,4 @@
+ -#!/bin/tcsh
+ +#!/bin/csh
+  
+  if ($#argv != 1) then
+      echo "Usage: $0 file.xls"
+ @@ -9,12 +9,12 @@
+  
+  #Generate a unique html filename (/tmp/scriptname.pidnum.html)
+  set com = $0
+ -set tmp = /tmp/$com:t.$$
+ +set tmp = `mktemp -t $0:t` || exit 1
+  set html = $tmp.html
+  
+  xlHtml -a $source > $html
+ -if ((!(-s $html)) | ($status)) then
+ -    echo "$0: failed to generate HTML file"
+ +if ((!(-r $html)) | ($status)) then
+ +    echo "$0"": failed to generate HTML file"
+      exit 1
+  endif
diff --git a/textproc/xlhtml/pkg-comment b/textproc/xlhtml/pkg-comment
new file mode 100644
index 000000000000..4ec92e51affe
--- /dev/null
+++ b/textproc/xlhtml/pkg-comment
@@ -0,0 +1 @@
+Utilities converting Excel and PowerPoint files to HTML and text
diff --git a/textproc/xlhtml/pkg-descr b/textproc/xlhtml/pkg-descr
new file mode 100644
index 000000000000..2c4b1118d8ad
--- /dev/null
+++ b/textproc/xlhtml/pkg-descr
@@ -0,0 +1,8 @@
+xlHtml is a free converter from Microsoft Excel and PowerPoint to HTML and tabs
+separated text.
+
+Using the program xlHtml, you can extract the content of a file generated
+by Microsoft Excel and PowerPoint and express its content using HTML or tabs
+separated text.
+
+WWW:	http://www.gate.net/~ddata/xlHtml/
diff --git a/textproc/xlhtml/pkg-plist b/textproc/xlhtml/pkg-plist
new file mode 100644
index 000000000000..42f9922656bd
--- /dev/null
+++ b/textproc/xlhtml/pkg-plist
@@ -0,0 +1,8 @@
+bin/nsopen
+bin/nspptview
+bin/nsxlview
+bin/pptHtml
+bin/xlHtml
+share/doc/xlHtml/README.xlHtml
+share/doc/xlHtml/README.pptHtml
+@dirrm share/doc/xlHtml