diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2001-09-13 06:43:26 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2001-09-13 06:43:26 +0000 |
| commit | cee16c481f7e9a7dc5b8ecea4ccfb04af8ba2ab0 (patch) | |
| tree | a1ffd32db8753a1f4e96c273336b4437ff249886 | |
| parent | Accompanying commit for Makefile rev 1.20. (diff) | |
Fix compilation problems.
Submitted by: asmodai
Notes
Notes:
svn path=/head/; revision=47790
| -rw-r--r-- | mail/evolution-devel/Makefile | 3 | ||||
| -rw-r--r-- | mail/evolution-devel/files/patch-aa | 25 | ||||
| -rw-r--r-- | mail/evolution/Makefile | 3 | ||||
| -rw-r--r-- | mail/evolution/files/patch-aa | 25 |
4 files changed, 44 insertions, 12 deletions
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile index 5db4470c5d6c..de77c50eab34 100644 --- a/mail/evolution-devel/Makefile +++ b/mail/evolution-devel/Makefile @@ -13,7 +13,8 @@ MASTER_SITE_SUBDIR= unstable/sources/evolution MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf +LIB_DEPENDS= bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \ + gtkhtml.15:${PORTSDIR}/www/gtkhtml #ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until # it actually works diff --git a/mail/evolution-devel/files/patch-aa b/mail/evolution-devel/files/patch-aa index 0ab8cde1b418..8d11003c26ea 100644 --- a/mail/evolution-devel/files/patch-aa +++ b/mail/evolution-devel/files/patch-aa @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- configure.orig Tue Sep 11 19:38:48 2001 -+++ configure Tue Sep 11 19:38:55 2001 +--- configure.orig Thu Sep 13 08:28:28 2001 ++++ configure Thu Sep 13 08:29:17 2001 @@ -5554,7 +5554,7 @@ CPPFLAGS_save="$CPPFLAGS" @@ -21,6 +18,24 @@ $FreeBSD$ fi rm -f conftest* +@@ -5648,7 +5648,7 @@ + ac_cv_db3_ldadd="" + + for name in db db3 db-3.1; do +- LIBS="$LIBS_save $with_db3_libs/lib${name}.a" ++ LIBS="$LIBS_save $with_db3_libs/lib${name}.so" + cat > conftest.$ac_ext <<EOF + #line 5654 "configure" + #include "confdefs.h" +@@ -5669,7 +5669,7 @@ + if { (eval echo configure:5670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + +- ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a" ++ ac_cv_db3_ldadd="$with_db3_libs/lib${name}.so" + break + + else @@ -5739,7 +5739,7 @@ echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6 diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 5db4470c5d6c..de77c50eab34 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -13,7 +13,8 @@ MASTER_SITE_SUBDIR= unstable/sources/evolution MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf +LIB_DEPENDS= bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \ + gtkhtml.15:${PORTSDIR}/www/gtkhtml #ldap.1:${PORTSDIR}/net/openldap <- avoid extra dependency until # it actually works diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa index 0ab8cde1b418..8d11003c26ea 100644 --- a/mail/evolution/files/patch-aa +++ b/mail/evolution/files/patch-aa @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- configure.orig Tue Sep 11 19:38:48 2001 -+++ configure Tue Sep 11 19:38:55 2001 +--- configure.orig Thu Sep 13 08:28:28 2001 ++++ configure Thu Sep 13 08:29:17 2001 @@ -5554,7 +5554,7 @@ CPPFLAGS_save="$CPPFLAGS" @@ -21,6 +18,24 @@ $FreeBSD$ fi rm -f conftest* +@@ -5648,7 +5648,7 @@ + ac_cv_db3_ldadd="" + + for name in db db3 db-3.1; do +- LIBS="$LIBS_save $with_db3_libs/lib${name}.a" ++ LIBS="$LIBS_save $with_db3_libs/lib${name}.so" + cat > conftest.$ac_ext <<EOF + #line 5654 "configure" + #include "confdefs.h" +@@ -5669,7 +5669,7 @@ + if { (eval echo configure:5670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + +- ac_cv_db3_ldadd="$with_db3_libs/lib${name}.a" ++ ac_cv_db3_ldadd="$with_db3_libs/lib${name}.so" + break + + else @@ -5739,7 +5739,7 @@ echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6 |