diff options
Diffstat (limited to 'converters/wv/patches/patch-ab')
| -rw-r--r-- | converters/wv/patches/patch-ab | 139 |
1 files changed, 92 insertions, 47 deletions
diff --git a/converters/wv/patches/patch-ab b/converters/wv/patches/patch-ab index 16b0322d97f..c4f7696288c 100644 --- a/converters/wv/patches/patch-ab +++ b/converters/wv/patches/patch-ab @@ -1,50 +1,95 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/02/27 22:09:18 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2000/08/05 02:39:19 jlam Exp $ ---- ./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 +--- configure.in.orig Thu Dec 16 10:35:16 1999 ++++ configure.in Fri Aug 4 21:37:12 2000 +@@ -305,7 +305,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 +@@ -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) + else + no_ttf=yes + 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 +@@ -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 + + + 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}/include ${TTF_LIBS}" + fi + + fi +@@ -374,7 +376,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 + +@@ -397,13 +399,13 @@ + 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 + + 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 @@ + + + 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 |