diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-12-31 02:15:16 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-12-31 02:15:16 +0800 |
| commit | 24db4d7c62855addab344acacb475cc519745a98 (patch) | |
| tree | 4efb76e3cab47ba0e4a2223fb2efe4542bcbb1a2 /databases | |
| parent | 0536fe390597f2d682e14373777c2274581d9a21 (diff) | |
| download | marcuscom-ports-24db4d7c62855addab344acacb475cc519745a98.tar marcuscom-ports-24db4d7c62855addab344acacb475cc519745a98.tar.gz marcuscom-ports-24db4d7c62855addab344acacb475cc519745a98.tar.bz2 marcuscom-ports-24db4d7c62855addab344acacb475cc519745a98.tar.lz marcuscom-ports-24db4d7c62855addab344acacb475cc519745a98.tar.xz marcuscom-ports-24db4d7c62855addab344acacb475cc519745a98.tar.zst marcuscom-ports-24db4d7c62855addab344acacb475cc519745a98.zip | |
Sync w/ FreeBSD ports tree that I have committed since a few days.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17183 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/evolution-data-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/evolution-data-server/files/patch-configure | 34 | ||||
| -rw-r--r-- | databases/evolution-data-server3/Makefile | 5 |
3 files changed, 35 insertions, 10 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 431b4090d..6a5e61ab9 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.214 2012/08/08 16:56:39 kwm Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.215 2012/09/01 23:02:08 mezz Exp $ # PORTNAME= evolution-data-server PORTVERSION= 2.32.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,7 +19,7 @@ COMMENT= The data backends for the Evolution integrated mail/PIM suite LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ gdata.7:${PORTSDIR}/devel/libgdata06 \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - ical.44:${PORTSDIR}/devel/libical \ + ical:${PORTSDIR}/devel/libical \ nss3.1:${PORTSDIR}/security/nss \ tasn1.4:${PORTSDIR}/security/libtasn1 \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 527384093..8eef3904d 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,7 +1,7 @@ ---- configure.orig 2009-12-25 20:21:00.000000000 +0100 -+++ configure 2009-12-25 20:21:01.000000000 +0100 -@@ -15968,6 +15968,14 @@ - _ACEOF +--- configure.orig 2010-11-14 22:59:14.000000000 -0800 ++++ configure 2012-06-12 08:40:11.000000000 -0700 +@@ -14174,6 +14174,14 @@ + $as_echo "#define _WIN32_WINNT 0x501" >>confdefs.h ;; +*freebsd*) @@ -13,5 +13,29 @@ + LIBEXECDIR_IN_SERVER_FILE="$libexecdir" + ;; *) - os_win32=no + os_win32='no' NO_UNDEFINED='' +@@ -16195,9 +16203,8 @@ + fi + + +- ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" " #if HAVE_ET_COM_ERR_H +- #include <com_err.h> +- #endif ++ ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" " #include <stdio.h> ++ #include <stdarg.h> + + " + if test "x$ac_cv_header_et_com_err_h" = x""yes; then : +@@ -16207,9 +16214,8 @@ + fi + + +- ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" " #if HAVE_COM_ERR_H +- #include <com_err.h> +- #endif ++ ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" " #include <stdio.h> ++ #include <stdarg.h> + + " + if test "x$ac_cv_header_com_err_h" = x""yes; then : diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile index 4f7fc791c..832c12d63 100644 --- a/databases/evolution-data-server3/Makefile +++ b/databases/evolution-data-server3/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.27 2012/08/08 16:56:39 kwm Exp $ +# $MCom: ports/databases/evolution-data-server3/Makefile,v 1.28 2012/08/16 19:28:53 kwm Exp $ # PORTNAME= evolution-data-server PORTVERSION= 3.4.4 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -23,7 +24,7 @@ LIB_DEPENDS= soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ oauth.8:${PORTSDIR}/net/liboauth \ goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \ gdata.13:${PORTSDIR}/devel/libgdata \ - ical.44:${PORTSDIR}/devel/libical \ + ical:${PORTSDIR}/devel/libical \ nss3.1:${PORTSDIR}/security/nss \ tasn1.4:${PORTSDIR}/security/libtasn1 \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring |