Index: devel/libqb/Makefile =================================================================== --- devel/libqb/Makefile (revision 467499) +++ devel/libqb/Makefile (working copy) @@ -1,31 +1,41 @@ -# Created by: dpejesh@yahoo.com +# Created by: David Shane Holden # $FreeBSD$ -PORTNAME= libqb -PORTVERSION= 1.0.2 -CATEGORIES= devel -MASTER_SITES= https://github.com/ClusterLabs/libqb/releases/download/v${PORTVERSION}/ +PORTNAME= libqb +PORTVERSION= 1.0.3 +CATEGORIES= devel -MAINTAINER= dpejesh@yahoo.com -COMMENT= High performance logging, tracing, ipc, and polling library +MAINTAINER= dpejesh@yahoo.com +COMMENT= High performance logging, tracing, ipc, and polling library -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING -GROUPS= haclient +TEST_DEPENDS= checkmk:devel/check -QB_SOCKET_DIR?= /var/run/qb -PLIST_SUB+= QB_SOCKET_DIR=${QB_SOCKET_DIR} +GROUPS= haclient -USE_LDCONFIG= yes -USES= autoreconf gmake libtool pathfix pkgconfig tar:xz -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-socket-dir=${QB_SOCKET_DIR} -INSTALL_TARGET= install-strip +QB_SOCKET_DIR?= /var/run/qb +PLIST_SUB+= QB_SOCKET_DIR=${QB_SOCKET_DIR} + +USE_GITHUB= yes +GH_ACCOUNT= ClusterLabs +GH_TAGNAME= v${PORTVERSION} + +USE_BINUTILS= yes +USE_LDCONFIG= yes +USES= autoreconf gmake libtool pathfix pkgconfig tar:xz +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-socket-dir=${QB_SOCKET_DIR} +LDFLAGS+= -B${LOCALBASE}/bin PATHFIX_MAKEFILEIN= Makefile.am -OPTIONS_DEFINE= DOXYGEN -OPTIONS_SUB= yes +INSTALL_TARGET= install-strip +TEST_TARGET= check + +OPTIONS_DEFINE= DOXYGEN +OPTIONS_SUB= yes + DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen post-install: Index: devel/libqb/distinfo =================================================================== --- devel/libqb/distinfo (revision 467499) +++ devel/libqb/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495648740 -SHA256 (libqb-1.0.2.tar.xz) = bbc4614a0f2abb78dbbd5da489f8cc828425c29c39ab743436801b379e87f229 -SIZE (libqb-1.0.2.tar.xz) = 451564 +TIMESTAMP = 1523289774 +SHA256 (ClusterLabs-libqb-1.0.3-v1.0.3_GH0.tar.gz) = 730387ef08616ec3267c1af6bc679a5092c2ce56f16d71a2cb7369ee65221559 +SIZE (ClusterLabs-libqb-1.0.3-v1.0.3_GH0.tar.gz) = 227704 Index: devel/libqb/files/patch-configure.ac =================================================================== --- devel/libqb/files/patch-configure.ac (revision 467499) +++ devel/libqb/files/patch-configure.ac (working copy) @@ -2,9 +2,9 @@ PTHREAD_PROCESS_SHARED. This causes libqb to fallback gracefully to using pthread mutexes without having to patch anything. ---- configure.ac.orig 2017-05-19 12:54:05 UTC +--- configure.ac.orig 2017-12-21 09:02:11 UTC +++ configure.ac -@@ -212,7 +212,7 @@ AC_CHECK_FUNCS([alarm clock_gettime ftru +@@ -218,7 +218,7 @@ AC_CHECK_FUNCS([alarm clock_gettime \ AX_SAVE_FLAGS CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LIBS="$LIBS $PTHREAD_LIBS" Index: devel/libqb/files/patch-lib_Makefile.am =================================================================== --- devel/libqb/files/patch-lib_Makefile.am (nonexistent) +++ devel/libqb/files/patch-lib_Makefile.am (working copy) @@ -0,0 +1,11 @@ +--- lib/Makefile.am.orig 2018-04-02 21:49:55 UTC ++++ lib/Makefile.am +@@ -135,6 +135,8 @@ install-exec-hook: qblog_script.ld + sed -i -- "s/libqb.so./$${so_ver}/" \ + "$(DESTDIR)$(libdir)/libqb.so-t" "$(DESTDIR)$(pkgconfigexecdir)/libqb.pc" + mv -f "$(DESTDIR)$(libdir)/libqb.so-t" "$(DESTDIR)$(libdir)/libqb.so" ++ rm -f "$(DESTDIR)$(pkgconfigexecdir)/libqb.pc--" ++ rm -f "$(DESTDIR)$(libdir)/libqb.so-t--" + endif + + if HAVE_SPLINT Property changes on: devel/libqb/files/patch-lib_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/libqb/pkg-plist =================================================================== --- devel/libqb/pkg-plist (revision 467499) +++ devel/libqb/pkg-plist (working copy) @@ -15,7 +15,7 @@ lib/libqb.a lib/libqb.so lib/libqb.so.0 -lib/libqb.so.0.18.2 +lib/libqb.so.0.19.0 libdata/pkgconfig/libqb.pc %%DOXYGEN%%man/man3/qbarray.h.3.gz %%DOXYGEN%%man/man3/qbatomic.h.3.gz Index: net/corosync/Makefile =================================================================== --- net/corosync/Makefile (revision 467499) +++ net/corosync/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= corosync PORTVERSION= 2.4.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://build.clusterlabs.org/corosync/releases/ @@ -13,13 +14,15 @@ LIB_DEPENDS= libnspr4.so:devel/nspr \ libnss3.so:security/nss \ - libqb.so:devel/libqb + libqb.so.0:devel/libqb USES= gmake groff libtool pathfix pkgconfig +USE_BINUTILS= yes USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} ${PORTNAME}-notifyd GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-secure-build +LDFLAGS+= -B${LOCALBASE}/bin INSTALL_TARGET= install-strip OPTIONS_DEFINE= DBUS SNMP Index: net/pacemaker/Makefile =================================================================== --- net/pacemaker/Makefile (revision 467499) +++ net/pacemaker/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= pacemaker PORTVERSION= 1.1.16 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= Pacemaker- CATEGORIES= net @@ -19,7 +19,7 @@ getopt>=0:misc/getopt LIB_DEPENDS= libgnutls.so:security/gnutls \ libltdl.so:devel/libltdl \ - libqb.so:devel/libqb \ + libqb.so.0:devel/libqb \ libuuid.so:misc/e2fsprogs-libuuid \ libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt @@ -37,6 +37,7 @@ GH_ACCOUNT= ClusterLabs USES= autoreconf gmake libtool pathfix pkgconfig python shebangfix +USE_BINUTILS= yes USE_GNOME= glib20 USE_LDCONFIG= yes USE_PYTHON= py3kplist @@ -46,6 +47,7 @@ --disable-hardening \ --with-corosync \ --without-heartbeat +LDFLAGS+= -B${LOCALBASE}/bin INSTALL_TARGET= install-strip PATHFIX_MAKEFILEIN= Makefile.am