summaryrefslogtreecommitdiff
path: root/biology
diff options
context:
space:
mode:
authorkamil <kamil@pkgsrc.org>2019-11-20 18:07:55 +0000
committerkamil <kamil@pkgsrc.org>2019-11-20 18:07:55 +0000
commite3bcfdd1f6a69a4804430308c777bb48b81b4b97 (patch)
tree6e6cc10d53f59174342842180eb677f8784b1937 /biology
parent0023a75308783d0b17775b7a255069f3cb4f8a38 (diff)
downloadpkgsrc-e3bcfdd1f6a69a4804430308c777bb48b81b4b97.tar.gz
openbabel: Fix pkg-config .pc file
Point to the proper includedir. Bump PKGREVISION
Diffstat (limited to 'biology')
-rw-r--r--biology/openbabel/Makefile5
-rw-r--r--biology/openbabel/buildlink3.mk4
-rw-r--r--biology/openbabel/distinfo3
-rw-r--r--biology/openbabel/patches/patch-openbabel-3.pc.cmake13
4 files changed, 21 insertions, 4 deletions
diff --git a/biology/openbabel/Makefile b/biology/openbabel/Makefile
index 546eb7a783b..62c0dce6d9d 100644
--- a/biology/openbabel/Makefile
+++ b/biology/openbabel/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2019/11/20 17:02:12 kamil Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/20 18:07:55 kamil Exp $
#
GITHUB_PROJECT= openbabel
DISTNAME= openbabel-${RELVERSION:S/-/./g}
+PKGREVISION= 1
CATEGORIES= biology
MASTER_SITES= ${MASTER_SITE_GITHUB:=openbabel/}
GITHUB_TAG= ${PKGBASE}-${RELVERSION}
@@ -18,6 +19,8 @@ USE_LANGUAGES= c gnu++11
USE_TOOLS+= pkg-config
USE_CMAKE= yes
+PKGCONFIG_OVERRIDE+= openbabel-3.pc.cmake
+
.include "options.mk"
CONFIGURE_DIRS= ${WRKDIR}/build
diff --git a/biology/openbabel/buildlink3.mk b/biology/openbabel/buildlink3.mk
index 1d054e11060..7306acb9250 100644
--- a/biology/openbabel/buildlink3.mk
+++ b/biology/openbabel/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.4 2019/11/20 17:02:12 kamil Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2019/11/20 18:07:55 kamil Exp $
BUILDLINK_TREE+= openbabel
.if !defined(OPENBABEL_BUILDLINK3_MK)
OPENBABEL_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.openbabel+= openbabel>=3.0.0
+BUILDLINK_API_DEPENDS.openbabel+= openbabel>=3.0.0nb1
BUILDLINK_ABI_DEPENDS.openbabel?= openbabel>=3.0.0
BUILDLINK_PKGSRCDIR.openbabel?= ../../biology/openbabel
diff --git a/biology/openbabel/distinfo b/biology/openbabel/distinfo
index 34a83524cc7..45e45f8be6e 100644
--- a/biology/openbabel/distinfo
+++ b/biology/openbabel/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2019/11/20 17:02:12 kamil Exp $
+$NetBSD: distinfo,v 1.9 2019/11/20 18:07:55 kamil Exp $
SHA1 (openbabel-3.0.0.tar.gz) = 8e1428127f00e39f5f05f58b9b186cd8e50f2486
RMD160 (openbabel-3.0.0.tar.gz) = 333fd2af6dd6e59ca88258c2f228932a728321c6
SHA512 (openbabel-3.0.0.tar.gz) = 94af7cffec7de3a7c9d18ea0e1f7b95b0fc64ec563ddb9d420bfb8e9dfa6ac2365338e55e0444e1f5aa2a9f35f5f53961212193c0fdb9d4fd348bd8f61a1684e
Size (openbabel-3.0.0.tar.gz) = 36571060 bytes
SHA1 (patch-doc_CMakeLists.txt) = c4a46fd0ddd253fb755680d7eb91799c74a6489d
+SHA1 (patch-openbabel-3.pc.cmake) = abae8cf74db7d45d340f17e5ef9749b6bafa5a70
SHA1 (patch-src_conformersearch.cpp) = 0f16cc0d0a45e30c6bf00af3b67fac435013a337
SHA1 (patch-src_formats_confabreport.cpp) = d9f81b6dfeff8ce7e94be5fdb375972ca8d422f2
diff --git a/biology/openbabel/patches/patch-openbabel-3.pc.cmake b/biology/openbabel/patches/patch-openbabel-3.pc.cmake
new file mode 100644
index 00000000000..f6892cd2256
--- /dev/null
+++ b/biology/openbabel/patches/patch-openbabel-3.pc.cmake
@@ -0,0 +1,13 @@
+$NetBSD: patch-openbabel-3.pc.cmake,v 1.1 2019/11/20 18:07:55 kamil Exp $
+
+--- openbabel-3.pc.cmake.orig 2019-10-07 16:39:17.000000000 +0000
++++ openbabel-3.pc.cmake
+@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/@LIB_INSTALL_DIR@
+ includedir=${prefix}/include
+-pkgincludedir=${includedir}/openbabel-2.0
++pkgincludedir=${includedir}/openbabel3/
+
+ Name: Open Babel library
+ Description: libopenbabel