aboutsummaryrefslogtreecommitdiff
path: root/mail/evolution
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-12-15 04:40:13 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-12-15 04:40:13 +0000
commitcc3a50e708b0a7a87f396b18ed14a16b131fd18a (patch)
tree0fa690948e4453ed50f3fe0451a8558b27c29476 /mail/evolution
parentbfadd1fd9bbaae2c1ca8cce388b761ec21f033ff (diff)
downloadports-cc3a50e708b0a7a87f396b18ed14a16b131fd18a.tar.gz
ports-cc3a50e708b0a7a87f396b18ed14a16b131fd18a.zip
Notes
Diffstat (limited to 'mail/evolution')
-rw-r--r--mail/evolution/Makefile39
-rw-r--r--mail/evolution/distinfo1
-rw-r--r--mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in44
-rw-r--r--mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh28
-rw-r--r--mail/evolution/files/patch-aa22
5 files changed, 108 insertions, 26 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 886095b0d7b7..2cdcccd564e9 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,10 +7,13 @@
PORTNAME= evolution
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail gnome
-MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITES= http://www.sleepycat.com/update/3.1.17/ \
+ ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/evolution
+DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+ db-3.1.17.tar.gz
MAINTAINER= gnome@FreeBSD.org
@@ -28,12 +31,13 @@ USE_X_PREFIX= yes
USE_GNOME= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-db3-libs=${LOCALBASE}/lib \
+CONFIGURE_ARGS= --with-db3-libs=${DB3_WRKSRC} \
+ --with-db3-includes=${DB3_WRKSRC} \
--with-html-dir=${PREFIX}/share/gnome/html \
--with-openssl-includes=${OPENSSLBASE}/include \
--with-openssl-libs=${OPENSSLBASE}/lib \
--with-pisock=${LOCALBASE}/pilot --enable-pilot-conduits=yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${DB3_WRKSRC} -I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
PLIST_SUB= VERSION=${PORTVERSION}
@@ -48,8 +52,31 @@ pre-patch:
xargs ${PERL} -pi -e 's|(["<])iconv.h|\1giconv.h|g'
@find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '<db.h>' | \
xargs ${PERL} -pi -e 's|<db.h>|<db3/db.h>|g'
- @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l 'wrong DB3' | \
- xargs ${PERL} -pi -e 's|.*wrong DB3.*||'
+
+# DB3 stuff. Ugly, I know, but that's life.
+DB3_WRKSRC= ${WRKDIR}/db-3.1.17/build_unix
+DB3_CONFIGURE_SCRIPT= ../dist/configure
+DB3_CONFIGURE_ARGS= --enable-compat185 \
+ --enable-dump185 --enable-cxx \
+ --enable-static \
+ --disable-dynamic \
+ --prefix=${PREFIX} \
+ --includedir=${PREFIX}/include/db3 \
+ --target=${ARCH}-unknown-freebsd${OSREL}
+
+pre-configure:
+ @(cd ${DB3_WRKSRC} && \
+ ${SETENV} CC="${CC}" CXX="${CXX}" \
+ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+ INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+ ${DB3_CONFIGURE_ENV} ./${DB3_CONFIGURE_SCRIPT} ${DB3_CONFIGURE_ARGS})
+ @(cd ${DB3_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+ @${RM} -f ${DB3_WRKSRC}/db3
+ @${LN} -s . ${DB3_WRKSRC}/db3
+# End of the DB3 stuff
post-install:
@find ${PREFIX}/share/gnome/evolution/default_user -type f | \
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 5df3f2507623..d3e47446f26a 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1 +1,2 @@
MD5 (evolution-1.0.tar.gz) = 89546c8d15c2aca6ca41caa5b5f14a44
+MD5 (db-3.1.17.tar.gz) = 5baeb94fb934d0bf783ea42117c400be
diff --git a/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in b/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in
new file mode 100644
index 000000000000..8609f029b432
--- /dev/null
+++ b/mail/evolution/files/patch-..::db-3.1.17::dist::Makefile.in
@@ -0,0 +1,44 @@
+
+$FreeBSD$
+
+--- ../db-3.1.17/dist/Makefile.in.orig Tue Jul 18 18:37:57 2000
++++ ../db-3.1.17/dist/Makefile.in Fri Dec 14 16:49:51 2001
+@@ -34,11 +34,11 @@
+ libdb= libdb.a
+
+ libso_base= libdb
+-libso_linkname= $(libso_base)-$(SOVERSION).la
+-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
+-libso_target= $(libso_base)-$(SOVERSION).la
++libso_linkname= $(libso_base)$(SOMAJOR).la
++libso= $(libso_base)$(SOMAJOR).@SOSUFFIX@
++libso_target= $(libso_base)$(SOMAJOR).la
+ libso_default= $(libso_base).@SOSUFFIX@
+-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
++libso_major= $(libso_base)$(SOMAJOR).@SOSUFFIX@.1
+
+ ##################################################
+ # C++
+@@ -49,10 +49,10 @@
+ ##################################################
+ libcxx= libdb_cxx.a
+ libxso_base= libdb_cxx
+-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
+-libxso_target= $(libxso_base)-$(SOVERSION).la
++libxso= $(libxso_base)$(SOMAJOR).@SOSUFFIX@
++libxso_target= $(libxso_base)$(SOMAJOR).la
+ libxso_default= $(libxso_base).@SOSUFFIX@
+-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
++libxso_major= $(libxso_base)$(SOMAJOR).@SOSUFFIX@.1
+
+ ##################################################
+ # JAVA
+@@ -112,7 +112,7 @@
+ bindir= @bindir@
+ includedir=@includedir@
+ libdir= @libdir@
+-docdir= $(prefix)/docs
++docdir= $(prefix)/share/doc/db3
+
+ dmode= 755
+ emode= 555
diff --git a/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh b/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh
new file mode 100644
index 000000000000..902d705c895b
--- /dev/null
+++ b/mail/evolution/files/patch-..::db-3.1.17::dist::ltmain.sh
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- ../db-3.1.17/dist/ltmain.sh.orig Sun Jul 30 20:45:53 2000
++++ ../db-3.1.17/dist/ltmain.sh Fri Dec 14 19:32:11 2001
+@@ -2694,6 +2694,9 @@
+ # Absolute path.
+ rpath="$rpath$dir:"
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ # Relative path: add a thisdir entry.
+ rpath="$rpath\$thisdir/$dir:"
+@@ -3356,10 +3359,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-aa
index 2aad42d959df..f5499db4ff70 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,8 +1,8 @@
$FreeBSD$
---- configure.orig Fri Dec 14 14:08:27 2001
-+++ configure Fri Dec 14 14:17:45 2001
+--- configure.orig Fri Dec 14 19:13:12 2001
++++ configure Fri Dec 14 19:20:26 2001
@@ -9253,7 +9253,7 @@
CPPFLAGS_save="$CPPFLAGS"
@@ -21,24 +21,6 @@ $FreeBSD$
fi
rm -f conftest*
-@@ -9347,7 +9347,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 9353 "configure"
- #include "confdefs.h"
-@@ -9368,7 +9368,7 @@
- if { (eval echo configure:9369: \"$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
@@ -9438,7 +9438,7 @@
echo "$ac_t""$ac_cv_db3_lib_version_match" 1>&6