diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-05-11 15:37:58 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-05-11 15:37:58 +0800 |
| commit | f26ae95709394d8a01dba628442bd191568760c3 (patch) | |
| tree | be4683f556784a776858bbb276c33e832418228d /databases | |
| parent | e6676d37ccac432d99563816ecc0e3866e20b985 (diff) | |
| download | marcuscom-ports-f26ae95709394d8a01dba628442bd191568760c3.tar marcuscom-ports-f26ae95709394d8a01dba628442bd191568760c3.tar.gz marcuscom-ports-f26ae95709394d8a01dba628442bd191568760c3.tar.bz2 marcuscom-ports-f26ae95709394d8a01dba628442bd191568760c3.tar.lz marcuscom-ports-f26ae95709394d8a01dba628442bd191568760c3.tar.xz marcuscom-ports-f26ae95709394d8a01dba628442bd191568760c3.tar.zst marcuscom-ports-f26ae95709394d8a01dba628442bd191568760c3.zip | |
Sync with FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10940 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/evolution-data-server/Makefile | 17 | ||||
| -rw-r--r-- | databases/evolution-data-server/files/patch-configure | 9 |
2 files changed, 13 insertions, 13 deletions
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index e39edae61..bde5c8efd 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/databases/evolution-data-server/Makefile,v 1.142 2008/03/10 20:33:29 mezz Exp $ +# $MCom: ports/databases/evolution-data-server/Makefile,v 1.144 2008/04/28 03:28:27 marcus Exp $ # PORTNAME= evolution-data-server @@ -27,7 +27,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui \ ltverhack USE_OPENLDAP= yes USE_AUTOTOOLS= libtool:15 -USE_BDB= 41 +USE_BDB= 41+ USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static \ --enable-nss=yes \ @@ -52,6 +52,7 @@ LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include .elif !defined(NO_KERBEROS) CONFIGURE_ARGS+= --with-krb5=/usr +KRB5_LIB= `/usr/bin/krb5-config gssapi --libs` .endif .if defined(WITH_IMAP4) || defined(PACKAGE_BUILDING) @@ -61,8 +62,16 @@ PLIST_SUB+= IMAP4="" PLIST_SUB+= IMAP4="@comment " .endif +EDS_BDB_MSG= "!!!WARNING!!!: Berkeley Database version is ${BDB_VER}. If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41." + +pre-everything:: + @if [ x"${BDB_VER}" != x"41" ]; then \ + ${ECHO_MSG} ${EDS_BDB_MSG} | ${FMT} 75 79 ; \ + fi + post-patch: - @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g' \ - ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \ + s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 1ef8d776b..3fac0e904 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -24,15 +24,6 @@ int main () -@@ -28982,7 +28990,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 -lroken -lgssapi -lcrypt" - sunlibs="-lkrb5 -lgss" - { echo "$as_me:$LINENO: checking for Kerberos 5" >&5 - echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; } @@ -33825,7 +33833,7 @@ idldir='${datadir}'/idl/evolution-data-s imagesdir='${datadir}'/pixmaps/evolution-data-server |