From f4c9de68f65edac52f9bd2627e77e6a2bc42e17e Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Fri, 1 Mar 2019 08:08:14 +0000 Subject: [PATCH] net/openpgm: Do not add -I to non-existing directory in openpgm-5.2.pc foo/lib/pgm-5.2/include does not exist, so applications using strict compiler flags will fail to build due to this. Here this breaks devel/xeus build after r491260 [1]: CMake Error in CMakeLists.txt: Imported target "cppzmq" includes non-existent path "/usr/local/lib/pgm-5.2/include" in its INTERFACE_INCLUDE_DIRECTORIES. Possible reasons include: * The path was deleted, renamed, or moved to another location. * An install or uninstall procedure did not complete successfully. * The installation package was faulty and references files it does not provide. - Bump revisions of all net/openpgm consumers - Unbreak devel/xeus [1] http://beefy9.nyi.freebsd.org/data/112amd64-default/491532/logs/errors/xeus-0.18.1.log PR: 230575 --- devel/libxs/Makefile | 2 +- devel/xeus/Makefile | 2 -- net-p2p/monero-cli/Makefile | 1 + net/cppzmq/Makefile | 2 +- net/libzmq3/Makefile | 1 + net/libzmq4/Makefile | 1 + net/openpgm/Makefile | 5 ++++- net/openpgm/distinfo | 4 +++- 8 files changed, 12 insertions(+), 6 deletions(-) diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile index 08fb3d16aac6..f95a5e49322a 100644 --- a/devel/libxs/Makefile +++ b/devel/libxs/Makefile @@ -4,7 +4,7 @@ PORTNAME= libxs PORTVERSION= 1.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org diff --git a/devel/xeus/Makefile b/devel/xeus/Makefile index 71a87c1bc08d..86e55d21965d 100644 --- a/devel/xeus/Makefile +++ b/devel/xeus/Makefile @@ -10,8 +10,6 @@ COMMENT= C++ implementation of the Jupyter kernel protocol LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to configure - BUILD_DEPENDS= cppzmq>0:net/cppzmq \ nlohmann-json>0:devel/nlohmann-json \ xtl-quant-stack>0:devel/xtl-quant-stack diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile index a7d05581054d..bbe9512ff259 100644 --- a/net-p2p/monero-cli/Makefile +++ b/net-p2p/monero-cli/Makefile @@ -5,6 +5,7 @@ PORTNAME= monero-cli # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present) PORTVERSION= 0.14.0.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 # and uncomment the following two lines #PORTVERSION= 0 #PKGNAMESUFFIX= -git-HEAD diff --git a/net/cppzmq/Makefile b/net/cppzmq/Makefile index 7460465336d7..2828cc4fe091 100644 --- a/net/cppzmq/Makefile +++ b/net/cppzmq/Makefile @@ -3,7 +3,7 @@ PORTNAME= cppzmq PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/libzmq3/Makefile b/net/libzmq3/Makefile index dbfb6c91a4b0..d858b7814a62 100644 --- a/net/libzmq3/Makefile +++ b/net/libzmq3/Makefile @@ -2,6 +2,7 @@ PORTNAME= libzmq3 PORTVERSION= 3.2.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://download.zeromq.org/ DISTNAME= zeromq-${DISTVERSION} diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile index 65be79a813b4..dec2e2936093 100644 --- a/net/libzmq4/Makefile +++ b/net/libzmq4/Makefile @@ -3,6 +3,7 @@ PORTNAME= libzmq4 DISTVERSIONPREFIX= v DISTVERSION= 4.3.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://github.com/zeromq/libzmq/releases/download/${DISTVERSIONFULL}/ DISTNAME= zeromq-${DISTVERSION} diff --git a/net/openpgm/Makefile b/net/openpgm/Makefile index 5aede59aa1ee..023c5f278ca4 100644 --- a/net/openpgm/Makefile +++ b/net/openpgm/Makefile @@ -4,9 +4,12 @@ PORTNAME= openpgm DISTVERSIONPREFIX= release- DISTVERSION= 5-2-122 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= ee25ff3d13f2639b4c3a42125e79f77f921c3320.patch:-p3 + MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of the PGM reliable multicast protocol diff --git a/net/openpgm/distinfo b/net/openpgm/distinfo index 731c651ae0f0..0485d8b2470c 100644 --- a/net/openpgm/distinfo +++ b/net/openpgm/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1474186140 +TIMESTAMP = 1551424949 SHA256 (steve-o-openpgm-release-5-2-122_GH0.tar.gz) = acc1545fd8060aa66b17327110e2859e451cfc685ebd3b2211619728e3471b66 SIZE (steve-o-openpgm-release-5-2-122_GH0.tar.gz) = 583469 +SHA256 (ee25ff3d13f2639b4c3a42125e79f77f921c3320.patch) = 4a9fc7fbb6e73e325639a895cd19c1ac6918b575f715c057caa01f826de40114 +SIZE (ee25ff3d13f2639b4c3a42125e79f77f921c3320.patch) = 990