summaryrefslogtreecommitdiff
path: root/textproc/xlhtml
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/xlhtml')
-rw-r--r--textproc/xlhtml/Makefile26
-rw-r--r--textproc/xlhtml/distinfo2
-rw-r--r--textproc/xlhtml/files/patch-aa57
-rw-r--r--textproc/xlhtml/files/patch-ab37
-rw-r--r--textproc/xlhtml/files/patch-ac13
-rw-r--r--textproc/xlhtml/files/patch-ad16
-rw-r--r--textproc/xlhtml/files/patch-ae23
-rw-r--r--textproc/xlhtml/files/patch-af101
-rw-r--r--textproc/xlhtml/files/patch-ag7
-rw-r--r--textproc/xlhtml/files/patch-ah18
-rw-r--r--textproc/xlhtml/files/patch-ai18
-rw-r--r--textproc/xlhtml/pkg-plist10
12 files changed, 130 insertions, 198 deletions
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index ab0a7fc7d8f2..d6f20de789f9 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: xlHtml
+# New ports collection makefile for: xlhtml
# Date created: 27 March 2000
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
@@ -6,10 +6,9 @@
#
PORTNAME= xlhtml
-PORTVERSION= 0.2.9.7
+PORTVERSION= 0.4
CATEGORIES= textproc
MASTER_SITES= http://www.xlhtml.org/
-DISTNAME= xlHtml-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
@@ -18,22 +17,17 @@ LIB_DEPENDS= cole.2:${PORTSDIR}/textproc/cole
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cole"
-MAN1= pptHtml.1 xlHtml.1
-
-pre-build:
- @${RM} -f ${WRKSRC}/cole.h
- @find ${WRKSRC} -type f | xargs ${GREP} -l '\.\./cole\.h' | \
- xargs ${PERL} -pi -e 's|\.\./cole\.h|cole/cole.h|g'
+MAN1= ppthtml.1 xlhtml.1
do-install:
- (cd ${WRKSRC}/xlHtml && ${MAKE} ${INSTALL_TARGET})
- (cd ${WRKSRC}/pptHtml && ${MAKE} ${INSTALL_TARGET})
+ (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
+ ${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
index d23aa8b671ac..48319ec5bf31 100644
--- a/textproc/xlhtml/distinfo
+++ b/textproc/xlhtml/distinfo
@@ -1 +1 @@
-MD5 (xlHtml-0.2.9.7.tar.gz) = 4a69bab9556800fb548da72838c5db81
+MD5 (xlhtml-0.4.tar.gz) = 4ead069a59340e728ce3597cd07aa222
diff --git a/textproc/xlhtml/files/patch-aa b/textproc/xlhtml/files/patch-aa
index be34ad03305f..7dd08f948839 100644
--- a/textproc/xlhtml/files/patch-aa
+++ b/textproc/xlhtml/files/patch-aa
@@ -1,28 +1,37 @@
---- 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 @@
+--- xlhtml/Makefile.in.orig Tue Dec 4 10:57:06 2001
++++ xlhtml/Makefile.in Mon Feb 25 01:19:14 2002
+@@ -76,13 +76,13 @@
- EXTRA_DIST = README ChangeLog TODO THANKS Test.xls Test.html xlHtml.ide
+ EXTRA_DIST = README ChangeLog TODO THANKS Test.xls Test.html xlhtml.1
--INCLUDES = -I$(top_srcdir)
--LDADD = $(top_builddir)/libcole.la
-+INCLUDES = -I$(LOCALBASE)/include
-+LDADD = -L$(LOCALBASE)/lib -lcole
-
- noinst_PROGRAMS = dump
+-INCLUDES = -I../cole
++INCLUDES = -I$(LOCALBASE)/include -I../cole
+ noinst_PROGRAMS = xldump xlcdump
+ noinst_SCRIPTS = xls-handler gpdemo
+ man_MANS = xlhtml.1
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)
+ bin_PROGRAMS = xlhtml
+-LDADD = ../cole/libcole.a
++LDADD = -L$(LOCALBASE)/lib -lcole
+ xlhtml_SOURCES = xlhtml.c
+ xldump_SOURCES = xldump.c
+ xlcdump_SOURCES = xlcdump.c
+@@ -99,15 +99,15 @@
+ LIBS = @LIBS@
+ xlhtml_OBJECTS = xlhtml.o
+ xlhtml_LDADD = $(LDADD)
+-xlhtml_DEPENDENCIES = ../cole/libcole.a
++xlhtml_DEPENDENCIES =
+ xlhtml_LDFLAGS =
+ xldump_OBJECTS = xldump.o
+ xldump_LDADD = $(LDADD)
+-xldump_DEPENDENCIES = ../cole/libcole.a
++xldump_DEPENDENCIES =
+ xldump_LDFLAGS =
+ xlcdump_OBJECTS = xlcdump.o
+ xlcdump_LDADD = $(LDADD)
+-xlcdump_DEPENDENCIES = ../cole/libcole.a
++xlcdump_DEPENDENCIES =
+ xlcdump_LDFLAGS =
+ SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
diff --git a/textproc/xlhtml/files/patch-ab b/textproc/xlhtml/files/patch-ab
index 72a637c1b9f4..17d4646b32f7 100644
--- a/textproc/xlhtml/files/patch-ab
+++ b/textproc/xlhtml/files/patch-ab
@@ -1,27 +1,32 @@
---- 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 @@
+--- ppthtml/Makefile.in.orig Mon Feb 25 00:50:26 2002
++++ ppthtml/Makefile.in Mon Feb 25 00:51:18 2002
+@@ -76,13 +76,13 @@
- EXTRA_DIST = README ChangeLog TODO THANKS test.ppt
+ EXTRA_DIST = README ChangeLog TODO THANKS test.ppt ppthtml.1
--INCLUDES = -I$(top_srcdir)
--LDADD = $(top_builddir)/libcole.la
-+INCLUDES = -I$(LOCALBASE)/include
-+LDADD = -L$(LOCALBASE)/lib -lcole
+-INCLUDES = -I../cole
++INCLUDES = -I$(LOCALBASE)/include -I../cole
noinst_PROGRAMS = pptdump
+ man_MANS = ppthtml.1
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 =
+ bin_PROGRAMS = ppthtml
+-LDADD = ../cole/libcole.a
++LDADD = -L$(LOCALBASE)/lib -lcole
+ ppthtml_SOURCES = ppthtml.c
+ AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -97,12 +97,12 @@
+ LIBS = @LIBS@
+ ppthtml_OBJECTS = ppthtml.o
+ ppthtml_LDADD = $(LDADD)
+-ppthtml_DEPENDENCIES = ../cole/libcole.a
++ppthtml_DEPENDENCIES =
+ ppthtml_LDFLAGS =
pptdump_SOURCES = pptdump.c
pptdump_OBJECTS = pptdump.o
pptdump_LDADD = $(LDADD)
--pptdump_DEPENDENCIES = $(top_builddir)/libcole.la
+-pptdump_DEPENDENCIES = ../cole/libcole.a
+pptdump_DEPENDENCIES =
pptdump_LDFLAGS =
SCRIPTS = $(bin_SCRIPTS)
diff --git a/textproc/xlhtml/files/patch-ac b/textproc/xlhtml/files/patch-ac
index 1aceae3ec8f6..4442c671ee7c 100644
--- a/textproc/xlhtml/files/patch-ac
+++ b/textproc/xlhtml/files/patch-ac
@@ -1,14 +1,17 @@
---- xlHtml/xlHtml.c.orig Sun Jun 3 22:37:46 2001
-+++ xlHtml/xlHtml.c Tue Jun 5 13:25:45 2001
-@@ -692,8 +692,13 @@
+
+$FreeBSD$
+
+--- xlhtml/xlhtml.c 2002/02/27 18:10:01 1.1
++++ xlhtml/xlhtml.c 2002/02/27 18:12:58
+@@ -746,8 +746,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)
++ if (xr2 == HARD_MAX_ROWS)
+ xr2 = ws_array[xp]->biggest_row;
-+ if(xc2 == MAX_COLS)
++ if (xc2 == HARD_MAX_COLS)
+ xc2 = ws_array[xp]->biggest_col;
OutputPartialTableAscii();
+ }
diff --git a/textproc/xlhtml/files/patch-ad b/textproc/xlhtml/files/patch-ad
deleted file mode 100644
index 438de2eb9627..000000000000
--- a/textproc/xlhtml/files/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
- --- 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
deleted file mode 100644
index 75c74e152ee5..000000000000
--- a/textproc/xlhtml/files/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
- --- 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/files/patch-af b/textproc/xlhtml/files/patch-af
index 764e50aa36cd..182b2c5363b7 100644
--- a/textproc/xlhtml/files/patch-af
+++ b/textproc/xlhtml/files/patch-af
@@ -1,94 +1,11 @@
---- Makefile.in.orig Wed Oct 27 18:47:25 1999
-+++ Makefile.in Mon Jul 24 11:36:03 2000
-@@ -84,9 +84,9 @@
-
- AUTOMAKE_OPTIONS = gnu 1.4
-
--lib_LTLIBRARIES = libcole.la
--libcole_la_LDFLAGS = -version-info @VERSION_INFO@
--libcole_la_SOURCES = cole.c cole.h version.c oledecod.c support.c support.h internal.c internal.h
-+#lib_LTLIBRARIES = libcole.la
-+#libcole_la_LDFLAGS = -version-info @VERSION_INFO@
-+#libcole_la_SOURCES = cole.c cole.h version.c oledecod.c support.c support.h internal.c internal.h
-
-
- ### olecod.c \
-@@ -98,9 +98,9 @@
- coleaclocal_DATA = cole.m4
-
- coleincdir = $(includedir)/cole
--coleinc_HEADERS = cole.h
-+#coleinc_HEADERS = cole.h
-
--SUBDIRS = . xlHtml pptHtml utils examples doc
-+SUBDIRS = . xlHtml pptHtml
+--- Makefile.in.orig Mon Feb 25 01:11:12 2002
++++ Makefile.in Mon Feb 25 01:11:18 2002
+@@ -74,7 +74,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+
+-SUBDIRS = cole xlhtml ppthtml
++SUBDIRS = xlhtml ppthtml
+ EXTRA_DIST = README-xlhtml README-ppthtml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
-@@ -112,9 +112,9 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libcole_la_LIBADD =
--libcole_la_OBJECTS = cole.lo version.lo oledecod.lo support.lo \
--internal.lo
-+#libcole_la_LIBADD =
-+#libcole_la_OBJECTS = cole.lo version.lo oledecod.lo support.lo \
-+#internal.lo
- SCRIPTS = $(bin_SCRIPTS)
-
- CFLAGS = @CFLAGS@
-@@ -137,14 +137,14 @@
-
- TAR = gtar
- GZIP_ENV = --best
--SOURCES = $(libcole_la_SOURCES)
--OBJECTS = $(libcole_la_OBJECTS)
-+#SOURCES = $(libcole_la_SOURCES)
-+#OBJECTS = $(libcole_la_OBJECTS)
-
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .s
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+# cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
-@@ -155,8 +155,8 @@
-
- config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
--$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-- cd $(srcdir) && $(AUTOCONF)
-+#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-+# cd $(srcdir) && $(AUTOCONF)
-
- config.h: stamp-h
- @if test ! -f $@; then \
-@@ -173,9 +173,9 @@
- rm -f $(srcdir)/stamp-h.in; \
- $(MAKE) $(srcdir)/stamp-h.in; \
- else :; fi
--$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOHEADER)
-- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-+#$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+# cd $(top_srcdir) && $(AUTOHEADER)
-+# @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
- mostlyclean-hdr:
-
-@@ -185,8 +185,8 @@
- -rm -f config.h
-
- maintainer-clean-hdr:
--cole.h: $(top_builddir)/config.status cole.h.in
-- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+#cole.h: $(top_builddir)/config.status cole.h.in
-+# cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- version.c: $(top_builddir)/config.status version.c.in
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- cole.spec: $(top_builddir)/config.status cole.spec.in
diff --git a/textproc/xlhtml/files/patch-ag b/textproc/xlhtml/files/patch-ag
new file mode 100644
index 000000000000..b0cd8e3a5fb0
--- /dev/null
+++ b/textproc/xlhtml/files/patch-ag
@@ -0,0 +1,7 @@
+--- Makefile.am.orig Mon Feb 25 01:12:58 2002
++++ Makefile.am Mon Feb 25 01:13:04 2002
+@@ -1,3 +1,3 @@
+-SUBDIRS = cole xlhtml ppthtml
++SUBDIRS = xlhtml ppthtml
+ EXTRA_DIST = README-xlhtml README-ppthtml
+
diff --git a/textproc/xlhtml/files/patch-ah b/textproc/xlhtml/files/patch-ah
new file mode 100644
index 000000000000..a454bad29664
--- /dev/null
+++ b/textproc/xlhtml/files/patch-ah
@@ -0,0 +1,18 @@
+--- xlhtml/Makefile.am.orig Mon Feb 25 01:15:12 2002
++++ xlhtml/Makefile.am Mon Feb 25 01:15:59 2002
+@@ -2,13 +2,13 @@
+
+ EXTRA_DIST = README ChangeLog TODO THANKS Test.xls Test.html xlhtml.1
+
+-INCLUDES = -I../cole
++INCLUDES = -I$(LOCALBASE)/include -I../cole
+ noinst_PROGRAMS = xldump xlcdump
+ noinst_SCRIPTS = xls-handler gpdemo
+ man_MANS = xlhtml.1
+ bin_SCRIPTS = nsopen nsxlview
+ bin_PROGRAMS = xlhtml
+-LDADD = ../cole/libcole.a
++LDADD = -L$(LOCALBASE)/lib -lcole
+ xlhtml_SOURCES = xlhtml.c
+ xldump_SOURCES = xldump.c
+ xlcdump_SOURCES = xlcdump.c
diff --git a/textproc/xlhtml/files/patch-ai b/textproc/xlhtml/files/patch-ai
new file mode 100644
index 000000000000..8a025abc134a
--- /dev/null
+++ b/textproc/xlhtml/files/patch-ai
@@ -0,0 +1,18 @@
+--- ppthtml/Makefile.am.orig Mon Feb 25 01:16:11 2002
++++ ppthtml/Makefile.am Mon Feb 25 01:16:32 2002
+@@ -2,13 +2,13 @@
+
+ EXTRA_DIST = README ChangeLog TODO THANKS test.ppt ppthtml.1
+
+-INCLUDES = -I../cole
++INCLUDES = -I$(LOCALBASE)/include -I../cole
+
+ noinst_PROGRAMS = pptdump
+ man_MANS = ppthtml.1
+ bin_SCRIPTS = nspptview
+ bin_PROGRAMS = ppthtml
+-LDADD = ../cole/libcole.a
++LDADD = -L$(LOCALBASE)/lib -lcole
+ ppthtml_SOURCES = ppthtml.c
+ AM_CFLAGS = -Wall -Wshadow -Wcast-align -Wpointer-arith
+
diff --git a/textproc/xlhtml/pkg-plist b/textproc/xlhtml/pkg-plist
index 42f9922656bd..045e94dfda89 100644
--- a/textproc/xlhtml/pkg-plist
+++ b/textproc/xlhtml/pkg-plist
@@ -1,8 +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
+bin/ppthtml
+bin/xlhtml
+share/doc/xlhtml/README.xlhtml
+share/doc/xlhtml/README.ppthtml
+@dirrm share/doc/xlhtml
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-28 23:56:52 +0000