hi,
this brings wv to 1.2.4 and removes anil as maintainer (with his
blessing).
pkg/SECURITY was removed as i couldn't find any dodgy temp-file
creation routines (it uses tmpfile(3) which uses mkstemp(3) for what i've
seen). please note that nothing depends on this, so it's mostly safe
dependencies wise.
this is needed for abiword 2.6.X.
comments, oks?
f.-
Index: converters/wv/Makefile
===================================================================
RCS file: /cvs/ports/converters/wv/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- converters/wv/Makefile 16 Sep 2007 01:40:28 -0000 1.12
+++ converters/wv/Makefile 9 May 2008 21:42:26 -0000
@@ -1,36 +1,41 @@
# $OpenBSD: Makefile,v 1.12 2007/09/16 01:40:28 merdely Exp $
-COMMENT= convert various Microsoft formats into HTML/PNG
+COMMENT = convert various Microsoft formats into HTML/PNG
-DISTNAME= wv-0.7.2
-PKGNAME= ${DISTNAME}p0
-CATEGORIES= converters
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
-
-HOMEPAGE= http://www.wvware.com/
-MAINTAINER= Anil Madhavapeddy <[EMAIL PROTECTED]>
-
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
-WANTLIB= ICE SM X11 c freetype jpeg m xml2 z
-
-MODULES= converters/libiconv
-LIB_DEPENDS= wmf.>=6,wmflite.>=6::graphics/libwmf \
- png.>=2::graphics/png \
- glib.>=1::devel/glib
-RUN_DEPENDS= ::graphics/ImageMagick
-
-USE_X11= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE= gnu dest
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng/"
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --enable-static
-CONFIGURE_ARGS+= --with-png=${LOCALBASE} --with-exporter \
- --with-libiconv=${LOCALBASE} \
- --with-Magick=${LOCALBASE} --with-libwmf=${LOCALBASE}
+DISTNAME = wv-1.2.4
-NO_REGRESS= Yes
+SHARED_LIBS = wv-1.2 1.0 \
+ wv 1.0
+
+CATEGORIES = converters
+
+HOMEPAGE = http://wvware.sourceforge.net/
+
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP = Yes
+
+WANTLIB = ICE SM X11 Xau Xdmcp bz2 c freetype iconv intl jpeg m pcre \
+ png xml2 z
+
+MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=wvware/}
+
+RUN_DEPENDS = ::graphics/ImageMagick
+LIB_DEPENDS = glib-2.0,gobject-2.0::devel/glib \
+ gsf-1::devel/libgsf \
+ wmf.>=6,wmflite.>=6::graphics/libwmf
+
+MAKE_FILE = GNUmakefile
+
+USE_X11 = Yes
+USE_GMAKE = Yes
+USE_LIBTOOL = Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng/"
+CONFIGURE_ARGS = ${CONFIGURE_SHARED} --enable-static \
+ --with-png=${LOCALBASE} --with-libwmf=${LOCALBASE}
+
+NO_REGRESS = Yes
.include <bsd.port.mk>
Index: converters/wv/distinfo
===================================================================
RCS file: /cvs/ports/converters/wv/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- converters/wv/distinfo 5 Apr 2007 15:37:48 -0000 1.4
+++ converters/wv/distinfo 9 May 2008 21:42:26 -0000
@@ -1,5 +1,5 @@
-MD5 (wv-0.7.2.tar.gz) = teZzvo3roCut07GnSZEbDA==
-RMD160 (wv-0.7.2.tar.gz) = 9GlkM/f/wgMzV1I73Kolp5n3dQM=
-SHA1 (wv-0.7.2.tar.gz) = XH/9POMQ/mxaoYOvP9H21OAbS+U=
-SHA256 (wv-0.7.2.tar.gz) = FriPmQQEuFjiNWG9VDK417RfNiGiO/h1MGXkb2Z/vzg=
-SIZE (wv-0.7.2.tar.gz) = 1187060
+MD5 (wv-1.2.4.tar.gz) = wYYcVgSR8SHhKRf6dpcKxQ==
+RMD160 (wv-1.2.4.tar.gz) = 1XjZMjYRt1fYkVoHe2NbbBRG55M=
+SHA1 (wv-1.2.4.tar.gz) = exGBR3RCauQe7gCZab70mGWhDHk=
+SHA256 (wv-1.2.4.tar.gz) = ZzEJkQ4i1M+UzIvk3LmgxBtfvbFzbUt73Hd4iU1XwtY=
+SIZE (wv-1.2.4.tar.gz) = 629554
Index: converters/wv/patches/patch-Makefile_in
===================================================================
RCS file: converters/wv/patches/patch-Makefile_in
diff -N converters/wv/patches/patch-Makefile_in
--- converters/wv/patches/patch-Makefile_in 8 Sep 2002 12:15:04 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$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=\"@[EMAIL PROTECTED]"
-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
-- $(LN) -s $(mandir)/man1/wvWare.1 $(mandir)/man1/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/
Index: converters/wv/patches/patch-wvHtml_in
===================================================================
RCS file: converters/wv/patches/patch-wvHtml_in
diff -N converters/wv/patches/patch-wvHtml_in
--- converters/wv/patches/patch-wvHtml_in 8 Sep 2002 12:15:04 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$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
-
-+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}
-+}
Index: converters/wv/patches/patch-wvMime
===================================================================
RCS file: /cvs/ports/converters/wv/patches/patch-wvMime,v
retrieving revision 1.2
diff -u -p -r1.2 patch-wvMime
--- converters/wv/patches/patch-wvMime 8 Sep 2002 12:15:04 -0000 1.2
+++ converters/wv/patches/patch-wvMime 9 May 2008 21:42:26 -0000
@@ -1,6 +1,6 @@
-$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
+$OpenBSD$
+--- wvMime.orig Thu May 8 13:57:31 2008
++++ wvMime Thu May 8 13:57:44 2008
@@ -43,10 +43,8 @@ fi
# temporary PS file, mangled to get some sort
# of semi-uniqueness
Index: converters/wv/patches/patch-wvText_in
===================================================================
RCS file: /cvs/ports/converters/wv/patches/patch-wvText_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-wvText_in
--- converters/wv/patches/patch-wvText_in 8 Sep 2002 12:15:04 -0000
1.2
+++ converters/wv/patches/patch-wvText_in 9 May 2008 21:42:26 -0000
@@ -1,44 +1,14 @@
-$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 @@
+$OpenBSD$
+--- wvText.in.orig Thu May 8 14:00:18 2008
++++ wvText.in Thu May 8 14:04:21 2008
+@@ -3,7 +3,9 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
--tmpdir=/tmp
-+TMPDIR=`mktemp -d /tmp/wvWare.XXXXXXXXXX`
-+export TMPDIR
+-tmpdir=${TMPDIR:-/tmp}
++tmpdir=`mktemp -d /tmp/wvText.XXXXXXXXXX`
++
++trap "rm -rf ${tmpdir}" 0 1 2 3 15
# argument checking
if [ ${#} -ne "2" ]; then
-@@ -32,21 +33,21 @@ if [ ${USING_LYNX} -ne "0" ]; then
- # intermediate file
- TMP_FILE="wv$$.html"
-
-- wvHtml "${1}" --targetdir="${tmpdir}" "${TMP_FILE}" >/dev/null 2>&1
-+ wvHtml "${1}" --targetdir="${TMPDIR}" "${TMP_FILE}" >/dev/null 2>&1
- if [ ${?} -ne "0" ]; then
- 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}
Index: converters/wv/pkg/PFRAG.shared
===================================================================
RCS file: converters/wv/pkg/PFRAG.shared
diff -N converters/wv/pkg/PFRAG.shared
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ converters/wv/pkg/PFRAG.shared 9 May 2008 21:42:26 -0000
@@ -0,0 +1,3 @@
[EMAIL PROTECTED] $OpenBSD$
[EMAIL PROTECTED] lib/libwv-1.2.so.${LIBwv-1.2_VERSION}
[EMAIL PROTECTED] lib/libwv.so.${LIBwv_VERSION}
Index: converters/wv/pkg/PLIST
===================================================================
RCS file: /cvs/ports/converters/wv/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- converters/wv/pkg/PLIST 25 Sep 2004 11:49:21 -0000 1.4
+++ converters/wv/pkg/PLIST 9 May 2008 21:42:26 -0000
@@ -1,11 +1,10 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/25 11:49:21 espie Exp $
-bin/make_epses.sh
-bin/wv-incconfig
-bin/wv-libconfig
+%%SHARED%%
bin/wvAbw
bin/wvCleanLatex
bin/wvConvert
bin/wvDVI
+bin/wvDocBook
bin/wvHtml
bin/wvLatex
bin/wvMime
@@ -17,12 +16,13 @@ bin/wvText
bin/wvVersion
bin/wvWare
bin/wvWml
-include/wv.h
-include/wvexporter.h
+include/wv/
+include/wv/wv.h
lib/libwv.a
+lib/libwv.la
+lib/pkgconfig/wv-1.0.pc
@man man/man1/wvAbw.1
@man man/man1/wvCleanLatex.1
[EMAIL PROTECTED] man/man1/wvConvert.1
@man man/man1/wvDVI.1
@man man/man1/wvHtml.1
@man man/man1/wvLatex.1
@@ -254,7 +254,6 @@ share/wv/patterns/sectionendeven.gif
share/wv/patterns/sectionendnewpage.gif
share/wv/patterns/sectionendodd.gif
share/wv/patterns/wmf.jpg
-share/wv/ttf/
share/wv/wingdingfont/
share/wv/wingdingfont/100.gif
share/wv/wingdingfont/101.gif
@@ -480,7 +479,10 @@ share/wv/wingdingfont/99.gif
share/wv/wvAbw.xml
share/wv/wvCleanLaTeX.xml
share/wv/wvConfig.xml
+share/wv/wvDocbook.xml
share/wv/wvHtml.xml
share/wv/wvLaTeX.xml
share/wv/wvText.xml
share/wv/wvWml.xml
+share/wv/wvXml.dtd
+share/wv/wvXml.xml
Index: converters/wv/pkg/SECURITY
===================================================================
RCS file: converters/wv/pkg/SECURITY
diff -N converters/wv/pkg/SECURITY
--- converters/wv/pkg/SECURITY 11 Aug 2001 00:51:31 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-$OpenBSD: SECURITY,v 1.1.1.1 2001/08/11 00:51:31 avsm Exp $
-
-This package has some pretty dodgy temp-file creation routines.
-Some of them have been patched away by wrapping them around mktemp(1)
-calls, but some remain. Set the TMPDIR environment variable to a
-unique directory to avoid this problem.
-
-The maintainer says that they are rewriting this package completely to
-avoid these problems in the future.
