View | Details | Raw Unified | Return to bug 227563 | Differences between
and this patch

Collapse All | Expand All

(-)devel/libqb/Makefile (-19 / +29 lines)
Lines 1-31 Link Here
1
# Created by: dpejesh@yahoo.com
1
# Created by: David Shane Holden <dpejesh@yahoo.com>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	libqb
4
PORTNAME=		libqb
5
PORTVERSION=	1.0.2
5
PORTVERSION=		1.0.3
6
CATEGORIES=	devel
6
CATEGORIES=		devel
7
MASTER_SITES=	https://github.com/ClusterLabs/libqb/releases/download/v${PORTVERSION}/
8
7
9
MAINTAINER=	dpejesh@yahoo.com
8
MAINTAINER=		dpejesh@yahoo.com
10
COMMENT=	High performance logging, tracing, ipc, and polling library
9
COMMENT=		High performance logging, tracing, ipc, and polling library
11
10
12
LICENSE=	LGPL21
11
LICENSE=		LGPL21
13
LICENSE_FILE=	${WRKSRC}/COPYING
12
LICENSE_FILE=		${WRKSRC}/COPYING
14
13
15
GROUPS=		haclient
14
TEST_DEPENDS=		checkmk:devel/check
16
15
17
QB_SOCKET_DIR?=	/var/run/qb
16
GROUPS=			haclient
18
PLIST_SUB+=	QB_SOCKET_DIR=${QB_SOCKET_DIR}
19
17
20
USE_LDCONFIG=	yes
18
QB_SOCKET_DIR?=		/var/run/qb
21
USES=		autoreconf gmake libtool pathfix pkgconfig tar:xz
19
PLIST_SUB+=		QB_SOCKET_DIR=${QB_SOCKET_DIR}
22
GNU_CONFIGURE=	yes
20
23
CONFIGURE_ARGS=	--with-socket-dir=${QB_SOCKET_DIR}
21
USE_GITHUB=		yes
24
INSTALL_TARGET=	install-strip
22
GH_ACCOUNT=		ClusterLabs
23
GH_TAGNAME=		v${PORTVERSION}
24
25
USE_BINUTILS=		yes
26
USE_LDCONFIG=		yes
27
USES=			autoreconf gmake libtool pathfix pkgconfig tar:xz
28
GNU_CONFIGURE=		yes
29
CONFIGURE_ARGS=		--with-socket-dir=${QB_SOCKET_DIR}
30
LDFLAGS+=		-B${LOCALBASE}/bin
25
PATHFIX_MAKEFILEIN=	Makefile.am
31
PATHFIX_MAKEFILEIN=	Makefile.am
26
32
27
OPTIONS_DEFINE=	DOXYGEN
33
INSTALL_TARGET=		install-strip
28
OPTIONS_SUB=	yes
34
TEST_TARGET=		check
35
36
OPTIONS_DEFINE=		DOXYGEN
37
OPTIONS_SUB=		yes
38
29
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
39
DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
30
40
31
post-install:
41
post-install:
(-)devel/libqb/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1495648740
1
TIMESTAMP = 1523289774
2
SHA256 (libqb-1.0.2.tar.xz) = bbc4614a0f2abb78dbbd5da489f8cc828425c29c39ab743436801b379e87f229
2
SHA256 (ClusterLabs-libqb-1.0.3-v1.0.3_GH0.tar.gz) = 730387ef08616ec3267c1af6bc679a5092c2ce56f16d71a2cb7369ee65221559
3
SIZE (libqb-1.0.2.tar.xz) = 451564
3
SIZE (ClusterLabs-libqb-1.0.3-v1.0.3_GH0.tar.gz) = 227704
(-)devel/libqb/files/patch-configure.ac (-2 / +2 lines)
Lines 2-10 Link Here
2
PTHREAD_PROCESS_SHARED.  This causes libqb to fallback gracefully
2
PTHREAD_PROCESS_SHARED.  This causes libqb to fallback gracefully
3
to using pthread mutexes without having to patch anything.
3
to using pthread mutexes without having to patch anything.
4
4
5
--- configure.ac.orig	2017-05-19 12:54:05 UTC
5
--- configure.ac.orig	2017-12-21 09:02:11 UTC
6
+++ configure.ac
6
+++ configure.ac
7
@@ -212,7 +212,7 @@ AC_CHECK_FUNCS([alarm clock_gettime ftru
7
@@ -218,7 +218,7 @@ AC_CHECK_FUNCS([alarm clock_gettime \
8
 AX_SAVE_FLAGS
8
 AX_SAVE_FLAGS
9
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
9
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
10
 LIBS="$LIBS $PTHREAD_LIBS"
10
 LIBS="$LIBS $PTHREAD_LIBS"
(-)devel/libqb/files/patch-lib_Makefile.am (+11 lines)
Line 0 Link Here
1
--- lib/Makefile.am.orig	2018-04-02 21:49:55 UTC
2
+++ lib/Makefile.am
3
@@ -135,6 +135,8 @@ install-exec-hook: qblog_script.ld
4
 	  sed -i -- "s/libqb.so.<digit>/$${so_ver}/" \
5
 	    "$(DESTDIR)$(libdir)/libqb.so-t" "$(DESTDIR)$(pkgconfigexecdir)/libqb.pc"
6
 	mv -f "$(DESTDIR)$(libdir)/libqb.so-t" "$(DESTDIR)$(libdir)/libqb.so"
7
+	rm -f "$(DESTDIR)$(pkgconfigexecdir)/libqb.pc--"
8
+	rm -f "$(DESTDIR)$(libdir)/libqb.so-t--"
9
 endif
10
 
11
 if HAVE_SPLINT
(-)devel/libqb/pkg-plist (-1 / +1 lines)
Lines 15-21 Link Here
15
lib/libqb.a
15
lib/libqb.a
16
lib/libqb.so
16
lib/libqb.so
17
lib/libqb.so.0
17
lib/libqb.so.0
18
lib/libqb.so.0.18.2
18
lib/libqb.so.0.19.0
19
libdata/pkgconfig/libqb.pc
19
libdata/pkgconfig/libqb.pc
20
%%DOXYGEN%%man/man3/qbarray.h.3.gz
20
%%DOXYGEN%%man/man3/qbarray.h.3.gz
21
%%DOXYGEN%%man/man3/qbatomic.h.3.gz
21
%%DOXYGEN%%man/man3/qbatomic.h.3.gz
(-)net/corosync/Makefile (-1 / +4 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	corosync
4
PORTNAME=	corosync
5
PORTVERSION=	2.4.2
5
PORTVERSION=	2.4.2
6
PORTREVISION=	1
6
CATEGORIES=	net
7
CATEGORIES=	net
7
MASTER_SITES=	http://build.clusterlabs.org/corosync/releases/
8
MASTER_SITES=	http://build.clusterlabs.org/corosync/releases/
8
9
Lines 13-25 Link Here
13
14
14
LIB_DEPENDS=	libnspr4.so:devel/nspr \
15
LIB_DEPENDS=	libnspr4.so:devel/nspr \
15
		libnss3.so:security/nss \
16
		libnss3.so:security/nss \
16
		libqb.so:devel/libqb
17
		libqb.so.0:devel/libqb
17
18
18
USES=		gmake groff libtool pathfix pkgconfig
19
USES=		gmake groff libtool pathfix pkgconfig
20
USE_BINUTILS=	yes
19
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
20
USE_RC_SUBR=	${PORTNAME} ${PORTNAME}-notifyd
22
USE_RC_SUBR=	${PORTNAME} ${PORTNAME}-notifyd
21
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
22
CONFIGURE_ARGS=	--disable-secure-build
24
CONFIGURE_ARGS=	--disable-secure-build
25
LDFLAGS+=	-B${LOCALBASE}/bin
23
INSTALL_TARGET=	install-strip
26
INSTALL_TARGET=	install-strip
24
27
25
OPTIONS_DEFINE=	DBUS SNMP
28
OPTIONS_DEFINE=	DBUS SNMP
(-)net/pacemaker/Makefile (-2 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	pacemaker
4
PORTNAME=	pacemaker
5
PORTVERSION=	1.1.16
5
PORTVERSION=	1.1.16
6
PORTREVISION=	1
6
PORTREVISION=	2
7
DISTVERSIONPREFIX=	Pacemaker-
7
DISTVERSIONPREFIX=	Pacemaker-
8
CATEGORIES=	net
8
CATEGORIES=	net
9
9
Lines 19-25 Link Here
19
		getopt>=0:misc/getopt
19
		getopt>=0:misc/getopt
20
LIB_DEPENDS=	libgnutls.so:security/gnutls \
20
LIB_DEPENDS=	libgnutls.so:security/gnutls \
21
		libltdl.so:devel/libltdl \
21
		libltdl.so:devel/libltdl \
22
		libqb.so:devel/libqb \
22
		libqb.so.0:devel/libqb \
23
		libuuid.so:misc/e2fsprogs-libuuid \
23
		libuuid.so:misc/e2fsprogs-libuuid \
24
		libxml2.so:textproc/libxml2 \
24
		libxml2.so:textproc/libxml2 \
25
		libxslt.so:textproc/libxslt
25
		libxslt.so:textproc/libxslt
Lines 37-42 Link Here
37
GH_ACCOUNT=	ClusterLabs
37
GH_ACCOUNT=	ClusterLabs
38
38
39
USES=		autoreconf gmake libtool pathfix pkgconfig python shebangfix
39
USES=		autoreconf gmake libtool pathfix pkgconfig python shebangfix
40
USE_BINUTILS=	yes
40
USE_GNOME=	glib20
41
USE_GNOME=	glib20
41
USE_LDCONFIG=	yes
42
USE_LDCONFIG=	yes
42
USE_PYTHON=	py3kplist
43
USE_PYTHON=	py3kplist
Lines 46-51 Link Here
46
		--disable-hardening \
47
		--disable-hardening \
47
		--with-corosync \
48
		--with-corosync \
48
		--without-heartbeat
49
		--without-heartbeat
50
LDFLAGS+=	-B${LOCALBASE}/bin
49
INSTALL_TARGET=	install-strip
51
INSTALL_TARGET=	install-strip
50
52
51
PATHFIX_MAKEFILEIN=	Makefile.am
53
PATHFIX_MAKEFILEIN=	Makefile.am

Return to bug 227563