Index: head/devel/libqb/Makefile =================================================================== --- head/devel/libqb/Makefile (revision 469701) +++ head/devel/libqb/Makefile (revision 469702) @@ -1,34 +1,44 @@ -# 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: ${MKDIR} ${STAGEDIR}${QB_SOCKET_DIR} .include Index: head/devel/libqb/distinfo =================================================================== --- head/devel/libqb/distinfo (revision 469701) +++ head/devel/libqb/distinfo (revision 469702) @@ -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: head/devel/libqb/files/patch-configure.ac =================================================================== --- head/devel/libqb/files/patch-configure.ac (revision 469701) +++ head/devel/libqb/files/patch-configure.ac (revision 469702) @@ -1,15 +1,15 @@ Disable check for pthread_spin_lock() since it doesn't support 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" -AC_CHECK_FUNCS([pthread_spin_lock pthread_setschedparam \ +AC_CHECK_FUNCS([pthread_setschedparam \ pthread_mutexattr_setpshared \ pthread_condattr_setpshared \ sem_timedwait semtimedop]) Index: head/devel/libqb/files/patch-lib_Makefile.am =================================================================== --- head/devel/libqb/files/patch-lib_Makefile.am (nonexistent) +++ head/devel/libqb/files/patch-lib_Makefile.am (revision 469702) @@ -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: head/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: head/devel/libqb/pkg-plist =================================================================== --- head/devel/libqb/pkg-plist (revision 469701) +++ head/devel/libqb/pkg-plist (revision 469702) @@ -1,38 +1,38 @@ include/qb/qbarray.h include/qb/qbatomic.h include/qb/qbconfig.h include/qb/qbdefs.h include/qb/qbhdb.h include/qb/qbipc_common.h include/qb/qbipcc.h include/qb/qbipcs.h include/qb/qblist.h include/qb/qblog.h include/qb/qbloop.h include/qb/qbmap.h include/qb/qbrb.h include/qb/qbutil.h 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 %%DOXYGEN%%man/man3/qbdefs.h.3.gz %%DOXYGEN%%man/man3/qbhdb.h.3.gz %%DOXYGEN%%man/man3/qbipc_common.h.3.gz %%DOXYGEN%%man/man3/qbipcc.h.3.gz %%DOXYGEN%%man/man3/qbipcs.h.3.gz %%DOXYGEN%%man/man3/qblist.h.3.gz %%DOXYGEN%%man/man3/qblog.h.3.gz %%DOXYGEN%%man/man3/qbloop.h.3.gz %%DOXYGEN%%man/man3/qbmap.h.3.gz %%DOXYGEN%%man/man3/qbrb.h.3.gz %%DOXYGEN%%man/man3/qbutil.h.3.gz %%DOXYGEN%%man/man8/qb-blackbox.8.gz sbin/qb-blackbox @comment %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/README.markdown @dir(,haclient,1770) %%QB_SOCKET_DIR%%