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

remove dep on lang/python/2.7,-bsddb and avoid using libexecinfo

Browse Source
This commit is contained in:
robert 2018-12-20 10:01:18 +00:00
parent afdc7f1771
commit 9321324341
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/kopano/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2018/12/19 20:51:31 sthen Exp $
# $OpenBSD: Makefile,v 1.31 2018/12/20 10:01:18 robert Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-mapi= kopano MAPI extensions for PHP
@ -6,7 +6,7 @@ COMMENT-mapi= kopano MAPI extensions for PHP
PKGNAME-main= kopano-core-${V}.${BUILD}
PKGNAME-mapi= kopano-mapi-${V}.${BUILD}
REVISION-main= 0
REVISION-main= 1
CATEGORIES= mail www productivity
@ -37,7 +37,6 @@ MESSAGE-main= # empty
UNMESSAGE-main= # empty
BUILD_DEPENDS= devel/gettext-tools \
devel/libexecinfo \
devel/py-setuptools${MODPY_FLAVOR} \
devel/swig \
shells/bash \
@ -61,7 +60,6 @@ RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
databases/xapian-bindings,-python \
devel/libmagic \
devel/py-dateutil${MODPY_FLAVOR} \
lang/python/2.7,-bsddb \
mail/p5-Mail-SpamAssassin \
textproc/catdoc \
www/py-jwt${MODPY_FLAVOR}

11
mail/kopano/core/patches/patch-common_platform_linux_cpp
View File

@ -1,8 +1,17 @@
$OpenBSD: patch-common_platform_linux_cpp,v 1.4 2018/12/17 15:19:40 robert Exp $
$OpenBSD: patch-common_platform_linux_cpp,v 1.5 2018/12/20 10:01:18 robert Exp $
Index: common/platform.linux.cpp
--- common/platform.linux.cpp.orig
+++ common/platform.linux.cpp
@@ -29,7 +29,7 @@
#else
# include <uuid.h>
#endif
-#if defined(__GLIBC__) || defined(OPENBSD)
+#if defined(__GLIBC__)
# include <execinfo.h>
# define WITH_BACKTRACE 1
#endif
@@ -84,6 +84,12 @@ void Sleep(unsigned int msec) {
namespace KC {

14
mail/kopano/core/patches/patch-configure_ac
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.11 2018/12/17 15:19:40 robert Exp $
$OpenBSD: patch-configure_ac,v 1.12 2018/12/20 10:01:18 robert Exp $
Index: configure.ac
--- configure.ac.orig
@ -70,7 +70,7 @@ Index: configure.ac
])
LIBS="$LIBS_system"
AC_SUBST([CRYPT_LIBS])
@@ -588,13 +591,22 @@ AC_CHECK_LIB([z], [gzopen], GZ_LIBS="-lz",
@@ -588,12 +591,14 @@ AC_CHECK_LIB([z], [gzopen], GZ_LIBS="-lz",
)
AC_SUBST(GZ_LIBS)
@ -85,17 +85,9 @@ Index: configure.ac
AC_SUBST(INTL_LIBS)
+LIBS=$LIBS_system
+LIBS="$LIBS -L/usr/local/lib"
+AC_CHECK_LIB([execinfo], [backtrace], EXECINFO_LIBS="-L/usr/local/lib -lexecinfo", dnl in -lexecinfo
+ AC_MSG_ERROR([required library libexecinfo missing or unusable])
+)
+AC_SUBST(EXECINFO_LIBS)
+LIBS=$LIBS_system
+
# check epoll support
AC_ARG_ENABLE([epoll], AS_HELP_STRING([--disable-epoll], [disable epoll and fallback to select]), [want_epoll=${enableval}], [want_epoll=yes])
AM_CONDITIONAL(WITH_EPOLL, test "$want_epoll" = "yes")
@@ -650,6 +662,8 @@ AS_IF([test "$have_icu" = 0], [
@@ -650,6 +655,8 @@ AS_IF([test "$have_icu" = 0], [
AC_MSG_ERROR([ICU is required but not found])
])
ZCPPFLAGS="$ZCPPFLAGS $icu_uc_CFLAGS $icu_i18n_CFLAGS"