From 8397223cf22016953e4908f242809caaab443dc0 Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 30 Oct 2008 16:36:35 +0000 Subject: [PATCH] - some cleanups * use autoconf for a saner configure/pthread/kerberos patch * add an XXX about ntlm shitz * set better CPPFLAGS to get rid of some db4 related patches --- databases/evolution-data-server/Makefile | 17 +++++-- .../patches/patch-acinclude_m4 | 17 +++++++ ...ssbook_backends_file_e-book-backend-file_c | 12 ----- ...kends_groupwise_e-book-backend-groupwise_c | 12 ----- ...ok_libedata-book_e-book-backend-db-cache_c | 11 ----- .../patches/patch-configure | 48 ------------------- .../patches/patch-configure_in | 12 +++++ .../patch-libedataserver_e-db3-utils_c | 12 ----- .../patches/patch-libedataserver_e-dbhash_c | 12 ----- 9 files changed, 42 insertions(+), 111 deletions(-) create mode 100644 databases/evolution-data-server/patches/patch-acinclude_m4 delete mode 100644 databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c delete mode 100644 databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c delete mode 100644 databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-book-backend-db-cache_c delete mode 100644 databases/evolution-data-server/patches/patch-configure create mode 100644 databases/evolution-data-server/patches/patch-configure_in delete mode 100644 databases/evolution-data-server/patches/patch-libedataserver_e-db3-utils_c delete mode 100644 databases/evolution-data-server/patches/patch-libedataserver_e-dbhash_c diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index d809e9ecdb8..957a0725164 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2008/07/04 21:28:50 jasper Exp $ +# $OpenBSD: Makefile,v 1.34 2008/10/30 16:36:35 jasper Exp $ SHARED_ONLY= Yes @@ -6,6 +6,7 @@ COMMENT= data backends for the Evolution mail/PIM suite GNOME_PROJECT= evolution-data-server GNOME_VERSION= 2.22.3 +PKGNAME= ${DISTNAME}p0 CATEGORIES= databases SHARED_LIBS += edataserver-1.2 10.0 # .10.0 SHARED_LIBS += egroupwise-1.2 13.1 # .13.1 @@ -41,7 +42,8 @@ MODULES= devel/gettext \ lang/python \ x11/gnome -BUILD_DEPENDS= :bison-*:devel/bison \ +BUILD_DEPENDS= :autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \ + :bison-*:devel/bison \ :libgnomeui-*:x11/gnome/libgnomeui LIB_DEPENDS= db:db-4.*:databases/db/v4 \ ldap,lber::databases/openldap \ @@ -53,7 +55,8 @@ LIB_DEPENDS= db:db-4.*:databases/db/v4 \ USE_X11= Yes YACC= bison -CONFIGURE_STYLE= gnu +AUTOCONF_VERSION= 2.61 +CONFIGURE_STYLE= autoconf gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/evolution-data-server \ --enable-gnome-keyring=yes \ @@ -65,7 +68,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --with-krb5-includes=/usr/include/kerberosV \ --with-libdb="${PREFIX}/lib" \ --with-openldap=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \ LDFLAGS="-L${LOCALBASE}/lib" R= ${GNOME_VERSION:R} @@ -76,3 +79,9 @@ post-extract: ${WRKSRC}/addressbook/libebook/gen-western-table.py .include + +# XXX: +# No NTLM support in OpenLDAP; Plaintext password authentication will be +# used when connecting to the Exchange Global Catalog server. Consider +# installing the evo-openldap package, or building OpenLDAP with the +# patch in servers/exchange/docs/openldap-ntlm.diff diff --git a/databases/evolution-data-server/patches/patch-acinclude_m4 b/databases/evolution-data-server/patches/patch-acinclude_m4 new file mode 100644 index 00000000000..d06262e5ff3 --- /dev/null +++ b/databases/evolution-data-server/patches/patch-acinclude_m4 @@ -0,0 +1,17 @@ +$OpenBSD: patch-acinclude_m4,v 1.1 2008/10/30 16:36:35 jasper Exp $ +--- acinclude.m4.orig Thu Oct 30 16:31:26 2008 ++++ acinclude.m4 Thu Oct 30 16:31:46 2008 +@@ -204,10 +204,10 @@ AC_DEFUN([EVO_SUNLDAP_CHECK], [ + # EVO_PTHREAD_CHECK + AC_DEFUN([EVO_PTHREAD_CHECK],[ + PTHREAD_LIB="" +- AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread", +- [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads", ++ AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-pthread", ++ [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-pthreads", + [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r", +- [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-lpthread", ++ [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIB="-pthread", + [AC_CHECK_FUNC(pthread_create)] + )] + )] diff --git a/databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c b/databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c deleted file mode 100644 index 7b49000cafd..00000000000 --- a/databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.1 2007/11/21 16:10:24 jasper Exp $ ---- addressbook/backends/file/e-book-backend-file.c.orig Sun Oct 28 15:29:26 2007 -+++ addressbook/backends/file/e-book-backend-file.c Sun Oct 28 15:30:02 2007 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include "db.h" -+#include - #include - #include - diff --git a/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c b/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c deleted file mode 100644 index 1d356ce7441..00000000000 --- a/databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-addressbook_backends_groupwise_e-book-backend-groupwise_c,v 1.6 2007/11/21 16:10:24 jasper Exp $ ---- addressbook/backends/groupwise/e-book-backend-groupwise.c.orig Sun Oct 28 15:31:57 2007 -+++ addressbook/backends/groupwise/e-book-backend-groupwise.c Sun Oct 28 15:32:13 2007 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include "db.h" -+#include - - #include - #include diff --git a/databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-book-backend-db-cache_c b/databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-book-backend-db-cache_c deleted file mode 100644 index 119cd9cabf0..00000000000 --- a/databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-book-backend-db-cache_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-addressbook_libedata-book_e-book-backend-db-cache_c,v 1.1 2007/11/21 16:10:24 jasper Exp $ ---- addressbook/libedata-book/e-book-backend-db-cache.c.orig Sun Oct 28 15:25:15 2007 -+++ addressbook/libedata-book/e-book-backend-db-cache.c Sun Oct 28 15:27:20 2007 -@@ -23,6 +23,7 @@ - #include - #endif - -+#include - #include - #include "e-book-backend-db-cache.h" - #include "e-book-backend.h" diff --git a/databases/evolution-data-server/patches/patch-configure b/databases/evolution-data-server/patches/patch-configure deleted file mode 100644 index 6c9bcd3970b..00000000000 --- a/databases/evolution-data-server/patches/patch-configure +++ /dev/null @@ -1,48 +0,0 @@ -$OpenBSD: patch-configure,v 1.7 2008/07/04 21:28:50 jasper Exp $ ---- configure.orig Sun Jun 29 07:45:59 2008 -+++ configure Fri Jul 4 23:07:12 2008 -@@ -27776,7 +27776,7 @@ if test "x${with_krb5}" != "xno"; then - LDFLAGS_save="$LDFLAGS" - - mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" -- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" -+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi" - sunlibs="-lkrb5 -lgss" - { echo "$as_me:$LINENO: checking for Kerberos 5" >&5 - echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; } -@@ -27795,8 +27795,7 @@ cat >>conftest.$ac_ext <<_ACEOF - int - main () - { --krb5_init_context -- ; -+krb5_init_context; - return 0; - } - _ACEOF -@@ -30213,13 +30212,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk - - - PTHREAD_LIB="" -- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 --echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5 -+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; } - if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" -+LIBS="-pthread $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -30275,7 +30274,7 @@ fi - { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5 - echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; } - if test $ac_cv_lib_pthread_pthread_create = yes; then -- PTHREAD_LIB="-lpthread" -+ PTHREAD_LIB="-pthread" - else - { echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5 - echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6; } diff --git a/databases/evolution-data-server/patches/patch-configure_in b/databases/evolution-data-server/patches/patch-configure_in new file mode 100644 index 00000000000..91814a1931e --- /dev/null +++ b/databases/evolution-data-server/patches/patch-configure_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure_in,v 1.1 2008/10/30 16:36:35 jasper Exp $ +--- configure.in.orig Thu Oct 30 16:30:18 2008 ++++ configure.in Thu Oct 30 16:30:29 2008 +@@ -1114,7 +1114,7 @@ if test "x${with_krb5}" != "xno"; then + LDFLAGS_save="$LDFLAGS" + + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" +- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" ++ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi" + sunlibs="-lkrb5 -lgss" + AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5, + [ diff --git a/databases/evolution-data-server/patches/patch-libedataserver_e-db3-utils_c b/databases/evolution-data-server/patches/patch-libedataserver_e-db3-utils_c deleted file mode 100644 index 5f9932a4445..00000000000 --- a/databases/evolution-data-server/patches/patch-libedataserver_e-db3-utils_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libedataserver_e-db3-utils_c,v 1.1 2007/11/21 16:10:24 jasper Exp $ ---- libedataserver/e-db3-utils.c.orig Sun Oct 28 11:39:17 2007 -+++ libedataserver/e-db3-utils.c Sun Oct 28 11:40:14 2007 -@@ -14,7 +14,7 @@ - #include - #include - --#include "db.h" -+#include - - #include "e-db3-utils.h" - diff --git a/databases/evolution-data-server/patches/patch-libedataserver_e-dbhash_c b/databases/evolution-data-server/patches/patch-libedataserver_e-dbhash_c deleted file mode 100644 index e89e1f3c32a..00000000000 --- a/databases/evolution-data-server/patches/patch-libedataserver_e-dbhash_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-libedataserver_e-dbhash_c,v 1.2 2008/06/02 16:46:26 jasper Exp $ ---- libedataserver/e-dbhash.c.orig Fri Apr 4 11:02:20 2008 -+++ libedataserver/e-dbhash.c Sun Jun 1 00:55:23 2008 -@@ -12,7 +12,7 @@ - - #include - #include --#include "db.h" -+#include - #include "md5-utils.h" - - struct _EDbHashPrivate