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

Fix Kerberos includes.

Browse Source
This commit is contained in:
ajacoutot 2013-06-18 13:16:51 +00:00
parent 7f313d1e66
commit 4871b68b9b
6 changed files with 32 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.147 2013/06/17 19:30:22 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.148 2013/06/18 13:16:52 ajacoutot Exp $
SHARED_ONLY= Yes
@ -59,7 +59,7 @@ LIB_DEPENDS= databases/db/v4 \
MODPY_RUNDEP= No
MODGNOME_TOOLS= gi vala
MODGNOME_CPPFLAGS= -I${LOCALBASE}/include/db4
MODGNOME_CPPFLAGS= -I${LOCALBASE}/include/db4 $$(krb5-config --cflags)
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-krb5 \

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

@ -1,6 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2013/06/17 19:30:22 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.10 2013/06/18 13:16:52 ajacoutot Exp $
XXX patch evo_krb5_support.m4 to use krb5-config(1) and push upstream
(and remove the call to krb5-config from MODGNOME_CPPFLAGS)
--- configure.orig Sat Jun 8 19:54:10 2013
+++ configure Thu Jun 13 17:32:26 2013
@ -13,12 +14,3 @@ XXX patch evo_krb5_support.m4 to use krb5-config(1) and push upstream
sunlibs="-lkrb5 -lgss"
if ${ac_cv_lib_kerberos5+:} false; then :
$as_echo_n "(cached) " >&6
@@ -22226,7 +22226,7 @@ $as_echo "#define HAVE_HEIMDAL_KRB5 1" >>confdefs.h
if test -z "$with_krb5_includes"; then
KRB5_CFLAGS="-I$with_krb5/include/heimdal"
else
- KRB5_CFLAGS="-I$with_krb5_includes"
+ KRB5_CFLAGS="`krb5-config --cflags`"
fi
msg_krb5="yes (Heimdal)"
else

39
mail/evolution-ews/Makefile
View File

@ -1,26 +1,26 @@
# $OpenBSD: Makefile,v 1.26 2013/06/17 19:30:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.27 2013/06/18 13:16:51 ajacoutot Exp $
SHARED_ONLY= Yes
SHARED_ONLY= Yes
COMMENT= evolution connector for MS Exchange via EWS
COMMENT= evolution connector for MS Exchange via EWS
GNOME_PROJECT= evolution-ews
GNOME_VERSION= 3.8.3
REVISION= 2
GNOME_PROJECT= evolution-ews
GNOME_VERSION= 3.8.3
REVISION= 2
CATEGORIES= mail
CATEGORIES= mail
SHARED_LIBS += eews-1.2 1.0 # unknown
SHARED_LIBS += ewsutils 1.0 # unknown
SHARED_LIBS += lzx 1.0 # unknown
EVO_VERSION= 3.8
SUBST_VARS= EVO_VERSION
EVO_VERSION= 3.8
SUBST_VARS= EVO_VERSION
HOMEPAGE= http://projects.gnome.org/evolution/
HOMEPAGE= http://projects.gnome.org/evolution/
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
Antoine Jacoutot <ajacoutot@openbsd.org>
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
Antoine Jacoutot <ajacoutot@openbsd.org>
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
@ -46,21 +46,22 @@ WANTLIB += vorbisfile webkitgtk-3.0 webp xcb xcb-render xcb-shm
WANTLIB += harfbuzz-icu icudata icuuc png xkbfile xml2 xslt z
WANTLIB += heimbase heimntlm hx509 roken wind
MODULES= devel/gettext \
x11/gnome
MODULES= devel/gettext \
x11/gnome
# XXX should be a LIB_DEPENDS+WANTLIB but check-lib-depends(1) does not
# work with unversioned solibs (LOCALBASE/lib/evolution/*/*.so).
BUILD_DEPENDS += mail/evolution,-main
RUN_DEPENDS += mail/evolution,-main
LIBTOOL_FLAGS= --tag=disable-static
LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-static \
--with-krb5
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --disable-static \
--with-krb5
MODGNOME_LDFLAGS=-Wl,-rpath,${TRUEPREFIX}/lib/evolution-data-server-${EVO_VERSION}
MODGNOME_CPPFLAGS= $$(krb5-config --cflags)
MODGNOME_LDFLAGS= -Wl,-rpath,${TRUEPREFIX}/lib/evolution-data-server-${EVO_VERSION}
post-install:
rm ${PREFIX}/lib/evolution-data-server/*/*.la

12
mail/evolution-ews/patches/patch-configure
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-configure,v 1.6 2013/06/17 19:30:44 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.7 2013/06/18 13:16:52 ajacoutot Exp $
XXX patch evo_krb5_support.m4 to use krb5-config(1) and push upstream
(and remove the call to krb5-config from MODGNOME_CPPFLAGS)
--- configure.orig Fri Jun 14 11:39:09 2013
+++ configure Fri Jun 14 11:39:47 2013
@ -13,12 +14,3 @@ XXX patch evo_krb5_support.m4 to use krb5-config(1) and push upstream
sunlibs="-lkrb5 -lgss"
if ${ac_cv_lib_kerberos5+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15534,7 +15534,7 @@ $as_echo "#define HAVE_HEIMDAL_KRB5 1" >>confdefs.h
if test -z "$with_krb5_includes"; then
KRB5_CFLAGS="-I$with_krb5/include/heimdal"
else
- KRB5_CFLAGS="-I$with_krb5_includes"
+ KRB5_CFLAGS="`krb5-config --cflags`"
fi
msg_krb5="yes (Heimdal)"
else

6
mail/evolution/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.199 2013/06/17 19:30:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.200 2013/06/18 13:16:51 ajacoutot Exp $
# XXX textproc/highlight
@ -89,7 +89,9 @@ RUN_DEPENDS-main += textproc/highlight
MODGNOME_TOOLS= yelp
MODGNOME_DESKTOP_FILE= Yes
MODGNOME_ICON_CACHE= Yes
MODGNOME_CPPFLAGS= -I${X11BASE}/include -DBOGOFILTER_BINARY="\\\"${LOCALBASE}/bin/bogofilter\\\""
MODGNOME_CPPFLAGS= -I${X11BASE}/include \
$$(krb5-config --cflags) \
-DBOGOFILTER_BINARY="\\\"${LOCALBASE}/bin/bogofilter\\\""
# without --as-needed, evolution takes 20 minutes (yes, 20!) to start
MODGNOME_LDFLAGS= -L${X11BASE}/lib -Wl,-rpath,${TRUEPREFIX}/lib/evolution/${R}:${TRUEPREFIX}/lib \
-Wl,--as-needed

12
mail/evolution/patches/patch-configure
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-configure,v 1.21 2013/06/17 19:30:43 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.22 2013/06/18 13:16:51 ajacoutot Exp $
XXX patch evo_krb5_support.m4 to use krb5-config(1) and push upstream
(and remove the call to krb5-config from MODGNOME_CPPFLAGS)
--- configure.orig Fri Jun 14 10:42:47 2013
+++ configure Fri Jun 14 10:43:20 2013
@ -13,12 +14,3 @@ XXX patch evo_krb5_support.m4 to use krb5-config(1) and push upstream
sunlibs="-lkrb5 -lgss"
if ${ac_cv_lib_kerberos5+:} false; then :
$as_echo_n "(cached) " >&6
@@ -16958,7 +16958,7 @@ $as_echo "#define HAVE_HEIMDAL_KRB5 1" >>confdefs.h
if test -z "$with_krb5_includes"; then
KRB5_CFLAGS="-I$with_krb5/include/heimdal"
else
- KRB5_CFLAGS="-I$with_krb5_includes"
+ KRB5_CFLAGS="`krb5-config --cflags`"
fi
msg_krb5="yes (Heimdal)"
else