cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- some cleanups

Browse Source 
* 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
This commit is contained in:
jasper 2008-10-30 16:36:35 +00:00
parent cdc0b08d42
commit 8397223cf2
9 changed files with 42 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
databases/evolution-data-server/Makefile
View File

@ -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 <bsd.port.mk>
# 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

17
databases/evolution-data-server/patches/patch-acinclude_m4 Normal file
View File

@ -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)]
)]
)]

12
databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c
View File

@ -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 <fcntl.h>
#include <time.h>
#include <errno.h>
-#include "db.h"
+#include <db4/db.h>
#include <sys/stat.h>
#include <sys/time.h>

12
databases/evolution-data-server/patches/patch-addressbook_backends_groupwise_e-book-backend-groupwise_c
View File

@ -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 <time.h>
#include <unistd.h>
#include <errno.h>
-#include "db.h"
+#include <db4/db.h>
#include <glib.h>
#include <glib/gstdio.h>

11
databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-book-backend-db-cache_c
View File

@ -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 <config.h>
#endif
+#include <db4/db.h>
#include <string.h>
#include "e-book-backend-db-cache.h"
#include "e-book-backend.h"

48
databases/evolution-data-server/patches/patch-configure
View File

@ -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; }

12
databases/evolution-data-server/patches/patch-configure_in Normal file
View File

@ -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,
[

12
databases/evolution-data-server/patches/patch-libedataserver_e-db3-utils_c
View File

@ -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 <glib.h>
#include <glib/gstdio.h>
-#include "db.h"
+#include <db4/db.h>
#include "e-db3-utils.h"

12
databases/evolution-data-server/patches/patch-libedataserver_e-dbhash_c
View File

@ -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 <string.h>
#include <fcntl.h>
-#include "db.h"
+#include <db4/db.h>
#include "md5-utils.h"
struct _EDbHashPrivate