cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to wv-0.7.2

Browse Source
This commit is contained in:
avsm 2002-09-08 12:15:04 +00:00
parent fa7914da97
commit eabc6eedae
8 changed files with 87 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
converters/wv/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2002/05/13 18:50:38 espie Exp $
# $OpenBSD: Makefile,v 1.5 2002/09/08 12:15:04 avsm Exp $
COMMENT= "convert various Microsoft formats into HTML/PNG"
DISTNAME= wv-0.6.5
DISTNAME= wv-0.7.2
CATEGORIES= converters
NEED_VERSION= 1.460
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
HOMEPAGE= http://www.wvware.com/
@ -16,7 +15,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MODULES= iconv
LIB_DEPENDS= wmf.0::graphics/libwmf \
LIB_DEPENDS= wmf.6,wmflite.6::graphics/libwmf \
png.2::graphics/png \
Magick.5::graphics/ImageMagick \
glib.1::devel/glib

6
converters/wv/distinfo
View File

@ -1,3 +1,3 @@
MD5 (wv-0.6.5.tar.gz) = b386a8a1a6b5a5bd1145434ca8f52254
RMD160 (wv-0.6.5.tar.gz) = dae3579c9533d58caf2122aa8330e661b007099b
SHA1 (wv-0.6.5.tar.gz) = 372494e96030de57c232c43f595fe83643a48a43
MD5 (wv-0.7.2.tar.gz) = b5e673be8deba02badd3b1a749911b0c
RMD160 (wv-0.7.2.tar.gz) = f4696433f7ffc2033357523bdcaa25a799f77503
SHA1 (wv-0.7.2.tar.gz) = 5c7ffd3ce310fe6c5aa183af3fd1f6d4e01b4be5

29
converters/wv/patches/patch-Makefile_in
View File

@ -1,12 +1,29 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2001/08/11 00:51:32 avsm Exp $
--- Makefile.in.orig Wed May 23 14:01:15 2001
+++ Makefile.in Wed May 23 14:02:07 2001
@@ -466,7 +466,7 @@ install: installdirs all
$OpenBSD: patch-Makefile_in,v 1.2 2002/09/08 12:15:04 avsm Exp $
--- Makefile.in.orig Mon Apr 29 17:05:45 2002
+++ Makefile.in Sat Sep 7 21:44:08 2002
@@ -82,7 +82,7 @@ src_mandir=$(srcdir)/help/man
VPATH = @srcdir@
DEFS = @DEFS@ -DVERSION=\"@VERSION@\" -DXMLCONFIG=\"$(datadir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(datadir)/wv/wvHtml.xml\"
-CPPFLAGS = @ICONV_CFLAGS@ @WMF_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @CPPFLAGS@
+CPPFLAGS = @WMF_CFLAGS@ @ICONV_CFLAGS@ @XML_CFLAGS@ @GLIB_CFLAGS@ @PNG_CFLAGS@ @ZLIB_CFLAGS@ @CPPFLAGS@
CFLAGS = @CFLAGS@ -ansi -pedantic
INCLUDES = -I. -I./ -I$(srcdir)/ -I$(srcdir)/magick/ -I$(srcdir)/libole2/ -I$(srcdir)/oledecod/
@@ -455,6 +455,7 @@ install: installdirs all
$(INSTALL) $(srcdir)/wv-incconfig $(bindir)/wv-incconfig
$(INSTALL) $(srcdir)/make_epses.sh $(bindir)/make_epses.sh
$(INSTALL_DATA) $(src_mandir)/wvWare.1 $(mandir)/man1/
+ ( cd $(src_mandir) && $(LN) -s wvWare.1 $(mandir)/man1/wvConvert.1 )
$(INSTALL_DATA) $(src_mandir)/wvHtml.1 $(mandir)/man1/
$(INSTALL_DATA) $(src_mandir)/wvLatex.1 $(mandir)/man1/
$(INSTALL_DATA) $(src_mandir)/wvCleanLatex.1 $(mandir)/man1/
@@ -465,8 +466,6 @@ install: installdirs all
$(INSTALL_DATA) $(src_mandir)/wvWml.1 $(mandir)/man1/
$(INSTALL_DATA) $(src_mandir)/wvAbw.1 $(mandir)/man1/
$(INSTALL_DATA) $(src_mandir)/wvRTF.1 $(mandir)/man1/
$(RM) -f $(mandir)/man1/wvConvert.1
- $(RM) -f $(mandir)/man1/wvConvert.1
- $(LN) -s $(mandir)/man1/wvWare.1 $(mandir)/man1/wvConvert.1
+ $(LN) -s $(mandir)/man1/wvWare.1 wvConvert.1
$(INSTALL_DATA) $(src_mandir)/wvMime.1 $(mandir)/man1/
$(INSTALL_DATA) $(src_mandir)/wvVersion.1 $(mandir)/man1/
$(INSTALL_DATA) $(src_mandir)/wvSummary.1 $(mandir)/man1/

19
converters/wv/patches/patch-wvHtml_in
View File

@ -1,12 +1,15 @@
$OpenBSD: patch-wvHtml_in,v 1.1.1.1 2001/08/11 00:51:32 avsm Exp $
--- wvHtml.in.orig Fri Nov 17 23:51:39 2000
+++ wvHtml.in Thu Aug 9 18:48:39 2001
@@ -16,4 +16,7 @@ if [ ${?} -ne "0" ]; then
$OpenBSD: patch-wvHtml_in,v 1.2 2002/09/08 12:15:04 avsm Exp $
--- wvHtml.in.orig Mon Feb 18 11:55:00 2002
+++ wvHtml.in Sat Sep 7 22:43:20 2002
@@ -136,8 +136,11 @@ else
exit 1
fi
-wvWare -x ${datadir}/wv/wvHtml.xml "${1}" > "${2}"
+TMPDIR=`mktemp -d /tmp/wvHtml.XXXXXXXXX` && {
+ wvWare -x ${datadir}/wv/wvHtml.xml "${1}" > "${2}"
+ rm -rf $TMPDIR
+TMPDIR=`mktemp -d /tmp/wvHtml.XXXXXXXXXX` && {
if test "x$o_file" = "x-"; then
"$wv_exec" $wv_opts -x "$xmlcfg" -d "$t_dir" -b "$name" "$i_file"
else
"$wv_exec" $wv_opts -x "$xmlcfg" -d "$t_dir" -b "$name" "$i_file" > "$t_dir"/"$o_file"
fi
+rm -rf ${TMPDIR}
+}

11
converters/wv/patches/patch-wvMime
View File

@ -1,15 +1,16 @@
$OpenBSD: patch-wvMime,v 1.1.1.1 2001/08/11 00:51:32 avsm Exp $
--- wvMime.orig Thu Aug 9 18:51:57 2001
+++ wvMime Thu Aug 9 18:53:52 2001
$OpenBSD: patch-wvMime,v 1.2 2002/09/08 12:15:04 avsm Exp $
--- wvMime.orig Fri Jan 19 05:11:01 2001
+++ wvMime Sat Sep 7 22:53:06 2002
@@ -43,10 +43,8 @@ fi
# temporary PS file, mangled to get some sort
# of semi-uniqueness
FILE=`basename ${1}`
-TMPDIR="/tmp/${FILE}-${USER}-${$}"
+TMPDIR=`mktemp -d /tmp/wvMime.XXXXXXXXXX`
TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps"
-TMPPS="$TMPDIR/${FILE}-${USER}-${$}.ps"
-
-mkdir $TMPDIR
+TMPDIR=`mktemp -d /tmp/wvMime.XXXXXXXXXX`
+TMPPS=`mktemp /tmp/wvMime.XXXXXXXXXX`
# Make sure all graphics go into /tmp as well
cp ${1} $TMPDIR/$FILE

56
converters/wv/patches/patch-wvText_in
View File

@ -1,22 +1,44 @@
$OpenBSD: patch-wvText_in,v 1.1.1.1 2001/08/11 00:51:32 avsm Exp $
--- wvText.in.orig Thu Aug 9 18:57:51 2001
+++ wvText.in Thu Aug 9 18:58:40 2001
@@ -29,7 +29,7 @@ if [ ${USING_LYNX} -ne "0" ]; then
fi
$OpenBSD: patch-wvText_in,v 1.2 2002/09/08 12:15:04 avsm Exp $
--- wvText.in.orig Mon Feb 18 11:50:45 2002
+++ wvText.in Sun Sep 8 12:37:54 2002
@@ -3,7 +3,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
datadir=@datadir@
-tmpdir=/tmp
+TMPDIR=`mktemp -d /tmp/wvWare.XXXXXXXXXX`
+export TMPDIR
# argument checking
if [ ${#} -ne "2" ]; then
@@ -32,21 +33,21 @@ if [ ${USING_LYNX} -ne "0" ]; then
# intermediate file
- TMP_FILE="/tmp/wv$$.html"
+ TMP_FILE=`mktemp /tmp/wvText.XXXXXXXXXX`
TMP_FILE="wv$$.html"
wvHtml "${1}" "${TMP_FILE}" >/dev/null 2>&1
- wvHtml "${1}" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1
+ wvHtml "${1}" --targetdir="${TMPDIR}" "${TMP_FILE}" >/dev/null 2>&1
if [ ${?} -ne "0" ]; then
@@ -51,5 +51,8 @@ else
# fall back onto our cruddy output
# this is, admittedly, better than running
# 'strings' on the word document though :)
- wvWare -x ${datadir}/wv/wvText.xml "${1}" > "${2}"
+ TMPDIR=`mktemp -d /tmp/wvWare.XXXXXXXXXX` && {
+ wvWare -x ${datadir}/wv/wvText.xml "${1}" > "${2}"
+ rm -rf $TMPDIR
+ }
echo "Could not convert into HTML"
exit 1
fi
# lynx actually does quite well
- TERM=vt100 lynx -dump -force_html "${tmpdir}/${TMP_FILE}" > "${2}"
+ TERM=vt100 lynx -dump -force_html "${TMPDIR}/${TMP_FILE}" > "${2}"
if [ ${?} -ne "0" ]; then
echo "Could not convert into Text"
exit 1
fi
# clean up
- rm -f "${tmpdir}/${TMP_FILE}"
+ rm -f "${TMPDIR}/${TMP_FILE}"
else
# fall back onto our cruddy output
@@ -54,3 +55,5 @@ else
# 'strings' on the word document though :)
wvWare -x ${datadir}/wv/wvText.xml "${1}" > "${2}"
fi
+
+rm -rf ${TMPDIR}

12
converters/wv/patches/patch-wvWare_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-wvWare_c,v 1.1.1.1 2001/08/11 00:51:32 avsm Exp $
--- wvWare.c.orig Thu Jun 28 16:06:34 2001
+++ wvWare.c Thu Jun 28 16:06:43 2001
@@ -901,7 +901,7 @@ mySpecCharProc (wvParseStruct * ps, U16
if (achp->fOle2)
exit (139);
-#if 0
+#if 1
wvStream_goto (ps->data, achp->fcPic_fcObj_lTagObj);
wvGetPICF (wvQuerySupported (&ps->fib, NULL), &picf, ps->data);
f = picf.rgb;

4
converters/wv/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/08/11 00:51:31 avsm Exp $
@comment $OpenBSD: PLIST,v 1.2 2002/09/08 12:15:05 avsm Exp $
bin/make_epses.sh
bin/wv-incconfig
bin/wv-libconfig
@ -12,7 +12,6 @@ bin/wvMime
bin/wvPDF
bin/wvPS
bin/wvRTF
bin/wvSimpleCLX
bin/wvSummary
bin/wvText
bin/wvVersion
@ -23,6 +22,7 @@ include/wvexporter.h
lib/libwv.a
man/man1/wvAbw.1
man/man1/wvCleanLatex.1
man/man1/wvConvert.1
man/man1/wvDVI.1
man/man1/wvHtml.1
man/man1/wvLatex.1