diff options
| author | ade <ade@FreeBSD.org> | 2000-08-18 00:45:29 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2000-08-18 00:45:29 +0800 |
| commit | 898a414a0906b441461470153f666446ed759095 (patch) | |
| tree | 64460cab7f53ac525bec5390b0d3300ddf43f355 /mail/evolution | |
| parent | 64520e4828a15b72998be7a20d2356064472bcf1 (diff) | |
| download | freebsd-ports-gnome-898a414a0906b441461470153f666446ed759095.tar.gz freebsd-ports-gnome-898a414a0906b441461470153f666446ed759095.tar.zst freebsd-ports-gnome-898a414a0906b441461470153f666446ed759095.zip | |
Updates for new gtkhtml and bonobo
Diffstat (limited to 'mail/evolution')
| -rw-r--r-- | mail/evolution/Makefile | 2 | ||||
| -rw-r--r-- | mail/evolution/files/patch-aa | 48 |
2 files changed, 45 insertions, 5 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index e9a6d9a7e8a2..de66f355ad19 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ bonobo.2:${PORTSDIR}/devel/bonobo \ gnomevfs.0:${PORTSDIR}/devel/gnomevfs \ unicode.0:${PORTSDIR}/devel/libunicode \ - gtkhtml.3:${PORTSDIR}/www/gtkhtml \ + gtkhtml.4:${PORTSDIR}/www/gtkhtml \ ldap.1:${PORTSDIR}/net/openldap \ capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ gpilotd.0:${PORTSDIR}/palm/gnomepilot diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index c77b683a198e..9f226d036a8a 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,6 +1,17 @@ ---- configure.orig Mon Jul 10 20:48:19 2000 -+++ configure Tue Jul 11 19:15:28 2000 -@@ -5795,8 +5795,8 @@ +--- configure.orig Fri Jul 28 11:18:54 2000 ++++ configure Wed Aug 16 17:16:40 2000 +@@ -5738,8 +5738,8 @@ + + saved_CFLAGS="$CFLAGS" + saved_LDFLAGS="$LDFLAGS" +-CFLAGS="$CFLAGS `gnome-config --cflags bonobo`" +-LDFLAGS="$LDFLAGS `gnome-config --libs bonobo`" ++CFLAGS="$CFLAGS `gnome-config --cflags bonobox`" ++LDFLAGS="$LDFLAGS `gnome-config --libs bonobox`" + cat > conftest.$ac_ext <<EOF + #line 5745 "configure" + #include "confdefs.h" +@@ -5799,8 +5799,8 @@ { echo "configure: error: Did not find gdkpixbuf installed" 1>&2; exit 1; } fi @@ -11,7 +22,36 @@ -@@ -7583,10 +7583,10 @@ +@@ -5813,13 +5813,13 @@ + + + +-BONOBO_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf gnomeui`" +-BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf gnomeui `" ++BONOBO_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf gnomeui`" ++BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gnomecanvaspixbuf gnomeui `" + + + +-BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS" +-BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS" ++BONOBO_HTML_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS" ++BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS" + + + +@@ -5930,8 +5930,8 @@ + CFLAGS="$saved_CFLAGS" + LDFLAGS="$saved_LDFLAGS" + +-BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `" +-BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobo libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `" ++BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `" ++BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `" + + + +@@ -7837,10 +7837,10 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac |