Date: Sat, 30 Jan 2016 05:08:12 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407507 - in head/sysutils: bareos-client bareos-docs bareos-server bareos-server/files Message-ID: <201601300508.u0U58Cpq083854@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Sat Jan 30 05:08:12 2016 New Revision: 407507 URL: https://svnweb.freebsd.org/changeset/ports/407507 Log: - Fix bareos-docs distinfo - Build bareos-* with jansson support - Bump PORTREVISION Modified: head/sysutils/bareos-client/Makefile head/sysutils/bareos-docs/distinfo head/sysutils/bareos-server/Makefile head/sysutils/bareos-server/files/patch-src-dird-Makefile.in Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Sat Jan 30 03:43:22 2016 (r407506) +++ head/sysutils/bareos-client/Makefile Sat Jan 30 05:08:12 2016 (r407507) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) Modified: head/sysutils/bareos-docs/distinfo ============================================================================== --- head/sysutils/bareos-docs/distinfo Sat Jan 30 03:43:22 2016 (r407506) +++ head/sysutils/bareos-docs/distinfo Sat Jan 30 05:08:12 2016 (r407507) @@ -1,2 +1,2 @@ -SHA256 (bareos-manual-main-reference.pdf) = 3e91963872dd18198f4122a73b895a6e0a820cb0942c2a2e108b3434771bd87f -SIZE (bareos-manual-main-reference.pdf) = 2869056 +SHA256 (bareos-manual-main-reference.pdf) = aa647370d0090b2f298f41d98ccc875c5ecdc2fa237b2bad9b35f1d2afa365ae +SIZE (bareos-manual-main-reference.pdf) = 3082318 Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Sat Jan 30 03:43:22 2016 (r407506) +++ head/sysutils/bareos-server/Makefile Sat Jan 30 05:08:12 2016 (r407507) @@ -3,7 +3,7 @@ PORTNAME= bareos DISTVERSION= 15.2.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server @@ -14,11 +14,12 @@ GH_TAGNAME= fb775025d54ef77abb4d67cc5aa9 MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) -USES+= libtool:keepla +USES+= libtool:keepla pkgconfig CONFLICTS?= bacula*-server-* -LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 +LIB_DEPENDS+= liblzo2.so:${PORTSDIR}/archivers/lzo2 \ + libjansson.so:${PORTSDIR}/devel/jansson USERS= bareos GROUPS= ${USERS} @@ -84,7 +85,8 @@ CONFIGURE_ARGS+=--with-tcp-wrappers=/usr --with-sbin-perm=755 \ --with-db-user=bareos \ --with-baseport=9101 \ - --with-pid-dir=/var/run/bareos + --with-pid-dir=/var/run/bareos \ + --with-jansson=${LOCALBASE} .if defined(WITH_CLIENT_ONLY) LMDB_CONFIGURE_ON= --enable-lmdb=yes Modified: head/sysutils/bareos-server/files/patch-src-dird-Makefile.in ============================================================================== --- head/sysutils/bareos-server/files/patch-src-dird-Makefile.in Sat Jan 30 03:43:22 2016 (r407506) +++ head/sysutils/bareos-server/files/patch-src-dird-Makefile.in Sat Jan 30 05:08:12 2016 (r407507) @@ -1,24 +1,32 @@ ---- src/dird/Makefile.in 2015-06-25 05:37:04.000000000 -0500 -+++ src/dird/Makefile.in 2015-07-25 16:32:30.152534000 -0500 -@@ -77,7 +77,7 @@ +--- src/dird/Makefile.in 2015-12-03 03:22:54.000000000 -0500 ++++ src/dird/Makefile.in 2016-01-29 23:53:16.549306000 -0500 +@@ -50,6 +50,7 @@ + INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include + + JANSSON_CPPFLAGS = @JANSSON_INC@ ++JANSSON_LDFLAGS = @JANSSON_LIBS@ + + .SUFFIXES: .c .o + .PHONY: +@@ -79,7 +80,7 @@ $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \ $(NDMP_LIBS) -lbareosfind -lbareossql -lbareoscats -lbareoscfg -lbareos -lm $(DLIB) \ $(DB_LIBS) $(LIBS) $(WRAPLIBS) $(GETTEXT_LIBS) $(CAP_LIBS) \ - $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) bareos-dbcheck: Makefile $(DBCHKOBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -88,7 +88,7 @@ +@@ -90,7 +91,7 @@ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(DBCHKOBJS) \ -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \ - $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) -+ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) ++ $(OPENSSL_LIBS) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS) testfind: Makefile $(TSTFNDOBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -99,7 +99,7 @@ +@@ -101,7 +102,7 @@ @echo "Linking $@ ..." $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) -L../lib -L../findlib -L../cats -o $@ $(TSTFNDOBJS) \ -lbareoscats -lbareossql -lbareoscfg -lbareosfind -lbareos -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) \ @@ -27,7 +35,7 @@ static-bareos-dir: Makefile $(SVROBJS) \ ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) \ -@@ -140,7 +140,6 @@ +@@ -142,7 +143,6 @@ $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-dir $(DESTDIR)$(sbindir)/bareos-dir $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bareos-dbcheck $(DESTDIR)$(sbindir)/bareos-dbcheck @srcconf=bareos-dir.conf; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601300508.u0U58Cpq083854>