On Sun Jan 09, 2022 at 05:12:37AM -0700, Stuart Henderson wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: [email protected] 2022/01/09 05:12:37
>
> Modified files:
> databases/xapian-core: Makefile distinfo
> Removed files:
> databases/xapian-core/patches:
> patch-cmake_xapian-config_cmake_in
>
> Log message:
> update to xapian-core-1.4.19
>
This breaks a couple of cmake ports, spotted by aja. Here is a fix which
brings back the patch. Tested with x11/kde-applications/khelpcenter.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-core/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- Makefile 9 Jan 2022 12:12:37 -0000 1.41
+++ Makefile 10 Jan 2022 19:28:36 -0000
@@ -8,6 +8,7 @@ DISTNAME= xapian-core-${V}
# the other xapian ports should be kept in-sync:
# databases/xapian-bindings
# www/xapian-omega
+REVISION= 0
SHARED_LIBS += xapian 5.2 # 40.2
Index: patches/patch-cmake_xapian-config_cmake_in
===================================================================
RCS file: patches/patch-cmake_xapian-config_cmake_in
diff -N patches/patch-cmake_xapian-config_cmake_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-cmake_xapian-config_cmake_in 10 Jan 2022 19:28:36 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Allow Xapian library to be found by CMake-based ports.
+
+Index: cmake/xapian-config.cmake.in
+--- cmake/xapian-config.cmake.in.orig
++++ cmake/xapian-config.cmake.in
+@@ -1,7 +1,7 @@
+ SET(prefix "@prefix@")
+ SET(exec_prefix "@exec_prefix@")
+ SET(XAPIAN_SHARED @XAPIAN_CMAKE_SHARED@ CACHE BOOL "Use shared xapian
library")
+-SET(XAPIAN_SHARED_LIBRARY
"@libdir@/libxapian@LIBRARY_VERSION_SUFFIX@@SHLIBEXT@@LIBRARY_SHARED_IMP_EXT@"
CACHE FILEPATH "Shared Xapian library")
++SET(XAPIAN_SHARED_LIBRARY
"@libdir@/libxapian@LIBRARY_VERSION_SUFFIX@@SHLIBEXT@.${LIBxapian_VERSION}"
CACHE FILEPATH "Libraries for Xapian")
+ SET(XAPIAN_STATIC_LIBRARY
"@libdir@/libxapian@LIBRARY_VERSION_SUFFIX@@LIBRARY_STATIC_EXT@" CACHE FILEPATH
"Static Xapian library")
+ SET(XAPIAN_STATIC_DEP_LIBS "@XAPIAN_CMAKE_LIBS@" CACHE STRING "Dependencies
of static xapian library")
+ IF(XAPIAN_SHARED)
