head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.54
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.52
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.50
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.48
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.46
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.44
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.42
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.40
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.38
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.36
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.34
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.32
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.30
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.28
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.26
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.24
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.22
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.20
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.18
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.16
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.14
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.12
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.4.0.10
	pkgsrc-2004Q4-base:1.4
	pkgsrc-2004Q3:1.4.0.8
	pkgsrc-2004Q3-base:1.4
	pkgsrc-2004Q2:1.4.0.6
	pkgsrc-2004Q2-base:1.4
	pkgsrc-2004Q1:1.4.0.4
	pkgsrc-2004Q1-base:1.4
	pkgsrc-2003Q4:1.4.0.2
	pkgsrc-2003Q4-base:1.4
	buildlink2-base:1.4
	netbsd-1-5-PATCH001:1.3
	netbsd-1-5-RELEASE:1.2
	netbsd-1-4-PATCH003:1.2
	netbsd-1-4-PATCH002:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2001.07.13.04.49.11;	author kei;	state dead;
branches;
next	1.3;

1.3
date	2000.10.16.15.14.23;	author rh;	state Exp;
branches;
next	1.2;

1.2
date	2000.08.05.02.39.19;	author jlam;	state Exp;
branches;
next	1.1;

1.1
date	2000.02.27.22.09.18;	author wiz;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2000.02.27.22.09.18;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.4
log
@* updated from 0.6.0 to 0.6.5.  There is no changelog in the distributed
  archive.  Below is the release note from its WWW page.

  Notes: Lots of minor changes, some minor API
  changes, some bugs fixed, some crashers removed
  Changes: Lots of minor changes, some minor API
  changes, some bugs fixed, some crashers removed

* converted to use buildlink.mk.
@
text
@$NetBSD: patch-ab,v 1.3 2000/10/16 15:14:23 rh Exp $

--- configure.orig	Tue Sep 19 21:38:01 2000
+++ configure
@@@@ -3567,7 +3567,7 @@@@
 _SAVE_LDFLAGS=$LDFLAGS
 
 if test "$TTF_DIR" != "" ; then
-CFLAGS="-I${TTF_DIR}/include $CFLAGS"
+CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
 LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
 fi
 
@@@@ -3602,7 +3602,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lttf -lm $LIBS"
+LIBS="-lttf -lintl -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 3608 "configure"
 #include "confdefs.h"
@@@@ -3630,7 +3630,7 @@@@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  TTF_LIBS="-lttf"
+  TTF_LIBS="-lttf -lintl"
 else
   echo "$ac_t""no" 1>&6
 no_ttf=yes
@@@@ -3641,14 +3641,14 @@@@
 fi
 
 if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
-    TTF_CFLAGS="-I${TTF_DIR}/include"
+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
     TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
 fi
 
 if test "x$no_ttf" = xyes; then
 	if test "$TTF_DIR" != "" ; then
-	CFLAGS="-I${TTF_DIR} $CFLAGS"
-	LDFLAGS="-L${TTF_DIR} $LDFLAGS"
+	CFLAGS="-I${TTF_DIR}/include/freetype $CFLAGS"
+	LDFLAGS="-L${TTF_DIR}/lib $LDFLAGS"
 	fi
 
 	if test "$TTF_DIR" = no; then
@@@@ -3684,7 +3684,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lttf -lm $LIBS"
+LIBS="-lttf -lintl -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 3690 "configure"
 #include "confdefs.h"
@@@@ -3712,7 +3712,7 @@@@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  TTF_LIBS="-lttf"
+  TTF_LIBS="-lttf -lintl"
 else
   echo "$ac_t""no" 1>&6
 no_ttf=yes
@@@@ -3724,8 +3724,8 @@@@
 
 
 if  test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ; then
-    TTF_CFLAGS="-I${TTF_DIR}"
-    TTF_LIBS="-L${TTF_DIR} ${TTF_LIBS}"
+    TTF_CFLAGS="-I${TTF_DIR}/include/freetype"
+    TTF_LIBS="-L${TTF_DIR}/lib ${TTF_LIBS}"
 fi
 
 fi
@@@@ -3747,7 +3747,7 @@@@
 _SAVE_LIBS=$LIBS
 
 if test "$WMF_DIR" != "" ; then
-CFLAGS="-I${WMF_DIR}/include $CFLAGS"
+CFLAGS="-I${WMF_DIR}/include/libwmf $CFLAGS"
 LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
 fi
 
@@@@ -3813,7 +3813,7 @@@@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  WMF_LIBS="-lgdwmf -lwmf -lxgd -ldib -lpng"
+  WMF_LIBS="-lgdwmf -lwmf -lttf -lxgd -ldib -lpng"
 else
   echo "$ac_t""no" 1>&6
 no_wmf=yes
@@@@ -3824,7 +3824,7 @@@@
 fi
 
 if  test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ; then
-    WMF_CFLAGS="-I${WMF_DIR}/include"
+    WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
     WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
 fi
 
@@@@ -3869,7 +3869,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lgdwmf -lwmf -lxgd -ldib -lpng $TTF_LIBS $XPM_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm $LIBS"
+LIBS="-lgdwmf -lwmf -lttf -lxgd -ldib -lpng $TTF_LIBS $XPM_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 3875 "configure"
 #include "confdefs.h"
@@@@ -3909,8 +3909,8 @@@@
 
 
 if  test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ; then
-    WMF_CFLAGS="-I${WMF_DIR}"
-    WMF_LIBS="-L${WMF_DIR} ${WMF_LIBS}"
+    WMF_CFLAGS="-I${WMF_DIR}/include/libwmf"
+    WMF_LIBS="-L${WMF_DIR}/lib ${WMF_LIBS}"
 fi
 
 fi
@@@@ -5425,11 +5425,11 @@@@
 		echo $ac_n "checking if PNG package is complete""... $ac_c" 1>&6
 echo "configure:5427: checking if PNG package is complete" >&5
 		if test $passed -gt 0; then
-			if test $failed -gt 0; then
+			if false; then
 				echo "$ac_t""no -- some components failed test" 1>&6
 				have_png='no (failed tests)'
 			else
-				LIB_PNG='-lpng'
+				LIB_PNG='-lpng -lz'
 				cat >> confdefs.h <<\EOF
 #define HasPNG 1
 EOF
@


1.3
log
@Update wv to 0.6.0.  Changes include:

 * Changed executable name from wvHtml to wvWare
 * Added Mime display script (wvMime) (Martin Vermeer, Dom)
 * Added Conversion Helper Scripts (wvHtml, wvLatex, wvCleanLatex,
   wvPS, wvDVI, wvPDF) (Dom)
 * Added CleanLaTeX output mode, more closely resembling hand-crafted
   LaTeX (Martin)
 * Use GLib (http://www.gtk.org) (Dom)
 * Use Gnome Libole2 (http://www.gnome.org) (Dom, Jamie)
 * New wvStream architecture (Jamie)
 * Word 2 support! (Martin Vermeer)
 * Code speedups and XP improvements (the Abiword team)
 * Massive work started on an exporter (Dom)
 * Move to wvware.sourceforge.net (Dom)
 * New Maintainer: Dom Lachowicz (cinamod@@hotmail.com)
   |-> also getting lots of help from Martin Vermeer
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Rework to use libwmf-0.1.17nb1.
@
text
@d3 3
a5 3
--- configure.in.orig	Thu Dec 16 10:35:16 1999
+++ configure.in	Fri Aug  4 21:37:12 2000
@@@@ -305,7 +305,7 @@@@
d14 15
a28 7
@@@@ -319,20 +319,21 @@@@
     AC_MSG_RESULT("$result")
 fi
 if [ test "$SYSTEM_TTF" = 1 ]; then
-    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
+    AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
+    no_ttf=yes,-lintl)
d30 3
a32 1
     no_ttf=yes
d35 1
a35 1
 if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
d50 19
a68 10
@@@@ -345,15 +346,16 @@@@
 		AC_MSG_RESULT("$result")
 	fi
 	if [ test "$SYSTEM_TTF" = 1 ]; then
-		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf"],no_ttf=yes,-lm)
+		AC_CHECK_LIB(ttf, TT_Init_FreeType, [TTF_LIBS="-lttf -lintl"],
+		no_ttf=yes,-lintl)
 	else
 		no_ttf=yes
 	fi
d71 1
a71 1
 if [ test -n "${TTF_DIR}" && test -d "${TTF_DIR}" && test "$SYSTEM_TTF" = 1 ]; then
d75 1
a75 1
+    TTF_LIBS="-L${TTF_DIR}/include ${TTF_LIBS}"
d79 1
a79 1
@@@@ -374,7 +376,7 @@@@
d88 10
a97 1
@@@@ -397,13 +399,13 @@@@
d100 1
a100 1
 if [ test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ]; then
d106 10
a115 8
 if test "x$no_wmf" = xyes; then
 	if test "$WMF_DIR" != "" ; then
-	CFLAGS="-I${WMF_DIR}/include $CFLAGS"
+	CFLAGS="-I${WMF_DIR}/include/libwmf $CFLAGS"
 	LDFLAGS="-L${WMF_DIR}/lib $LDFLAGS"
 	fi
 
@@@@ -427,8 +429,8 @@@@
d118 1
a118 1
 if [ test -n "${WMF_DIR}" && test -d "${WMF_DIR}" && test "$SYSTEM_WMF" = 1 ]; then
d126 14
@


1.1
log
@Initial revision
@
text
@d3 91
a93 47
--- ./Makefile.in.orig	Thu Dec 16 16:52:20 1999
+++ ./Makefile.in	Sun Feb 27 20:05:06 2000
@@@@ -76,7 +76,7 @@@@
 
 VPATH = @@srcdir@@
 
-CFLAGS = @@CFLAGS@@ @@DEFS@@ @@ZLIB_CFLAGS@@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/  @@TTF_CFLAGS@@ @@WMF_CFLAGS@@ -DTTFDIR=\"$(libdir)/wv/ttf\" -DXMLCONFIG=\"$(libdir)/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(libdir)/wv/wvHtml.xml\" 
+CFLAGS = @@CFLAGS@@ @@DEFS@@ @@ZLIB_CFLAGS@@ -I. -I./ -I$(srcdir)/ -I$(srcdir)/iconv/ -I$(srcdir)/magick/ -I$(srcdir)/expat/xmlparse/ -I$(srcdir)/oledecod/  @@TTF_CFLAGS@@ @@WMF_CFLAGS@@ -DTTFDIR=\"$(libdir)/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\" 
 
 MKINSTALLDIRS = $(srcdir)/mkinstalldirs
 
@@@@ -293,10 +293,11 @@@@
 	$(mandir) \
 	$(mandir)/man1 \
 	$(libdir) \
-	$(libdir)/wv\
-	$(libdir)/wv/wingdingfont \
-	$(libdir)/wv/patterns \
-	$(libdir)/wv/ttf \
+	$(prefix)/share/wv\
+	$(prefix)/share/wv/wingdingfont \
+	$(prefix)/share/wv/patterns \
+	$(prefix)/share/wv/ttf \
+	$(prefix)/share/wv \
 	$(includedir)
 	
 
@@@@ -313,13 +314,16 @@@@
 	$(INSTALL_DATA) $(srcdir)/wvHtml.1 $(mandir)/man1/
 	$(INSTALL_DATA) wv.h $(includedir)/wv.h
 	$(INSTALL_DATA) $(srcdir)/libwv.a $(libdir)/libwv.a
-	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(libdir)/wv/wvHtml.xml
-	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(libdir)/wv/wvConfig.xml
+	$(INSTALL_DATA) $(srcdir)/lyx.xml $(prefix)/share/wv/lyx.xml
+	$(INSTALL_DATA) $(srcdir)/wvHtml.xml $(prefix)/share/wv/wvHtml.xml
+	$(INSTALL_DATA) $(srcdir)/wvConfig.xml $(prefix)/share/wv/wvConfig.xml
+	$(INSTALL_DATA) $(srcdir)/wvLaTeX.xml $(prefix)/share/wv/wvLaTeX.xml
+	$(INSTALL_DATA) $(srcdir)/wvOnline.xml $(prefix)/share/wv/wvOnline.xml
 	for filename in wingdingfont/*.gif; do \
-		$(INSTALL_DATA) $$filename $(libdir)/wv/wingdingfont; \
+		$(INSTALL_DATA) $$filename $(prefix)/share/wv/wingdingfont; \
 	done
 	for filename in patterns/*.gif patterns/*.jpg; do \
-		$(INSTALL_DATA) $$filename $(libdir)/wv/patterns; \
+		$(INSTALL_DATA) $$filename $(prefix)/share/wv/patterns; \
 	done
 
d95 1
@


1.1.1.1
log
@Initial import of wv, a MS-Word file to HTML/LaTeX converter.
This is the successor of textproc/mswordview, which should be retired
sometime -- at the moment there are still files that are handled better
by it.
@
text
@@
