diff options
Diffstat (limited to 'converters/wv/patches/patch-aa')
| -rw-r--r-- | converters/wv/patches/patch-aa | 145 |
1 files changed, 57 insertions, 88 deletions
diff --git a/converters/wv/patches/patch-aa b/converters/wv/patches/patch-aa index 3565f054b35..c792b3c7deb 100644 --- a/converters/wv/patches/patch-aa +++ b/converters/wv/patches/patch-aa @@ -1,90 +1,59 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/02/27 22:09:18 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2000/08/05 02:39:19 jlam Exp $ ---- ./configure.orig Thu Dec 16 16:35:18 1999 -+++ ./configure Sun Feb 27 17:13:01 2000 -@@ -5313,76 +5313,28 @@ - echo "configure:5314: checking for PNG support ..." >&5 - failed=0; - passed=0; -- ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for png.h""... $ac_c" 1>&6 --echo "configure:5319: checking for png.h" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext <<EOF --#line 5324 "configure" -+ cat > conftest.$ac_ext <<EOF -+#line 5318 "configure" - #include "confdefs.h" - #include <png.h> --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- passed=`expr $passed + 1` --else -- echo "$ac_t""no" 1>&6 --failed=`expr $failed + 1` --fi -- -- ac_safe=`echo "pngconf.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for pngconf.h""... $ac_c" 1>&6 --echo "configure:5353: checking for pngconf.h" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext <<EOF --#line 5358 "configure" --#include "confdefs.h" - #include <pngconf.h> -+int main() { -+ -+; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:5363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -+if { (eval echo configure:5326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+ passed=`expr $passed + 1` - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" -+ failed=`expr $failed + 1` - fi - rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- passed=`expr $passed + 1` --else -- echo "$ac_t""no" 1>&6 --failed=`expr $failed + 1` --fi +--- Makefile.in.orig Thu Dec 16 10:52:20 1999 ++++ Makefile.in Fri Aug 4 21:37:11 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/ @WMF_CFLAGS@ @TTF_CFLAGS@ -DTTFDIR=\"$(prefix)/share/wv/ttf\" -DXMLCONFIG=\"$(prefix)/share/wv/wvConfig.xml\" -DHTMLCONFIG=\"$(prefix)/share/wv/wvHtml.xml\" @CPPFLAGS@ + + MKINSTALLDIRS = $(srcdir)/mkinstalldirs + +@@ -223,7 +223,7 @@ + wv-incconfig: Makefile + rm -f wv-incconfig + echo \#\!/bin/sh > wv-incconfig +- echo echo @ZLIB_CFLAGS@ -I$(includedir) @WMF_CFLAGS@ >> wv-incconfig ++ echo echo @WMF_CFLAGS@ @ZLIB_CFLAGS@ -I$(includedir) >> wv-incconfig + + lex.yy.c: parser.lex + $(LEX) parser.lex +@@ -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 + - echo $ac_n "checking for png_info_init in -lpng""... $ac_c" 1>&6 --echo "configure:5386: checking for png_info_init in -lpng" >&5 -+echo "configure:5338: checking for png_info_init in -lpng" >&5 - ac_lib_var=`echo png'_'png_info_init | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 |